svn commit: r568636 - in /lenya/trunk/src/webapp: global-sitemap.xmap lenya/resources/css/menu.css lenya/xslt/menu/menu2xhtml.xsl lenya/xslt/menu/menu2xslt.xsl

Author: andreas
Date: Wed Aug 22 07:54:40 2007
New Revision: 568636

URL: http://svn.apache.org/viewvc?rev=568636&view=rev
Log:
Prepare core for Ajax menu

Modified:
    lenya/trunk/src/webapp/global-sitemap.xmap
    lenya/trunk/src/webapp/lenya/resources/css/menu.css
    lenya/trunk/src/webapp/lenya/xslt/menu/menu2xhtml.xsl
    lenya/trunk/src/webapp/lenya/xslt/menu/menu2xslt.xsl

Modified: lenya/trunk/src/webapp/global-sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/global-sitemap.xmap?rev=568636&r1=568635&r2=568636&view=diff
==============================================================================
--- lenya/trunk/src/webapp/global-sitemap.xmap (original)
+++ lenya/trunk/src/webapp/global-sitemap.xmap Wed Aug 22 07:54:40 2007
@@ -316,16 +316,21 @@
       </map:match>
     </map:pipeline>
 
-    <map:pipeline>
-      
-      <!-- Usecases -->
-      <map:match type="usecase" pattern="*">
-        <map:mount uri-prefix="" src="lenya/usecase.xmap" check-reload="true" reload-method="synchron"/>
-      </map:match>
-
-    </map:pipeline>
-
-    <map:pipeline>
+   <map:pipeline>
+     
+     <!-- Enter a module -->
+     <map:match type="request-parameter" pattern="lenya.module">
+       <map:mount uri-prefix="" src="fallback://lenya/modules/{1}/sitemap.xmap" check-reload="true" reload-method="synchron"/>
+     </map:match>
+     
+     <!-- Usecases -->
+     <map:match type="usecase" pattern="*">
+       <map:mount uri-prefix="" src="lenya/usecase.xmap" check-reload="true" reload-method="synchron"/>
+     </map:match>
+     
+   </map:pipeline>
+   
+   <map:pipeline>
       <map:match pattern="index.html">
         <map:aggregate element="aggregation-wrapper" label="aggregate">
           <map:part src="cocoon:/aggregate-publications"/>
@@ -390,11 +395,6 @@
         <map:transform src="lenya/xslt/util/introduction.xsl"/>
         <map:call resource="style-cms-page"/>
         <map:serialize />
-      </map:match>
-      
-      <!-- Enter a module -->
-      <map:match type="request-parameter" pattern="lenya.module">
-        <map:mount uri-prefix="" src="fallback://lenya/modules/{1}/sitemap.xmap" check-reload="true" reload-method="synchron"/>
       </map:match>
       
       <!-- Resources -->

Modified: lenya/trunk/src/webapp/lenya/resources/css/menu.css
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/css/menu.css?rev=568636&r1=568635&r2=568636&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/css/menu.css (original)
+++ lenya/trunk/src/webapp/lenya/resources/css/menu.css Wed Aug 22 07:54:40 2007
@@ -92,3 +92,9 @@
 #lenya-info ul li#info-time { border: 0; }
 
 #page { width: 100%; height: 100%; }
+
+#lenyaMenuPlaceholder {
+    background: url('/modules/menubar/images/indicator.gif') 20px 20px no-repeat;
+    border-bottom: 1px solid #c6c6c5;
+    height: 57px;
+}

Modified: lenya/trunk/src/webapp/lenya/xslt/menu/menu2xhtml.xsl
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/xslt/menu/menu2xhtml.xsl?rev=568636&r1=568635&r2=568636&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/xslt/menu/menu2xhtml.xsl (original)
+++ lenya/trunk/src/webapp/lenya/xslt/menu/menu2xhtml.xsl Wed Aug 22 07:54:40 2007
@@ -49,6 +49,8 @@
 <xsl:variable name="image-prefix"><xsl:value-of select="$contextprefix"/>/lenya/menu/images</xsl:variable>
  
 <xsl:template match="/menu:menu">
+  
+  <div>
     
   <!-- Lenya graphic -->
   <div id="lenya-logo">
@@ -138,6 +140,8 @@
         <xsl:apply-templates select="menu:menus/menu:menu" mode="nav"/>
       </ul>
     </div>
+    
+  </div>
 
   </div>
 

Modified: lenya/trunk/src/webapp/lenya/xslt/menu/menu2xslt.xsl
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/xslt/menu/menu2xslt.xsl?rev=568636&r1=568635&r2=568636&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/xslt/menu/menu2xslt.xsl (original)
+++ lenya/trunk/src/webapp/lenya/xslt/menu/menu2xslt.xsl Wed Aug 22 07:54:40 2007
@@ -55,8 +55,8 @@
             </head>
             <body>
               <xso:apply-templates select="xhtml:html/xhtml:body/@*"/>
-              <xsl:apply-templates select="xhtml:div[@id = 'lenya-logo']"/>
-              <xsl:apply-templates select="xhtml:div[@id = 'lenya-menus']"/>
+              <xsl:apply-templates select="xhtml:div/xhtml:div[@id = 'lenya-logo']"/>
+              <xsl:apply-templates select="xhtml:div/xhtml:div[@id = 'lenya-menus']"/>
               <div id="lenya-cmsbody">
                 <xso:apply-templates select="xhtml:html/xhtml:body/node()"/>
               </div>