Menü gefixt und richtig gestyled

diff --git a/bin/mozilla/menu.pl b/bin/mozilla/menu.pl
index 8536c26cabf929ba0959e23bd73b9f771f5160e6..eb717077e99f8dffe4877de8269b0c537d352594 100644 (file)
--- a/bin/mozilla/menu.pl
+++ b/bin/mozilla/menu.pl
@@ -128,7 +128,6 @@ sub section_menu {
 
     if (!$level) { # toplevel
       push @items, make_item(
 
     if (!$level) { # toplevel
       push @items, make_item(

-        href     => '#',

         img      =>  make_image(icon => $item . '.png', size => 24, label => $label),
         label    => $label,
         height   => 24,
         img      =>  make_image(icon => $item . '.png', size => 24, label => $label),
         label    => $label,
         height   => 24,

diff --git a/css/lx-office-erp/menu.css b/css/lx-office-erp/menu.css
index 1c34f5bd8c46faf5253aa6a235f1a215cdc55109..67c314fc74306d591809c05e228a1286185e5e37 100644 (file)
--- a/css/lx-office-erp/menu.css
+++ b/css/lx-office-erp/menu.css
@@ -300,4 +300,6 @@ div#menuv4 li li li li:hover ul
 #html-menu a { vertical-align: top }
 #html-menu .item span.menu-spacer { display: inline-block; width: 24px }
 #html-menu .menu span.menu-spacer { display: inline-block; width: 32px }
 #html-menu a { vertical-align: top }
 #html-menu .item span.menu-spacer { display: inline-block; width: 24px }
 #html-menu .menu span.menu-spacer { display: inline-block; width: 32px }

+#html-menu div.menu div.menuitemchunk { color:blue;}
+#html-menu div.menu div.menuitemchunk:hover { color:blue; background-color: lemonchiffon; cursor: pointer; }

 
 

diff --git a/templates/webpages/menu/menu.html b/templates/webpages/menu/menu.html
index e7d710c7660b7921cddb3c4bcbebeee6dc46ad9c..87a81a9afc7d50984d62424fbe018e1fa251f909 100644 (file)
--- a/templates/webpages/menu/menu.html
+++ b/templates/webpages/menu/menu.html
@@ -4,18 +4,31 @@
 <div id='html-menu'>
   [% INCLUDE sections %]
 </div>
 <div id='html-menu'>
   [% INCLUDE sections %]
 </div>

+<script type='text/javascript'>
+  $(function(){
+    $('#html-menu div.menu-submenu').hide();
+    $('#html-menu div.menu').each(function() {
+      $(this).click(function(){
+        $('#html-menu div.menu-submenu').not('#' + $(this).attr('id') + '_submenu').hide();
+        $('#' + $(this).attr('id') + '_submenu').toggle();
+      });
+    });
+  });
+</script>

 </body>
 </html>
 [%- BLOCK sections %]
 [%- FOREACH item IN sections %]
  <div class='menu-multiline'>
  [% SET menuouterloopcount = loop.count %]
 </body>
 </html>
 [%- BLOCK sections %]
 [%- FOREACH item IN sections %]
  <div class='menu-multiline'>
  [% SET menuouterloopcount = loop.count %]

- [%- FOREACH chunk IN item.chunks %]
-   <div id='menuitem[% menulevel %]_[% menuouterloopcount %]' class='menuitem [% item.class %] hover'>[% PROCESS item %]</div>
- [%- END %]
+  <div id='menuitem[% menulevel %]_[% menuouterloopcount %]' class='menuitem [% item.class %] hover'>
+   [%- FOREACH chunk IN item.chunks %]
+   <div class='menuitemchunk hover'>[% PROCESS item %]</div>
+   [%- END %]
+  </div>

    [%- IF item.subitems.size %]
    <div id='menuitem[% menulevel %]_[% loop.count %]_submenu' class='menu-submenu[% menulevel %]'>
    [%- IF item.subitems.size %]
    <div id='menuitem[% menulevel %]_[% loop.count %]_submenu' class='menu-submenu[% menulevel %]'>

-   [% INCLUDE sections sections=item.subitems, menulevel='_'+loop.count %]
+   [% INCLUDE sections sections=item.subitems, menulevel= menulevel _ '_' _ loop.count %]

    </div>
   [%- END %]
  </div>
    </div>
   [%- END %]
  </div>


@@ -24,24 +37,8 @@
 [%- BLOCK item %]
   [% item.spacer %]
   [%- IF item.href %]
 [%- BLOCK item %]
   [% item.spacer %]
   [%- IF item.href %]

-    [% L.link(item.href, L.html_tag('span', L.html_tag('img', undef, item.img), class='menu-spacer') _ chunk, target=item.target) %]
+    [% L.link(item.href, L.html_tag('span', L.img_tag(item.img), class='menu-spacer') _ chunk, class='menu-link', target=item.target) %]

   [%- ELSE %]
   [%- ELSE %]

-    [% L.html_tag('img', undef, item.img) _ chunk %]
+    [% L.img_tag(item.img) _ chunk %]

   [%- END %]
 [%- END %]
   [%- END %]
 [%- END %]

-
-</body>
-
-<script type='text/javascript'>
-  $(function(){
-    $('#html-menu div.menu-submenu').hide();
-    $('#html-menu div.menu, #html-menu div.submenu').each(function() {
-      $(this).click(function(){
-        $('#html-menu div.menu-submenu').not('#' + $(this).attr('id') + '_submenu').hide();
-        $('#' + $(this).attr('id') + '_submenu').toggle();
-      });
-    });
-  });
-</script>
-
-</html>