From 974c9bba61e24749869160fead2e9e5b7cf7d0a7 Mon Sep 17 00:00:00 2001 From: David Duque Date: Mon, 13 Apr 2020 01:16:23 +0100 Subject: [PATCH] Fix status check colors, add SMTP relay stub --- .editorconfig | 3 + management/templates/index.html | 705 ++++++++++++------------ management/templates/smtp-relays.html | 6 + management/templates/system-status.html | 276 +++++----- 4 files changed, 506 insertions(+), 484 deletions(-) create mode 100644 management/templates/smtp-relays.html diff --git a/.editorconfig b/.editorconfig index fbe828c3..85e5fd9c 100644 --- a/.editorconfig +++ b/.editorconfig @@ -12,6 +12,9 @@ charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true +[*.html] +indent_style = tab + [Makefile] indent_style = tab indent_size = 4 diff --git a/management/templates/index.html b/management/templates/index.html index 2c0d5a9a..5649ccfc 100644 --- a/management/templates/index.html +++ b/management/templates/index.html @@ -1,396 +1,409 @@ - - - - - {{hostname}} - Mail-in-a-Box Control Panel + + + + - + {{hostname}} - Mail-in-a-Box Control Panel - - - - - + h4:first-child { + margin-top: 6px; + } - - + .admin_panel { + display: none; + } - + table.table { + margin: 1.5em 0; + } -
-
- {% include "system-status.html" %} -
+ ol li { + margin-bottom: 1em; + } + + + -
- {% include "system-backup.html" %} -
+ -
- {% include "external-dns.html" %} -
+ + -
- {% include "custom-dns.html" %} -
+ -
- {% include "login.html" %} -
+
+
+ {% include "system-status.html" %} +
-
- {% include "mail-guide.html" %} -
+
+ {% include "system-backup.html" %} +
-
- {% include "users.html" %} -
+
+ {% include "external-dns.html" %} +
-
- {% include "aliases.html" %} -
+
+ {% include "custom-dns.html" %} +
-
- {% include "sync-guide.html" %} -
+
+ {% include "login.html" %} +
-
- {% include "web.html" %} -
+
+ {% include "mail-guide.html" %} +
-
- {% include "ssl.html" %} -
+
+ {% include "users.html" %} +
-
+
+ {% include "aliases.html" %} +
- -
+
+ {% include "sync-guide.html" %} +
- +
+ {% include "web.html" %} +
- +
+ {% include "ssl.html" %} +
- - +
- + -var ajax_num_executing_requests = 0; -function ajax_with_indicator(options) { - setTimeout("if (ajax_num_executing_requests > 0) $('#ajax_loading_indicator').fadeIn()", 100); - function hide_loading_indicator() { - ajax_num_executing_requests--; - if (ajax_num_executing_requests == 0) - $('#ajax_loading_indicator').stop(true).hide(); // stop() prevents an ongoing fade from causing the thing to be shown again after this call - } - var old_success = options.success; - var old_error = options.error; - options.success = function(data) { - hide_loading_indicator(); - if (data.status == "error") - show_modal_error("Error", data.message); - else if (old_success) - old_success(data); - }; - options.error = function(jqxhr) { - hide_loading_indicator(); - if (!old_error) - show_modal_error("Error", "Something went wrong, sorry.") - else - old_error(jqxhr.responseText, jqxhr); - }; - ajax_num_executing_requests++; - $.ajax(options); - return false; // handy when called from onclick -} + + - - diff --git a/management/templates/smtp-relays.html b/management/templates/smtp-relays.html new file mode 100644 index 00000000..b578b7cf --- /dev/null +++ b/management/templates/smtp-relays.html @@ -0,0 +1,6 @@ + + +

SMTP Relays

+ +

Coming Soon™

diff --git a/management/templates/system-status.html b/management/templates/system-status.html index a56d0cd5..09e94b7e 100644 --- a/management/templates/system-status.html +++ b/management/templates/system-status.html @@ -1,169 +1,169 @@

System Status Checks

-
+
- + - + -
-
+
+
- - - - - -
+ + + + + +
-
+