diff options
| author | Valérie-Emma Leroux <emma@iggdrasil.net> | 2017-04-07 11:40:31 +0200 |
|---|---|---|
| committer | Valérie-Emma Leroux <emma@iggdrasil.net> | 2017-04-07 11:40:31 +0200 |
| commit | 7f22d3c20cc24debfe123425efa63ec5293e4b4c (patch) | |
| tree | f773b80964981c231c892ee5255b94285bc5620a /ishtar_common/templates/ishtar/dashboards/dashboard_main.html | |
| parent | 9127307734c85b816ac7dbb539b565ffb106d60f (diff) | |
| parent | da4af2ab5d105f6d2ce442b517e532b7570616e3 (diff) | |
| download | Ishtar-7f22d3c20cc24debfe123425efa63ec5293e4b4c.tar.bz2 Ishtar-7f22d3c20cc24debfe123425efa63ec5293e4b4c.zip | |
Merge branch 'master' of git.iggdrasil.net:/srv/git/ishtar
Conflicts:
archaeological_operations/templates/ishtar/sheet_operation.html
Diffstat (limited to 'ishtar_common/templates/ishtar/dashboards/dashboard_main.html')
| -rw-r--r-- | ishtar_common/templates/ishtar/dashboards/dashboard_main.html | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/ishtar_common/templates/ishtar/dashboards/dashboard_main.html b/ishtar_common/templates/ishtar/dashboards/dashboard_main.html index 93e11d604..6a5a67a63 100644 --- a/ishtar_common/templates/ishtar/dashboards/dashboard_main.html +++ b/ishtar_common/templates/ishtar/dashboards/dashboard_main.html @@ -15,7 +15,16 @@ {% endblock %} {% block content %} <script> -$(function() { $( "#dash-tabs" ).tabs(); }); +$(function() { + $( "#dash-tabs" ).tabs({ + beforeActivate: function( event, ui ) { + $("#progress").show(); + }, + load: function( event, ui ) { + $("#progress").hide(); + } + }); +}); </script> <div id='dashboard'> <div id="dash-tabs"> |