forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r161374 - in forrest/trunk/main/webapp/skins: leather-dev/xslt/html/site2xhtml.xsl pelt/xslt/html/site2xhtml.xsl tigris/xslt/html/site2xhtml.xsl
Date Fri, 15 Apr 2005 02:42:21 GMT
Author: crossley
Date: Thu Apr 14 19:42:19 2005
New Revision: 161374

URL: http://svn.apache.org/viewcvs?view=rev&rev=161374
Log:
Submitted by: Lorenz Froihofer
Issue: FOR-304 minitoc toc-minsections not recognized by skins for toc-location="menu"

Modified:
    forrest/trunk/main/webapp/skins/leather-dev/xslt/html/site2xhtml.xsl
    forrest/trunk/main/webapp/skins/pelt/xslt/html/site2xhtml.xsl
    forrest/trunk/main/webapp/skins/tigris/xslt/html/site2xhtml.xsl

Modified: forrest/trunk/main/webapp/skins/leather-dev/xslt/html/site2xhtml.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/skins/leather-dev/xslt/html/site2xhtml.xsl?view=diff&r1=161373&r2=161374
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/xslt/html/site2xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/xslt/html/site2xhtml.xsl Thu Apr 14 19:42:19
2005
@@ -131,7 +131,9 @@
             <xsl:when test="div/@class='current'">
               <li class="menupage">
                 <div class="menupagetitle"><xsl:value-of select="div" /></div>
-                <xsl:if test="$config/toc/@max-depth&gt;0 and contains($minitoc-location,'menu')">
+                <xsl:if test="$config/toc/@max-depth&gt;0
+                    and contains($minitoc-location,'menu')
+                    and count(//tocitems/tocitem) >= $config/toc/@min-sections">
                   <li class="menupageitemgroup">
                       <xsl:for-each select = "//tocitems/tocitem">
                         <div class="menupageitem">

Modified: forrest/trunk/main/webapp/skins/pelt/xslt/html/site2xhtml.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/skins/pelt/xslt/html/site2xhtml.xsl?view=diff&r1=161373&r2=161374
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/xslt/html/site2xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/pelt/xslt/html/site2xhtml.xsl Thu Apr 14 19:42:19 2005
@@ -488,7 +488,9 @@
             <xsl:when test="div/@class='current'">
               <div class="menupage">
                 <div class="menupagetitle"><xsl:value-of select="div" /></div>
-                <xsl:if test="$config/toc/@max-depth&gt;0 and contains($minitoc-location,'menu')">
+                <xsl:if test="$config/toc/@max-depth > 0
+                    and contains($minitoc-location,'menu')
+                    and count(//tocitems/tocitem) >= $config/toc/@min-sections">
                   <div class="menupageitemgroup">
                       <xsl:for-each select = "//tocitems/tocitem">
                         <div class="menupageitem">

Modified: forrest/trunk/main/webapp/skins/tigris/xslt/html/site2xhtml.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/skins/tigris/xslt/html/site2xhtml.xsl?view=diff&r1=161373&r2=161374
==============================================================================
--- forrest/trunk/main/webapp/skins/tigris/xslt/html/site2xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/tigris/xslt/html/site2xhtml.xsl Thu Apr 14 19:42:19 2005
@@ -295,7 +295,9 @@
       </div>
       <xsl:apply-templates select="div[@class='menu']"/>
 
-      <xsl:if test="$config/toc/@max-depth&gt;0 and contains($minitoc-location,'menu')">
+      <xsl:if test="$config/toc/@max-depth > 0
+          and contains($minitoc-location,'menu')
+          and count(//tocitems/tocitem) >= $config/toc/@min-sections">
         <xsl:if test="//tocitems/tocitem">
           <div class="label">
              <strong>Page</strong>



Mime
View raw message