forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nicola...@apache.org
Subject svn commit: rev 43468 - in forrest/trunk/src/core/context: . resources/stylesheets
Date Tue, 07 Sep 2004 11:30:38 GMT
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>

Mime
View raw message