forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nicola...@apache.org
Subject cvs commit: xml-forrest/src/documentation/content/xdocs your-project.xml
Date Tue, 25 Nov 2003 16:13:00 GMT
nicolaken    2003/11/25 08:13:00

  Modified:    src/core/context/skins/common/xslt/html site2xhtml.xsl
               src/core/context/skins/forrest-css/xslt/html site2xhtml.xsl
               src/core/context/skins/forrest-site/xslt/html site2xhtml.xsl
               src/core/context/skins/krysalis-site/xslt/html
                        site2xhtml.xsl
               src/core/context/WEB-INF cocoon.xconf
               src/documentation/content/xdocs your-project.xml
  Log:
        <action dev="NKB" type="update" context="skins" fixes-bug="FOR-85"
          due-to="Ross Gardler" due-to-email="ross@saafe.org" >
          Skins are now editable directly in FORREST_HOME.
        </action>
  
  Revision  Changes    Path
  1.2       +8 -1      xml-forrest/src/core/context/skins/common/xslt/html/site2xhtml.xsl
  
  Index: site2xhtml.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/skins/common/xslt/html/site2xhtml.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- site2xhtml.xsl	20 Oct 2003 16:29:05 -0000	1.1
  +++ site2xhtml.xsl	25 Nov 2003 16:12:59 -0000	1.2
  @@ -47,6 +47,13 @@
     <xsl:variable name="skin-img-dir" select="concat(string($root), 'skin/images')"/>
     <xsl:variable name="spacer" select="concat($root, 'skin/images/spacer.gif')"/>
   
  +  <xsl:template name="breadcrumbs">
  +    <xsl:if test="($config/trail/link1/@name)and($config/trail/link1/@name!='')"><a
href="{$config/trail/link1/@href}"><xsl:value-of select="$config/trail/link1/@name"/></a></xsl:if>
  +    <xsl:if test="($config/trail/link2/@name)and($config/trail/link2/@name!='')">
&gt; <a href="{$config/trail/link2/@href}">  <xsl:value-of select="$config/trail/link2/@name"/></a>
</xsl:if>
  +    <xsl:if test="($config/trail/link3/@name)and($config/trail/link3/@name!='')">
&gt; <a href="{$config/trail/link3/@href}">  <xsl:value-of select="$config/trail/link3/@name"/></a>
</xsl:if>
  +    <script type="text/javascript" language="JavaScript" src="{$root}skin/breadcrumbs.js"/>
  +  </xsl:template>
  +  
     <xsl:template match="site">
       <html>
         <head>
  
  
  
  1.2       +2 -2      xml-forrest/src/core/context/skins/forrest-css/xslt/html/site2xhtml.xsl
  
  Index: site2xhtml.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/skins/forrest-css/xslt/html/site2xhtml.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- site2xhtml.xsl	20 Oct 2003 16:29:05 -0000	1.1
  +++ site2xhtml.xsl	25 Nov 2003 16:12:59 -0000	1.2
  @@ -39,7 +39,7 @@
         </head>
         <body>
         	<div id="toplinks">
  -			<script type="text/javascript" language="JavaScript" src="{$root}skin/breadcrumbs.js"></script>
  +		   <xsl:call-template name="breadcrumbs"/>
   		</div>
   		
           <!-- ================= start Banner ================== -->
  
  
  
  1.2       +2 -2      xml-forrest/src/core/context/skins/forrest-site/xslt/html/site2xhtml.xsl
  
  Index: site2xhtml.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/skins/forrest-site/xslt/html/site2xhtml.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- site2xhtml.xsl	20 Oct 2003 16:29:05 -0000	1.1
  +++ site2xhtml.xsl	25 Nov 2003 16:13:00 -0000	1.2
  @@ -41,7 +41,7 @@
             <img class="spacer" src="{$spacer}" alt="" width="5" height="1" />
             <xsl:comment>===== breadcrumb trail (javascript-generated) ====</xsl:comment>
             <font face="Arial, Helvetica, Sans-serif" size="2">
  -              <script type="text/javascript" language="JavaScript" src="{$root}skin/breadcrumbs.js"/>
  +             <xsl:call-template name="breadcrumbs"/>
             </font>
           </td>
         </tr>
  
  
  
  1.3       +2 -2      xml-forrest/src/core/context/skins/krysalis-site/xslt/html/site2xhtml.xsl
  
  Index: site2xhtml.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/skins/krysalis-site/xslt/html/site2xhtml.xsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- site2xhtml.xsl	25 Nov 2003 14:55:54 -0000	1.2
  +++ site2xhtml.xsl	25 Nov 2003 16:13:00 -0000	1.3
  @@ -353,7 +353,7 @@
   	      <td></td>
   	      <!-- ============ Breadcrumbs =========== -->
             <td class="subborder trail">
  -	         &#160;<script type="text/javascript" language="JavaScript" src="{$root}skin/breadcrumbs.js"></script>&#160;
  +	         &#160;<xsl:call-template name="breadcrumbs"/>&#160;
   	      </td>
   	      <!-- ============ Page font settings =========== -->
   	      <td class="subborder trail" align="right" nowrap="true">
  
  
  
  1.2       +2 -1      xml-forrest/src/core/context/WEB-INF/cocoon.xconf
  
  Index: cocoon.xconf
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/WEB-INF/cocoon.xconf,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- cocoon.xconf	20 Oct 2003 15:38:35 -0000	1.1
  +++ cocoon.xconf	25 Nov 2003 16:13:00 -0000	1.2
  @@ -164,12 +164,14 @@
           <menu-scheme>@menu-scheme@</menu-scheme>
           <bugtracking-url>@bugtracking-url@</bugtracking-url>
           <i18n>@i18n@</i18n>
  +        <home>@forrest.home@/</home>
         </values>
       </component-instance>
   
       <component-instance name="project"       class="org.apache.cocoon.components.modules.input.DefaultsMetaModule">
         <values>
           <skin>@skin@</skin>
  +        <skinconf>@project.home@/@project.skinconf@</skinconf>        
           <doc>@project.home@/@project.content-dir@/</doc>
           <content>@project.home@/@project.raw-content-dir@/</content>
           <content.xdocs>@project.home@/@project.xdocs-dir@/</content.xdocs>
  @@ -178,7 +180,6 @@
           <skins-dir>@project.home@/@project.skins-dir@/</skins-dir>
         </values>
       </component-instance>
  -
   
       <component-instance
         class="org.apache.cocoon.components.modules.input.XMLFileModule"
  
  
  
  1.31      +8 -2      xml-forrest/src/documentation/content/xdocs/your-project.xml
  
  Index: your-project.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/your-project.xml,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- your-project.xml	7 Sep 2003 04:58:15 -0000	1.30
  +++ your-project.xml	25 Nov 2003 16:13:00 -0000	1.31
  @@ -766,6 +766,12 @@
   
     ]]><strong>... overrides of default templates ...</strong><![CDATA[

   </xsl:stylesheet>]]></source>
  +          <p>In order to use this feature in your custom skins you must copy
  +          the common skin from the forrest distribution into your custom skins 
  +          directory (see <code>xml-forrest/src/resources/skins/common</code>).
  +          This will protect your skin from changes in the Forrest common skin,
  +          but you must remember to update this skin in order to take advantage
  +          of new features added by the Forrest team.</p>
             <p>This is particularly relevant for menu rendering (book2menu.xsl),
               where the common stylesheet does the 'logic' of which item is
               selected, and overriding stylesheets define the presentation.</p>
  
  
  

Mime
View raw message