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 2021-12-25 19:09:03 +00:00
parent 5b082ab200
commit b287c3502a
9 changed files with 91 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
daemon.py
View File

@ -2222,9 +2222,9 @@ class PubServer(BaseHTTPRequestHandler):
# set boolean values # set boolean values
if 'rss-icon-at-top' in themeDesignerParams: if 'rss-icon-at-top' in themeDesignerParams:
if themeDesignerParams['rss-icon-at-top'].lower() == 'true': if themeDesignerParams['rss-icon-at-top'].lower() == 'true':
self.server.rssIconAtTop = True self.server.rss_icon_at_top = True
else: else:
self.server.rssIconAtTop = False self.server.rss_icon_at_top = False
if 'publish-button-at-top' in themeDesignerParams: if 'publish-button-at-top' in themeDesignerParams:
if themeDesignerParams['publish-button-at-top'].lower() == 'true': if themeDesignerParams['publish-button-at-top'].lower() == 'true':
self.server.publish_button_at_top = True self.server.publish_button_at_top = True
@ -5024,9 +5024,9 @@ class PubServer(BaseHTTPRequestHandler):
self.server.iconsAsButtons = \ self.server.iconsAsButtons = \
getConfigParam(self.server.base_dir, getConfigParam(self.server.base_dir,
'iconsAsButtons') 'iconsAsButtons')
self.server.rssIconAtTop = \ self.server.rss_icon_at_top = \
getConfigParam(self.server.base_dir, getConfigParam(self.server.base_dir,
'rssIconAtTop') 'rss_icon_at_top')
self.server.publish_button_at_top = \ self.server.publish_button_at_top = \
getConfigParam(self.server.base_dir, getConfigParam(self.server.base_dir,
'publish_button_at_top') 'publish_button_at_top')
@ -5965,9 +5965,9 @@ class PubServer(BaseHTTPRequestHandler):
self.server.iconsAsButtons = \ self.server.iconsAsButtons = \
getConfigParam(base_dir, getConfigParam(base_dir,
'iconsAsButtons') 'iconsAsButtons')
self.server.rssIconAtTop = \ self.server.rss_icon_at_top = \
getConfigParam(base_dir, getConfigParam(base_dir,
'rssIconAtTop') 'rss_icon_at_top')
self.server.publish_button_at_top = \ self.server.publish_button_at_top = \
getConfigParam(base_dir, getConfigParam(base_dir,
'publish_button_at_top') 'publish_button_at_top')
@ -9688,7 +9688,7 @@ class PubServer(BaseHTTPRequestHandler):
base_dir, nickname, domain) base_dir, nickname, domain)
msg = \ msg = \
htmlProfile(self.server.signingPrivateKeyPem, htmlProfile(self.server.signingPrivateKeyPem,
self.server.rssIconAtTop, self.server.rss_icon_at_top,
self.server.cssCache, self.server.cssCache,
iconsAsButtons, iconsAsButtons,
defaultTimeline, defaultTimeline,
@ -9804,7 +9804,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.content_license_url self.server.content_license_url
msg = \ msg = \
htmlProfile(signingPrivateKeyPem, htmlProfile(signingPrivateKeyPem,
self.server.rssIconAtTop, self.server.rss_icon_at_top,
self.server.cssCache, self.server.cssCache,
iconsAsButtons, iconsAsButtons,
defaultTimeline, defaultTimeline,
@ -10250,7 +10250,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.showPublishAsIcon, self.server.showPublishAsIcon,
fullWidthTimelineButtonHeader, fullWidthTimelineButtonHeader,
self.server.iconsAsButtons, self.server.iconsAsButtons,
self.server.rssIconAtTop, self.server.rss_icon_at_top,
self.server.publish_button_at_top, self.server.publish_button_at_top,
authorized, authorized,
self.server.themeName, self.server.themeName,
@ -10401,7 +10401,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.showPublishAsIcon, self.server.showPublishAsIcon,
fullWidthTimelineButtonHeader, fullWidthTimelineButtonHeader,
self.server.iconsAsButtons, self.server.iconsAsButtons,
self.server.rssIconAtTop, self.server.rss_icon_at_top,
self.server.publish_button_at_top, self.server.publish_button_at_top,
authorized, self.server.themeName, authorized, self.server.themeName,
self.server.peertubeInstances, self.server.peertubeInstances,
@ -10544,7 +10544,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.showPublishAsIcon, self.server.showPublishAsIcon,
fullWidthTimelineButtonHeader, fullWidthTimelineButtonHeader,
self.server.iconsAsButtons, self.server.iconsAsButtons,
self.server.rssIconAtTop, self.server.rss_icon_at_top,
self.server.publish_button_at_top, self.server.publish_button_at_top,
authorized, self.server.themeName, authorized, self.server.themeName,
self.server.peertubeInstances, self.server.peertubeInstances,
@ -10685,7 +10685,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.showPublishAsIcon, self.server.showPublishAsIcon,
fullWidthTimelineButtonHeader, fullWidthTimelineButtonHeader,
self.server.iconsAsButtons, self.server.iconsAsButtons,
self.server.rssIconAtTop, self.server.rss_icon_at_top,
self.server.publish_button_at_top, self.server.publish_button_at_top,
authorized, authorized,
self.server.themeName, self.server.themeName,
@ -10827,7 +10827,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.showPublishAsIcon, self.server.showPublishAsIcon,
fullWidthTimelineButtonHeader, fullWidthTimelineButtonHeader,
self.server.iconsAsButtons, self.server.iconsAsButtons,
self.server.rssIconAtTop, self.server.rss_icon_at_top,
self.server.publish_button_at_top, self.server.publish_button_at_top,
authorized, authorized,
self.server.themeName, self.server.themeName,
@ -10979,7 +10979,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.showPublishAsIcon, self.server.showPublishAsIcon,
fullWidthTimelineButtonHeader, fullWidthTimelineButtonHeader,
self.server.iconsAsButtons, self.server.iconsAsButtons,
self.server.rssIconAtTop, self.server.rss_icon_at_top,
self.server.publish_button_at_top, self.server.publish_button_at_top,
authorized, authorized,
self.server.themeName, self.server.themeName,
@ -11128,7 +11128,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.showPublishAsIcon, self.server.showPublishAsIcon,
fullWidthTimelineButtonHeader, fullWidthTimelineButtonHeader,
self.server.iconsAsButtons, self.server.iconsAsButtons,
self.server.rssIconAtTop, self.server.rss_icon_at_top,
self.server.publish_button_at_top, self.server.publish_button_at_top,
authorized, authorized,
self.server.themeName, self.server.themeName,
@ -11235,7 +11235,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.showPublishAsIcon, self.server.showPublishAsIcon,
self.server.fullWidthTimelineButtonHeader, self.server.fullWidthTimelineButtonHeader,
self.server.iconsAsButtons, self.server.iconsAsButtons,
self.server.rssIconAtTop, self.server.rss_icon_at_top,
self.server.publish_button_at_top, self.server.publish_button_at_top,
authorized, self.server.themeName, authorized, self.server.themeName,
self.server.peertubeInstances, self.server.peertubeInstances,
@ -11319,7 +11319,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.showPublishAsIcon, self.server.showPublishAsIcon,
self.server.fullWidthTimelineButtonHeader, self.server.fullWidthTimelineButtonHeader,
self.server.iconsAsButtons, self.server.iconsAsButtons,
self.server.rssIconAtTop, self.server.rss_icon_at_top,
self.server.publish_button_at_top, self.server.publish_button_at_top,
authorized, self.server.themeName, authorized, self.server.themeName,
self.server.peertubeInstances, self.server.peertubeInstances,
@ -11441,7 +11441,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.showPublishAsIcon, self.server.showPublishAsIcon,
fullWidthTimelineButtonHeader, fullWidthTimelineButtonHeader,
self.server.iconsAsButtons, self.server.iconsAsButtons,
self.server.rssIconAtTop, self.server.rss_icon_at_top,
self.server.publish_button_at_top, self.server.publish_button_at_top,
authorized, authorized,
self.server.themeName, self.server.themeName,
@ -11579,7 +11579,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.showPublishAsIcon, self.server.showPublishAsIcon,
fullWidthTimelineButtonHeader, fullWidthTimelineButtonHeader,
self.server.iconsAsButtons, self.server.iconsAsButtons,
self.server.rssIconAtTop, self.server.rss_icon_at_top,
self.server.publish_button_at_top, self.server.publish_button_at_top,
authorized, authorized,
self.server.themeName, self.server.themeName,
@ -11711,7 +11711,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.showPublishAsIcon, self.server.showPublishAsIcon,
fullWidthTimelineButtonHeader, fullWidthTimelineButtonHeader,
self.server.iconsAsButtons, self.server.iconsAsButtons,
self.server.rssIconAtTop, self.server.rss_icon_at_top,
self.server.publish_button_at_top, self.server.publish_button_at_top,
authorized, moderationActionStr, authorized, moderationActionStr,
self.server.themeName, self.server.themeName,
@ -11815,7 +11815,7 @@ class PubServer(BaseHTTPRequestHandler):
base_dir, nickname, domain) base_dir, nickname, domain)
msg = \ msg = \
htmlProfile(self.server.signingPrivateKeyPem, htmlProfile(self.server.signingPrivateKeyPem,
self.server.rssIconAtTop, self.server.rss_icon_at_top,
self.server.cssCache, self.server.cssCache,
self.server.iconsAsButtons, self.server.iconsAsButtons,
self.server.defaultTimeline, self.server.defaultTimeline,
@ -11936,7 +11936,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.content_license_url self.server.content_license_url
msg = \ msg = \
htmlProfile(self.server.signingPrivateKeyPem, htmlProfile(self.server.signingPrivateKeyPem,
self.server.rssIconAtTop, self.server.rss_icon_at_top,
self.server.cssCache, self.server.cssCache,
self.server.iconsAsButtons, self.server.iconsAsButtons,
self.server.defaultTimeline, self.server.defaultTimeline,
@ -12055,7 +12055,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.content_license_url self.server.content_license_url
msg = \ msg = \
htmlProfile(self.server.signingPrivateKeyPem, htmlProfile(self.server.signingPrivateKeyPem,
self.server.rssIconAtTop, self.server.rss_icon_at_top,
self.server.cssCache, self.server.cssCache,
self.server.iconsAsButtons, self.server.iconsAsButtons,
self.server.defaultTimeline, self.server.defaultTimeline,
@ -12191,7 +12191,7 @@ class PubServer(BaseHTTPRequestHandler):
base_dir, nickname, domain) base_dir, nickname, domain)
msg = \ msg = \
htmlProfile(self.server.signingPrivateKeyPem, htmlProfile(self.server.signingPrivateKeyPem,
self.server.rssIconAtTop, self.server.rss_icon_at_top,
self.server.cssCache, self.server.cssCache,
self.server.iconsAsButtons, self.server.iconsAsButtons,
self.server.defaultTimeline, self.server.defaultTimeline,
@ -14958,7 +14958,7 @@ class PubServer(BaseHTTPRequestHandler):
timelinePath = \ timelinePath = \
'/users/' + nickname + '/' + self.server.defaultTimeline '/users/' + nickname + '/' + self.server.defaultTimeline
showPublishAsIcon = self.server.showPublishAsIcon showPublishAsIcon = self.server.showPublishAsIcon
rssIconAtTop = self.server.rssIconAtTop rss_icon_at_top = self.server.rss_icon_at_top
iconsAsButtons = self.server.iconsAsButtons iconsAsButtons = self.server.iconsAsButtons
defaultTimeline = self.server.defaultTimeline defaultTimeline = self.server.defaultTimeline
accessKeys = self.server.accessKeys accessKeys = self.server.accessKeys
@ -14976,7 +14976,7 @@ class PubServer(BaseHTTPRequestHandler):
timelinePath, timelinePath,
showPublishAsIcon, showPublishAsIcon,
authorized, authorized,
rssIconAtTop, rss_icon_at_top,
iconsAsButtons, iconsAsButtons,
defaultTimeline, defaultTimeline,
self.server.themeName, self.server.themeName,
@ -15015,7 +15015,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.translate, self.server.translate,
timelinePath, timelinePath,
authorized, authorized,
self.server.rssIconAtTop, self.server.rss_icon_at_top,
iconsAsButtons, iconsAsButtons,
defaultTimeline, defaultTimeline,
self.server.themeName, self.server.themeName,
@ -18430,7 +18430,7 @@ def runDaemon(content_license_url: str,
allow_local_network_access: bool, allow_local_network_access: bool,
max_feed_item_size_kb: int, max_feed_item_size_kb: int,
publish_button_at_top: bool, publish_button_at_top: bool,
rssIconAtTop: bool, rss_icon_at_top: bool,
iconsAsButtons: bool, iconsAsButtons: bool,
fullWidthTimelineButtonHeader: bool, fullWidthTimelineButtonHeader: bool,
showPublishAsIcon: bool, showPublishAsIcon: bool,
@ -18668,7 +18668,7 @@ def runDaemon(content_license_url: str,
httpd.iconsAsButtons = iconsAsButtons httpd.iconsAsButtons = iconsAsButtons
# whether to show the RSS icon at the top or the bottom of the timeline # whether to show the RSS icon at the top or the bottom of the timeline
httpd.rssIconAtTop = rssIconAtTop httpd.rss_icon_at_top = rss_icon_at_top
# Whether to show the newswire publish button at the top, # Whether to show the newswire publish button at the top,
# above the header image # above the header image

14
epicyon.py
View File

@ -347,8 +347,8 @@ parser.add_argument("--log_login_failures",
type=str2bool, nargs='?', type=str2bool, nargs='?',
const=True, default=False, const=True, default=False,
help="Whether to log longin failures") help="Whether to log longin failures")
parser.add_argument("--rssIconAtTop", parser.add_argument("--rss_icon_at_top",
dest='rssIconAtTop', dest='rss_icon_at_top',
type=str2bool, nargs='?', type=str2bool, nargs='?',
const=True, default=True, const=True, default=True,
help="Whether to show the rss icon at teh top or bottom" + help="Whether to show the rss icon at teh top or bottom" +
@ -3088,10 +3088,10 @@ iconsAsButtons = \
if iconsAsButtons is not None: if iconsAsButtons is not None:
args.iconsAsButtons = bool(iconsAsButtons) args.iconsAsButtons = bool(iconsAsButtons)
rssIconAtTop = \ rss_icon_at_top = \
getConfigParam(base_dir, 'rssIconAtTop') getConfigParam(base_dir, 'rss_icon_at_top')
if rssIconAtTop is not None: if rss_icon_at_top is not None:
args.rssIconAtTop = bool(rssIconAtTop) args.rss_icon_at_top = bool(rss_icon_at_top)
publish_button_at_top = \ publish_button_at_top = \
getConfigParam(base_dir, 'publish_button_at_top') getConfigParam(base_dir, 'publish_button_at_top')
@ -3228,7 +3228,7 @@ if __name__ == "__main__":
args.allow_local_network_access, args.allow_local_network_access,
args.max_feed_item_size_kb, args.max_feed_item_size_kb,
args.publish_button_at_top, args.publish_button_at_top,
args.rssIconAtTop, args.rss_icon_at_top,
args.iconsAsButtons, args.iconsAsButtons,
args.fullWidthTimelineButtonHeader, args.fullWidthTimelineButtonHeader,
args.showPublishAsIcon, args.showPublishAsIcon,

2
theme.py
View File

@ -210,7 +210,7 @@ def _setRssIconAtTop(base_dir: str, atTop: bool) -> bool:
configJson = loadJson(configFilename, 0) configJson = loadJson(configFilename, 0)
if not configJson: if not configJson:
return False return False
configJson['rssIconAtTop'] = atTop configJson['rss_icon_at_top'] = atTop
return saveJson(configJson, configFilename) return saveJson(configJson, configFilename)

14
webapp_column_left.py
View File

@ -116,7 +116,7 @@ def getLeftColumnContent(base_dir: str, nickname: str, domainFull: str,
http_prefix: str, translate: {}, http_prefix: str, translate: {},
editor: bool, artist: bool, editor: bool, artist: bool,
showBackButton: bool, timelinePath: str, showBackButton: bool, timelinePath: str,
rssIconAtTop: bool, showHeaderImage: bool, rss_icon_at_top: bool, showHeaderImage: bool,
frontPage: bool, theme: str, frontPage: bool, theme: str,
accessKeys: {}, accessKeys: {},
shared_items_federated_domains: []) -> str: shared_items_federated_domains: []) -> str:
@ -148,7 +148,7 @@ def getLeftColumnContent(base_dir: str, nickname: str, domainFull: str,
'<button class="cancelbtn">' + \ '<button class="cancelbtn">' + \
translate['Go Back'] + '</button></a>\n' translate['Go Back'] + '</button></a>\n'
if (editor or rssIconAtTop) and not showHeaderImage: if (editor or rss_icon_at_top) and not showHeaderImage:
htmlStr += '<div class="columnIcons">' htmlStr += '<div class="columnIcons">'
if editImageClass == 'leftColEdit': if editImageClass == 'leftColEdit':
@ -190,14 +190,14 @@ def getLeftColumnContent(base_dir: str, nickname: str, domainFull: str,
' <a href="' + rssUrl + '"><img class="' + editImageClass + \ ' <a href="' + rssUrl + '"><img class="' + editImageClass + \
'" loading="lazy" alt="' + rssTitle + '" title="' + rssTitle + \ '" loading="lazy" alt="' + rssTitle + '" title="' + rssTitle + \
'" src="/icons/logorss.png" /></a>\n' '" src="/icons/logorss.png" /></a>\n'
if rssIconAtTop: if rss_icon_at_top:
htmlStr += rssIconStr htmlStr += rssIconStr
htmlStr += ' </div>\n' htmlStr += ' </div>\n'
if editImageClass == 'leftColEdit': if editImageClass == 'leftColEdit':
htmlStr += ' </center>\n' htmlStr += ' </center>\n'
if (editor or rssIconAtTop) and not showHeaderImage: if (editor or rss_icon_at_top) and not showHeaderImage:
htmlStr += '</div><br>' htmlStr += '</div><br>'
# if showHeaderImage: # if showHeaderImage:
@ -342,7 +342,7 @@ def getLeftColumnContent(base_dir: str, nickname: str, domainFull: str,
'<p class="login-text"><a href="/terms">' + \ '<p class="login-text"><a href="/terms">' + \
translate['Terms of Service'] + '</a></p>' translate['Terms of Service'] + '</a></p>'
if linksFileContainsEntries and not rssIconAtTop: if linksFileContainsEntries and not rss_icon_at_top:
htmlStr += '<br><div class="columnIcons">' + rssIconStr + '</div>' htmlStr += '<br><div class="columnIcons">' + rssIconStr + '</div>'
return htmlStr return htmlStr
@ -352,7 +352,7 @@ def htmlLinksMobile(cssCache: {}, base_dir: str,
nickname: str, domainFull: str, nickname: str, domainFull: str,
http_prefix: str, translate, http_prefix: str, translate,
timelinePath: str, authorized: bool, timelinePath: str, authorized: bool,
rssIconAtTop: bool, rss_icon_at_top: bool,
iconsAsButtons: bool, iconsAsButtons: bool,
defaultTimeline: str, defaultTimeline: str,
theme: str, accessKeys: {}, theme: str, accessKeys: {},
@ -398,7 +398,7 @@ def htmlLinksMobile(cssCache: {}, base_dir: str,
http_prefix, translate, http_prefix, translate,
editor, artist, editor, artist,
False, timelinePath, False, timelinePath,
rssIconAtTop, False, False, rss_icon_at_top, False, False,
theme, accessKeys, theme, accessKeys,
shared_items_federated_domains) shared_items_federated_domains)
if editor and not _linksExist(base_dir): if editor and not _linksExist(base_dir):

20
webapp_column_right.py
View File

@ -54,7 +54,7 @@ def getRightColumnContent(base_dir: str, nickname: str, domainFull: str,
showBackButton: bool, timelinePath: str, showBackButton: bool, timelinePath: str,
showPublishButton: bool, showPublishButton: bool,
showPublishAsIcon: bool, showPublishAsIcon: bool,
rssIconAtTop: bool, rss_icon_at_top: bool,
publish_button_at_top: bool, publish_button_at_top: bool,
authorized: bool, authorized: bool,
showHeaderImage: bool, showHeaderImage: bool,
@ -108,8 +108,9 @@ def getRightColumnContent(base_dir: str, nickname: str, domainFull: str,
nickname + '/' + rightImageFile + '" />\n' + \ nickname + '/' + rightImageFile + '" />\n' + \
' </center>\n' ' </center>\n'
if (showPublishButton or editor or rssIconAtTop) and not showHeaderImage: if showPublishButton or editor or rss_icon_at_top:
htmlStr += '<div class="columnIcons">' if not showHeaderImage:
htmlStr += '<div class="columnIcons">'
if editImageClass == 'rightColEdit': if editImageClass == 'rightColEdit':
htmlStr += '\n <center>\n' htmlStr += '\n <center>\n'
@ -166,7 +167,7 @@ def getRightColumnContent(base_dir: str, nickname: str, domainFull: str,
translate['Newswire RSS Feed'] + ' | " title="' + \ translate['Newswire RSS Feed'] + ' | " title="' + \
translate['Newswire RSS Feed'] + '" src="/' + \ translate['Newswire RSS Feed'] + '" src="/' + \
'icons/logorss.png" /></a>\n' 'icons/logorss.png" /></a>\n'
if rssIconAtTop: if rss_icon_at_top:
htmlStr += rssIconStr htmlStr += rssIconStr
# show publish icon at top # show publish icon at top
@ -191,8 +192,9 @@ def getRightColumnContent(base_dir: str, nickname: str, domainFull: str,
if showHeaderImage: if showHeaderImage:
htmlStr += ' <br>\n' htmlStr += ' <br>\n'
if (showPublishButton or editor or rssIconAtTop) and not showHeaderImage: if showPublishButton or editor or rss_icon_at_top:
htmlStr += '</div><br>' if not showHeaderImage:
htmlStr += '</div><br>'
# show the newswire lines # show the newswire lines
newswireContentStr = \ newswireContentStr = \
@ -201,7 +203,7 @@ def getRightColumnContent(base_dir: str, nickname: str, domainFull: str,
htmlStr += newswireContentStr htmlStr += newswireContentStr
# show the rss icon at the bottom, typically on the right hand side # show the rss icon at the bottom, typically on the right hand side
if newswireContentStr and not rssIconAtTop: if newswireContentStr and not rss_icon_at_top:
htmlStr += '<br><div class="columnIcons">' + rssIconStr + '</div>' htmlStr += '<br><div class="columnIcons">' + rssIconStr + '</div>'
return htmlStr return htmlStr
@ -450,7 +452,7 @@ def htmlNewswireMobile(cssCache: {}, base_dir: str, nickname: str,
timelinePath: str, timelinePath: str,
showPublishAsIcon: bool, showPublishAsIcon: bool,
authorized: bool, authorized: bool,
rssIconAtTop: bool, rss_icon_at_top: bool,
iconsAsButtons: bool, iconsAsButtons: bool,
defaultTimeline: str, defaultTimeline: str,
theme: str, theme: str,
@ -501,7 +503,7 @@ def htmlNewswireMobile(cssCache: {}, base_dir: str, nickname: str,
moderator, editor, moderator, editor,
newswire, positiveVoting, newswire, positiveVoting,
False, timelinePath, showPublishButton, False, timelinePath, showPublishButton,
showPublishAsIcon, rssIconAtTop, False, showPublishAsIcon, rss_icon_at_top, False,
authorized, False, theme, authorized, False, theme,
defaultTimeline, accessKeys) defaultTimeline, accessKeys)
if editor and not newswire: if editor and not newswire:

4
webapp_frontscreen.py
View File

@ -94,7 +94,7 @@ def _htmlFrontScreenPosts(recentPostsCache: {}, maxRecentPosts: int,
def htmlFrontScreen(signingPrivateKeyPem: str, def htmlFrontScreen(signingPrivateKeyPem: str,
rssIconAtTop: bool, rss_icon_at_top: bool,
cssCache: {}, iconsAsButtons: bool, cssCache: {}, iconsAsButtons: bool,
defaultTimeline: str, defaultTimeline: str,
recentPostsCache: {}, maxRecentPosts: int, recentPostsCache: {}, maxRecentPosts: int,
@ -156,7 +156,7 @@ def htmlFrontScreen(signingPrivateKeyPem: str,
getLeftColumnContent(base_dir, 'news', domainFull, getLeftColumnContent(base_dir, 'news', domainFull,
http_prefix, translate, http_prefix, translate,
False, False, False, False,
False, None, rssIconAtTop, True, False, None, rss_icon_at_top, True,
True, theme, accessKeys, True, theme, accessKeys,
shared_items_federated_domains) shared_items_federated_domains)
profileHeaderStr += \ profileHeaderStr += \

4
webapp_moderation.py
View File

@ -44,7 +44,7 @@ def htmlModeration(cssCache: {}, defaultTimeline: str,
showPublishAsIcon: bool, showPublishAsIcon: bool,
fullWidthTimelineButtonHeader: bool, fullWidthTimelineButtonHeader: bool,
iconsAsButtons: bool, iconsAsButtons: bool,
rssIconAtTop: bool, rss_icon_at_top: bool,
publish_button_at_top: bool, publish_button_at_top: bool,
authorized: bool, moderationActionStr: str, authorized: bool, moderationActionStr: str,
theme: str, peertubeInstances: [], theme: str, peertubeInstances: [],
@ -72,7 +72,7 @@ def htmlModeration(cssCache: {}, defaultTimeline: str,
showPublishedDateOnly, showPublishedDateOnly,
newswire, False, False, artist, positiveVoting, newswire, False, False, artist, positiveVoting,
showPublishAsIcon, fullWidthTimelineButtonHeader, showPublishAsIcon, fullWidthTimelineButtonHeader,
iconsAsButtons, rssIconAtTop, publish_button_at_top, iconsAsButtons, rss_icon_at_top, publish_button_at_top,
authorized, moderationActionStr, theme, authorized, moderationActionStr, theme,
peertubeInstances, allow_local_network_access, peertubeInstances, allow_local_network_access,
textModeBanner, accessKeys, systemLanguage, textModeBanner, accessKeys, systemLanguage,

4
webapp_profile.py
View File

@ -539,7 +539,7 @@ def _getProfileHeaderAfterSearch(base_dir: str,
def htmlProfile(signingPrivateKeyPem: str, def htmlProfile(signingPrivateKeyPem: str,
rssIconAtTop: bool, rss_icon_at_top: bool,
cssCache: {}, iconsAsButtons: bool, cssCache: {}, iconsAsButtons: bool,
defaultTimeline: str, defaultTimeline: str,
recentPostsCache: {}, maxRecentPosts: int, recentPostsCache: {}, maxRecentPosts: int,
@ -568,7 +568,7 @@ def htmlProfile(signingPrivateKeyPem: str,
return "" return ""
if isSystemAccount(nickname): if isSystemAccount(nickname):
return htmlFrontScreen(signingPrivateKeyPem, return htmlFrontScreen(signingPrivateKeyPem,
rssIconAtTop, rss_icon_at_top,
cssCache, iconsAsButtons, cssCache, iconsAsButtons,
defaultTimeline, defaultTimeline,
recentPostsCache, maxRecentPosts, recentPostsCache, maxRecentPosts,

59
webapp_timeline.py
View File

@ -361,7 +361,7 @@ def _htmlTimelineEnd(base_dir: str, nickname: str, domainFull: str,
moderator: bool, editor: bool, moderator: bool, editor: bool,
newswire: {}, positiveVoting: bool, newswire: {}, positiveVoting: bool,
showPublishAsIcon: bool, showPublishAsIcon: bool,
rssIconAtTop: bool, publish_button_at_top: bool, rss_icon_at_top: bool, publish_button_at_top: bool,
authorized: bool, theme: str, authorized: bool, theme: str,
defaultTimeline: str, accessKeys: {}, defaultTimeline: str, accessKeys: {},
boxName: str, boxName: str,
@ -381,7 +381,8 @@ def _htmlTimelineEnd(base_dir: str, nickname: str, domainFull: str,
newswire, positiveVoting, newswire, positiveVoting,
False, None, True, False, None, True,
showPublishAsIcon, showPublishAsIcon,
rssIconAtTop, publish_button_at_top, rss_icon_at_top,
publish_button_at_top,
authorized, True, theme, authorized, True, theme,
defaultTimeline, accessKeys) defaultTimeline, accessKeys)
tlStr += ' <td valign="top" class="col-right" ' + \ tlStr += ' <td valign="top" class="col-right" ' + \
@ -436,7 +437,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
showPublishAsIcon: bool, showPublishAsIcon: bool,
fullWidthTimelineButtonHeader: bool, fullWidthTimelineButtonHeader: bool,
iconsAsButtons: bool, iconsAsButtons: bool,
rssIconAtTop: bool, rss_icon_at_top: bool,
publish_button_at_top: bool, publish_button_at_top: bool,
authorized: bool, authorized: bool,
moderationActionStr: str, moderationActionStr: str,
@ -745,7 +746,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
leftColumnStr = \ leftColumnStr = \
getLeftColumnContent(base_dir, nickname, domainFull, getLeftColumnContent(base_dir, nickname, domainFull,
http_prefix, translate, http_prefix, translate,
editor, artist, False, None, rssIconAtTop, editor, artist, False, None, rss_icon_at_top,
True, False, theme, accessKeys, True, False, theme, accessKeys,
shared_items_federated_domains) shared_items_federated_domains)
tlStr += ' <td valign="top" class="col-left" ' + \ tlStr += ' <td valign="top" class="col-left" ' + \
@ -792,7 +793,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
moderator, editor, moderator, editor,
newswire, positiveVoting, newswire, positiveVoting,
showPublishAsIcon, showPublishAsIcon,
rssIconAtTop, publish_button_at_top, rss_icon_at_top, publish_button_at_top,
authorized, theme, authorized, theme,
defaultTimeline, accessKeys, defaultTimeline, accessKeys,
boxName, boxName,
@ -810,7 +811,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
moderator, editor, moderator, editor,
newswire, positiveVoting, newswire, positiveVoting,
showPublishAsIcon, showPublishAsIcon,
rssIconAtTop, publish_button_at_top, rss_icon_at_top, publish_button_at_top,
authorized, theme, authorized, theme,
defaultTimeline, accessKeys, defaultTimeline, accessKeys,
boxName, boxName,
@ -958,7 +959,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
moderator, editor, moderator, editor,
newswire, positiveVoting, newswire, positiveVoting,
showPublishAsIcon, showPublishAsIcon,
rssIconAtTop, publish_button_at_top, rss_icon_at_top, publish_button_at_top,
authorized, theme, authorized, theme,
defaultTimeline, accessKeys, defaultTimeline, accessKeys,
boxName, boxName,
@ -1132,7 +1133,7 @@ def htmlShares(cssCache: {}, defaultTimeline: str,
showPublishAsIcon: bool, showPublishAsIcon: bool,
fullWidthTimelineButtonHeader: bool, fullWidthTimelineButtonHeader: bool,
iconsAsButtons: bool, iconsAsButtons: bool,
rssIconAtTop: bool, rss_icon_at_top: bool,
publish_button_at_top: bool, publish_button_at_top: bool,
authorized: bool, theme: str, authorized: bool, theme: str,
peertubeInstances: [], peertubeInstances: [],
@ -1164,7 +1165,7 @@ def htmlShares(cssCache: {}, defaultTimeline: str,
newswire, False, False, artist, newswire, False, False, artist,
positiveVoting, showPublishAsIcon, positiveVoting, showPublishAsIcon,
fullWidthTimelineButtonHeader, fullWidthTimelineButtonHeader,
iconsAsButtons, rssIconAtTop, publish_button_at_top, iconsAsButtons, rss_icon_at_top, publish_button_at_top,
authorized, None, theme, peertubeInstances, authorized, None, theme, peertubeInstances,
allow_local_network_access, textModeBanner, allow_local_network_access, textModeBanner,
accessKeys, systemLanguage, max_like_count, accessKeys, systemLanguage, max_like_count,
@ -1187,7 +1188,7 @@ def htmlWanted(cssCache: {}, defaultTimeline: str,
showPublishAsIcon: bool, showPublishAsIcon: bool,
fullWidthTimelineButtonHeader: bool, fullWidthTimelineButtonHeader: bool,
iconsAsButtons: bool, iconsAsButtons: bool,
rssIconAtTop: bool, rss_icon_at_top: bool,
publish_button_at_top: bool, publish_button_at_top: bool,
authorized: bool, theme: str, authorized: bool, theme: str,
peertubeInstances: [], peertubeInstances: [],
@ -1219,7 +1220,7 @@ def htmlWanted(cssCache: {}, defaultTimeline: str,
newswire, False, False, artist, newswire, False, False, artist,
positiveVoting, showPublishAsIcon, positiveVoting, showPublishAsIcon,
fullWidthTimelineButtonHeader, fullWidthTimelineButtonHeader,
iconsAsButtons, rssIconAtTop, publish_button_at_top, iconsAsButtons, rss_icon_at_top, publish_button_at_top,
authorized, None, theme, peertubeInstances, authorized, None, theme, peertubeInstances,
allow_local_network_access, textModeBanner, allow_local_network_access, textModeBanner,
accessKeys, systemLanguage, max_like_count, accessKeys, systemLanguage, max_like_count,
@ -1243,7 +1244,7 @@ def htmlInbox(cssCache: {}, defaultTimeline: str,
showPublishAsIcon: bool, showPublishAsIcon: bool,
fullWidthTimelineButtonHeader: bool, fullWidthTimelineButtonHeader: bool,
iconsAsButtons: bool, iconsAsButtons: bool,
rssIconAtTop: bool, rss_icon_at_top: bool,
publish_button_at_top: bool, publish_button_at_top: bool,
authorized: bool, theme: str, authorized: bool, theme: str,
peertubeInstances: [], peertubeInstances: [],
@ -1275,7 +1276,7 @@ def htmlInbox(cssCache: {}, defaultTimeline: str,
newswire, False, False, artist, newswire, False, False, artist,
positiveVoting, showPublishAsIcon, positiveVoting, showPublishAsIcon,
fullWidthTimelineButtonHeader, fullWidthTimelineButtonHeader,
iconsAsButtons, rssIconAtTop, publish_button_at_top, iconsAsButtons, rss_icon_at_top, publish_button_at_top,
authorized, None, theme, peertubeInstances, authorized, None, theme, peertubeInstances,
allow_local_network_access, textModeBanner, allow_local_network_access, textModeBanner,
accessKeys, systemLanguage, max_like_count, accessKeys, systemLanguage, max_like_count,
@ -1299,7 +1300,7 @@ def htmlBookmarks(cssCache: {}, defaultTimeline: str,
showPublishAsIcon: bool, showPublishAsIcon: bool,
fullWidthTimelineButtonHeader: bool, fullWidthTimelineButtonHeader: bool,
iconsAsButtons: bool, iconsAsButtons: bool,
rssIconAtTop: bool, rss_icon_at_top: bool,
publish_button_at_top: bool, publish_button_at_top: bool,
authorized: bool, theme: str, authorized: bool, theme: str,
peertubeInstances: [], peertubeInstances: [],
@ -1331,7 +1332,7 @@ def htmlBookmarks(cssCache: {}, defaultTimeline: str,
newswire, False, False, artist, newswire, False, False, artist,
positiveVoting, showPublishAsIcon, positiveVoting, showPublishAsIcon,
fullWidthTimelineButtonHeader, fullWidthTimelineButtonHeader,
iconsAsButtons, rssIconAtTop, publish_button_at_top, iconsAsButtons, rss_icon_at_top, publish_button_at_top,
authorized, None, theme, peertubeInstances, authorized, None, theme, peertubeInstances,
allow_local_network_access, textModeBanner, allow_local_network_access, textModeBanner,
accessKeys, systemLanguage, max_like_count, accessKeys, systemLanguage, max_like_count,
@ -1355,7 +1356,7 @@ def htmlInboxDMs(cssCache: {}, defaultTimeline: str,
showPublishAsIcon: bool, showPublishAsIcon: bool,
fullWidthTimelineButtonHeader: bool, fullWidthTimelineButtonHeader: bool,
iconsAsButtons: bool, iconsAsButtons: bool,
rssIconAtTop: bool, rss_icon_at_top: bool,
publish_button_at_top: bool, publish_button_at_top: bool,
authorized: bool, theme: str, authorized: bool, theme: str,
peertubeInstances: [], peertubeInstances: [],
@ -1382,7 +1383,7 @@ def htmlInboxDMs(cssCache: {}, defaultTimeline: str,
newswire, False, False, artist, positiveVoting, newswire, False, False, artist, positiveVoting,
showPublishAsIcon, showPublishAsIcon,
fullWidthTimelineButtonHeader, fullWidthTimelineButtonHeader,
iconsAsButtons, rssIconAtTop, publish_button_at_top, iconsAsButtons, rss_icon_at_top, publish_button_at_top,
authorized, None, theme, peertubeInstances, authorized, None, theme, peertubeInstances,
allow_local_network_access, textModeBanner, allow_local_network_access, textModeBanner,
accessKeys, systemLanguage, max_like_count, accessKeys, systemLanguage, max_like_count,
@ -1406,7 +1407,7 @@ def htmlInboxReplies(cssCache: {}, defaultTimeline: str,
showPublishAsIcon: bool, showPublishAsIcon: bool,
fullWidthTimelineButtonHeader: bool, fullWidthTimelineButtonHeader: bool,
iconsAsButtons: bool, iconsAsButtons: bool,
rssIconAtTop: bool, rss_icon_at_top: bool,
publish_button_at_top: bool, publish_button_at_top: bool,
authorized: bool, theme: str, authorized: bool, theme: str,
peertubeInstances: [], peertubeInstances: [],
@ -1434,7 +1435,7 @@ def htmlInboxReplies(cssCache: {}, defaultTimeline: str,
newswire, False, False, artist, newswire, False, False, artist,
positiveVoting, showPublishAsIcon, positiveVoting, showPublishAsIcon,
fullWidthTimelineButtonHeader, fullWidthTimelineButtonHeader,
iconsAsButtons, rssIconAtTop, publish_button_at_top, iconsAsButtons, rss_icon_at_top, publish_button_at_top,
authorized, None, theme, peertubeInstances, authorized, None, theme, peertubeInstances,
allow_local_network_access, textModeBanner, allow_local_network_access, textModeBanner,
accessKeys, systemLanguage, max_like_count, accessKeys, systemLanguage, max_like_count,
@ -1458,7 +1459,7 @@ def htmlInboxMedia(cssCache: {}, defaultTimeline: str,
showPublishAsIcon: bool, showPublishAsIcon: bool,
fullWidthTimelineButtonHeader: bool, fullWidthTimelineButtonHeader: bool,
iconsAsButtons: bool, iconsAsButtons: bool,
rssIconAtTop: bool, rss_icon_at_top: bool,
publish_button_at_top: bool, publish_button_at_top: bool,
authorized: bool, theme: str, authorized: bool, theme: str,
peertubeInstances: [], peertubeInstances: [],
@ -1486,7 +1487,7 @@ def htmlInboxMedia(cssCache: {}, defaultTimeline: str,
newswire, False, False, artist, newswire, False, False, artist,
positiveVoting, showPublishAsIcon, positiveVoting, showPublishAsIcon,
fullWidthTimelineButtonHeader, fullWidthTimelineButtonHeader,
iconsAsButtons, rssIconAtTop, publish_button_at_top, iconsAsButtons, rss_icon_at_top, publish_button_at_top,
authorized, None, theme, peertubeInstances, authorized, None, theme, peertubeInstances,
allow_local_network_access, textModeBanner, allow_local_network_access, textModeBanner,
accessKeys, systemLanguage, max_like_count, accessKeys, systemLanguage, max_like_count,
@ -1510,7 +1511,7 @@ def htmlInboxBlogs(cssCache: {}, defaultTimeline: str,
showPublishAsIcon: bool, showPublishAsIcon: bool,
fullWidthTimelineButtonHeader: bool, fullWidthTimelineButtonHeader: bool,
iconsAsButtons: bool, iconsAsButtons: bool,
rssIconAtTop: bool, rss_icon_at_top: bool,
publish_button_at_top: bool, publish_button_at_top: bool,
authorized: bool, theme: str, authorized: bool, theme: str,
peertubeInstances: [], peertubeInstances: [],
@ -1538,7 +1539,7 @@ def htmlInboxBlogs(cssCache: {}, defaultTimeline: str,
newswire, False, False, artist, newswire, False, False, artist,
positiveVoting, showPublishAsIcon, positiveVoting, showPublishAsIcon,
fullWidthTimelineButtonHeader, fullWidthTimelineButtonHeader,
iconsAsButtons, rssIconAtTop, publish_button_at_top, iconsAsButtons, rss_icon_at_top, publish_button_at_top,
authorized, None, theme, peertubeInstances, authorized, None, theme, peertubeInstances,
allow_local_network_access, textModeBanner, allow_local_network_access, textModeBanner,
accessKeys, systemLanguage, max_like_count, accessKeys, systemLanguage, max_like_count,
@ -1562,7 +1563,7 @@ def htmlInboxFeatures(cssCache: {}, defaultTimeline: str,
showPublishAsIcon: bool, showPublishAsIcon: bool,
fullWidthTimelineButtonHeader: bool, fullWidthTimelineButtonHeader: bool,
iconsAsButtons: bool, iconsAsButtons: bool,
rssIconAtTop: bool, rss_icon_at_top: bool,
publish_button_at_top: bool, publish_button_at_top: bool,
authorized: bool, authorized: bool,
theme: str, theme: str,
@ -1590,7 +1591,7 @@ def htmlInboxFeatures(cssCache: {}, defaultTimeline: str,
newswire, False, False, False, newswire, False, False, False,
positiveVoting, showPublishAsIcon, positiveVoting, showPublishAsIcon,
fullWidthTimelineButtonHeader, fullWidthTimelineButtonHeader,
iconsAsButtons, rssIconAtTop, publish_button_at_top, iconsAsButtons, rss_icon_at_top, publish_button_at_top,
authorized, None, theme, peertubeInstances, authorized, None, theme, peertubeInstances,
allow_local_network_access, textModeBanner, allow_local_network_access, textModeBanner,
accessKeys, systemLanguage, max_like_count, accessKeys, systemLanguage, max_like_count,
@ -1614,7 +1615,7 @@ def htmlInboxNews(cssCache: {}, defaultTimeline: str,
positiveVoting: bool, showPublishAsIcon: bool, positiveVoting: bool, showPublishAsIcon: bool,
fullWidthTimelineButtonHeader: bool, fullWidthTimelineButtonHeader: bool,
iconsAsButtons: bool, iconsAsButtons: bool,
rssIconAtTop: bool, rss_icon_at_top: bool,
publish_button_at_top: bool, publish_button_at_top: bool,
authorized: bool, theme: str, authorized: bool, theme: str,
peertubeInstances: [], peertubeInstances: [],
@ -1641,7 +1642,7 @@ def htmlInboxNews(cssCache: {}, defaultTimeline: str,
newswire, moderator, editor, artist, newswire, moderator, editor, artist,
positiveVoting, showPublishAsIcon, positiveVoting, showPublishAsIcon,
fullWidthTimelineButtonHeader, fullWidthTimelineButtonHeader,
iconsAsButtons, rssIconAtTop, publish_button_at_top, iconsAsButtons, rss_icon_at_top, publish_button_at_top,
authorized, None, theme, peertubeInstances, authorized, None, theme, peertubeInstances,
allow_local_network_access, textModeBanner, allow_local_network_access, textModeBanner,
accessKeys, systemLanguage, max_like_count, accessKeys, systemLanguage, max_like_count,
@ -1665,7 +1666,7 @@ def htmlOutbox(cssCache: {}, defaultTimeline: str,
showPublishAsIcon: bool, showPublishAsIcon: bool,
fullWidthTimelineButtonHeader: bool, fullWidthTimelineButtonHeader: bool,
iconsAsButtons: bool, iconsAsButtons: bool,
rssIconAtTop: bool, rss_icon_at_top: bool,
publish_button_at_top: bool, publish_button_at_top: bool,
authorized: bool, theme: str, authorized: bool, theme: str,
peertubeInstances: [], peertubeInstances: [],
@ -1694,7 +1695,7 @@ def htmlOutbox(cssCache: {}, defaultTimeline: str,
showPublishedDateOnly, showPublishedDateOnly,
newswire, False, False, artist, positiveVoting, newswire, False, False, artist, positiveVoting,
showPublishAsIcon, fullWidthTimelineButtonHeader, showPublishAsIcon, fullWidthTimelineButtonHeader,
iconsAsButtons, rssIconAtTop, publish_button_at_top, iconsAsButtons, rss_icon_at_top, publish_button_at_top,
authorized, None, theme, peertubeInstances, authorized, None, theme, peertubeInstances,
allow_local_network_access, textModeBanner, allow_local_network_access, textModeBanner,
accessKeys, systemLanguage, max_like_count, accessKeys, systemLanguage, max_like_count,