X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fmenu%2Fmenunew.html;h=55fcab82b23a987b24fbb7d7d2816d2999ca8323;hb=fba80f760f04b951eb7bf903a9ad6a1f2bc733de;hp=539bf4e55d6827acc8e934d096041f9ebd260453;hpb=171a38d37e97d7c21f6e78fdc344fc1bd12b9ab6;p=kivitendo-erp.git

diff --git a/templates/webpages/menu/menunew.html b/templates/webpages/menu/menunew.html
index 539bf4e55..55fcab82b 100644
--- a/templates/webpages/menu/menunew.html
+++ b/templates/webpages/menu/menunew.html
@@ -1,34 +1,36 @@
 [%- USE T8 %]
-[% USE HTML %]
+[% USE HTML %][%- USE LxERP -%]
  <script type="text/javascript">
 <!--
-$(function() {
+function clockon() {
   var now = new Date();
   var h = now.getHours();
   var m = now.getMinutes();
   document.getElementById('clock_id').innerHTML = (h<10?'0'+h:h)+":"+(m<10?'0'+m:m);
   var timer=setTimeout("clockon()", 10000);
-})
+}
+$(clockon);
 //-->
  </script>
 
  <script type="text/javascript" src="js/dhtmlsuite/menu-for-applications.js"></script>
 
- <table class="menunew">
-  <tr>
-   <td>
-    &nbsp;
-    [<a href="menunew.pl?action=display" target="_blank">[% 'new Window' | $T8 %]</a>]
-    &nbsp;
-    [<a href="JavaScript:top.main_window.print()">[% 'print' | $T8 %]</a>]
-   </td>
-   <td align="right" nowrap>
-    [[% 'User' | $T8 %]: [% HTML.escape(login) %] -
-    <a href="controller.pl?action=LoginScreen/logout" target="_top">[% 'logout' | $T8 %]</a>]
-    [% date %] <span id='clock_id' style='position:relative'></span>&nbsp;
-   </td>
-  </tr>
- </table>
+ <div id="frame-header">
+  <span class="frame-header-element frame-header-left">
+   [<a href="login.pl?action=company_logo" target="_blank">[% 'new Window' | $T8 %]</a>]
+   [<a href="JavaScript:top.print()">[% 'print' | $T8 %]</a>]
+   [[% 'Search contacts' | $T8 %] <input size="15" name="search_term" id="search_term" onkeydown="return on_keydown_quicksearch($('#search_term'), event)">]
+  </span>
+  <span class="frame-header-element frame-header-right">
+   [[% 'User' | $T8 %]: [% MYCONFIG.login | html %] -
+    [% 'Client' | $T8 %]: [% AUTH.client.name | html %] -
+   <a href="controller.pl?action=LoginScreen/logout" target="_top">[% 'logout' | $T8 %]</a>]
+   [% date %] <span id='clock_id' style='position:relative'></span>&nbsp;
+  </span>
+  <span class="frame-header-element frame-header-right" id="ajax-spinner">
+   <img src="image/[% IF MYCONFIG.stylesheet == 'lx-office-erp.css' %]spinner-blue.gif[% ELSE %]spinner-white.gif[% END %]" alt="[% LxERP.t8('Loading...') %]">
+  </span>
+ </div>
 
  <div id="main_menu_div"></div>
 
@@ -37,25 +39,25 @@ $(function() {
  [%- FOREACH mainitem = menu_items %]
   [%- SET main_id = main_id + 1 %]
   <li id="[% main_id %]"[% IF mainitem.image %] itemIcon="[% mainitem.image %]"[% END %]>
-   <a href="[% IF mainitem.href %][% mainitem.href %][% ELSE %]#[% END %]">
+   <a href="[% IF mainitem.href %][% mainitem.href %][% ELSE %]#[% END %]"[% IF mainitem.target && (mainitem.target != 'main_window') %] target="[% HTML.escape(mainitem.target) %]"[% END %]>
     [%- 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 %]
       <li id="[% sub1_id %]"[% IF sub1item.image %] itemIcon="[% sub1item.image %]"[% END %]>
-       <a href="[% IF sub1item.href %][% sub1item.href %][% ELSE %]#[% END %]">
+       <a href="[% IF sub1item.href %][% sub1item.href %][% ELSE %]#[% END %]"[% IF sub1item.target && (sub1item.target != 'main_window') %] target="[% HTML.escape(sub1item.target) %]"[% END %]>
         [%- 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 %]
           <li id="[% sub2_id %]"[% IF sub2item.image %] itemIcon="[% sub2item.image %]"[% END %]>
-           <a href="[% IF sub2item.href %][% sub2item.href %][% ELSE %]#[% END %]">
+           <a href="[% IF sub2item.href %][% sub2item.href %][% ELSE %]#[% END %]"[% IF sub2item.target && (sub2item.target != 'main_window') %] target="[% HTML.escape(sub2item.target) %]"[% END %]>
             [%- HTML.escape(sub2item.title) %]
            </a>
           </li>
@@ -76,7 +78,6 @@ $(function() {
 $(function(){
   DHTMLSuite.createStandardObjects();
 
-  DHTMLSuite.configObj.setCssPath('[% myconfig.css_path %]/dhtmlsuite/');
   DHTMLSuite.configObj.setImagePath('image/dhtmlsuite/');
 
   var menu_model = new DHTMLSuite.menuModel();