svn commit: r636766 - in /lenya/sandbox/modules/docustyle: resources/css/screen.css xslt/navigation/menu.xsl xslt/navigation/tabs.xsl

Author: andreas
Date: Thu Mar 13 06:56:21 2008
New Revision: 636766

URL: http://svn.apache.org/viewvc?rev=636766&view=rev
Log:
Updating docustyle module to navigation module changes.

Modified:
    lenya/sandbox/modules/docustyle/resources/css/screen.css
    lenya/sandbox/modules/docustyle/xslt/navigation/menu.xsl
    lenya/sandbox/modules/docustyle/xslt/navigation/tabs.xsl

Modified: lenya/sandbox/modules/docustyle/resources/css/screen.css
URL: http://svn.apache.org/viewvc/lenya/sandbox/modules/docustyle/resources/css/screen.css?rev=636766&r1=636765&r2=636766&view=diff
==============================================================================
--- lenya/sandbox/modules/docustyle/resources/css/screen.css (original)
+++ lenya/sandbox/modules/docustyle/resources/css/screen.css Thu Mar 13 06:56:21 2008
@@ -112,19 +112,19 @@
   padding: 0 0 0 0;
 }
 
-#menu li#menuitem-1 {
+#menu li {
   font-size: 11pt;
   font-weight: bold;
   padding-left: 0;
   background: none;
 }
 
-li#menuitem-1 span {
+#menu li span {
   margin-left: 0;
   padding-left: 0;
 }
 
-#menu li {
+#menu li ul li {
   font-size: 10pt;
   font-weight: normal;
   padding-left: 1em;

Modified: lenya/sandbox/modules/docustyle/xslt/navigation/menu.xsl
URL: http://svn.apache.org/viewvc/lenya/sandbox/modules/docustyle/xslt/navigation/menu.xsl?rev=636766&r1=636765&r2=636766&view=diff
==============================================================================
--- lenya/sandbox/modules/docustyle/xslt/navigation/menu.xsl (original)
+++ lenya/sandbox/modules/docustyle/xslt/navigation/menu.xsl Thu Mar 13 06:56:21 2008
@@ -35,59 +35,17 @@
   <xsl:template match="site:node">
     <xsl:param name="parent-id"/>
     <xsl:variable name="id" select="concat($parent-id, position())"/>
-    <xsl:call-template name="item">
-      <xsl:with-param name="id" select="$id"/>
-    </xsl:call-template>
-  </xsl:template>
-  
-  
-  <xsl:template name="children">
-    <xsl:param name="id"/>
-    <xsl:if test="site:node">
-      <ul id="menu-{$id}">
-        <xsl:apply-templates select="site:node">
-          <xsl:with-param name="parent-id" select="concat($id, '.')"/>
-        </xsl:apply-templates>
-      </ul>
-    </xsl:if>
-  </xsl:template>
-  
-  
-  <xsl:template name="item">
-    <xsl:param name="id"/>
-    <xsl:choose>
-      <xsl:when test="@current = 'true'">
-        <xsl:call-template name="item-selected">
-          <xsl:with-param name="id" select="$id"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="item-default">
-          <xsl:with-param name="id" select="$id"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  
-  
-  <xsl:template name="item-default">
-    <xsl:param name="id"/>
     <li id="menuitem-{$id}">
-      <xsl:call-template name="menuItemClass"/>
-      <a>
-        <xsl:choose>
-          <xsl:when test="site:link/@href">
-            <xsl:copy-of select="site:link/@href"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:attribute name="onclick">javascript:toggleMenu('menuitem-<xsl:value-of select="$id"/>');</xsl:attribute>
-          </xsl:otherwise>
-        </xsl:choose>
-        <xsl:value-of select="site:link/@label"/>
-      </a>
-      <xsl:call-template name="children">
+      <xsl:apply-templates select="site:link">
         <xsl:with-param name="id" select="$id"/>
