X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fmenu%2Fmenunew.html;h=df3ed7b39136748ab6396ddca45a83386017dbc4;hb=5dfa532c0d982a8ce9a6e7aa0922a138efe3bb34;hp=55fcab82b23a987b24fbb7d7d2816d2999ca8323;hpb=841d44c00aae1166a0721e40dc2f9ffb7b9ac5b5;p=kivitendo-erp.git

diff --git a/templates/webpages/menu/menunew.html b/templates/webpages/menu/menunew.html
index 55fcab82b..df3ed7b39 100644
--- a/templates/webpages/menu/menunew.html
+++ b/templates/webpages/menu/menunew.html
@@ -1,65 +1,31 @@
 [%- USE T8 %]
-[% USE HTML %][%- USE LxERP -%]
- <script type="text/javascript">
-<!--
-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>
-
- <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>
-
+[%- USE L %]
+[%- USE HTML %]
+[%- USE LxERP -%]
  <div id="main_menu_div"></div>
-
  [%- SET main_id = '100' %]
  <ul id="main_menu_model"  style='display:none'>
- [%- FOREACH mainitem = menu_items %]
+ [%- FOREACH node = menu.tree %]
+  [%- NEXT UNLESS node.visible %]
   [%- 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 %]"[% 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 * 10 %]"[% END %]>
+  <li id="[% main_id %]"[% IF icon_path(node.icon) %] itemIcon="[% icon_path(node.icon) %]"[% END %]>
+   [% L.link(menu.href_for_node(node) || '#', menu.name_for_node(node), target=node.target) %]
+   [%- IF node.children %]
+    <ul width="[% max_width(node) %]">
      [%- SET sub1_id = main_id * 100 %]
-     [%- FOREACH sub1item = mainitem.subitems %]
+     [%- FOREACH sub1node = node.children %]
+      [%- NEXT UNLESS sub1node.visible %]
       [%- 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 %]"[% 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 * 10 %]"[% END %]>
+      <li id="[% sub1_id %]"[% IF icon_path(sub1node.icon) %] itemIcon="[% icon_path(sub1node.icon) %]"[% END %]>
+       [% L.link(menu.href_for_node(sub1node) || '#', menu.name_for_node(sub1node), target=sub1node.target) %]
+       [%- IF sub1node.children %]
+        <ul width="[% max_width(sub1node) %]">
          [%- SET sub2_id = sub1_id * 100 %]
-         [%- FOREACH sub2item = sub1item.subitems %]
+         [%- FOREACH sub2node = sub1node.children %]
+          [%- NEXT UNLESS sub2node.visible %]
           [%- 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 %]"[% IF sub2item.target && (sub2item.target != 'main_window') %] target="[% HTML.escape(sub2item.target) %]"[% END %]>
-            [%- HTML.escape(sub2item.title) %]
-           </a>
+          <li id="[% sub2_id %]"[% IF icon_path(sub2node.icon) %] itemIcon="[% icon_path(sub2node.icon) %]"[% END %]>
+            [% L.link(menu.href_for_node(sub2node) || '#', menu.name_for_node(sub2node), target=sub2node.target) %]
           </li>
          [%- END %]
         </ul>
@@ -71,30 +37,3 @@ $(clockon);
   </li>
  [%- END %]
  </ul>
-
- <script type="text/javascript">
-  <!--
-
-$(function(){
-  DHTMLSuite.createStandardObjects();
-
-  DHTMLSuite.configObj.setImagePath('image/dhtmlsuite/');
-
-  var menu_model = new DHTMLSuite.menuModel();
-  menu_model.addItemsFromMarkup('main_menu_model');
-  menu_model.init();
-
-  var menu_bar = new DHTMLSuite.menuBar();
-  menu_bar.addMenuItems(menu_model);
-  menu_bar.setTarget('main_menu_div');
-  menu_bar.init();
-});
-
-
-
-function open_url(url, target) {
-
-}
-
-    -->
- </script>