diff options
-rw-r--r-- | install/ui/reset_password.html | 3 | ||||
-rw-r--r-- | install/ui/reset_password.js | 45 |
2 files changed, 46 insertions, 2 deletions
diff --git a/install/ui/reset_password.html b/install/ui/reset_password.html index 598fe8f1e..ec09bbfaf 100644 --- a/install/ui/reset_password.html +++ b/install/ui/reset_password.html @@ -50,6 +50,9 @@ <div class="alert alert-warning" style="display:none;"> <span class="fa fa-warning"></span><p></p> </div> + <div class="alert alert-info" style="display:none;"> + <span class="fa fa-info-circle"></span><p></p> + </div> </div> </div> </div> diff --git a/install/ui/reset_password.js b/install/ui/reset_password.js index 1afc76eba..2e0db7db8 100644 --- a/install/ui/reset_password.js +++ b/install/ui/reset_password.js @@ -134,6 +134,16 @@ RP.show_error = function(message) { $('.alert-success').css('display', 'none'); }; +RP.show_info = function(message) { + + $('.alert-info > p').text(message || ''); + if (!message) { + $('.alert-info').css('display', 'none'); + } else { + $('.alert-info').css('display', ''); + } +}; + RP.show_success = function(message) { $('.alert-success > p').text(message); @@ -158,10 +168,41 @@ RP.parse_uri = function() { RP.redirect = function() { var opts = RP.parse_uri(); - var url = opts['redirect']; + var url = opts['url']; + var delay = parseInt(opts['delay'], 10); + + var msg_cont = $('.alert-success > p'); + $('.redirect', msg_cont).remove(); + + // button for manual redirection if (url) { - window.location = url; + var redir_cont = $('<span/>', { 'class': 'redirect' }). + append(' '). + append($('<a/>', { + href: url, + text: 'Continue to next page' + })). + appendTo(msg_cont); + } else { + return; + } + + if (delay <= 0 || delay > 0) { // NaN check + RP.redir_url = url; + RP.redir_delay = delay; + RP.redir_count_down(); + } +}; + +RP.redir_count_down = function() { + + RP.show_info("You will be redirected in " + Math.max(RP.redir_delay, 0) + "s"); + if (RP.redir_delay <= 0) { + window.location = RP.redir_url; + return; } + window.setTimeout(RP.redir_count_down, 1000); + RP.redir_delay--; }; |