From 2644093fc54706c4a1697d007e5f857b0b1189a1 Mon Sep 17 00:00:00 2001 From: Ross Mountjoy Date: Thu, 30 Jan 2020 07:56:10 -0500 Subject: [PATCH] 1 --- dashmachine/settings_system/routes.py | 19 +- .../templates/settings_system/settings.html | 388 +++++++++++------- 2 files changed, 249 insertions(+), 158 deletions(-) diff --git a/dashmachine/settings_system/routes.py b/dashmachine/settings_system/routes.py index c7bd692..43b4977 100644 --- a/dashmachine/settings_system/routes.py +++ b/dashmachine/settings_system/routes.py @@ -2,8 +2,8 @@ import os from flask import render_template, request, Blueprint, jsonify from dashmachine.settings_system.forms import ConfigForm from dashmachine.user_system.forms import UserForm -from dashmachine.main.utils import read_config -from dashmachine.main.models import Files +from dashmachine.main.utils import read_config, row2dict +from dashmachine.main.models import Files, TemplateApps from dashmachine.paths import backgrounds_images_folder, icons_images_folder from dashmachine.settings_system.utils import load_files_html @@ -17,11 +17,16 @@ def settings(): with open("dashmachine/user_data/config.ini", "r") as config_file: config_form.config.data = config_file.read() files_html = load_files_html() + template_apps = [] + t_apps = TemplateApps.query.all() + for t_app in t_apps: + template_apps.append(f"{t_app.name}&&{t_app.icon}") return render_template( "settings_system/settings.html", config_form=config_form, files_html=files_html, user_form=user_form, + template_apps=",".join(template_apps), ) @@ -44,3 +49,13 @@ def add_images(): new_path = os.path.join(dest_folder, file.name) os.rename(file.path, new_path) return load_files_html() + + +@settings_system.route("/settings/get_app_template", methods=["GET"]) +def get_app_template(): + template_app = TemplateApps.query.filter_by(name=request.args.get("name")).first() + template = f"[{template_app.name}]
" + for key, value in row2dict(template_app).items(): + if key not in ["id", "name"]: + template += f"{key} = {value}
" + return template diff --git a/dashmachine/templates/settings_system/settings.html b/dashmachine/templates/settings_system/settings.html index 2401ebc..a2d9545 100644 --- a/dashmachine/templates/settings_system/settings.html +++ b/dashmachine/templates/settings_system/settings.html @@ -9,6 +9,17 @@ body { overflow: hidden !important; } + + .settings-page-card { + max-height: calc(100vh - 30px); + min-height: calc(100vh - 30px); + } + + #apps .dropdown-content { + border-top-left-radius: 0px; + border-top-right-radius: 0px; + background: var(--theme-surface-1); + } {% if settings.background %}