external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-03-04 15:54:48 +01:00
Code Issues Releases Wiki Activity

move the reboot button, fix grammar, refactor check for DRY, add changelog entry

Browse Source
This commit is contained in:
Joshua Tauberer
2016-03-23 16:37:15 -04:00
parent b71ad85e9f
commit 67555679bd
4 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
management/templates/system-status.html
View File

@@ -1,9 +1,5 @@
<h2>System Status Checks</h2>
<div id="system-reboot-required" style="display: none">
<button type="button" class="btn btn-danger" onclick="confirm_reboot(); return false;">Reboot required</button>
</div>
<style>
#system-checks .heading td {
font-weight: bold;
@@ -38,22 +34,24 @@
font-family: monospace;
white-space: pre-wrap;
}
#system-reboot-required {
max-width: 20em;
margin-bottom: 1em;
}
#system-privacy-setting {
float: right;
max-width: 20em;
margin-bottom: 1em;
}
</style>
<div class="row">
<div class="col-md-push-9 col-md-3">
<div id="system-reboot-required" style="display: none; margin-bottom: 1em;">
<button type="button" class="btn btn-danger" onclick="confirm_reboot(); return false;">Reboot Box</button>
<div>No reboot is necessary.</div>
</div>
<div id="system-privacy-setting" style="display: none">
<div><a onclick="return enable_privacy(!current_privacy_setting)" href="#"><span>Enable/Disable</span> New-Version Check</a></div>
<p style="line-height: 125%"><small>(When enabled, status checks phone-home to check for a new release of Mail-in-a-Box.)</small></p>
</div>
</div> <!-- /col -->
<div class="col-md-pull-3 col-md-8">
<table id="system-checks" class="table" style="max-width: 60em">
<thead>
</thead>
@@ -61,6 +59,9 @@
</tbody>
</table>
</div> <!-- /col -->
</div> <!-- /row -->
<script>
function show_system_status() {
$('#system-checks tbody').html("<tr><td colspan='2' class='text-muted'>Loading...</td></tr>")
@@ -81,7 +82,9 @@ function show_system_status() {
"GET",
{ },
function(r) {
$('#system-reboot-required').toggle(r);
$('#system-reboot-required').show(); // show when r becomes available
$('#system-reboot-required').find('button').toggle(r);
$('#system-reboot-required').find('div').toggle(!r);
});
api(
@@ -139,16 +142,18 @@ function enable_privacy(status) {
function confirm_reboot() {
show_modal_confirm(
"Reboot server",
$("<p>This will reboot your server, until the server is fully restarted your users will not be able to send and receive email. The reboot can't be cancelled</p>"),
"Reboot now",
"Reboot",
$("<p>This will reboot your Mail-in-a-Box <code>{{hostname}}</code>.</p> <p>Until the machine is fully restarted, your users will not be able to send and receive email, and you will not be able to connect to this control panel or with SSH. The reboot cannot be cancelled.</p>"),
"Reboot Now",
function() {
api(
"/system/reboot",
"POST",
{ },
function(r) {
show_modal_error("Reboot", "Please refresh the page after a minute or so." + r);
var msg = "<p>Please reload this page after a minute or so.</p>";
if (r) msg = "<p>The reboot command said:</p> <pre>" + $("<pre/>").text(r).html() + "</pre>"; // successful reboots don't produce any output; the output must be HTML-escaped
show_modal_error("Reboot", msg);
});
});
}