From: Ben H. <ne...@us...> - 2006-04-19 20:09:05
|
Update of /cvsroot/springframework/spring-projects/spring-webflow/docs/reference/styles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7864/docs/reference/styles Modified Files: html.xsl fopdf.xsl html_chunk.xsl html.css Log Message: Updated the doc style to match the Spring doc style Index: html_chunk.xsl =================================================================== RCS file: /cvsroot/springframework/spring-projects/spring-webflow/docs/reference/styles/html_chunk.xsl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** html_chunk.xsl 24 Sep 2005 07:55:49 -0000 1.1 --- html_chunk.xsl 19 Apr 2006 20:08:57 -0000 1.2 *************** *** 1,17 **** ! <?xml version="1.0"?> ! <!-- ! ! This is the XSL HTML configuration file for the Hibernate ! Reference Documentation. ! ! It took me days to figure out this stuff and fix most of ! the obvious bugs in the DocBook XSL distribution, so if you ! use this stylesheet, give some credit back to the Hibernate ! project. ! ! chr...@bl... --> - <!DOCTYPE xsl:stylesheet [ <!ENTITY db_xsl_path "../lib/docbook-xsl/"> --- 1,7 ---- ! <?xml version="1.0" ?> <!-- ! This is the XSL HTML configuration file for the Spring ! Reference Documentation. --> <!DOCTYPE xsl:stylesheet [ <!ENTITY db_xsl_path "../lib/docbook-xsl/"> *************** *** 19,90 **** <!ENTITY admon_gfx_path "../images/admons/"> ]> ! ! <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" ! version="1.0" ! xmlns="http://www.w3.org/TR/xhtml1/transitional" ! exclude-result-prefixes="#default"> ! ! <xsl:import href="&db_xsl_path;/html/chunk.xsl"/> ! ! <!--################################################### HTML Settings ! ################################################### --> ! ! <xsl:param name="chunk.section.depth">'5'</xsl:param> ! <xsl:param name="use.id.as.filename">'1'</xsl:param> ! <xsl:param name="html.stylesheet">../styles/html.css</xsl:param> ! ! <!-- These extensions are required for table printing and other stuff --> ! <xsl:param name="use.extensions">1</xsl:param> ! <xsl:param name="tablecolumns.extension">0</xsl:param> ! <xsl:param name="callout.extensions">1</xsl:param> ! <xsl:param name="graphicsize.extension">0</xsl:param> ! ! <!--################################################### Table Of Contents ! ################################################### --> ! ! <!-- Generate the TOCs for named components only --> ! <xsl:param name="generate.toc"> book toc </xsl:param> ! ! <!-- Show only Sections up to level 3 in the TOCs --> ! <xsl:param name="toc.section.depth">3</xsl:param> ! ! <!--################################################### Labels ! ################################################### --> ! ! <!-- Label Chapters and Sections (numbering) --> ! <xsl:param name="chapter.autolabel">1</xsl:param> ! <xsl:param name="section.autolabel" select="1"/> ! <xsl:param name="section.label.includes.component.label" select="1"/> ! ! <!--################################################### Callouts ! ################################################### --> ! ! <!-- Use images for callouts instead of (1) (2) (3) --> ! <xsl:param name="callout.graphics">1</xsl:param> ! <xsl:param name="callout.graphics.path">&callout_gfx_path;</xsl:param> ! ! <!-- Place callout marks at this column in annotated areas --> ! <xsl:param name="callout.defaultcolumn">90</xsl:param> ! ! <!--################################################### Admonitions ! ################################################### --> ! ! <!-- Use nice graphics for admonitions --> ! <xsl:param name="admon.graphics">'1'</xsl:param> ! <xsl:param name="admon.graphics.path">&admon_gfx_path;</xsl:param> ! ! <!--################################################### Misc ! ################################################### --> ! ! <!-- Placement of titles --> ! <xsl:param name="formal.title.placement"> figure after example before --- 9,61 ---- <!ENTITY admon_gfx_path "../images/admons/"> ]> ! <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns="http://www.w3.org/TR/xhtml1/transitional" ! exclude-result-prefixes="#default"> ! <xsl:import href="&db_xsl_path;/html/chunk.xsl" /> ! <!--################################################### HTML Settings ! ################################################### --> ! <xsl:param name="chunk.section.depth">'5'</xsl:param> ! <xsl:param name="use.id.as.filename">'1'</xsl:param> ! <xsl:param name="html.stylesheet">../styles/html.css</xsl:param> ! <!-- These extensions are required for table printing and other stuff --> ! <xsl:param name="use.extensions">1</xsl:param> ! <xsl:param name="tablecolumns.extension">0</xsl:param> ! <xsl:param name="callout.extensions">1</xsl:param> ! <xsl:param name="graphicsize.extension">0</xsl:param> ! <!--################################################### Table Of Contents ! ################################################### --> ! <!-- Generate the TOCs for named components only --> ! <xsl:param name="generate.toc"> book toc </xsl:param> ! <!-- Show only Sections up to level 3 in the TOCs --> ! <xsl:param name="toc.section.depth">3</xsl:param> ! <!--################################################### Labels ! ################################################### --> ! <!-- Label Chapters and Sections (numbering) --> ! <xsl:param name="chapter.autolabel">1</xsl:param> ! <xsl:param name="section.autolabel" select="1" /> ! <xsl:param name="section.label.includes.component.label" select="1" /> ! <!--################################################### Callouts ! ################################################### --> ! <!-- Use images for callouts instead of (1) (2) (3) --> ! <xsl:param name="callout.graphics">1</xsl:param> ! <xsl:param name="callout.graphics.path">&callout_gfx_path;</xsl:param> ! <!-- Place callout marks at this column in annotated areas --> ! <xsl:param name="callout.defaultcolumn">90</xsl:param> ! <!--################################################### Admonitions ! ################################################### --> ! <!-- Use nice graphics for admonitions --> ! <xsl:param name="admon.graphics">'1'</xsl:param> ! <xsl:param name="admon.graphics.path">&admon_gfx_path;</xsl:param> ! <!--################################################### Misc ! ################################################### --> ! <!-- Placement of titles --> ! <xsl:param name="formal.title.placement"> figure after example before *************** *** 92,96 **** table before procedure before ! </xsl:param> </xsl:stylesheet> --- 63,103 ---- table before procedure before ! </xsl:param> ! <xsl:template match="author" mode="titlepage.mode"> ! <xsl:if test="name(preceding-sibling::*[1]) = 'author'"> ! <xsl:text>, </xsl:text> ! </xsl:if> ! <span class="{name(.)}"> ! <xsl:call-template name="person.name" /> ! <xsl:apply-templates mode="titlepage.mode" select="./contrib" /> ! <xsl:apply-templates mode="titlepage.mode" select="./affiliation" /> ! </span> ! </xsl:template> ! <xsl:template match="authorgroup" mode="titlepage.mode"> ! <div class="{name(.)}"> ! <h2>Authors</h2> ! <p/> ! <xsl:apply-templates mode="titlepage.mode" /> ! </div> ! </xsl:template> ! <!--################################################### ! Headers and Footers ! ################################################### --> + <!-- lets have a Spring and I21 banner across the top of each page --> + <xsl:template name="user.header.navigation"> + <div style="background-color:#86AEA5;border:none;height:73px;border:1px solid black;"> + <a style="border:none;background: url();" href="http://www.springframework.org/" title="The Spring Framework"> + <img style="border:none;" src="images/xdev-spring_logo.jpg"/> + </a> + <a style="border:none;background: url();" href="http://www.interface21.com/" title="Interface21 - Spring from the Source"> + <img style="border:none;position:absolute;padding-top:7px;right:32px;" src="images/i21-banner-stamped.jpg"/> + </a> + </div> + </xsl:template> + + <!-- no header navigation --> + <xsl:template name="header.navigation"/> + <xsl:param name="navig.showtitles">1</xsl:param> + </xsl:stylesheet> Index: html.css =================================================================== RCS file: /cvsroot/springframework/spring-projects/spring-webflow/docs/reference/styles/html.css,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** html.css 24 Sep 2005 07:55:49 -0000 1.1 --- html.css 19 Apr 2006 20:08:57 -0000 1.2 *************** *** 1,4 **** A { ! color: #003399; } --- 1,36 ---- + BODY { + text-align: justify; + margin-right: 2em; + margin-left: 2em; + } + + A[accesskey^="p"] { + font-family: Verdana, Arial, helvetica, sans-serif; + font-size: 12px; + color: #003399; + } + + A[accesskey^="u"] { + font-family: Verdana, Arial, helvetica, sans-serif; + font-size: 12px; + color: #003399; + } + + A[accesskey^="h"] { + font-family: Verdana, Arial, helvetica, sans-serif; + font-size: 12px; + color: #003399; + } + + A[accesskey^="n"] { + font-family: Verdana, Arial, helvetica, sans-serif; + font-size: 12px; + color: #003399; + } + A { ! color: #003399; ! font-family: Verdana, Arial, helvetica, sans-serif; ! font-size: 12px; } *************** *** 11,14 **** --- 43,55 ---- } + P { + font-family: Verdana, Arial; + } + + DT { + font-family: Verdana, Arial; + font-size: 12px; + } + P, DL, DT, DD, BLOCKQUOTE { color: #000000; *************** *** 16,20 **** margin-top: 3px; padding-top: 0px; - /*border: 1px solid black;*/ } --- 57,60 ---- *************** *** 29,34 **** P.releaseinfo { ! font-size: 120%; font-weight: bold; ! font-family: Arial, helvetica, sans-serif; padding-top: 10px; } --- 69,75 ---- P.releaseinfo { ! font-size: 100%; ! font-weight: bold; ! font-family: Verdana, Arial, helvetica, sans-serif; padding-top: 10px; } *************** *** 36,40 **** P.pubdate { font-size: 120%; font-weight: bold; ! font-family: Arial, helvetica, sans-serif; } --- 77,81 ---- P.pubdate { font-size: 120%; font-weight: bold; ! font-family: Verdana, Arial, helvetica, sans-serif; } *************** *** 43,51 **** } - TD, TH, SPAN { color: #000000; } BLOCKQUOTE { margin-right: 0px; --- 84,101 ---- } TD, TH, SPAN { color: #000000; } + TD[width^="40%"] { + font-family: Verdana, Arial, helvetica, sans-serif; + font-size: 12px; + color: #003399; + } + + TABLE[summary^="Navigation header"] tbody tr th[colspan^="3"] { + font-family: Verdana, Arial, helvetica, sans-serif; + } + BLOCKQUOTE { margin-right: 0px; *************** *** 57,61 **** margin-top:0px; padding-top:14px; ! font-family: Arial, helvetica, sans-serif; margin-bottom: 0px; } --- 107,111 ---- margin-top:0px; padding-top:14px; ! font-family: Verdana, Arial, helvetica, sans-serif; margin-bottom: 0px; } *************** *** 71,81 **** } ! H3.author { ! color: #000000; ! font-weight:500; ! margin-top:0px; ! padding-top:0px; ! font-family: Arial, helvetica, sans-serif; ! margin-bottom: 0px; } --- 121,127 ---- } ! .firstname, .surname { ! font-size: 12px; ! font-family: Verdana, Arial, helvetica, sans-serif; } *************** *** 85,92 **** --- 131,173 ---- border: 1px thin black; empty-cells: hide; + margin: 10px 0px 30px 50px; + width: 90%; + } + + div.table { + margin: 30px 0 30 0; + border: 1px dashed gray; + padding: 10px; + } + + div.table > p.title { + padding-left: 10px; + } + + table[summary^="Navigation footer"] { + border-collapse: collapse; + border-spacing:0; + border: 1px thin black; + empty-cells: hide; + margin: 0px; + width: 100%; + } + + table[summary^="Note"], table[summary^="Warning"] { + border-collapse: collapse; + border-spacing:0; + border: 1px thin black; + empty-cells: hide; + margin: 10px 0 10 -20; + width: 100%; } TD { padding: 4pt; + font-family: Verdana, Arial, helvetica, sans-serif; + } + + div.warning TD { + text-align: justify; } *************** *** 111,115 **** TT { ! font-size: 90%; font-family: "Courier New", Courier, monospace; color: #000000; --- 192,196 ---- TT { ! font-size: 110%; font-family: "Courier New", Courier, monospace; color: #000000; *************** *** 121,125 **** PRE { ! font-size: 90%; padding: 5px; border-style: solid; --- 202,206 ---- PRE { ! font-size: 110%; padding: 5px; border-style: solid; *************** *** 148,157 **** } - /*(.itemizedlist, UL { - padding-top: 0; - padding-bottom:0; - margin:0; - }*/ - .term { font-weight:bold; --- 229,232 ---- *************** *** 163,168 **** } ! .legalnotice { ! font-size: 70%; } - --- 238,254 ---- } ! .legalnotice { ! font-family: Verdana, Arial, helvetica, sans-serif; ! font-size: 12px; ! font-style: italic; ! } ! ! .sidebar { ! float: right; ! margin: 10px 0px 10px 30px; ! padding: 10px 20px 20px 20px; ! width: 33%; ! border: 1px solid black; ! background-color: #F4F4F4; ! font-size: 14px; } Index: fopdf.xsl =================================================================== RCS file: /cvsroot/springframework/spring-projects/spring-webflow/docs/reference/styles/fopdf.xsl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** fopdf.xsl 2 Mar 2006 23:47:20 -0000 1.2 --- fopdf.xsl 19 Apr 2006 20:08:57 -0000 1.3 *************** *** 2,6 **** <!-- ! The base of this stylesheet was graciously borrowed from the Hibernate project. --> --- 2,12 ---- <!-- ! ! This is the XSL FO (PDF) stylesheet for the Spring reference ! documentation. ! ! Thanks are due to Christian Bauer of the Hibernate project ! team for writing the original stylesheet upon which this one ! is based. --> *************** *** 8,11 **** --- 14,18 ---- <!ENTITY db_xsl_path "../lib/docbook-xsl/"> <!ENTITY admon_gfx_path "../images/admons/"> + <!ENTITY copyright "©"> ]> *************** *** 50,54 **** <fo:table-cell text-align="center"> <fo:block font-family="Helvetica" font-size="12pt" padding="10mm"> ! <xsl:text>Copyright (c) 2004-2006 </xsl:text> <xsl:for-each select="bookinfo/authorgroup/author"> <xsl:if test="position() > 1"> --- 57,61 ---- <fo:table-cell text-align="center"> <fo:block font-family="Helvetica" font-size="12pt" padding="10mm"> ! <xsl:text>Copyright ©right; 2004-2006 </xsl:text> <xsl:for-each select="bookinfo/authorgroup/author"> <xsl:if test="position() > 1"> *************** *** 94,166 **** Custom Footer ################################################### --> ! ! <!-- This footer prints the Spring Web Flow version number on the left side --> ! <xsl:template name="footer.content"> ! <xsl:param name="pageclass" select="''"/> ! <xsl:param name="sequence" select="''"/> ! <xsl:param name="position" select="''"/> ! <xsl:param name="gentext-key" select="''"/> ! ! <xsl:variable name="Version"> ! <xsl:choose> ! <xsl:when test="//releaseinfo"> ! <xsl:text>Spring Web Flow </xsl:text><xsl:value-of select="//releaseinfo"/> ! </xsl:when> ! <xsl:otherwise> ! <!-- nop --> ! </xsl:otherwise> ! </xsl:choose> ! </xsl:variable> ! ! <xsl:choose> ! <xsl:when test="$sequence='blank'"> ! <xsl:choose> ! <xsl:when test="$double.sided != 0 and $position = 'left'"> ! <xsl:value-of select="$Version"/> ! </xsl:when> ! ! <xsl:when test="$double.sided = 0 and $position = 'center'"> ! <!-- nop --> ! </xsl:when> ! ! <xsl:otherwise> ! <fo:page-number/> ! </xsl:otherwise> ! </xsl:choose> ! </xsl:when> ! ! <xsl:when test="$pageclass='titlepage'"> ! <!-- nop: other titlepage sequences have no footer --> ! </xsl:when> ! ! <xsl:when test="$double.sided != 0 and $sequence = 'even' and $position='left'"> ! <fo:page-number/> ! </xsl:when> ! ! <xsl:when test="$double.sided != 0 and $sequence = 'odd' and $position='right'"> ! <fo:page-number/> ! </xsl:when> ! ! <xsl:when test="$double.sided = 0 and $position='right'"> ! <fo:page-number/> ! </xsl:when> ! ! <xsl:when test="$double.sided != 0 and $sequence = 'odd' and $position='left'"> ! <xsl:value-of select="$Version"/> ! </xsl:when> ! ! <xsl:when test="$double.sided != 0 and $sequence = 'even' and $position='right'"> ! <xsl:value-of select="$Version"/> ! </xsl:when> ! ! <xsl:when test="$double.sided = 0 and $position='left'"> ! <xsl:value-of select="$Version"/> ! </xsl:when> ! ! <xsl:otherwise> ! <!-- nop --> ! </xsl:otherwise> ! </xsl:choose> ! </xsl:template> <!--################################################### --- 101,147 ---- Custom Footer ################################################### --> ! <xsl:template name="footer.content"> ! <xsl:param name="pageclass" select="''" /> ! <xsl:param name="sequence" select="''" /> ! <xsl:param name="position" select="''" /> ! <xsl:param name="gentext-key" select="''" /> ! <xsl:variable name="Version"> ! <xsl:if test="//releaseinfo"> ! <xsl:text>Spring Framework (</xsl:text><xsl:value-of select="//releaseinfo" /><xsl:text>)</xsl:text> ! </xsl:if> ! </xsl:variable> ! <xsl:choose> ! <xsl:when test="$sequence='blank'"> ! <xsl:if test="$position = 'center'"> ! <xsl:value-of select="$Version" /> ! </xsl:if> ! </xsl:when> ! <!-- for double sided printing, print page numbers on alternating sides (of the page) --> ! <xsl:when test="$double.sided != 0"> ! <xsl:choose> ! <xsl:when test="$sequence = 'even' and $position='left'"> ! <fo:page-number /> ! </xsl:when> ! <xsl:when test="$sequence = 'odd' and $position='right'"> ! <fo:page-number /> ! </xsl:when> ! <xsl:when test="$position='center'"> ! <xsl:value-of select="$Version" /> ! </xsl:when> ! </xsl:choose> ! </xsl:when> ! <!-- for single sided printing, print all page numbers on the right (of the page) --> ! <xsl:when test="$double.sided = 0"> ! <xsl:choose> ! <xsl:when test="$position='center'"> ! <xsl:value-of select="$Version" /> ! </xsl:when> ! <xsl:when test="$position='right'"> ! <fo:page-number /> ! </xsl:when> ! </xsl:choose> ! </xsl:when> ! </xsl:choose> ! </xsl:template> <!--################################################### *************** *** 182,185 **** --- 163,167 ---- last-line-end-indent="-{$toc.indent.width}pt" white-space-treatment="preserve" + text-align="left" white-space-collapse="false"> <fo:inline keep-with-next.within-line="always"> *************** *** 272,276 **** <!-- Left aligned text and no hyphenation --> ! <xsl:param name="alignment">left</xsl:param> <xsl:param name="hyphenate">false</xsl:param> --- 254,258 ---- <!-- Left aligned text and no hyphenation --> ! <xsl:param name="alignment">justify</xsl:param> <xsl:param name="hyphenate">false</xsl:param> *************** *** 410,417 **** <xsl:attribute name="space-before.optimum">1em</xsl:attribute> <xsl:attribute name="space-before.maximum">1em</xsl:attribute> - <!-- alef: commented out because footnotes were screwed because of it --> - <!--<xsl:attribute name="space-after.minimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>--> <xsl:attribute name="border-color">#444444</xsl:attribute> <xsl:attribute name="border-style">solid</xsl:attribute> --- 392,395 ---- *************** *** 476,478 **** --- 454,475 ---- </xsl:attribute-set> + <!--################################################### + colored and hyphenated links + ################################################### --> + <xsl:template match="ulink"> + <fo:basic-link external-destination="{@url}" + xsl:use-attribute-sets="xref.properties" + text-decoration="underline" + color="blue"> + <xsl:choose> + <xsl:when test="count(child::node())=0"> + <xsl:value-of select="@url"/> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates/> + </xsl:otherwise> + </xsl:choose> + </fo:basic-link> + </xsl:template> + </xsl:stylesheet> Index: html.xsl =================================================================== RCS file: /cvsroot/springframework/spring-projects/spring-webflow/docs/reference/styles/html.xsl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** html.xsl 24 Sep 2005 07:55:49 -0000 1.1 --- html.xsl 19 Apr 2006 20:08:57 -0000 1.2 *************** *** 1,17 **** <?xml version="1.0"?> - <!-- ! ! This is the XSL HTML configuration file for the Hibernate ! Reference Documentation. ! ! It took me days to figure out this stuff and fix most of ! the obvious bugs in the DocBook XSL distribution, so if you ! use this stylesheet, give some credit back to the Hibernate ! project. ! ! chr...@bl... --> - <!DOCTYPE xsl:stylesheet [ <!ENTITY db_xsl_path "../lib/docbook-xsl/"> --- 1,7 ---- <?xml version="1.0"?> <!-- ! This is the XSL HTML configuration file for the Spring ! Reference Documentation. --> <!DOCTYPE xsl:stylesheet [ <!ENTITY db_xsl_path "../lib/docbook-xsl/"> *************** *** 79,88 **** <xsl:param name="admon.graphics.path">&admon_gfx_path;</xsl:param> ! <!--################################################### Misc ! ################################################### --> ! ! <!-- Placement of titles --> ! <xsl:param name="formal.title.placement"> figure after example before --- 69,77 ---- <xsl:param name="admon.graphics.path">&admon_gfx_path;</xsl:param> ! <!--################################################### Misc ! ################################################### --> ! <!-- Placement of titles --> ! <xsl:param name="formal.title.placement"> figure after example before *************** *** 90,94 **** table before procedure before ! </xsl:param> ! </xsl:stylesheet> --- 79,100 ---- table before procedure before ! </xsl:param> ! <xsl:template match="author" mode="titlepage.mode"> ! <xsl:if test="name(preceding-sibling::*[1]) = 'author'"> ! <xsl:text>, </xsl:text> ! </xsl:if> ! <span class="{name(.)}"> ! <xsl:call-template name="person.name" /> ! <xsl:apply-templates mode="titlepage.mode" select="./contrib" /> ! <xsl:apply-templates mode="titlepage.mode" select="./affiliation" /> ! </span> ! </xsl:template> ! <xsl:template match="authorgroup" mode="titlepage.mode"> ! <div class="{name(.)}"> ! <h2>Authors</h2> ! <p/> ! <xsl:apply-templates mode="titlepage.mode" /> ! </div> ! </xsl:template> ! </xsl:stylesheet> |