diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-12-17 03:39:47 +0100 | 
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-12-17 03:39:47 +0100 | 
| commit | 8a7d722e8c09e4479391d4ba3af16b0270e6725d (patch) | |
| tree | c783a908e0cdce780f7317eed92faa257a6d29f5 | |
| parent | e3d63542412501965c4d9016f50a820282cb9dbb (diff) | |
| download | Ishtar-8a7d722e8c09e4479391d4ba3af16b0270e6725d.tar.bz2 Ishtar-8a7d722e8c09e4479391d4ba3af16b0270e6725d.zip  | |
Add animated images to inform that a process is running (refs #1560)
| -rw-r--r-- | ishtar_common/static/js/ishtar.js | 15 | ||||
| -rw-r--r-- | ishtar_common/static/media/images/indicator.gif | bin | 0 -> 1553 bytes | |||
| -rw-r--r-- | ishtar_common/static/media/style.css | 5 | 
3 files changed, 18 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();          }      });  } diff --git a/ishtar_common/static/media/images/indicator.gif b/ishtar_common/static/media/images/indicator.gif Binary files differnew file mode 100644 index 000000000..085ccaeca --- /dev/null +++ b/ishtar_common/static/media/images/indicator.gif diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index e59f84e85..ba95e5863 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -382,6 +382,10 @@ table.confirm tr.spacer td:last-child{      font-size:0.7em  } +.ui-autocomplete-loading { +    background:url('images/indicator.gif') no-repeat right center; +} +  .jqgrid{      cursor:pointer;  } @@ -664,6 +668,7 @@ a.remove{  }  #progress-content{ +    cursor:pointer;      background-image:url(images/ajax-loader.gif);      background-repeat: no-repeat;      background-position:center center;  | 
