ha7ilm/openwebrx
1
0
Fork 0
mirror of https://github.com/ha7ilm/openwebrx.git synced 2026-04-21 06:13:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

re-route settings urls

Browse source
This commit is contained in:
Jakob Ketterl 2021-02-13 16:44:14 +01:00
parent ae76470612
commit cda43b5c5c
9 changed files with 38 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

16
owrx/controllers/settings.py
View file

@ -64,6 +64,11 @@ class SettingsController(AuthorizationMixin, WebpageController):
class SdrSettingsController(AuthorizationMixin, WebpageController):
def header_variables(self):
variables = super().header_variables()
variables["assets_prefix"] = "../"
return variables
def template_variables(self):
variables = super().template_variables()
variables["devices"] = self.render_devices()
@ -94,7 +99,7 @@ class SdrSettingsController(AuthorizationMixin, WebpageController):
)
def indexAction(self):
self.serve_template("sdrsettings.html", **self.template_variables())
self.serve_template("settings/sdr.html", **self.template_variables())
class GeneralSettingsController(AuthorizationMixin, WebpageController):
@ -372,7 +377,12 @@ class GeneralSettingsController(AuthorizationMixin, WebpageController):
)
def indexAction(self):
self.serve_template("generalsettings.html", **self.template_variables())
self.serve_template("settings/general.html", **self.template_variables())
def header_variables(self):
variables = super().header_variables()
variables["assets_prefix"] = "../"
return variables
def template_variables(self):
variables = super().template_variables()
@ -417,4 +427,4 @@ class GeneralSettingsController(AuthorizationMixin, WebpageController):
else:
config[k] = v
config.store()
self.send_redirect("/generalsettings")
self.send_redirect("/settings/general")

5
owrx/controllers/template.py
View file

@ -18,8 +18,11 @@ class TemplateController(Controller):
class WebpageController(TemplateController):
def header_variables(self):
return {"assets_prefix": ""}
def template_variables(self):
header = self.render_template("include/header.include.html")
header = self.render_template("include/header.include.html", **self.header_variables())
return {"header": header}