indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Tidying

merge-requests/30/head
Bob Mottram 2022-06-12 13:55:04 +01:00
parent 3a8f2fa5d3
commit 94854ae7c2
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon.py
View File

@ -2573,9 +2573,7 @@ class PubServer(BaseHTTPRequestHandler):
if 'submitThemeDesignerReset=' in theme_params or \
'submitThemeDesigner=' not in theme_params:
if 'submitThemeDesignerReset=' in theme_params:
reset_theme_designer_settings(base_dir, theme_name, domain,
allow_local_network_access,
system_language)
reset_theme_designer_settings(base_dir)
set_theme(base_dir, theme_name, domain,
allow_local_network_access, system_language,
dyslexic_font, True)

12
theme.py
View File

@ -394,10 +394,10 @@ def _set_theme_from_dict(base_dir: str, name: str,
)
for scr in screen_name:
if bg_params.get(scr):
_set_background_format(base_dir, name, scr, bg_params[scr])
_set_background_format(base_dir, scr, bg_params[scr])
def _set_background_format(base_dir: str, name: str,
def _set_background_format(base_dir: str,
background_type: str, extension: str) -> None:
"""Sets the background file extension
"""
@ -533,9 +533,7 @@ def set_theme_from_designer(base_dir: str, theme_name: str, domain: str,
dyslexic_font, False)
def reset_theme_designer_settings(base_dir: str, theme_name: str, domain: str,
allow_local_network_access: bool,
system_language: str) -> None:
def reset_theme_designer_settings(base_dir: str) -> None:
"""Resets the theme designer settings
"""
custom_variables_file = base_dir + '/accounts/theme.json'
@ -864,9 +862,7 @@ def set_theme(base_dir: str, name: str, domain: str,
# if the theme has changed then remove any custom settings
if prev_theme_name != name or designer_reset:
reset_theme_designer_settings(base_dir, name, domain,
allow_local_network_access,
system_language)
reset_theme_designer_settings(base_dir)
_remove_theme(base_dir)