forked from indymedia/epicyon
Test without fallbacks
parent
862526819d
commit
81a49a63ce
|
@ -7,14 +7,12 @@ __email__ = "bob@freedombone.net"
|
||||||
__status__ = "Production"
|
__status__ = "Production"
|
||||||
|
|
||||||
import os
|
import os
|
||||||
from shutil import copyfile
|
|
||||||
from utils import getConfigParam
|
from utils import getConfigParam
|
||||||
from utils import getNicknameFromActor
|
from utils import getNicknameFromActor
|
||||||
from utils import isEditor
|
from utils import isEditor
|
||||||
from webapp_utils import sharesTimelineJson
|
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 getImageFile
|
|
||||||
from webapp_utils import headerButtonsFrontScreen
|
from webapp_utils import headerButtonsFrontScreen
|
||||||
from webapp_utils import htmlHeaderWithExternalStyle
|
from webapp_utils import htmlHeaderWithExternalStyle
|
||||||
from webapp_utils import htmlFooter
|
from webapp_utils import htmlFooter
|
||||||
|
@ -84,22 +82,6 @@ def getLeftColumnContent(baseDir: str, nickname: str, domainFull: str,
|
||||||
if showHeaderImage:
|
if showHeaderImage:
|
||||||
leftImageFile, leftColumnImageFilename = \
|
leftImageFile, leftColumnImageFilename = \
|
||||||
getLeftImageFile(baseDir, nickname, domain, theme)
|
getLeftImageFile(baseDir, nickname, domain, theme)
|
||||||
if not os.path.isfile(leftColumnImageFilename):
|
|
||||||
theme = getConfigParam(baseDir, 'theme').lower()
|
|
||||||
if theme == 'default':
|
|
||||||
theme = ''
|
|
||||||
else:
|
|
||||||
theme = '_' + theme
|
|
||||||
themeLeftImageFile, themeLeftColumnImageFilename = \
|
|
||||||
getImageFile(baseDir, 'left_col_image', baseDir + '/img',
|
|
||||||
nickname, domain, theme)
|
|
||||||
if os.path.isfile(themeLeftColumnImageFilename):
|
|
||||||
leftColumnImageFilename = \
|
|
||||||
baseDir + '/accounts/' + \
|
|
||||||
nickname + '@' + domain + '/' + themeLeftImageFile
|
|
||||||
copyfile(themeLeftColumnImageFilename,
|
|
||||||
leftColumnImageFilename)
|
|
||||||
leftImageFile = themeLeftImageFile
|
|
||||||
|
|
||||||
# show the image at the top of the column
|
# show the image at the top of the column
|
||||||
editImageClass = 'leftColEdit'
|
editImageClass = 'leftColEdit'
|
||||||
|
|
|
@ -86,22 +86,6 @@ def getRightColumnContent(baseDir: str, nickname: str, domainFull: str,
|
||||||
if showHeaderImage:
|
if showHeaderImage:
|
||||||
rightImageFile, rightColumnImageFilename = \
|
rightImageFile, rightColumnImageFilename = \
|
||||||
getRightImageFile(baseDir, nickname, domain, theme)
|
getRightImageFile(baseDir, nickname, domain, theme)
|
||||||
if not os.path.isfile(rightColumnImageFilename):
|
|
||||||
theme = getConfigParam(baseDir, 'theme').lower()
|
|
||||||
if theme == 'default':
|
|
||||||
theme = ''
|
|
||||||
else:
|
|
||||||
theme = '_' + theme
|
|
||||||
themeRightImageFile, themeRightColumnImageFilename = \
|
|
||||||
getImageFile(baseDir, 'right_col_image', baseDir + '/img',
|
|
||||||
nickname, domain, theme)
|
|
||||||
if os.path.isfile(themeRightColumnImageFilename):
|
|
||||||
rightColumnImageFilename = \
|
|
||||||
baseDir + '/accounts/' + \
|
|
||||||
nickname + '@' + domain + '/' + themeRightImageFile
|
|
||||||
copyfile(themeRightColumnImageFilename,
|
|
||||||
rightColumnImageFilename)
|
|
||||||
rightImageFile = themeRightImageFile
|
|
||||||
|
|
||||||
# show the image at the top of the column
|
# show the image at the top of the column
|
||||||
editImageClass = 'rightColEdit'
|
editImageClass = 'rightColEdit'
|
||||||
|
|
|
@ -253,23 +253,6 @@ def htmlSearchHashtagCategory(cssCache: {}, translate: {},
|
||||||
# show a banner above the search box
|
# show a banner above the search box
|
||||||
searchBannerFile, searchBannerFilename = \
|
searchBannerFile, searchBannerFilename = \
|
||||||
getSearchBannerFile(baseDir, searchNickname, domain, theme)
|
getSearchBannerFile(baseDir, searchNickname, domain, theme)
|
||||||
if not os.path.isfile(searchBannerFilename):
|
|
||||||
# get the default search banner for the theme
|
|
||||||
theme = getConfigParam(baseDir, 'theme').lower()
|
|
||||||
if theme == 'default':
|
|
||||||
theme = ''
|
|
||||||
else:
|
|
||||||
theme = '_' + theme
|
|
||||||
themeSearchImageFile, themeSearchBannerFilename = \
|
|
||||||
getImageFile(baseDir, 'search_banner', baseDir + '/img',
|
|
||||||
searchNickname, domain, theme)
|
|
||||||
if os.path.isfile(themeSearchBannerFilename):
|
|
||||||
searchBannerFilename = \
|
|
||||||
baseDir + '/accounts/' + \
|
|
||||||
searchNickname + '@' + domain + '/' + themeSearchImageFile
|
|
||||||
copyfile(themeSearchBannerFilename,
|
|
||||||
searchBannerFilename)
|
|
||||||
searchBannerFile = themeSearchImageFile
|
|
||||||
|
|
||||||
if os.path.isfile(searchBannerFilename):
|
if os.path.isfile(searchBannerFilename):
|
||||||
htmlStr += '<a href="' + actor + '/search">\n'
|
htmlStr += '<a href="' + actor + '/search">\n'
|
||||||
|
|
|
@ -332,23 +332,6 @@ def htmlSearch(cssCache: {}, translate: {},
|
||||||
# show a banner above the search box
|
# show a banner above the search box
|
||||||
searchBannerFile, searchBannerFilename = \
|
searchBannerFile, searchBannerFilename = \
|
||||||
getSearchBannerFile(baseDir, searchNickname, domain, theme)
|
getSearchBannerFile(baseDir, searchNickname, domain, theme)
|
||||||
if not os.path.isfile(searchBannerFilename):
|
|
||||||
# get the default search banner for the theme
|
|
||||||
theme = getConfigParam(baseDir, 'theme').lower()
|
|
||||||
if theme == 'default':
|
|
||||||
theme = ''
|
|
||||||
else:
|
|
||||||
theme = '_' + theme
|
|
||||||
themeSearchImageFile, themeSearchBannerFilename = \
|
|
||||||
getImageFile(baseDir, 'search_banner', baseDir + '/img',
|
|
||||||
searchNickname, domain, theme)
|
|
||||||
if os.path.isfile(themeSearchBannerFilename):
|
|
||||||
searchBannerFilename = \
|
|
||||||
baseDir + '/accounts/' + \
|
|
||||||
searchNickname + '@' + domain + '/' + themeSearchImageFile
|
|
||||||
copyfile(themeSearchBannerFilename,
|
|
||||||
searchBannerFilename)
|
|
||||||
searchBannerFile = themeSearchImageFile
|
|
||||||
|
|
||||||
if os.path.isfile(searchBannerFilename):
|
if os.path.isfile(searchBannerFilename):
|
||||||
usersPath = '/users/' + searchNickname
|
usersPath = '/users/' + searchNickname
|
||||||
|
|
Loading…
Reference in New Issue