forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From je...@apache.org
Subject cvs commit: xml-forrest/src/resources/skins/common/xslt/html tabutils.xsl
Date Fri, 09 May 2003 03:16:44 GMT
jefft       2003/05/08 20:16:43

  Modified:    .        status.xml
               src/resources/fresh-site/src/documentation/content/xdocs
                        tabs.xml
               src/resources/schema/dtd tab-cocoon-v10.dtd
               src/resources/skins/common/xslt/html tabutils.xsl
  Log:
  add @indexfile to tabs. We can't infer this from @href without breaking the selected-tab
algorithm
  
  Revision  Changes    Path
  1.157     +4 -0      xml-forrest/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/status.xml,v
  retrieving revision 1.156
  retrieving revision 1.157
  diff -u -r1.156 -r1.157
  --- status.xml	7 May 2003 23:48:05 -0000	1.156
  +++ status.xml	9 May 2003 03:16:43 -0000	1.157
  @@ -24,6 +24,10 @@
   
     <changes>
       <release version="0.5-dev" date="unreleased">
  +      <action dev="JT" type="update" context="schemas">
  +        Add a @indexfile attribute to tabs.xml, so that the user can specify 
  +        which file the tab links to.
  +      </action>
         <action dev="JT" type="fix" context="webapp">
           Enable link rewriting for *.ehtml files.
         </action>
  
  
  
  1.3       +3 -3      xml-forrest/src/resources/fresh-site/src/documentation/content/xdocs/tabs.xml
  
  Index: tabs.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/fresh-site/src/documentation/content/xdocs/tabs.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- tabs.xml	7 Jan 2003 16:43:45 -0000	1.2
  +++ tabs.xml	9 May 2003 03:16:43 -0000	1.3
  @@ -7,13 +7,13 @@
     xmlns:xlink="http://www.w3.org/1999/xlink">
   
     <!-- The rules are:
  -    @dir will always have /index.html added.
  +    @dir will always have '/@indexfile' added.
  +    @indexfile gets appended to @dir if the tab is selected. Defaults to 'index.html'
       @href is not modified unless it is root-relative and obviously specifies a
       directory (ends in '/'), in which case /index.html will be added
     -->
   
  -
  -  <tab label="Home" dir=""/>
  +  <tab label="Home" dir="" indexfile="index.html"/>
     <!-- Add new tabs here, eg:
     <tab label="How-Tos" dir="community/howto/"/>
     <tab label="XML Site" dir="xml-site/"/>
  
  
  
  1.6       +1 -0      xml-forrest/src/resources/schema/dtd/tab-cocoon-v10.dtd
  
  Index: tab-cocoon-v10.dtd
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/schema/dtd/tab-cocoon-v10.dtd,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- tab-cocoon-v10.dtd	2 Nov 2002 10:09:39 -0000	1.5
  +++ tab-cocoon-v10.dtd	9 May 2003 03:16:43 -0000	1.6
  @@ -51,6 +51,7 @@
   <!ATTLIST tab
     label CDATA #REQUIRED
     dir CDATA #IMPLIED
  +  indexfile CDATA #IMPLIED
     href CDATA #IMPLIED
     type (visible | hidden) "visible"
   >
  
  
  
  1.3       +6 -1      xml-forrest/src/resources/skins/common/xslt/html/tabutils.xsl
  
  Index: tabutils.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/common/xslt/html/tabutils.xsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- tabutils.xsl	2 Apr 2003 11:01:32 -0000	1.2
  +++ tabutils.xsl	9 May 2003 03:16:43 -0000	1.3
  @@ -32,7 +32,12 @@
           <xsl:if test="$tab/@dir or substring($tab/@href, string-length($tab/@href),
             string-length($tab/@href)) = '/'">
             <xsl:text>/</xsl:text>
  -          <xsl:value-of select="$dir_index"/>
  +          <xsl:if test="$tab/@indexfile">
  +            <xsl:value-of select="$tab/@indexfile"/>
  +          </xsl:if>
  +          <xsl:if test="not(@indexfile)">
  +            <xsl:value-of select="$dir_index"/>
  +          </xsl:if>
           </xsl:if>
         </xsl:variable>
   
  
  
  

Mime
View raw message