Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

diff --git a/css/kivitendo/menu.css b/css/kivitendo/menu.css
index 625abec..b5819a6 100644 (file)
--- a/css/kivitendo/menu.css
+++ b/css/kivitendo/menu.css
@@ -29,12 +29,6 @@ body.menuv4 {
        margin: 0;
        padding: 0.3em 1em;
 }
-#menuv4 h2:before {
-       content: " ";
-}
-#menuv4 h2:after {
-       content: " ";
-}
 #menuv4 h2 {
        background-color: #ffffff;
        color: #000000;

diff --git a/css/lx-office-erp/menu.css b/css/lx-office-erp/menu.css
index 807082e..469d9de 100644 (file)
--- a/css/lx-office-erp/menu.css
+++ b/css/lx-office-erp/menu.css
@@ -115,13 +115,11 @@ position:absolute;
 z-index:500;
 top:auto;
 display:none;
-background:#000;
 }
 
 #menuv3 ul ul ul {
 top:0;
 left:100%;
-background:#000;
 }
 
 /* Begin non-anchor hover selectors */
@@ -176,12 +174,6 @@ margin:0;
 padding:1px 0 1px 3px;
 }
 
-#menuv4 h2:before {
-    content:" ";
-}
-#menuv4 h2:after {
-    content:" ";
-}
 #menuv4 h2 {
 color:#fff;
 padding:2px 10px;
@@ -223,11 +215,6 @@ float:none;
 border:0;
 }
 
-#menuv4 li.sub {
-left:-25px;
-top:-3px;
-}
-
 /* IE6 spacing bug fix, <li>s without a bottom border get spaced to far
  * correction: the bug will change the height of the parent element! this will also cause the whole menu to grow
  * so the only method to get this pile of crap going is to add a bottom border to the <li>s, where the enclosing <ul> already has
@@ -255,7 +242,7 @@ display:none;
 
 #menuv4 ul ul ul {
 top:0;
-left:100%;
+left:90%;
 }
 
 /* Begin non-anchor hover selectors */
@@ -286,7 +273,7 @@ div#menuv4 li:hover ul,
 div#menuv4 li li:hover ul,
 div#menuv4 li li li:hover ul,
 div#menuv4 li li li li:hover ul
-{display:block; left:10px;}
+{display:block;}
 
 /* End of non-anchor hover selectors */
 

diff --git a/templates/webpages/menu/header.html b/templates/webpages/menu/header.html
index 44f6c79..2c443f4 100644 (file)
--- a/templates/webpages/menu/header.html
+++ b/templates/webpages/menu/header.html
@@ -21,7 +21,7 @@
 [%- END %]
  <span class="frame-header-element frame-header-right">
   [% 'User' | $T8 %]:
-  [% MYCONFIG.login %]
+  [% MYCONFIG.login | html %]
   [<a href="controller.pl?action=LoginScreen/logout" target="_top" title="[% 'Logout now' | $T8 %]">[% 'Logout' | $T8 %]</a>]
   [% now.to_lxoffice %] -
   [% now.hms %]