Globaler AJAX-Spinner in Headerzeile rechts

diff --git a/SL/Layout/None.pm b/SL/Layout/None.pm
index 60b8512fee35df34b4983627b8c801fd5953d922..ffd5bb55e0fb0921b4e825646da44ceb5e6a49e5 100644 (file)
--- a/SL/Layout/None.pm
+++ b/SL/Layout/None.pm
@@ -8,6 +8,7 @@ use List::MoreUtils qw(apply);
 sub javascripts_inline {
   _setup_formats(),
   _setup_focus(),
+  _setup_ajax_spinner(),
 }
 
 sub use_javascript {
@@ -48,4 +49,8 @@ sub _setup_focus {
   }
 }
 
+sub _setup_ajax_spinner {
+  return SL::Presenter->get->render('layout/ajax_spinner_setup', { type => 'js' });
+}
+
 1;

diff --git a/css/kivitendo/frame_header/header.css b/css/kivitendo/frame_header/header.css
index 376cb1e101ba1331c29cf72da41c0b4e41bf7731..80ab601fb2e37d681fcbbb5aae006329228ba7da 100644 (file)
--- a/css/kivitendo/frame_header/header.css
+++ b/css/kivitendo/frame_header/header.css
@@ -11,6 +11,7 @@
   padding: 0;
   border: 0;
   overflow: hidden;
+  min-height: 20px;
   width: 100%;
   border-spacing: 0;
   font-size: 12px;
@@ -31,3 +32,9 @@
   font-family: verdana,arial,sans-serif;
   vertical-align: middle;
 }
+
+#frame-header #ajax-spinner {
+  margin-top: 2px;
+  margin-right: 10px;
+  display: none;
+}

diff --git a/css/lx-office-erp/frame_header/header.css b/css/lx-office-erp/frame_header/header.css
index 852a76c985c183d33b70f47919e44b707f4e9a34..3046f2336ec477ed21b255aa7c88958d7aa75693 100644 (file)
--- a/css/lx-office-erp/frame_header/header.css
+++ b/css/lx-office-erp/frame_header/header.css
@@ -15,6 +15,7 @@
   color: white;
   border: 0;
   overflow: hidden;
+  min-height: 20px;
   width: 100%;
   border-spacing: 0;
   font-size: 12px;
@@ -36,3 +37,13 @@
   font-family: verdana,arial,sans-serif;
   vertical-align: middle;
 }
+
+#frame-header #ajax-spinner {
+  margin-top: 2px;
+  margin-right: 10px;
+  display: none;
+  width: 16px;
+  height: 16px;
+  min-width: 16px;
+  min-height: 16px;
+}

diff --git a/image/spinner-blue.gif b/image/spinner-blue.gif
new file mode 100644 (file)
index 0000000..8e3f3b1
Binary files /dev/null and b/image/spinner-blue.gif differ

diff --git a/image/spinner-white.gif b/image/spinner-white.gif
new file mode 100644 (file)
index 0000000..e192ca8
Binary files /dev/null and b/image/spinner-white.gif differ

diff --git a/templates/webpages/layout/ajax_spinner_setup.js b/templates/webpages/layout/ajax_spinner_setup.js
new file mode 100644 (file)
index 0000000..675c7e6
--- /dev/null
+++ b/templates/webpages/layout/ajax_spinner_setup.js
@@ -0,0 +1,7 @@
+$(function() {
+  $(document).ajaxSend(function() {
+    $('#ajax-spinner').show();
+  }).ajaxStop(function() {
+    $('#ajax-spinner').hide();
+  });
+});

diff --git a/templates/webpages/menu/header.html b/templates/webpages/menu/header.html
index 869479fee6285c6ad7943fd2aa7d550198b427f2..0ad43f50f2ac0fd3f4756291bac5745b08db09f3 100644 (file)
--- a/templates/webpages/menu/header.html
+++ b/templates/webpages/menu/header.html
@@ -1,4 +1,4 @@
-[%- USE T8 %]
+[%- USE T8 %][%- USE LxERP -%]
 <div id="frame-header">
 [% UNLESS is_links %]
  <span class="frame-header-element frame-header-left">
@@ -16,4 +16,7 @@
   [% now.to_lxoffice %] -
   [% now.hms %]
  </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>

diff --git a/templates/webpages/menu/menunew.html b/templates/webpages/menu/menunew.html
index b94024678c317134f49909e486f9c0132da87016..11e676e08c9cb1a5e309de9947e2a3986ebc2274 100644 (file)
--- a/templates/webpages/menu/menunew.html
+++ b/templates/webpages/menu/menunew.html
@@ -1,5 +1,5 @@
 [%- USE T8 %]
-[% USE HTML %]
+[% USE HTML %][%- USE LxERP -%]
  <script type="text/javascript">
 <!--
 function clockon() {
@@ -26,6 +26,9 @@ $(clockon);
    <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>

diff --git a/templates/webpages/menu/menuv3.html b/templates/webpages/menu/menuv3.html
index 3798bdc012e40e36f3f4528bae7885991c329c98..88729888173f89136e0c5d1c860859ea19f6fdf8 100644 (file)
--- a/templates/webpages/menu/menuv3.html
+++ b/templates/webpages/menu/menuv3.html
@@ -1,5 +1,5 @@
 [%- USE T8 %]
-[% USE HTML %]
+[% USE HTML %][%- USE LxERP -%]
  <script type="text/javascript" src="js/quicksearch_input.js"></script>
  <script type="text/javascript">
  <!--
@@ -25,6 +25,9 @@ $(clockon);
     <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="menuv3">