diff --git a/dashmachine/settings_system/routes.py b/dashmachine/settings_system/routes.py index 7b29cbb..9f1c34e 100644 --- a/dashmachine/settings_system/routes.py +++ b/dashmachine/settings_system/routes.py @@ -17,7 +17,7 @@ from dashmachine.paths import ( user_data_folder, template_apps_folder, ) -from dashmachine.version import version +from dashmachine.version import version, revision_number settings_system = Blueprint("settings_system", __name__) @@ -52,6 +52,7 @@ def settings(): user_form=user_form, template_apps=",".join(template_apps), version=version, + revision_number=revision_number, users=users, config_readme=config_readme, ) diff --git a/dashmachine/static/images/apps/alertmanager.png b/dashmachine/static/images/apps/alertmanager.png index a3a9601..4b72f56 100644 Binary files a/dashmachine/static/images/apps/alertmanager.png and b/dashmachine/static/images/apps/alertmanager.png differ diff --git a/dashmachine/static/images/apps/aria2.png b/dashmachine/static/images/apps/aria2.png index c2a1452..d004fde 100644 Binary files a/dashmachine/static/images/apps/aria2.png and b/dashmachine/static/images/apps/aria2.png differ diff --git a/dashmachine/static/images/apps/cloudcmd.png b/dashmachine/static/images/apps/cloudcmd.png index b5da320..e9440b5 100644 Binary files a/dashmachine/static/images/apps/cloudcmd.png and b/dashmachine/static/images/apps/cloudcmd.png differ diff --git a/dashmachine/static/images/apps/filerun.png b/dashmachine/static/images/apps/filerun.png index ea391a1..69dbcf1 100644 Binary files a/dashmachine/static/images/apps/filerun.png and b/dashmachine/static/images/apps/filerun.png differ diff --git a/dashmachine/static/images/apps/guacamole.png b/dashmachine/static/images/apps/guacamole.png index 5946fb7..dea8e86 100644 Binary files a/dashmachine/static/images/apps/guacamole.png and b/dashmachine/static/images/apps/guacamole.png differ diff --git a/dashmachine/static/images/apps/icon.png b/dashmachine/static/images/apps/icon.png index 4f06a32..24617e4 100644 Binary files a/dashmachine/static/images/apps/icon.png and b/dashmachine/static/images/apps/icon.png differ diff --git a/dashmachine/static/images/apps/karma.png b/dashmachine/static/images/apps/karma.png index 38ea875..2a87c81 100644 Binary files a/dashmachine/static/images/apps/karma.png and b/dashmachine/static/images/apps/karma.png differ diff --git a/dashmachine/static/images/apps/netdata.png b/dashmachine/static/images/apps/netdata.png index 1de841f..a2bfb55 100644 Binary files a/dashmachine/static/images/apps/netdata.png and b/dashmachine/static/images/apps/netdata.png differ diff --git a/dashmachine/static/images/apps/openwrt.png b/dashmachine/static/images/apps/openwrt.png index 5a7a52f..be22a93 100644 Binary files a/dashmachine/static/images/apps/openwrt.png and b/dashmachine/static/images/apps/openwrt.png differ diff --git a/dashmachine/static/images/apps/pfsense.png b/dashmachine/static/images/apps/pfsense.png index b45292a..fc02425 100644 Binary files a/dashmachine/static/images/apps/pfsense.png and b/dashmachine/static/images/apps/pfsense.png differ diff --git a/dashmachine/static/images/apps/prometheus.png b/dashmachine/static/images/apps/prometheus.png index a3a9601..4b72f56 100644 Binary files a/dashmachine/static/images/apps/prometheus.png and b/dashmachine/static/images/apps/prometheus.png differ diff --git a/dashmachine/static/images/apps/statping.png b/dashmachine/static/images/apps/statping.png index 9fb125f..432abab 100644 Binary files a/dashmachine/static/images/apps/statping.png and b/dashmachine/static/images/apps/statping.png differ diff --git a/dashmachine/templates/error_pages/unauthorized.html b/dashmachine/templates/error_pages/unauthorized.html index d45df2e..eb3b875 100644 --- a/dashmachine/templates/error_pages/unauthorized.html +++ b/dashmachine/templates/error_pages/unauthorized.html @@ -1,4 +1,5 @@ {% extends "main/base.html" %} +{% from 'global_macros.html' import button %} {% block content %} @@ -6,6 +7,20 @@
warning

