harmacist/DashMachine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- fixed issue with 'info' tab of settings editor not appearing on desktop size

Browse Source 
- fixed 'tags' gui section if no tags exist in config
- fixed issue with tag selector visibility
This commit is contained in:
Ross Mountjoy 2020-05-08 13:12:13 -04:00
parent e63aa75c22
commit c521b41765
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dashmachine/main/routes.py
View File

@ -165,6 +165,8 @@ def load_settings_editor():
json.loads(tag_json) json.loads(tag_json)
for tag_json in settings_dict["tags"].replace("},{", "}%,%{").split("%,%") for tag_json in settings_dict["tags"].replace("},{", "}%,%{").split("%,%")
] ]
else:
settings_dict["tags"] = ["list"] + [{"name": "", "icon": "", "sort_pos": ""}]
settings_editor_html = render_template_string( settings_editor_html = render_template_string(
""" """
{% from 'main/settings-editor.html' import SettingsEditor with context %} {% from 'main/settings-editor.html' import SettingsEditor with context %}

4
dashmachine/templates/global_macros.html
View File

@ -240,9 +240,9 @@ class=''
<input data-search-providers-url="{{ url_for('main.build_action_provider_url') }}" <input data-search-providers-url="{{ url_for('main.build_action_provider_url') }}"
type="text" type="text"
class="card-filter action-bar theme-surface-transparent" class="card-filter action-bar theme-surface-transparent"
placeholder="Search apps" autofocus> placeholder="Search.." autofocus>
{% if True %} {% if tags|length > 1 %}
<i class="toggle-tag-expand-all-btn material-icons right filter-action pointer">unfold_less</i> <i class="toggle-tag-expand-all-btn material-icons right filter-action pointer">unfold_less</i>
<!-- Dropdown Trigger --> <!-- Dropdown Trigger -->
<a class='dropdown-trigger filter-tags-dropdown-trigger' data-target='filter-tags-dropdown-{{ location }}'> <a class='dropdown-trigger filter-tags-dropdown-trigger' data-target='filter-tags-dropdown-{{ location }}'>

2
dashmachine/templates/main/settings-editor.html
View File

@ -14,7 +14,7 @@
<div class="row"> <div class="row">
<div class="col s12 mb-2"> <div class="col s12 mb-2">
<ul class="tabs theme-background"> <ul class="tabs theme-background tabs-fixed-width">
{% if access_group.can_access_main_settings == "True"%} {% if access_group.can_access_main_settings == "True"%}
<li class="tab col s3 active"><a id="settings-gui-tab" href="#settings-gui"> <li class="tab col s3 active"><a id="settings-gui-tab" href="#settings-gui">
<i class="material-icons-outlined">settings</i> <i class="material-icons-outlined">settings</i>