svn commit: r591405 - in /lenya/sandbox/pubs/docu: lenya/modules/sitetree/xslt/navigation/menu.xsl resources/shared/css/page.css resources/shared/images/bullet-closed.png resources/shared/images/bullet-open.png resources/shared/images/bullet.png

Author: andreas
Date: Fri Nov  2 10:26:00 2007
New Revision: 591405

URL: http://svn.apache.org/viewvc?rev=591405&view=rev
Log:
Updated menu layout

Added:
    lenya/sandbox/pubs/docu/resources/shared/images/bullet-closed.png   (with props)
    lenya/sandbox/pubs/docu/resources/shared/images/bullet-open.png   (with props)
    lenya/sandbox/pubs/docu/resources/shared/images/bullet.png   (with props)
Modified:
    lenya/sandbox/pubs/docu/lenya/modules/sitetree/xslt/navigation/menu.xsl
    lenya/sandbox/pubs/docu/resources/shared/css/page.css

Modified: lenya/sandbox/pubs/docu/lenya/modules/sitetree/xslt/navigation/menu.xsl
URL: http://svn.apache.org/viewvc/lenya/sandbox/pubs/docu/lenya/modules/sitetree/xslt/navigation/menu.xsl?rev=591405&r1=591404&r2=591405&view=diff
==============================================================================
--- lenya/sandbox/pubs/docu/lenya/modules/sitetree/xslt/navigation/menu.xsl (original)
+++ lenya/sandbox/pubs/docu/lenya/modules/sitetree/xslt/navigation/menu.xsl Fri Nov  2 10:26:00 2007
@@ -48,12 +48,6 @@
     <xsl:param name="id"/>
     <xsl:if test="nav:node">
       <ul id="menuitem-{$id}">
-        <xsl:attribute name="class">
-          <xsl:choose>
-            <xsl:when test="descendant-or-self::nav:node[@current = 'true']">open</xsl:when>
-            <xsl:otherwise>closed</xsl:otherwise>
-          </xsl:choose>
-        </xsl:attribute>
         <xsl:apply-templates select="nav:node">
           <xsl:with-param name="parent-id" select="concat($id, '.')"/>
         </xsl:apply-templates>
@@ -81,7 +75,13 @@
   
   <xsl:template name="item-default">
     <xsl:param name="id"/>
-    <li>
+    <li id="menuitem-{$id}">
+      <xsl:attribute name="class">
+        <xsl:choose>
+          <xsl:when test="descendant::nav:node[@current = 'true']">open</xsl:when>
+          <xsl:when test="descendant::nav:node">closed</xsl:when>
+        </xsl:choose>
+      </xsl:attribute>
       <a>
         <xsl:choose>
           <xsl:when test="@uuid">

Modified: lenya/sandbox/pubs/docu/resources/shared/css/page.css
URL: http://svn.apache.org/viewvc/lenya/sandbox/pubs/docu/resources/shared/css/page.css?rev=591405&r1=591404&r2=591405&view=diff
==============================================================================
--- lenya/sandbox/pubs/docu/resources/shared/css/page.css (original)
+++ lenya/sandbox/pubs/docu/resources/shared/css/page.css Fri Nov  2 10:26:00 2007
@@ -118,15 +118,23 @@
   font-size: medium;
 }
 
-#menu ul.closed li {
-  display: none;
-}
-
 #menu li {
-  background: url('/default/live/images/bullet.png') left .2em no-repeat;
+  background: url('/docu/live/images/bullet.png') left .2em no-repeat;
   padding-left: .7em;
 }
 
+#menu li.open {
+  background: url('/docu/live/images/bullet-open.png') left .2em no-repeat;
+}
+
+#menu li.closed {
+  background: url('/docu/live/images/bullet-closed.png') left .2em no-repeat;
+}
+
+#menu li.closed ul {
+  display: none;
+}
+
 #menu span, #menu a {
   display: block;
   margin: 0 0 .2em 0;
@@ -147,65 +155,6 @@
   background-color: #FFEEEE;
 }
 
-
-/* -- old menu -- */
-
-.menublock-1, .menublock-selected-1 {
-    padding: 0px;
-}
-
-.menublock-1 .menublock-2 { display: none; }
-.menublock-2 .menublock-3 { display: none; }
-.menublock-3 .menublock-4 { display: none; }
-.menublock-4 .menublock-5 { display: none; }
-
-.menuitem-1, .menuitem-selected-1,
-.menuitem-2, .menuitem-selected-2,
-.menuitem-3, .menuitem-selected-3,
-.menuitem-4, .menuitem-selected-4,
-.menuitem-5, .menuitem-selected-5 {
-  font-size: 80%;
-}
-  
-.menuitem-1, .menuitem-selected-1 {
-  margin: 10px 0px 0px 0px;
-  padding: 2px 5px 2px 30px;
-}
-
-.menuitem-2, .menuitem-selected-2 {
-  padding: 2px 5px 2px 50px;
-  background: url('/default/live/images/bullet.png') 36px .4em no-repeat;
-}
-
-.menuitem-3, .menuitem-selected-3 {
-  padding: 2px 5px 2px 70px;
-  background: url('/default/live/images/bullet.png') 56px .4em no-repeat;
-}
-  
-.menuitem-4, .menuitem-selected-4 {
-  padding: 2px 5px 2px 90px;
-  background: url('/default/live/images/bullet.png') 76px .4em no-repeat;
-}
-  
-.menuitem-5, .menuitem-selected-5 {
-  padding: 2px 5px 2px 110px;
-  background: url('/default/live/images/bullet.png') 96px .4em no-repeat;
-}
-  
-
-.menuitem-selected-1,
-.menuitem-selected-2,
-.menuitem-selected-3,
-.menuitem-selected-4,
-.menuitem-selected-5 {
-  background-color: #FFEEEE;
-/*
-  color: black;
-  background-color: #BB9999;
-  font-weight: bold;
-*/
-}
-  
 /* breadcrumb */
 
 #breadcrumb {

Added: lenya/sandbox/pubs/docu/resources/shared/images/bullet-closed.png
URL: http://svn.apache.org/viewvc/lenya/sandbox/pubs/docu/resources/shared/images/bullet-closed.png?rev=591405&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lenya/sandbox/pubs/docu/resources/shared/images/bullet-closed.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lenya/sandbox/pubs/docu/resources/shared/images/bullet-open.png
URL: http://svn.apache.org/viewvc/lenya/sandbox/pubs/docu/resources/shared/images/bullet-open.png?rev=591405&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lenya/sandbox/pubs/docu/resources/shared/images/bullet-open.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lenya/sandbox/pubs/docu/resources/shared/images/bullet.png
URL: http://svn.apache.org/viewvc/lenya/sandbox/pubs/docu/resources/shared/images/bullet.png?rev=591405&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lenya/sandbox/pubs/docu/resources/shared/images/bullet.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream