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

Snake case

merge-requests/30/head
Bob Mottram 2022-01-04 13:25:15 +00:00
parent 4bab3be92f
commit 24fd4a9a1b
2 changed files with 110 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
webapp_suspended.py
View File

@ -16,19 +16,19 @@ from webapp_utils import html_footer
def html_suspended(css_cache: {}, base_dir: str) -> str: def html_suspended(css_cache: {}, base_dir: str) -> str:
"""Show the screen for suspended accounts """Show the screen for suspended accounts
""" """
suspendedForm = '' suspended_form = ''
css_filename = base_dir + '/epicyon-suspended.css' css_filename = base_dir + '/epicyon-suspended.css'
if os.path.isfile(base_dir + '/suspended.css'): if os.path.isfile(base_dir + '/suspended.css'):
css_filename = base_dir + '/suspended.css' css_filename = base_dir + '/suspended.css'
instanceTitle = \ instance_title = \
get_config_param(base_dir, 'instanceTitle') get_config_param(base_dir, 'instanceTitle')
suspendedForm = \ suspended_form = \
html_header_with_external_style(css_filename, instanceTitle, None) html_header_with_external_style(css_filename, instance_title, None)
suspendedForm += \ suspended_form += \
'<div><center>\n' + \ '<div><center>\n' + \
' <p class="screentitle">Account Suspended</p>\n' + \ ' <p class="screentitle">Account Suspended</p>\n' + \
' <p>See <a href="/terms">Terms of Service</a></p>\n' + \ ' <p>See <a href="/terms">Terms of Service</a></p>\n' + \
'</center></div>\n' '</center></div>\n'
suspendedForm += html_footer() suspended_form += html_footer()
return suspendedForm return suspended_form

204
webapp_theme_designer.py
View File

@ -172,82 +172,82 @@ def html_theme_designer(css_cache: {}, base_dir: str,
theme_name: str, access_keys: {}) -> str: theme_name: str, access_keys: {}) -> str:
"""Edit theme settings """Edit theme settings
""" """
themeFilename = base_dir + '/theme/' + theme_name + '/theme.json' theme_filename = base_dir + '/theme/' + theme_name + '/theme.json'
themeJson = {} theme_json = {}
if os.path.isfile(themeFilename): if os.path.isfile(theme_filename):
themeJson = load_json(themeFilename) theme_json = load_json(theme_filename)
# set custom theme parameters # set custom theme parameters
customVariablesFile = base_dir + '/accounts/theme.json' custom_variables_file = base_dir + '/accounts/theme.json'
if os.path.isfile(customVariablesFile): if os.path.isfile(custom_variables_file):
customThemeParams = load_json(customVariablesFile, 0) custom_theme_params = load_json(custom_variables_file, 0)
if customThemeParams: if custom_theme_params:
for variableName, value in customThemeParams.items(): for variable_name, value in custom_theme_params.items():
themeJson[variableName] = value theme_json[variable_name] = value
themeForm = '' theme_form = ''
css_filename = base_dir + '/epicyon-profile.css' css_filename = base_dir + '/epicyon-profile.css'
if os.path.isfile(base_dir + '/epicyon.css'): if os.path.isfile(base_dir + '/epicyon.css'):
css_filename = base_dir + '/epicyon.css' css_filename = base_dir + '/epicyon.css'
instanceTitle = \ instance_title = \
get_config_param(base_dir, 'instanceTitle') get_config_param(base_dir, 'instanceTitle')
themeForm = \ theme_form = \
html_header_with_external_style(css_filename, instanceTitle, None) html_header_with_external_style(css_filename, instance_title, None)
banner_file, banner_filename = \ banner_file, _ = \
get_banner_file(base_dir, nickname, domain, theme_name) get_banner_file(base_dir, nickname, domain, theme_name)
themeForm += \ theme_form += \
'<a href="/users/' + nickname + '/' + default_timeline + '" ' + \ '<a href="/users/' + nickname + '/' + default_timeline + '" ' + \
'accesskey="' + access_keys['menuTimeline'] + '">' + \ 'accesskey="' + access_keys['menuTimeline'] + '">' + \
'<img loading="lazy" class="timeline-banner" ' + \ '<img loading="lazy" class="timeline-banner" ' + \
'title="' + translate['Switch to timeline view'] + '" ' + \ 'title="' + translate['Switch to timeline view'] + '" ' + \
'alt="' + translate['Switch to timeline view'] + '" ' + \ 'alt="' + translate['Switch to timeline view'] + '" ' + \
'src="/users/' + nickname + '/' + banner_file + '" /></a>\n' 'src="/users/' + nickname + '/' + banner_file + '" /></a>\n'
themeForm += '<div class="container">\n' theme_form += '<div class="container">\n'
themeForm += \ theme_form += \
' <h1>' + translate['Theme Designer'] + '</h1>\n' ' <h1>' + translate['Theme Designer'] + '</h1>\n'
themeForm += ' <form method="POST" action="' + \ theme_form += ' <form method="POST" action="' + \
'/users/' + nickname + '/changeThemeSettings">\n' '/users/' + nickname + '/changeThemeSettings">\n'
resetKey = access_keys['menuLogout'] reset_key = access_keys['menuLogout']
submitKey = access_keys['submitButton'] submit_key = access_keys['submitButton']
themeForm += \ theme_form += \
' <center>\n' + \ ' <center>\n' + \
' <button type="submit" class="button" ' + \ ' <button type="submit" class="button" ' + \
'name="submitThemeDesignerReset" ' + \ 'name="submitThemeDesignerReset" ' + \
'accesskey="' + resetKey + '">' + \ 'accesskey="' + reset_key + '">' + \
translate['Reset'] + '</button>\n' + \ translate['Reset'] + '</button>\n' + \
' <button type="submit" class="button" ' + \ ' <button type="submit" class="button" ' + \
'name="submitThemeDesigner" accesskey="' + submitKey + '">' + \ 'name="submitThemeDesigner" accesskey="' + submit_key + '">' + \
translate['Submit'] + '</button>\n </center>\n' translate['Submit'] + '</button>\n </center>\n'
tableStr = ' <table class="accesskeys">\n' table_str = ' <table class="accesskeys">\n'
tableStr += ' <colgroup>\n' table_str += ' <colgroup>\n'
tableStr += ' <col span="1" class="accesskeys-left">\n' table_str += ' <col span="1" class="accesskeys-left">\n'
tableStr += ' <col span="1" class="accesskeys-center">\n' table_str += ' <col span="1" class="accesskeys-center">\n'
tableStr += ' </colgroup>\n' table_str += ' </colgroup>\n'
tableStr += ' <tbody>\n' table_str += ' <tbody>\n'
fontStr = ' <div class="container">\n' + tableStr font_str = ' <div class="container">\n' + table_str
colorStr = ' <div class="container">\n' + tableStr color_str = ' <div class="container">\n' + table_str
dimensionStr = ' <div class="container">\n' + tableStr dimension_str = ' <div class="container">\n' + table_str
switchStr = ' <div class="container">\n' + tableStr switch_str = ' <div class="container">\n' + table_str
for variableName, value in themeJson.items(): for variable_name, value in theme_json.items():
if 'font-size' in variableName: if 'font-size' in variable_name:
variableNameStr = variableName.replace('-', ' ') variable_name_str = variable_name.replace('-', ' ')
variableNameStr = variableNameStr.title() variable_name_str = variable_name_str.title()
fontStr += \ font_str += \
' <tr><td><label class="labels">' + \ ' <tr><td><label class="labels">' + \
variableNameStr + '</label></td>' variable_name_str + '</label></td>'
fontStr += \ font_str += \
'<td><input type="text" name="themeSetting_' + \ '<td><input type="text" name="themeSetting_' + \
variableName + '" value="' + str(value) + \ variable_name + '" value="' + str(value) + \
'" title="' + variableNameStr + '"></td></tr>\n' '" title="' + variable_name_str + '"></td></tr>\n'
elif ('-color' in variableName or elif ('-color' in variable_name or
'-background' in variableName or '-background' in variable_name or
variableName.endswith('-text') or variable_name.endswith('-text') or
value.startswith('#') or value.startswith('#') or
color_to_hex.get(value)): color_to_hex.get(value)):
# only use colors defined as hex # only use colors defined as hex
@ -256,76 +256,78 @@ def html_theme_designer(css_cache: {}, base_dir: str,
value = color_to_hex[value] value = color_to_hex[value]
else: else:
continue continue
variableNameStr = variableName.replace('-', ' ') variable_name_str = variable_name.replace('-', ' ')
if ' color' in variableNameStr: if ' color' in variable_name_str:
variableNameStr = variableNameStr.replace(' color', '') variable_name_str = variable_name_str.replace(' color', '')
if ' bg' in variableNameStr: if ' bg' in variable_name_str:
variableNameStr = variableNameStr.replace(' bg', ' background') variable_name_str = \
elif ' fg' in variableNameStr: variable_name_str.replace(' bg', ' background')
variableNameStr = variableNameStr.replace(' fg', ' foreground') elif ' fg' in variable_name_str:
if variableNameStr == 'cw': variable_name_str = \
variableNameStr = 'content warning' variable_name_str.replace(' fg', ' foreground')
variableNameStr = variableNameStr.title() if variable_name_str == 'cw':
colorStr += \ variable_name_str = 'content warning'
variable_name_str = variable_name_str.title()
color_str += \
' <tr><td><label class="labels">' + \ ' <tr><td><label class="labels">' + \
variableNameStr + '</label></td>' variable_name_str + '</label></td>'
colorStr += \ color_str += \
'<td><input type="color" name="themeSetting_' + \ '<td><input type="color" name="themeSetting_' + \
variableName + '" value="' + str(value) + \ variable_name + '" value="' + str(value) + \
'" title="' + variableNameStr + '"></td></tr>\n' '" title="' + variable_name_str + '"></td></tr>\n'
elif (('-width' in variableName or elif (('-width' in variable_name or
'-height' in variableName or '-height' in variable_name or
'-spacing' in variableName or '-spacing' in variable_name or
'-margin' in variableName or '-margin' in variable_name or
'-vertical' in variableName) and '-vertical' in variable_name) and
(value.lower() != 'true' and value.lower() != 'false')): (value.lower() != 'true' and value.lower() != 'false')):
variableNameStr = variableName.replace('-', ' ') variable_name_str = variable_name.replace('-', ' ')
variableNameStr = variableNameStr.title() variable_name_str = variable_name_str.title()
dimensionStr += \ dimension_str += \
' <tr><td><label class="labels">' + \ ' <tr><td><label class="labels">' + \
variableNameStr + '</label></td>' variable_name_str + '</label></td>'
dimensionStr += \ dimension_str += \
'<td><input type="text" name="themeSetting_' + \ '<td><input type="text" name="themeSetting_' + \
variableName + '" value="' + str(value) + \ variable_name + '" value="' + str(value) + \
'" title="' + variableNameStr + '"></td></tr>\n' '" title="' + variable_name_str + '"></td></tr>\n'
elif value.title() == 'True' or value.title() == 'False': elif value.title() == 'True' or value.title() == 'False':
variableNameStr = variableName.replace('-', ' ') variable_name_str = variable_name.replace('-', ' ')
variableNameStr = variableNameStr.title() variable_name_str = variable_name_str.title()
switchStr += \ switch_str += \
' <tr><td><label class="labels">' + \ ' <tr><td><label class="labels">' + \
variableNameStr + '</label></td>' variable_name_str + '</label></td>'
checkedStr = '' checked_str = ''
if value.title() == 'True': if value.title() == 'True':
checkedStr = ' checked' checked_str = ' checked'
switchStr += \ switch_str += \
'<td><input type="checkbox" class="profilecheckbox" ' + \ '<td><input type="checkbox" class="profilecheckbox" ' + \
'name="themeSetting_' + variableName + '"' + \ 'name="themeSetting_' + variable_name + '"' + \
checkedStr + '></td></tr>\n' checked_str + '></td></tr>\n'
colorStr += ' </table>\n </div>\n' color_str += ' </table>\n </div>\n'
fontStr += ' </table>\n </div>\n' font_str += ' </table>\n </div>\n'
dimensionStr += ' </table>\n </div>\n' dimension_str += ' </table>\n </div>\n'
switchStr += ' </table>\n </div>\n' switch_str += ' </table>\n </div>\n'
themeFormats = '.zip, .gz' theme_formats = '.zip, .gz'
exportImportStr = ' <div class="container">\n' export_import_str = ' <div class="container">\n'
exportImportStr += \ export_import_str += \
' <label class="labels">' + \ ' <label class="labels">' + \
translate['Import Theme'] + '</label>\n' translate['Import Theme'] + '</label>\n'
exportImportStr += ' <input type="file" id="import_theme" ' export_import_str += ' <input type="file" id="import_theme" '
exportImportStr += 'name="submitImportTheme" ' export_import_str += 'name="submitImportTheme" '
exportImportStr += 'accept="' + themeFormats + '">\n' export_import_str += 'accept="' + theme_formats + '">\n'
exportImportStr += \ export_import_str += \
' <label class="labels">' + \ ' <label class="labels">' + \
translate['Export Theme'] + '</label><br>\n' translate['Export Theme'] + '</label><br>\n'
exportImportStr += \ export_import_str += \
' <button type="submit" class="button" ' + \ ' <button type="submit" class="button" ' + \
'name="submitExportTheme">➤</button><br>\n' 'name="submitExportTheme">➤</button><br>\n'
exportImportStr += ' </div>\n' export_import_str += ' </div>\n'
themeForm += colorStr + fontStr + dimensionStr theme_form += color_str + font_str + dimension_str
themeForm += switchStr + exportImportStr theme_form += switch_str + export_import_str
themeForm += ' </form>\n' theme_form += ' </form>\n'
themeForm += '</div>\n' theme_form += '</div>\n'
themeForm += html_footer() theme_form += html_footer()
return themeForm return theme_form