diff --git a/python/web/src/static/themes/modern/icons/cloud-off.svg b/python/web/src/static/themes/modern/icons/cloud-off.svg new file mode 100644 index 0000000000..b53410adfa --- /dev/null +++ b/python/web/src/static/themes/modern/icons/cloud-off.svg @@ -0,0 +1 @@ + diff --git a/python/web/src/static/themes/modern/icons/cloud.svg b/python/web/src/static/themes/modern/icons/cloud.svg new file mode 100644 index 0000000000..448e1485bb --- /dev/null +++ b/python/web/src/static/themes/modern/icons/cloud.svg @@ -0,0 +1 @@ + diff --git a/python/web/src/static/themes/modern/icons/command.svg b/python/web/src/static/themes/modern/icons/command.svg new file mode 100644 index 0000000000..e4d7559593 --- /dev/null +++ b/python/web/src/static/themes/modern/icons/command.svg @@ -0,0 +1 @@ + diff --git a/python/web/src/static/themes/modern/style.css b/python/web/src/static/themes/modern/style.css index a21a91ed96..8bfadd1b3e 100644 --- a/python/web/src/static/themes/modern/style.css +++ b/python/web/src/static/themes/modern/style.css @@ -419,8 +419,8 @@ div.header div.authentication-disabled a { color: #fff; } - div.header div.login-status.logged-in a { - background: var(--danger) no-repeat right 0.5rem center; + div.header div.login-status.logged-in span.log-out-button a { + background: var(--primary) no-repeat right 0.5rem center; background-image: url("icons/log-out.svg"); background-size: var(--icon-size); border-radius: var(--border-radius); @@ -430,6 +430,17 @@ div.header div.authentication-disabled a { color: #fff; } + div.header div.login-status.logged-in span.admin-button a { + background: var(--secondary) no-repeat right 0.5rem center; + background-image: url("icons/command.svg"); + background-size: var(--icon-size); + border-radius: var(--border-radius); + padding: 0.25rem 2.25rem 0.25rem 0.75rem; + display: inline-block; + text-decoration: none; + color: #fff; + } + div.header div.login-status.logged-in span.logged-in-as-text { margin-right: 1rem; } @@ -954,6 +965,29 @@ section#manual a p { margin: 0; } +/* + ------------------------------------------------------------------------------ + Admin > Section: Services + ------------------------------------------------------------------------------ + */ +section#services ul { + list-style: none; + padding-left: 0; +} + +section#services li { + margin-bottom: 0.5em; + padding: 0.25rem 0 0.25rem 2rem; +} + +section#services li.enabled { + background: url("icons/cloud.svg") no-repeat left center; +} + +section#services li.disabled { + background: url("icons/cloud-off.svg") no-repeat left center; +} + /* ------------------------------------------------------------------------------ Drives page diff --git a/python/web/src/templates/admin.html b/python/web/src/templates/admin.html new file mode 100644 index 0000000000..dd6d77e78d --- /dev/null +++ b/python/web/src/templates/admin.html @@ -0,0 +1,194 @@ +{% extends "base.html" %} +{% block content %} + +
+
+ + {{ _("Logging") }} + + +
+ +
+
+ + + + + +
+
+ +
+
+ + + +
+
+
+ +
+ +
+
+ + {{ _("Appearance") }} + + +
+ +
+
+ {{ _("The current theme is \"%(theme)s\".", theme=current_theme) }} + {% if current_theme == "classic" %} + {{ _('Switch to the %(theme)s theme', theme="modern") }} + {% else %} + {{ _('Switch to the %(theme)s theme', theme="classic") }} + {% endif %} +
+ +
+ + + +
+
+ +
+
+ + + +
+
+ + +
+
+
+ +
+ +
+
+ + {{ _("Companion Services") }} + + +
+ +
+ +
+ +
+
+ + {{ _("System Operations") }} + + +
+ +
+
+ +
+
+ +
+
+
+ +

{{ _("Go to Home") }}

+ +{% endblock content %} diff --git a/python/web/src/templates/base.html b/python/web/src/templates/base.html index 38cbe09ba1..4ebdfd6a32 100644 --- a/python/web/src/templates/base.html +++ b/python/web/src/templates/base.html @@ -32,7 +32,9 @@
{{ _("Logged in as %(username)s", username=env["username"]) }} - - {{ _("Log Out") }} + {{ _("Log Out") }} + - + {{ _("Settings") }}
{% else %}
@@ -104,55 +106,8 @@

{% block content %}{% endblock content %}

-
- {% if current_theme == "classic" %} - {{ _('Switch to the %(theme)s theme', theme="modern") }} - {% else %} - {{ _('Switch to the %(theme)s theme', theme="classic") }} - {% endif %} -
- -
- {% if env["netatalk_configured"] %} - {{ _("Mac AFP file sharing is enabled.") }} - {% if env["webmin_configured"] %} - - {{ ("Server administration") }} - - {% endif %} - {% else %} - {{ _("Mac AFP file sharing is disabled.") }} - {% endif %} -
-
- {% if env["samba_configured"] %} - {{ _("Windows SMB file sharing is enabled.") }} - {% if env["webmin_configured"] %} - - {{ ("Server administration") }} - - {% endif %} - {% else %} - {{ _("Windows SMB file sharing is disabled.") }} - {% endif %} -
-
- {% if env["ftp_configured"] %} - {{ _("FTP file sharing is enabled.") }} - {% else %} - {{ _("FTP file sharing is disabled.") }} - {% endif %} -
-
- {% if env["macproxy_configured"] %} - {{ _("Macproxy is running at %(ip_addr)s (default port 5000)", ip_addr=env['ip_addr']) }} - {% else %} - {{ _("Macproxy is disabled.") }} - {% endif %} -
-
- {{ _("PiSCSI software version:") }} {{ env["version"] }} + {{ _("PiSCSI software version:") }} {{ env["version"] }}
{{ _("Hardware and OS:") }} {{ env["running_env"]["env"] }} diff --git a/python/web/src/templates/index.html b/python/web/src/templates/index.html index fb3a5b325b..a6c4420cd1 100644 --- a/python/web/src/templates/index.html +++ b/python/web/src/templates/index.html @@ -568,7 +568,6 @@
-
@@ -669,109 +668,6 @@
-
- - {{ _("Logging") }} - -
    -
  • {{ _("The current dropdown selection indicates the active log level.") }}
    • -
-
- -
-
- - - - - -
-
- -
-
- - - -
-
-
- -
- -
-
- - {{ _("System Operations") }} - -
    -
  • {{ _("The System Name is the \"pretty\" hostname if set, with a fallback to the regular hostname.") }}
    • -
  • {{ _("IMPORTANT: Always shut down the system before turning off the power. Failing to do so may lead to data loss.") }}
    • -
-
- -
-
- - - -
-
-
-
- - - -
-
- - -
-
-
-
- -
-
- -
-
-
- -
-

{{ _("Read the PiSCSI Manual") }}
diff --git a/python/web/src/web.py b/python/web/src/web.py index 6829b3d427..63db290c7a 100644 --- a/python/web/src/web.py +++ b/python/web/src/web.py @@ -105,11 +105,6 @@ def get_env_info(): "version": server_info["version"], "image_dir": server_info["image_dir"], "image_root_dir": Path(server_info["image_dir"]).name, - "netatalk_configured": sys_cmd.running_proc("afpd"), - "samba_configured": sys_cmd.running_proc("smbd"), - "ftp_configured": sys_cmd.running_proc("vsftpd"), - "macproxy_configured": sys_cmd.running_proc("macproxy"), - "webmin_configured": sys_cmd.running_proc("miniserv.pl"), "cd_suffixes": tuple(server_info["sccd"]), "rm_suffixes": tuple(server_info["scrm"]), "mo_suffixes": tuple(server_info["scmo"]), @@ -263,7 +258,6 @@ def index(): return response( template="index.html", page_title=_("PiSCSI Control Page"), - locales=get_supported_locales(), netinfo=piscsi_cmd.get_network_info(), bridge_configured=sys_cmd.is_bridge_setup(), devices=formatted_devices, @@ -273,8 +267,6 @@ def index(): config_files=config_files, device_types=device_types, scan_depth=server_info["scan_depth"], - log_levels=server_info["log_levels"], - current_log_level=server_info["current_log_level"], scsi_ids=scsi_ids, units=units, reserved_scsi_ids=reserved_scsi_ids, @@ -320,6 +312,27 @@ def drive_list(): ) +@APP.route("/sys/admin", methods=["GET"]) +def admin(): + """ + Sets up the data structures and kicks off the rendering of the system admin page + """ + server_info = piscsi_cmd.get_server_info() + + return response( + template="admin.html", + page_title=_("PiSCSI System Administration"), + log_levels=server_info["log_levels"], + current_log_level=server_info["current_log_level"], + locales=get_supported_locales(), + netatalk_configured=sys_cmd.running_proc("afpd"), + samba_configured=sys_cmd.running_proc("smbd"), + ftp_configured=sys_cmd.running_proc("vsftpd"), + macproxy_configured=sys_cmd.running_proc("macproxy"), + webmin_configured=sys_cmd.running_proc("miniserv.pl"), + ) + + @APP.route("/upload", methods=["GET"]) def upload_page(): """