From: Sven Schöling <s.schoeling@linet-services.de>
Date: Tue, 4 Sep 2012 16:53:41 +0000 (+0200)
Subject: css gefixt, klassen minified, html reduziert
X-Git-Tag: release-3.0.0beta1~202
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=ae2e9adff855796d7ad0de34b4f73aeb35744a19;p=kivitendo-erp.git

css gefixt, klassen minified, html reduziert
---

diff --git a/css/lx-office-erp/menu.css b/css/lx-office-erp/menu.css
index b81f4229b..413e36f6c 100644
--- a/css/lx-office-erp/menu.css
+++ b/css/lx-office-erp/menu.css
@@ -291,19 +291,21 @@ div#menuv4 li li li li:hover ul
 /* End of non-anchor hover selectors */
 
 
-#html-menu { float:left; }
-#html-menu tr { vertical-align: top; }
-#html-menu div.menuitem { padding: 2px 0px 2px 0px; white-space: nowrap; }
+#html-menu { float:left; width: 183px; }
+#html-menu div.mi { margin-top: 4px; margin-bottom: 3px; white-space: nowrap; clear:both }
 #html-menu div.submenu { font-weight: bold }
-#html-menu img { vertical-align: middle; border: 0; }
+#html-menu img { vertical-align: top; border: 0; }
 #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: 28px }
-#html-menu div.menu span.menuitemchunk { color:blue; }
-#html-menu div.menu span.menuitemchunk:hover { color:blue; background-color: lemonchiffon; cursor: pointer; }
-#html-menu span.menuitemchunk { white-space: normal; }
-#html-menu .spacer0 { position:relative; left: 2px }
-#html-menu .spacer1 { position:relative; left: 6px }
-#html-menu .spacer2 { position:relative; left: 12px }
+#html-menu .item span.ms { float:left; width: 24px }
+#html-menu .menu span.ms { float:left; width: 32px }
+#html-menu div.menu { height: 24px }
+#html-menu div.menu span.mic { color:blue; position: relative; top: 5px; }
+#html-menu div.menu:hover,
+#html-menu div.item:hover { color:blue; background-color: lemonchiffon; cursor: pointer; }
+#html-menu span.mic { white-space: normal; display: inline-block; vertical-align: top; line-height: 1.2; }
+#html-menu a.ml span.mic { width: 145px } /* fix deep indents */
+#html-menu div.spacer0 { position:relative; padding-left: 2px }
+#html-menu div.spacer1 { position:relative; padding-left: 8px }
+#html-menu div.spacer2 { position:relative; padding-left: 16px }
 
 
diff --git a/templates/webpages/menu/menu.html b/templates/webpages/menu/menu.html
index ce9cb284f..fcc032cab 100644
--- a/templates/webpages/menu/menu.html
+++ b/templates/webpages/menu/menu.html
@@ -6,11 +6,11 @@
 </div>
 <script type='text/javascript'>
   $(function(){
-    $('#html-menu div.menu-submenu').hide();
+    $('#html-menu div.item, #html-menu div.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();
+        $('#html-menu div.mi').not('div.menu').not('[id^=' + $(this).attr('id') + '_]').hide();
+        $('#html-menu div.mi[id^=' + $(this).attr('id') + '_]').toggle();
       });
     });
   });
@@ -19,17 +19,15 @@
 </html>
 [%- BLOCK sections %]
 [%- FOREACH item IN sections %]
- <div id='menuitem[% menulevel %]_[% loop.count %]' class='menuitem menuitemchunk [% item.spacer %] [% item.class %] hover'>
-  [%- IF item.href %]
-     <a href="[% item.href | html %]" class='menu-link' target='[% item.target %]'><span class="menuitemicon menu-spacer">[% L.img_tag(item.img) %]</span><span class='menuitemchunk hover'>[% item.label %]</span></a>
-  [%- ELSE %]
-   <span class="menuitemicon menu-spacer">[% L.img_tag(item.img) %]</span><span class='menuitemchunk hover'>[% item.label %]</span>
-  [%- END %]
+ <div id='mi[% menulevel %]_[% loop.count %]' class='mi [% item.spacer %] [% item.class %]'>
+ [%- IF item.href %]
+  <a href="[% item.href | html %]" class='ml' target='[% item.target %]'><span class="mii ms">[% L.img_tag(item.img) %]</span><span class='mic'>[% item.label %]</span></a>
+ [%- ELSE %]
+  <span class="mii ms">[% L.img_tag(item.img) %]</span><span class='mic'>[% item.label %]</span>
+ [%- END %]
  </div>
  [%- IF item.subitems.size %]
-  <div id='menuitem[% menulevel %]_[% loop.count %]_submenu' class='menu-submenu[% menulevel %]'>
-   [% INCLUDE sections sections=item.subitems, menulevel= menulevel _ '_' _ loop.count %]
-  </div>
+  [% INCLUDE sections sections=item.subitems, menulevel= menulevel _ '_' _ loop.count %]
  [%- END %]
 [%- END %]
 [%- END  %]