From 54fde2c1c00c4570cc1242e8c3e8623bb52e9f91 Mon Sep 17 00:00:00 2001 From: Jakob Ketterl Date: Thu, 18 Feb 2021 22:12:13 +0100 Subject: [PATCH] reuse existing template --- htdocs/settings/sdr.html | 21 --------------------- owrx/controllers/settings/sdr.py | 13 ++++++++++--- 2 files changed, 10 insertions(+), 24 deletions(-) delete mode 100644 htdocs/settings/sdr.html diff --git a/htdocs/settings/sdr.html b/htdocs/settings/sdr.html deleted file mode 100644 index f85dfde..0000000 --- a/htdocs/settings/sdr.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - OpenWebRX Settings - - - - - - - -${header} -
-
-

SDR device settings

-
-
- ${devices} -
-
- \ No newline at end of file diff --git a/owrx/controllers/settings/sdr.py b/owrx/controllers/settings/sdr.py index ec5b601..708a24f 100644 --- a/owrx/controllers/settings/sdr.py +++ b/owrx/controllers/settings/sdr.py @@ -13,11 +13,18 @@ class SdrSettingsController(AuthorizationMixin, WebpageController): def template_variables(self): variables = super().template_variables() - variables["devices"] = self.render_devices() + variables["sections"] = self.render_devices() + variables["title"] = "SDR device settings" return variables def render_devices(self): - return "".join(self.render_device(key, value) for key, value in Config.get()["sdrs"].items()) + 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 """ @@ -41,4 +48,4 @@ class SdrSettingsController(AuthorizationMixin, WebpageController): ) def indexAction(self): - self.serve_template("settings/sdr.html", **self.template_variables()) + self.serve_template("settings/general.html", **self.template_variables())