From c91e52b9b1013f8a7efb62db911dc7d41b73732e Mon Sep 17 00:00:00 2001 From: Tobias Block Date: Sat, 28 Sep 2024 00:44:18 +0000 Subject: [PATCH] Minor UI fixes and changes. Increased version number. --- VERSION | 2 +- webgui.py | 6 ++--- webinterface/dashboards.py | 6 +++-- webinterface/statics/css/custom.css | 1 + webinterface/templates/base.html | 19 +++++++-------- webinterface/templates/configuration.html | 5 ++-- .../templates/dashboards/dashboards.html | 2 +- webinterface/templates/dashboards/tests.html | 24 +++++++++---------- webinterface/templates/index.html | 18 ++++++++------ webinterface/templates/rules.html | 2 +- webinterface/templates/targets.html | 3 +-- webinterface/templates/users.html | 20 ++++++++-------- 12 files changed, 57 insertions(+), 51 deletions(-) diff --git a/VERSION b/VERSION index e3c078ac..e6285df8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.3.1-beta.13 \ No newline at end of file +0.4.0-alpha.1 \ No newline at end of file diff --git a/webgui.py b/webgui.py index 338ce0eb..e6e0f43b 100755 --- a/webgui.py +++ b/webgui.py @@ -339,7 +339,7 @@ async def configuration(request) -> Response: context = { "request": request, "mercure_version": mercure_defs.VERSION, - "page": "configuration", + "page": "homepage", "config": config.mercure, "os_string": os_string, "config_edited": config_edited, @@ -372,7 +372,7 @@ async def configuration_edit(request) -> Response: context = { "request": request, "mercure_version": mercure_defs.VERSION, - "page": "configuration", + "page": "homepage", "config_content": config_content, } context.update(get_user_information(request)) @@ -835,7 +835,7 @@ async def server_error(request, exc) -> Response: app.mount("/users", users.users_app) app.mount("/queue", queue.queue_app) app.mount("/api", api.api_app) -app.mount("/dashboards", dashboards.dashboards_app) +app.mount("/tools", dashboards.dashboards_app) diff --git a/webinterface/dashboards.py b/webinterface/dashboards.py index d441f192..8afc4275 100644 --- a/webinterface/dashboards.py +++ b/webinterface/dashboards.py @@ -38,7 +38,8 @@ async def tasks(request): context = { "request": request, "mercure_version": mercure_defs.VERSION, - "page": "tasks", + "page": "tools", + "tab": "tasks", } context.update(get_user_information(request)) return templates.TemplateResponse(template, context) @@ -51,7 +52,8 @@ async def tests(request): context = { "request": request, "mercure_version": mercure_defs.VERSION, - "page": "tests", + "page": "tools", + "tab": "tests", } context.update(get_user_information(request)) return templates.TemplateResponse(template, context) diff --git a/webinterface/statics/css/custom.css b/webinterface/statics/css/custom.css index d7b2f465..e0982abe 100755 --- a/webinterface/statics/css/custom.css +++ b/webinterface/statics/css/custom.css @@ -16,6 +16,7 @@ border-bottom-right-radius: 0px; } + .navbar.is-black .navbar-start > a.navbar-item:hover, .navbar.is-black .navbar-item.has-dropdown:hover .navbar-link { background-color: hsl(141, 71%, 48%); diff --git a/webinterface/templates/base.html b/webinterface/templates/base.html index 1f165da5..ff068afc 100755 --- a/webinterface/templates/base.html +++ b/webinterface/templates/base.html @@ -43,23 +43,20 @@ Overview + + Setup + Queue - - Rules - {% if is_admin %} Logs - + Tools {% endif %} - - Configuration - {% endif %} {% if logged_in %}{% if appliance_name != 'master' %} @@ -100,7 +97,8 @@ {% block extra_nav %} {% if page in ['rules','targets','modules', 'users'] %}
-
+
+
-
- {% endif %} + + + {% endif %} {% endblock %}
diff --git a/webinterface/templates/configuration.html b/webinterface/templates/configuration.html index 612e93a2..5fcd30db 100755 --- a/webinterface/templates/configuration.html +++ b/webinterface/templates/configuration.html @@ -10,11 +10,12 @@

Configuration

- {% if is_admin %}
+  Back + {% if is_admin %}  Edit + {% endif %}
- {% endif %}
diff --git a/webinterface/templates/dashboards/dashboards.html b/webinterface/templates/dashboards/dashboards.html index 8028f39a..ca3531d5 100644 --- a/webinterface/templates/dashboards/dashboards.html +++ b/webinterface/templates/dashboards/dashboards.html @@ -7,7 +7,7 @@