mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some breaks from merge

alt-html-css
Admin 2020-11-15 08:41:53 +00:00
parent e004327824
commit 685959b976
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
webapp_timeline.py
View File

@ -131,14 +131,15 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
# Full Row of Buttons # Full Row of Buttons
tlStr += \ if fullWidthTimelineButtonHeader:
headerButtonsTimeline(defaultTimeline, boxName, pageNumber, tlStr += \
translate, usersPath, headerButtonsTimeline(defaultTimeline, boxName, pageNumber,
minimal, moderator, translate, usersPath,
manuallyApproveFollowers, minimal, moderator,
baseDir, nickname, manuallyApproveFollowers,
domain, iconsDir, timelineStartTime, baseDir, nickname,
iconsAsButtons) domain, timelineStartTime,
iconsAsButtons)
# start the timeline # start the timeline
tlStr += '<div class="timeline">\n' tlStr += '<div class="timeline">\n'
@ -156,6 +157,16 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
# center column containing posts # center column containing posts
tlStr += ' <div class="col-center">\n' tlStr += ' <div class="col-center">\n'
if not fullWidthTimelineButtonHeader:
tlStr += \
headerButtonsTimeline(defaultTimeline, boxName, pageNumber,
translate, usersPath,
minimal, moderator,
manuallyApproveFollowers,
baseDir, nickname,
domain, timelineStartTime,
iconsAsButtons)
# second row of buttons for moderator actions # second row of buttons for moderator actions
if moderator and boxName == 'moderation': if moderator and boxName == 'moderation':
tlStr += \ tlStr += \
@ -454,7 +465,6 @@ def headerButtonsTimeline(defaultTimeline: str,
manuallyApproveFollowers: bool, manuallyApproveFollowers: bool,
baseDir: str, baseDir: str,
nickname: str, domain: str, nickname: str, domain: str,
iconsDir: str,
timelineStartTime, timelineStartTime,
iconsAsButtons: bool) -> str: iconsAsButtons: bool) -> str:
"""Returns the header at the top of the timeline, containing """Returns the header at the top of the timeline, containing

6
webapp_utils.py
View File

@ -527,11 +527,7 @@ def htmlHeaderWithExternalStyle(cssFilename: str, lang='en') -> str:
htmlStr += ' <head>\n' htmlStr += ' <head>\n'
htmlStr += ' <meta charset="utf-8">\n' htmlStr += ' <meta charset="utf-8">\n'
htmlStr += ' <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">\n' htmlStr += ' <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">\n'
fontName, fontFormat = getFontFromCss(css) cssFile = '/' + cssFilename.split('/')[-1]
if fontName:
htmlStr += ' <link rel="preload" as="font" type="' + \
fontFormat + '" href="' + fontName + '" crossorigin>\n'
cssFile = cssFilename.split('/')[-1]
# TODO: Clean up - default load only one base css file # TODO: Clean up - default load only one base css file
htmlStr += ' <link rel="stylesheet" href="base.css">\n' htmlStr += ' <link rel="stylesheet" href="base.css">\n'
#htmlStr += ' <link rel="stylesheet" href="' + cssFile + '">\n' #htmlStr += ' <link rel="stylesheet" href="' + cssFile + '">\n'