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

merge-requests/30/head
Bob Mottram 2022-08-29 11:16:32 +01:00
commit 6f98cca6fb
2 changed files with 34 additions and 31 deletions

View File

@ -5871,40 +5871,42 @@ 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 = \
system_language, fields['themeDropdown']
self.server.dyslexic_font, True) set_theme(base_dir, self.server.theme_name,
self.server.text_mode_banner = \ domain, allow_local_network_access,
get_text_mode_banner(self.server.base_dir) system_language,
self.server.iconsCache = {} self.server.dyslexic_font, True)
self.server.fontsCache = {} self.server.text_mode_banner = \
self.server.css_cache = {} get_text_mode_banner(self.server.base_dir)
self.server.show_publish_as_icon = \ self.server.iconsCache = {}
get_config_param(self.server.base_dir, self.server.fontsCache = {}
'showPublishAsIcon') self.server.css_cache = {}
self.server.full_width_tl_button_header = \ self.server.show_publish_as_icon = \
get_config_param(self.server.base_dir, get_config_param(self.server.base_dir,
'fullWidthTlButtonHeader') 'showPublishAsIcon')
self.server.icons_as_buttons = \ self.server.full_width_tl_button_header = \
get_config_param(self.server.base_dir, get_config_param(self.server.base_dir,
'iconsAsButtons') 'fullWidthTlButtonHeader')
self.server.rss_icon_at_top = \ self.server.icons_as_buttons = \
get_config_param(self.server.base_dir, get_config_param(self.server.base_dir,
'rssIconAtTop') 'iconsAsButtons')
self.server.publish_button_at_top = \ self.server.rss_icon_at_top = \
get_config_param(self.server.base_dir, get_config_param(self.server.base_dir,
'publishButtonAtTop') 'rssIconAtTop')
set_news_avatar(base_dir, self.server.publish_button_at_top = \
fields['themeDropdown'], get_config_param(self.server.base_dir,
http_prefix, 'publishButtonAtTop')
domain, set_news_avatar(base_dir,
domain_full) fields['themeDropdown'],
http_prefix,
domain, domain_full)
if nickname == admin_nickname: if nickname == admin_nickname:
# change media instance status # change media instance status

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')