-      </xsl:call-template>
+      </xsl:apply-templates>
+      <xsl:if test="site:node[site:link]">
+        <ul id="menu-{$id}">
+          <xsl:apply-templates select="site:node[site:link]">
+            <xsl:with-param name="parent-id" select="concat($id, '.')"/>
+          </xsl:apply-templates>
+        </ul>
+      </xsl:if>
     </li>
   </xsl:template>
   
@@ -100,25 +58,38 @@
         <xsl:text> </xsl:text>
       </xsl:if>
       <xsl:choose>
-        <xsl:when test="site:node and (@ancestorOfCurrent = 'true' or @current = 'true')">open</xsl:when>
-        <xsl:when test="site:node">closed</xsl:when>
+        <xsl:when test="../site:node and (../@ancestorOfCurrent = 'true' or @current = 'true')">open</xsl:when>
+        <xsl:when test="../site:node">closed</xsl:when>
       </xsl:choose>
     </xsl:attribute>
     
   </xsl:template>
   
   
-  <xsl:template name="item-selected">
+  <xsl:template match="site:link">
     <xsl:param name="id"/>
-    <li id="menuitem-{$id}">
-      <xsl:call-template name="menuItemClass">
-        <xsl:with-param name="baseClass">selected</xsl:with-param>
-      </xsl:call-template>
-      <span><xsl:value-of select="site:link/@label"/></span>
-      <xsl:call-template name="children">
-        <xsl:with-param name="id" select="$id"/>
-      </xsl:call-template>
-    </li>
+    <xsl:choose>
+      <xsl:when test="@current = 'true'">
+        <xsl:call-template name="menuItemClass">
+          <xsl:with-param name="baseClass">selected</xsl:with-param>
+        </xsl:call-template>
+        <span><xsl:value-of select="@label"/></span>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="menuItemClass"/>
+        <a>
+          <xsl:choose>
+            <xsl:when test="@href">
+              <xsl:copy-of select="@href"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:attribute name="onclick">javascript:toggleMenu('menuitem-<xsl:value-of select="$id"/>');</xsl:attribute>
+            </xsl:otherwise>
+          </xsl:choose>
+          <xsl:value-of select="@label"/>
+        </a>
+      </xsl:otherwise>
+    </xsl:choose>
   </xsl:template>
   
   

Modified: lenya/sandbox/modules/docustyle/xslt/navigation/tabs.xsl
URL: http://svn.apache.org/viewvc/lenya/sandbox/modules/docustyle/xslt/navigation/tabs.xsl?rev=636766&r1=636765&r2=636766&view=diff
==============================================================================
--- lenya/sandbox/modules/docustyle/xslt/navigation/tabs.xsl (original)
+++ lenya/sandbox/modules/docustyle/xslt/navigation/tabs.xsl Thu Mar 13 06:56:21 2008
@@ -32,19 +32,24 @@
   </xsl:template>
   
   
-  <xsl:template match="site:node[site:link]">
+  <xsl:template match="site:node">
+    <xsl:apply-templates select="site:link"/>
+  </xsl:template>
+  
+  
+  <xsl:template match="site:link">
     <li>
       <xsl:attribute name="class">
         <xsl:text>tab</xsl:text>
-        <xsl:if test="@current = 'true' or @ancestorOfCurrent = 'true'">
+        <xsl:if test="@current = 'true' or ../@ancestorOfCurrent = 'true'">
           <xsl:text>-selected</xsl:text>
         </xsl:if>
       </xsl:attribute>
       <a>
-        <xsl:if test="not(@current = 'true' or @ancestorOfCurrent = 'true')">
-          <xsl:copy-of select="site:link/@href"/>
+        <xsl:if test="not(@current = 'true' or ../@ancestorOfCurrent = 'true')">
+          <xsl:copy-of select="@href"/>
         </xsl:if>
-        <span><xsl:value-of select="site:link/@label"/></span>
+        <span><xsl:value-of select="@label"/></span>
       </a>
     </li>
   </xsl:template>