forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r523917 - in /forrest/trunk: main/webapp/resources/stylesheets/linkmap-to-document.xsl site-author/status.xml
Date Fri, 30 Mar 2007 03:03:41 GMT
Author: crossley
Date: Thu Mar 29 20:03:40 2007
New Revision: 523917

URL: http://svn.apache.org/viewvc?view=rev&rev=523917
Log:
The group labels have no links, so don't show them.
Remove section and use ToC in the title instead. Better page layout.
Use @description if available.

Modified:
    forrest/trunk/main/webapp/resources/stylesheets/linkmap-to-document.xsl
    forrest/trunk/site-author/status.xml

Modified: forrest/trunk/main/webapp/resources/stylesheets/linkmap-to-document.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/linkmap-to-document.xsl?view=diff&rev=523917&r1=523916&r2=523917
==============================================================================
--- forrest/trunk/main/webapp/resources/stylesheets/linkmap-to-document.xsl (original)
+++ forrest/trunk/main/webapp/resources/stylesheets/linkmap-to-document.xsl Thu Mar 29 20:03:40
2007
@@ -26,16 +26,15 @@
    <xsl:template match="/">
      <document>
        <header>
-         <title>Site Linkmap</title>
+         <title>Site Linkmap Table of Contents</title>
        </header>
        <body>
-        <section>
-          <title>Table of Contents</title>
+         <p>This is a map of the complete site and its structure.</p>
+
 <!-- FIXME: FOR-731 workaround for a side-effect of the workaround for FOR-675
-           <xsl:apply-templates select="*[not(self::site)]" />        
+         <xsl:apply-templates select="*[not(self::site)]" />        
 -->
-           <xsl:apply-templates select="*" />        
-        </section>
+         <xsl:apply-templates select="*" />        
        </body>
      </document>       
    </xsl:template>     
@@ -43,7 +42,22 @@
      <xsl:template match="*">
         <xsl:if test="@label">
           <ul>
-            <li><a href="{@href}"><xsl:value-of select="@label" /></a>&#160;&#160;&#160;_________________________&#160;&#160;<em><xsl:value-of
select="name(.)" /></em></li>
+            <li>
+              <a>
+                <xsl:if test="@href!=''">
+                  <xsl:attribute name="href">
+                    <xsl:value-of select="@href"/>
+                  </xsl:attribute>
+                </xsl:if>
+                <xsl:value-of select="@label"/>
+              <!-- force site element name to be on same line as label -->
+              </a>&#160;&#160;___________________&#160;&#160;<em><xsl:value-of
select="name(.)" /></em>
+              <xsl:if test="@description">
+                <!-- allow description to flow to next line in a small window -->
+                <xsl:text>&#160;: </xsl:text>
+                <xsl:value-of select="normalize-space(@description)"/>
+              </xsl:if>
+            </li>
 
             <xsl:if test="*">
               <ul> 

Modified: forrest/trunk/site-author/status.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?view=diff&rev=523917&r1=523916&r2=523917
==============================================================================
--- forrest/trunk/site-author/status.xml (original)
+++ forrest/trunk/site-author/status.xml Thu Mar 29 20:03:40 2007
@@ -142,6 +142,11 @@
         <link href="site:upgrading_08">upgrading to v0.8</link>
       </action>
 <!--2007-03-->
+      <action dev="DC" type="update" context="code">
+        Improved the autogenerated site linkmap.html page. Do not show empty links for group
labels.
+        Use a better title and introduction.
+        Use @description if available.
+      </action>
       <action dev="TS" type="fix" context="docs" fixes-bug="FOR-861">
               Update docs to reflect locationmap naming conventions.
       </action>



Mime
View raw message