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

[kivitendo-erp.git] / templates / webpages / menu / menunew.html

diff --git a/templates/webpages/menu/menunew.html b/templates/webpages/menu/menunew.html
index f746092..4c51b66 100644 (file)
--- a/templates/webpages/menu/menunew.html
+++ b/templates/webpages/menu/menunew.html
@@ -19,12 +19,12 @@ $(clockon);
   <tr>
    <td>
     &nbsp;
-    [<a href="menunew.pl?action=display" target="_blank">[% 'new Window' | $T8 %]</a>]
+    [<a href="login.pl?action=company_logo" target="_blank">[% 'new Window' | $T8 %]</a>]
     &nbsp;
-    [<a href="JavaScript:top.main_window.print()">[% 'print' | $T8 %]</a>]
+    [<a href="JavaScript:top.print()">[% 'print' | $T8 %]</a>]
    </td>
    <td align="right" nowrap>
-    [[% 'User' | $T8 %]: [% HTML.escape(login) %] -
+    [[% 'User' | $T8 %]: [% HTML.escape(MYCONFIG.login) %] -
     <a href="controller.pl?action=LoginScreen/logout" target="_top">[% 'logout' | $T8 %]</a>]
     [% date %] <span id='clock_id' style='position:relative'></span>&nbsp;
    </td>
@@ -42,7 +42,7 @@ $(clockon);
     [%- HTML.escape(mainitem.title) %]
    </a>
    [%- IF mainitem.subitems %]
-    <ul[%- IF force_ul_width %] width="[% mainitem.max_width * 12 %]"[% END %]>
+    <ul[%- IF force_ul_width %] width="[% mainitem.max_width * 10 %]"[% END %]>
      [%- SET sub1_id = main_id * 100 %]
      [%- FOREACH sub1item = mainitem.subitems %]
       [%- SET sub1_id = sub1_id + 1 %]
@@ -51,7 +51,7 @@ $(clockon);
         [%- HTML.escape(sub1item.title) %]
        </a>
        [%- IF sub1item.subitems %]
-        <ul[%- IF force_ul_width %] width="[% sub1item.max_width * 12 %]"[% END %]>
+        <ul[%- IF force_ul_width %] width="[% sub1item.max_width * 10 %]"[% END %]>
          [%- SET sub2_id = sub1_id * 100 %]
          [%- FOREACH sub2item = sub1item.subitems %]
           [%- SET sub2_id = sub2_id + 1 %]
@@ -77,7 +77,6 @@ $(clockon);
 $(function(){
   DHTMLSuite.createStandardObjects();
 
-  DHTMLSuite.configObj.setCssPath('[% myconfig.css_path %]/dhtmlsuite/');
   DHTMLSuite.configObj.setImagePath('image/dhtmlsuite/');
 
   var menu_model = new DHTMLSuite.menuModel();