diff --git a/webapp_timeline.py b/webapp_timeline.py index 4a0fe141..b9468325 100644 --- a/webapp_timeline.py +++ b/webapp_timeline.py @@ -131,14 +131,15 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str, # Full Row of Buttons - tlStr += \ - headerButtonsTimeline(defaultTimeline, boxName, pageNumber, - translate, usersPath, - minimal, moderator, - manuallyApproveFollowers, - baseDir, nickname, - domain, iconsDir, timelineStartTime, - iconsAsButtons) + if fullWidthTimelineButtonHeader: + tlStr += \ + headerButtonsTimeline(defaultTimeline, boxName, pageNumber, + translate, usersPath, + minimal, moderator, + manuallyApproveFollowers, + baseDir, nickname, + domain, timelineStartTime, + iconsAsButtons) # start the timeline tlStr += '
\n' @@ -156,6 +157,16 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str, # center column containing posts tlStr += '
\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 if moderator and boxName == 'moderation': tlStr += \ @@ -454,7 +465,6 @@ def headerButtonsTimeline(defaultTimeline: str, manuallyApproveFollowers: bool, baseDir: str, nickname: str, domain: str, - iconsDir: str, timelineStartTime, iconsAsButtons: bool) -> str: """Returns the header at the top of the timeline, containing diff --git a/webapp_utils.py b/webapp_utils.py index 88494e0f..9daee68e 100644 --- a/webapp_utils.py +++ b/webapp_utils.py @@ -527,11 +527,7 @@ def htmlHeaderWithExternalStyle(cssFilename: str, lang='en') -> str: htmlStr += ' \n' htmlStr += ' \n' htmlStr += ' \n' - fontName, fontFormat = getFontFromCss(css) - if fontName: - htmlStr += ' \n' - cssFile = cssFilename.split('/')[-1] + cssFile = '/' + cssFilename.split('/')[-1] # TODO: Clean up - default load only one base css file htmlStr += ' \n' #htmlStr += ' \n'