Fix broken function refs

alt-html-css
Admin 2020-12-13 12:22:36 +00:00
parent 47ac4ef70c
commit 9038753abc
6 changed files with 6 additions and 9 deletions

View File

@ -10,7 +10,6 @@ import os
from datetime import datetime from datetime import datetime
from content import replaceEmojiFromTags from content import replaceEmojiFromTags
from webapp_utils import getIconsWebPath
from webapp_utils import htmlHeaderWithExternalStyle, htmlHeaderWithExternalStyles from webapp_utils import htmlHeaderWithExternalStyle, htmlHeaderWithExternalStyles
from webapp_utils import htmlFooter from webapp_utils import htmlFooter
from webapp_utils import getPostAttachmentsAsHtml from webapp_utils import getPostAttachmentsAsHtml

View File

@ -15,7 +15,6 @@ from webapp_utils import sharesTimelineJson
from webapp_utils import htmlPostSeparator from webapp_utils import htmlPostSeparator
from webapp_utils import getLeftImageFile from webapp_utils import getLeftImageFile
from webapp_utils import headerButtonsFrontScreen from webapp_utils import headerButtonsFrontScreen
from webapp_utils import getIconsWebPath
from webapp_utils import htmlHeaderWithExternalStyle, htmlHeaderWithExternalStyles from webapp_utils import htmlHeaderWithExternalStyle, htmlHeaderWithExternalStyles
from webapp_utils import htmlFooter from webapp_utils import htmlFooter
from webapp_utils import getBannerFile from webapp_utils import getBannerFile

View File

@ -23,7 +23,6 @@ from webapp_utils import htmlFooter
from webapp_utils import getBannerFile from webapp_utils import getBannerFile
from webapp_utils import htmlPostSeparator from webapp_utils import htmlPostSeparator
from webapp_utils import headerButtonsFrontScreen from webapp_utils import headerButtonsFrontScreen
from webapp_utils import getIconsWebPath
from webapp_headerbuttons import headerNewsTabs from webapp_headerbuttons import headerNewsTabs

View File

@ -131,7 +131,6 @@ def htmlFrontScreen(rssIconAtTop: bool,
# NOTE: Related also to class "page" added to 'webapp_create_post.py' # NOTE: Related also to class "page" added to 'webapp_create_post.py'
profileHeaderStr += '<div class="timeline">\n' profileHeaderStr += '<div class="timeline">\n'
iconsPath = getIconsWebPath(baseDir)
leftColumnStr = \ leftColumnStr = \
getLeftColumnContent(baseDir, 'news', domainFull, getLeftColumnContent(baseDir, 'news', domainFull,
httpPrefix, translate, httpPrefix, translate,
@ -183,7 +182,6 @@ def htmlFrontScreen(rssIconAtTop: bool,
# Footer which is only used for system accounts # Footer which is only used for system accounts
iconsPath = getIconsWebPath(baseDir)
rightColumnStr = \ rightColumnStr = \
getRightColumnContent(baseDir, 'news', domainFull, getRightColumnContent(baseDir, 'news', domainFull,
httpPrefix, translate, httpPrefix, translate,

View File

@ -43,7 +43,6 @@ from follow import isFollowerOfPerson
from webapp_frontscreen import htmlFrontScreen from webapp_frontscreen import htmlFrontScreen
from webapp_utils import scheduledPostsExist from webapp_utils import scheduledPostsExist
from webapp_utils import getPersonAvatarUrl from webapp_utils import getPersonAvatarUrl
from webapp_utils import getIconsWebPath
from webapp_utils import htmlHeaderWithExternalStyle, htmlHeaderWithExternalStyles from webapp_utils import htmlHeaderWithExternalStyle, htmlHeaderWithExternalStyles
from webapp_utils import htmlFooter from webapp_utils import htmlFooter
from webapp_utils import addEmojiToDisplayName from webapp_utils import addEmojiToDisplayName

View File

@ -197,7 +197,10 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
# start the timeline # start the timeline
tlStr += '<div class="timeline">\n' tlStr += '<div class="timeline">\n'
domainFull = getFullDomain(domain, port) domainFull = domain
if port:
if port != 80 and port != 443:
domainFull = domain + ':' + str(port)
# For 'News' instances, only show standard "buttons" on "user" pages # For 'News' instances, only show standard "buttons" on "user" pages
if defaultTimeline == 'tlfeatures' and boxName in userPages: if defaultTimeline == 'tlfeatures' and boxName in userPages:
@ -214,7 +217,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
# left column # left column
leftColumnStr = \ leftColumnStr = \
getLeftColumnContent(baseDir, nickname, domainFull, getLeftColumnContent(baseDir, nickname, domainFull,
httpPrefix, translate, iconsPath, httpPrefix, translate,
editor, False, None, rssIconAtTop, editor, False, None, rssIconAtTop,
True, False) True, False)
tlStr += ' <div class="section links">\n' + \ tlStr += ' <div class="section links">\n' + \
@ -407,7 +410,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
if defaultTimeline == 'tlfeatures' and boxName not in userPages: if defaultTimeline == 'tlfeatures' and boxName not in userPages:
# right column # right column
rightColumnStr = getRightColumnContent(baseDir, nickname, domainFull, rightColumnStr = getRightColumnContent(baseDir, nickname, domainFull,
httpPrefix, translate, iconsPath, httpPrefix, translate,
moderator, editor, moderator, editor,
newswire, positiveVoting, newswire, positiveVoting,
False, None, True, False, None, True,