Add animated images to inform that a process is running (refs #1560)

1 files changed, 13 insertions, 2 deletions

diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js
index 13f3896a6..b4a079ef8 100644
--- a/ishtar_common/static/js/ishtar.js
+++ b/ishtar_common/static/js/ishtar.js
@@ -79,31 +79,42 @@ $("#main_menu ul li").live('click', function(){
 $(".help_display").live("click", function(){
     var help_text_id = $(this).attr("href") + "_help";
     $(help_text_id).toggle();
-})
+});
+
+$('#progress-content').live('click', function(){
+    $('#progress').hide();
+});
 
 var last_window;
 
 function load_window(url, speed, on_success){
+    $("#progress").show();
     $.ajax({
         url: url,
         cache: false,
         success:function(html){
+            $("#progress").hide();
             $("#window").append(html);
             $("#"+last_window).show();
             $("a[rel^='prettyPhoto']").prettyPhoto({'social_tools':''});
             if (on_success) on_success();
         },
         error:function(XMLHttpRequest, textStatus, errorThrows){
+            $("#progress").hide();
         }
     });
 }
 
 function load_url(url){
+    $("#progress").show();
     $.ajax({
         url: url,
         cache: false,
-        success:function(html){},
+        success:function(html){
+            $("#progress").hide();
+        },
         error:function(XMLHttpRequest, textStatus, errorThrows){
+            $("#progress").hide();
         }
     });
 }