diff options
Diffstat (limited to 'ishtar_common/static')
| -rw-r--r-- | ishtar_common/static/js/ishtar.js | 22 | ||||
| -rw-r--r-- | ishtar_common/static/media/style.css | 21 | 
2 files changed, 43 insertions, 0 deletions
| diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js index f469fc546..4d82cb238 100644 --- a/ishtar_common/static/js/ishtar.js +++ b/ishtar_common/static/js/ishtar.js @@ -108,6 +108,28 @@ $(document).on("click", '#progress-content', function(){      $('#progress').hide();  }); +function long_wait(){ +    $('#progress').addClass('long'); +    $('#progress').show(); +    $('.progress-1').show('slow'); +    setTimeout(function(){ +        $('.progress-1').hide('slow'); +        $('.progress-2').show('slow'); +    }, 60000); +    setTimeout(function(){ +        $('.progress-2').hide('slow'); +        $('.progress-3').show('slow'); +    }, 120000); +    setTimeout(function(){ +        $('.progress-3').hide('slow'); +        $('.progress-4').show('slow'); +    }, 180000); +    setTimeout(function(){ +        $('.progress-4').hide('slow'); +        long_wait(); +    }, 240000); +} +  var last_window;  function load_window(url, speed, on_success){ diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index 42381afa9..02f4d930b 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -1199,6 +1199,27 @@ input.widget-oa{      padding:10px;  } +#progress.long #progress-content{ +    background-position:center 20px; +    width:130px; +    height: auto; +    padding-top: 60px; +} + +#progress-content p{ +    display: none; +    padding: 0; +    margin: 0; +} + +#progress.long #progress-content p{ +    display: block; +} + +#progress.long #progress-content p.progress-detail{ +    display: none; +} +  #merge-table{      background-color:#fff;      width:700px; | 
