From d65743f2eacfc3a1420a11693e4741dfdd949fba Mon Sep 17 00:00:00 2001 From: Jakob Ketterl Date: Thu, 18 Feb 2021 23:05:43 +0100 Subject: [PATCH] rename template variable --- htdocs/settings/general.html | 6 +++--- owrx/controllers/settings/__init__.py | 2 +- owrx/controllers/settings/sdr.py | 26 ++++++++++++-------------- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/htdocs/settings/general.html b/htdocs/settings/general.html index de0353e..e9297b1 100644 --- a/htdocs/settings/general.html +++ b/htdocs/settings/general.html @@ -12,9 +12,9 @@ ${header}
-
-

${title}

+
+

${title}s

- ${sections} + ${content}
\ No newline at end of file diff --git a/owrx/controllers/settings/__init__.py b/owrx/controllers/settings/__init__.py index 907ceda..6ddcb54 100644 --- a/owrx/controllers/settings/__init__.py +++ b/owrx/controllers/settings/__init__.py @@ -67,7 +67,7 @@ class SettingsFormController(AuthorizationMixin, WebpageController, metaclass=AB def template_variables(self): variables = super().template_variables() - variables["sections"] = self.render_sections() + variables["content"] = self.render_sections() variables["title"] = self.getTitle() return variables diff --git a/owrx/controllers/settings/sdr.py b/owrx/controllers/settings/sdr.py index e8cd6e7..24d39e0 100644 --- a/owrx/controllers/settings/sdr.py +++ b/owrx/controllers/settings/sdr.py @@ -1,8 +1,6 @@ from owrx.controllers.admin import AuthorizationMixin from owrx.controllers.template import WebpageController from owrx.config import Config -from urllib.parse import quote -import json class SdrSettingsController(AuthorizationMixin, WebpageController): @@ -13,21 +11,13 @@ class SdrSettingsController(AuthorizationMixin, WebpageController): def template_variables(self): variables = super().template_variables() - variables["sections"] = self.render_devices() + variables["content"] = self.render_devices() variables["title"] = "SDR device settings" return variables def render_devices(self): - return """ -
- {devices} -
- """.format( - devices="".join(self.render_device(key, value) for key, value in Config.get()["sdrs"].items()) - ) - - def render_device(self, device_id, config): - return """ + def render_device(device_id, config): + return """
{device_name} @@ -37,7 +27,15 @@ class SdrSettingsController(AuthorizationMixin, WebpageController):
""".format( - device_name=config["name"] + device_name=config["name"] + ) + + return """ +
+ {devices} +
+ """.format( + devices="".join(render_device(key, value) for key, value in Config.get()["sdrs"].items()) ) def indexAction(self):