You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by ch...@apache.org on 2004/04/28 12:28:15 UTC

svn commit: rev 10358 - in xml/forrest/trunk: . src/core/context/resources/stylesheets

Author: cheche
Date: Wed Apr 28 03:28:13 2004
New Revision: 10358

Modified:
   xml/forrest/trunk/src/core/context/resources/stylesheets/site2book.xsl
   xml/forrest/trunk/status.xml
Log:
site2book.xsl handle all menu-item and menu attributes


Modified: xml/forrest/trunk/src/core/context/resources/stylesheets/site2book.xsl
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/stylesheets/site2book.xsl	(original)
+++ xml/forrest/trunk/src/core/context/resources/stylesheets/site2book.xsl	Wed Apr 28 03:28:13 2004
@@ -48,29 +48,14 @@
       <!-- No children -> must be a menu item -->
       <!-- Has children, but they are not for display -> menu item -->
       <xsl:when test="count(*) = 0 or count(*) > 0 and (not(*/@label))">
-        <menu-item label="{@label}" href="{@href}">
-          <xsl:if test="@description">
-            <xsl:attribute name="description">
-              <xsl:value-of select="@description"/>
-            </xsl:attribute>
-          </xsl:if>
+        <menu-item>
+          <xsl:copy-of select="@*"/> 
         </menu-item>
       </xsl:when>
-
       <!-- Anything else is considered a menu -->
       <xsl:otherwise>
-        <menu label="{@label}">
-          <xsl:if test="@href">
-            <xsl:attribute name="href">
-              <xsl:value-of select="@href"/>
-            </xsl:attribute>
-          </xsl:if>
-          <xsl:if test="@description">
-            <xsl:attribute name="description">
-              <xsl:value-of select="@description"/>
-            </xsl:attribute>
-          </xsl:if>
-
+        <menu>
+          <xsl:copy-of select="@*"/> 
           <xsl:apply-templates/>
         </menu>
       </xsl:otherwise>

Modified: xml/forrest/trunk/status.xml
==============================================================================
--- xml/forrest/trunk/status.xml	(original)
+++ xml/forrest/trunk/status.xml	Wed Apr 28 03:28:13 2004
@@ -44,6 +44,9 @@
 
   <changes>
     <release version="0.6-dev" date="unreleased">
+      <action dev="JJP" type="fix" context="core" fixes-bug="FOR-69">
+        site2book.xsl handle all menu-item and menu attributes
+      </action>
       <action dev="DPB" type="fix" context="core" due-to="Rob Exley" fixes-bug="FOR-115">
         Proper table around 'graphic' in simplified docbook.
       </action>