Merge branch 'master' into dev

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

diff --git a/templates/webpages/menu/menuv3.html b/templates/webpages/menu/menuv3.html
index eae64cc..8872988 100644 (file)
--- a/templates/webpages/menu/menuv3.html
+++ b/templates/webpages/menu/menuv3.html
@@ -1,32 +1,8 @@
 [%- USE T8 %]
-[% USE HTML %]
- <script type="text/javascript" src="js/jquery.js"></script>
+[% USE HTML %][%- USE LxERP -%]
+ <script type="text/javascript" src="js/quicksearch_input.js"></script>
  <script type="text/javascript">
  <!--
-function on_keydown_quicksearch(e) {
-  var key;
-
-  if (window.event)
-    key = window.event.keyCode;   // IE
-  else
-    key = e.which;                // Firefox
-
-  if (key != 13)
-    return true;
-
-  var search_term = $("#search_term");
-  var value       = search_term.val();
-  if (!value)
-    return true;
-
-  var url = "ct.pl?action=list_contacts&INPUT_ENCODING=utf-8&filter.status=active&search_term=" + encodeURIComponent(value);
-
-  search_term.val('');
-  $("#win1").attr('src', url);
-
-  return false;
-}
-
 function clockon() {
   var now = new Date();
   var h = now.getHours();
@@ -38,24 +14,21 @@ $(clockon);
 //-->
  </script>
 
- <table border="0" width="100%" background="image/bg_titel.gif" cellpadding="0" cellspacing="0">
-  <tr>
-   <td style="color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>
-    &nbsp;
+<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>]
-    &nbsp;
     [<a href="JavaScript:top.print()">[% 'print' | $T8 %]</a>]
-    &nbsp;
-    [[% 'Search contacts' | $T8 %] <input size="15" name="search_term" id="search_term" onkeydown="return on_keydown_quicksearch(event)">]
-   </td>
-   <td align="right" style="vertical-align:middle; color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>
-    [[% 'User' | $T8 %]: [% HTML.escape(login) %] -
+    [[% '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 %] -
     <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>
-
+ </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="menuv3">
 
   [% menu %]