Author: kkolinko
Date: Fri Mar  5 19:33:15 2010
New Revision: 919553

URL: http://svn.apache.org/viewvc?rev=919553&view=rev
Log:
tomcat-site.xsl:
Copied subsection name disambiguation code and TOC generation code from 
tomcat-docs.xsl of Tomcat trunk.
bugreport.xml:
Added TOC. Added link to report Taglibs issues.

Modified:
    tomcat/site/trunk/xdocs/bugreport.xml
    tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl

Modified: tomcat/site/trunk/xdocs/bugreport.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/bugreport.xml?rev=919553&r1=919552&r2=919553&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/bugreport.xml (original)
+++ tomcat/site/trunk/xdocs/bugreport.xml Fri Mar  5 19:33:15 2010
@@ -8,6 +8,10 @@
 
 <body>
 
+<section name="Table of Contents">
+<toc/>
+</section>
+
 <section name="Before you report a bug">
 <p>The Apache Tomcat community consists of those who use Apache Tomcat, help 
answer
 questions on discussions lists, contribute documentation and patches,
@@ -214,13 +218,16 @@
 Report an Apache Tomcat Native bug
 <a 
href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%20Native";>
 here</a>.<br />
+Report an Apache Taglibs bug
+<a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Taglibs";>
+here</a>.<br />
 </p>
 <p></p>
 <subsection name="Security Issues">
 <p>Security-related bugs are of special concern.  If you have a verified
 security bug to report please neither post it
 to public email lists nor submit a bug report.
-See <a href="security.html">Security Reports</a> page on how to report them</p>
+See <a href="security.html">Security Reports</a> page on how to report 
them.</p>
 </subsection>
 
 </section>

Modified: tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl?rev=919553&r1=919552&r2=919553&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl (original)
+++ tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Fri Mar  5 19:33:15 2010
@@ -207,6 +207,11 @@
   <!-- Process a documentation subsection -->
   <xsl:template match="subsection">
     <xsl:variable name="name">
+      <xsl:if test="
+          count(//*[(local-name()='section' or local-name()='subsection') and 
@name=current()/@name]) &gt; 1
+          ">
+        <xsl:value-of select="concat(ancestor::section/@name, '/')"/>
+      </xsl:if>
       <xsl:value-of select="@name"/>
     </xsl:variable>
     <table border="0" cellspacing="0" cellpadding="2" width="100%">
@@ -225,6 +230,28 @@
   </xsl:template>
 
 
+  <!-- Generate table of contents -->
+  <xsl:template match="toc">
+    <ul><xsl:apply-templates mode="toc" select="following::section"/></ul>
+  </xsl:template>
+
+  <xsl:template mode="toc" match="section|subsection">
+    <xsl:variable name="name">
+      <xsl:if test="local-name()='subsection' and 
+          count(//*[(local-name()='section' or local-name()='subsection') and 
@name=current()/@name]) &gt; 1
+          ">
+        <xsl:value-of select="concat(ancestor::section/@name, '/')"/>
+      </xsl:if>
+      <xsl:value-of select="@name"/>
+    </xsl:variable>
+    <li><a href="#{$name}"><xsl:value-of select="@name"/></a>
+    <xsl:if test="subsection">
+      <ol><xsl:apply-templates mode="toc" select="subsection"/></ol>
+    </xsl:if>
+    </li>
+  </xsl:template>
+
+
   <!-- Process a source code example -->
   <xsl:template match="source">
     <div align="left">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to