Unauthorized

+ +

This user account is not in the access group allowed to view this page.

+ + {{ button( + float="center", + href=url_for('user_system.login'), + text="Go to login" + ) }} + + {{ button( + float="center", + href="javascript:history.back()", + text="Go back" + ) }}
{% endblock content %} diff --git a/dashmachine/templates/main/home.html b/dashmachine/templates/main/home.html index ca6eea9..f10ba98 100644 --- a/dashmachine/templates/main/home.html +++ b/dashmachine/templates/main/home.html @@ -78,7 +78,13 @@ {% else %} {# otherwise, render the apps like this #} {% for app in apps %} - {{ App(app) }} + {% if app.type == "app" %} + {{ App(app) }} + {% elif app.type == "collection" %} + {{ Collection(app) }} + {% elif app.type == "custom" %} + {{ Custom(app) }} + {% endif %} {% endfor %} {% endif %} {% else %} diff --git a/dashmachine/templates/main/macros.html b/dashmachine/templates/main/macros.html index 8cedccd..7068263 100644 --- a/dashmachine/templates/main/macros.html +++ b/dashmachine/templates/main/macros.html @@ -40,7 +40,7 @@
{{ app.name }} - more_vert + more_vert {% if app.data_sources.count() > 0 %} refresh {% endif %} diff --git a/dashmachine/templates/settings_system/settings.html b/dashmachine/templates/settings_system/settings.html index a6f0793..f2a056c 100644 --- a/dashmachine/templates/settings_system/settings.html +++ b/dashmachine/templates/settings_system/settings.html @@ -130,7 +130,7 @@
DashMachine

Version:

-

{{ version }}

+

{{ version }}-{{ revision_number }}

Author:

diff --git a/dashmachine/version.py b/dashmachine/version.py index a58f928..822ee65 100755 --- a/dashmachine/version.py +++ b/dashmachine/version.py @@ -1 +1,2 @@ version = "v0.5" +revision_number = "2" diff --git a/readme_cards.md b/readme_cards.md index 7d0494b..3a16d0e 100644 --- a/readme_cards.md +++ b/readme_cards.md @@ -33,7 +33,7 @@ These entries provide a card on the dashboard containing a list of links. [Collection Name] type = collection icon = collections_bookmark -urls = {"url": "google.com", "icon": "static/images/apps/default.png", "name": "Google", "open_in": "new_tab"},{"url": "duckduckgo.com", "icon": "static/images/apps/default.png", "name": "DuckDuckGo", "open_in": "iframe"} +urls = {"url": "google.com", "icon": "static/images/apps/default.png", "name": "Google", "open_in": "new_tab"},{"url": "duckduckgo.com", "icon": "static/images/apps/default.png", "name": "DuckDuckGo", "open_in": "this_tab"} ``` | Variable | Required | Description | Options | @@ -57,5 +57,6 @@ data_sources = my_data_source |-------------------|----------|----------------------------------------------------------------------------------------------|-------------------------------------| | [Collection Name] | Yes | Name for the collection | [Collection Name] | | type | Yes | This tells DashMachine what type of card this is. | custom | +| data_sources | Yes | What data sources to display on the card. | comma separated string | | tags | No | Optionally specify tags for organization on /home | comma separated string | | groups | No | Optionally specify the access groups that can see this app. | comma separated string | \ No newline at end of file