You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by ni...@apache.org on 2004/09/07 13:30:38 UTC

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

Author: nicolaken
Date: Tue Sep  7 04:30:38 2004
New Revision: 43468

Modified:
   forrest/trunk/src/core/context/linkmap.xmap
   forrest/trunk/src/core/context/resources/stylesheets/linkmap2document.xsl
Log:
Fix bug that has come in mergin with other changes in linkmap.xmap.
Enhance the output to show only the elements with labels using the labels as monikers and fix ordering.

Modified: forrest/trunk/src/core/context/linkmap.xmap
==============================================================================
--- forrest/trunk/src/core/context/linkmap.xmap	(original)
+++ forrest/trunk/src/core/context/linkmap.xmap	Tue Sep  7 04:30:38 2004
@@ -53,13 +53,14 @@
          </map:when>  
        </map:select>
      </map:pipeline>
+ 
+     <map:pipeline>     
       <map:match pattern="linkmap.xml">
         <map:generate src="cocoon://abs-linkmap" />
         <map:transform src="{forrest:stylesheets}/linkmap2document.xsl"/>
         <map:serialize type="xml" />
       </map:match>
       
-     <map:pipeline>
       <!-- site.xml with @href's appended to be context-relative. -->
       <map:match pattern="abs-linkmap">
         <map:generate src="{project:content.xdocs}site.xml" />

Modified: forrest/trunk/src/core/context/resources/stylesheets/linkmap2document.xsl
==============================================================================
--- forrest/trunk/src/core/context/resources/stylesheets/linkmap2document.xsl	(original)
+++ forrest/trunk/src/core/context/resources/stylesheets/linkmap2document.xsl	Tue Sep  7 04:30:38 2004
@@ -37,14 +37,16 @@
    </xsl:template>     
 
      <xsl:template match="*">
-     
+        <xsl:if test="@label">
+          <li><a href="{@href}"><xsl:value-of select="@label" /></a></li>
+        </xsl:if>
+        
         <xsl:if test="*">
          <ul> 
 	     <xsl:apply-templates/>        
          </ul>
         </xsl:if>
-        <li><a href="{@href}"><xsl:value-of select="name(.)" /></a></li>
-
+        
      </xsl:template>
 
 </xsl:stylesheet>