diff options
author | Jannik Schönartz | 2017-12-14 13:03:44 +0100 |
---|---|---|
committer | Jannik Schönartz | 2017-12-14 13:03:44 +0100 |
commit | 5d5c2f27bee5d4fbd3747555efbf2ac9f337805b (patch) | |
tree | c65898e1b3d6f0f46366a280bbbaf4c6ccbc477c /modules-available/systemstatus/templates | |
parent | [usb-lock-off] Design changes to fit the design_guidelines. TODO: lang_discar... (diff) | |
parent | [sysconfig] Update translations (diff) | |
download | slx-admin-5d5c2f27bee5d4fbd3747555efbf2ac9f337805b.tar.gz slx-admin-5d5c2f27bee5d4fbd3747555efbf2ac9f337805b.tar.xz slx-admin-5d5c2f27bee5d4fbd3747555efbf2ac9f337805b.zip |
Merge branch 'master' into usb-lock-off
Diffstat (limited to 'modules-available/systemstatus/templates')
-rw-r--r-- | modules-available/systemstatus/templates/_page.html | 22 | ||||
-rw-r--r-- | modules-available/systemstatus/templates/services.html | 26 |
2 files changed, 39 insertions, 9 deletions
diff --git a/modules-available/systemstatus/templates/_page.html b/modules-available/systemstatus/templates/_page.html index 48a7e5c4..ca3e6fd2 100644 --- a/modules-available/systemstatus/templates/_page.html +++ b/modules-available/systemstatus/templates/_page.html @@ -1,3 +1,5 @@ +<h1>{{lang_moduleHeading}}</h1> + {{#rebootTask}} <div data-tm-id="{{rebootTask}}" data-tm-log="messages">Reboot...</div> {{/rebootTask}} @@ -84,9 +86,23 @@ <form class="form-adduser" action="?do=SystemStatus" method="post"> <input type="hidden" name="token" value="{{token}}"> <input type="hidden" name="action" value="reboot"> - <div>Server Reboot</div> - <label><input type="checkbox" name="confirm" value="yep"> {{lang_iAmSure}}</label> - <button class="btn btn-warning btn-xs" type="submit">Reboot</button> + <button class="btn btn-warning" type="button" data-toggle="modal" data-target="#rebootServerModal"><span class="glyphicon glyphicon-repeat"></span> {{lang_serverReboot}}</button> + + + <div class ="modal fade" id="rebootServerModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"> + <div class="modal-dialog" style="width: 400px" role="document"> + <div class="modal-content"> + <div class="modal-body"> + {{lang_areYouSureNoUndo}} + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button> + <button type="submit" class="btn btn-sm btn-warning"><span class="glyphicon glyphicon-repeat"></span> {{lang_serverReboot}}</button> + </div> + </div> + </div> + </div> + </form> <div id="dmsd-users"></div> </div> diff --git a/modules-available/systemstatus/templates/services.html b/modules-available/systemstatus/templates/services.html index 6c4f0b93..29b33687 100644 --- a/modules-available/systemstatus/templates/services.html +++ b/modules-available/systemstatus/templates/services.html @@ -1,6 +1,20 @@ -{{#ldadpError}} -<pre>{{ldadpError}}</pre> -{{/ldadpError}} -{{^ldadpError}} -<div class="alert alert-success">LDAP-AD-Proxy: OK</div> -{{/ldadpError}} +{{#services}} + {{#unknown}} + <div class="alert alert-warning"> + {{name}}: {{lang_unknownState}} + </div> + {{/unknown}} + {{^unknown}} + {{#fail}} + <div class="alert alert-danger"> + {{name}}: <b>{{lang_failure}}</b> + {{#data.messages}}<pre>{{data.messages}}</pre>{{/data.messages}} + </div> + {{/fail}} + {{^fail}} + <div class="alert alert-success"> + {{name}}: {{lang_OK}} + </div> + {{/fail}} + {{/unknown}} +{{/services}} |