diff options
author | Simon Rettberg | 2014-12-02 19:22:48 +0100 |
---|---|---|
committer | Simon Rettberg | 2014-12-02 19:22:48 +0100 |
commit | ba2a49e9875eda489385e370bb9f2259779caa7b (patch) | |
tree | 2654d7b4a6bf99d584e146f7708c75a5b8beaeac /templates | |
parent | Fix wrong event type when displaying event log (diff) | |
download | slx-admin-ba2a49e9875eda489385e370bb9f2259779caa7b.tar.gz slx-admin-ba2a49e9875eda489385e370bb9f2259779caa7b.tar.xz slx-admin-ba2a49e9875eda489385e370bb9f2259779caa7b.zip |
Tweaks and fixes
Diffstat (limited to 'templates')
-rw-r--r-- | templates/backup/restore.html | 6 | ||||
-rw-r--r-- | templates/baseconfig/_page.html | 2 | ||||
-rw-r--r-- | templates/serversetup/ipxe.html | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/templates/backup/restore.html b/templates/backup/restore.html index 2e33beb3..e613bdf4 100644 --- a/templates/backup/restore.html +++ b/templates/backup/restore.html @@ -51,8 +51,12 @@ $.ajax({url: "index.php?do=Main", timeout: 3000}).success(function(data, textStatus, jqXHR) { if (textStatus !== "success" && textStatus !== "notmodified") return; + if (data.indexOf('Connecting to the local database failed') > -1) + return; clearTimeout(slxTimeoutId); - window.location.replace("index.php?do=Main&message[]=success%7Crestore-done"); + setTimeout(function() { + window.location.replace("index.php?do=Main&message[]=success%7Crestore-done"); + }, 2000); }); } </script> diff --git a/templates/baseconfig/_page.html b/templates/baseconfig/_page.html index f72a25f4..054e0a6c 100644 --- a/templates/baseconfig/_page.html +++ b/templates/baseconfig/_page.html @@ -15,7 +15,7 @@ {{{item}}} </div> <div class="col-md-2"> - <a class="btn btn-default" data-toggle="modal" data-target="#help-{{setting}}">{{lang_help}}</a> + <a class="btn btn-default" data-toggle="modal" data-target="#help-{{setting}}"><span class="glyphicon glyphicon-question-sign"></span></a> </div> </div> </div> diff --git a/templates/serversetup/ipxe.html b/templates/serversetup/ipxe.html index ec8ddc2f..3d3d9b1d 100644 --- a/templates/serversetup/ipxe.html +++ b/templates/serversetup/ipxe.html @@ -29,7 +29,7 @@ <div class="form-group"> <strong>{{lang_masterPassword}}</strong> <div class="form-narrow"> - <input type="text" class="form-control" name="masterpassword" value="{{masterpassword}}"> + <input type="text" class="form-control" name="masterpassword" value="{{masterpasswordclear}}"> </div> <i>{{lang_masterPasswordHelp}}</i> </div> |