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

Remove legacy theme setting function 

This is done with a json file now
merge-requests/30/head
Bob Mottram 2022-03-13 10:29:27 +00:00
parent 6d3e63c1df
commit 5eefbb5249
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
theme.py
View File

@ -861,16 +861,11 @@ def set_theme(base_dir: str, name: str, domain: str,
_remove_theme(base_dir) _remove_theme(base_dir)
# has the theme changed?
themes = get_themes_list(base_dir) themes = get_themes_list(base_dir)
for theme_name in themes: for theme_name in themes:
theme_name_lower = theme_name.lower() theme_name_lower = theme_name.lower()
if name == theme_name_lower: if name == theme_name_lower:
allow_access = allow_local_network_access
try:
globals()['set_theme' + theme_name](base_dir, allow_access)
except BaseException:
print('EX: set_theme unable to set theme ' + theme_name)
if prev_theme_name: if prev_theme_name:
if prev_theme_name.lower() != theme_name_lower: if prev_theme_name.lower() != theme_name_lower:
# change the banner and profile image # change the banner and profile image
@ -878,12 +873,14 @@ def set_theme(base_dir: str, name: str, domain: str,
_set_theme_images(base_dir, name) _set_theme_images(base_dir, name)
_set_theme_fonts(base_dir, name) _set_theme_fonts(base_dir, name)
result = True result = True
break
if not result: if not result:
# default # default
_set_theme_default(base_dir, allow_local_network_access) _set_theme_default(base_dir, allow_local_network_access)
result = True result = True
# read theme settings from a json file in the theme directory
variables_file = base_dir + '/theme/' + name + '/theme.json' variables_file = base_dir + '/theme/' + name + '/theme.json'
if os.path.isfile(variables_file): if os.path.isfile(variables_file):
_read_variables_file(base_dir, name, variables_file, _read_variables_file(base_dir, name, variables_file,