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

Merge branch 'main' of gitlab.com:bashrc2/epicyon

merge-requests/30/head
Bob Mottram 2022-08-29 11:16:32 +01:00
parent 6d3828e93d 7ee99bcbfa
commit 6f98cca6fb
2 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
daemon.py
View File

@ -5871,13 +5871,16 @@ class PubServer(BaseHTTPRequestHandler):
if check_name_and_bio: if check_name_and_bio:
redirect_path = 'previewAvatar' redirect_path = 'previewAvatar'
# change the theme from edit profile screen
if nickname == admin_nickname or \ if nickname == admin_nickname or \
is_artist(base_dir, nickname): is_artist(base_dir, nickname):
# change theme
if fields.get('themeDropdown'): if fields.get('themeDropdown'):
self.server.theme_name = fields['themeDropdown'] if self.server.theme_name != \
set_theme(base_dir, self.server.theme_name, domain, fields['themeDropdown']:
allow_local_network_access, self.server.theme_name = \
fields['themeDropdown']
set_theme(base_dir, self.server.theme_name,
domain, allow_local_network_access,
system_language, system_language,
self.server.dyslexic_font, True) self.server.dyslexic_font, True)
self.server.text_mode_banner = \ self.server.text_mode_banner = \
@ -5903,8 +5906,7 @@ class PubServer(BaseHTTPRequestHandler):
set_news_avatar(base_dir, set_news_avatar(base_dir,
fields['themeDropdown'], fields['themeDropdown'],
http_prefix, http_prefix,
domain, domain, domain_full)
domain_full)
if nickname == admin_nickname: if nickname == admin_nickname:
# change media instance status # change media instance status

1
theme.py
View File

@ -542,6 +542,7 @@ def reset_theme_designer_settings(base_dir: str) -> None:
if os.path.isfile(custom_variables_file): if os.path.isfile(custom_variables_file):
try: try:
os.remove(custom_variables_file) os.remove(custom_variables_file)
print('Theme designer settings were reset')
except OSError: except OSError:
print('EX: unable to remove theme designer settings on reset') print('EX: unable to remove theme designer settings on reset')