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

Rss icon at bottom of links screen on mobile

main
Bob Mottram 2020-10-31 12:34:13 +00:00
parent fe5aa060e0
commit 114f2039dd
2 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
daemon.py
View File

@ -6066,7 +6066,8 @@ class PubServer(BaseHTTPRequestHandler):
iconsAsButtons = \ iconsAsButtons = \
self.server.iconsAsButtons self.server.iconsAsButtons
msg = \ msg = \
htmlProfile(self.server.cssCache, htmlProfile(self.server.rssIconAtTop,
self.server.cssCache,
iconsAsButtons, iconsAsButtons,
defaultTimeline, defaultTimeline,
recentPostsCache, recentPostsCache,
@ -6144,7 +6145,8 @@ class PubServer(BaseHTTPRequestHandler):
iconsAsButtons = \ iconsAsButtons = \
self.server.iconsAsButtons self.server.iconsAsButtons
msg = \ msg = \
htmlProfile(self.server.cssCache, htmlProfile(self.server.rssIconAtTop,
self.server.cssCache,
iconsAsButtons, iconsAsButtons,
defaultTimeline, defaultTimeline,
recentPostsCache, recentPostsCache,
@ -7708,7 +7710,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.GETbusy = False self.server.GETbusy = False
return True return True
msg = \ msg = \
htmlProfile(self.server.cssCache, htmlProfile(self.server.rssIconAtTop,
self.server.cssCache,
self.server.iconsAsButtons, self.server.iconsAsButtons,
self.server.defaultTimeline, self.server.defaultTimeline,
self.server.recentPostsCache, self.server.recentPostsCache,
@ -7798,7 +7801,8 @@ class PubServer(BaseHTTPRequestHandler):
return True return True
msg = \ msg = \
htmlProfile(self.server.cssCache, htmlProfile(self.server.rssIconAtTop,
self.server.cssCache,
self.server.iconsAsButtons, self.server.iconsAsButtons,
self.server.defaultTimeline, self.server.defaultTimeline,
self.server.recentPostsCache, self.server.recentPostsCache,
@ -7887,7 +7891,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.GETbusy = False self.server.GETbusy = False
return True return True
msg = \ msg = \
htmlProfile(self.server.cssCache, htmlProfile(self.server.rssIconAtTop,
self.server.cssCache,
self.server.iconsAsButtons, self.server.iconsAsButtons,
self.server.defaultTimeline, self.server.defaultTimeline,
self.server.recentPostsCache, self.server.recentPostsCache,
@ -7952,7 +7957,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.GETbusy = False self.server.GETbusy = False
return True return True
msg = \ msg = \
htmlProfile(self.server.cssCache, htmlProfile(self.server.rssIconAtTop,
self.server.cssCache,
self.server.iconsAsButtons, self.server.iconsAsButtons,
self.server.defaultTimeline, self.server.defaultTimeline,
self.server.recentPostsCache, self.server.recentPostsCache,
@ -9512,6 +9518,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
msg = htmlNewswireMobile(self.server.cssCache, msg = htmlNewswireMobile(self.server.cssCache,
self.server.baseDir, self.server.baseDir,
nickname, nickname,
@ -9523,7 +9530,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.positiveVoting, self.server.positiveVoting,
timelinePath, timelinePath,
showPublishAsIcon, showPublishAsIcon,
authorized).encode('utf-8') authorized,
rssIconAtTop).encode('utf-8')
self._set_headers('text/html', len(msg), self._set_headers('text/html', len(msg),
cookie, callingDomain) cookie, callingDomain)
self._write(msg) self._write(msg)
@ -9549,7 +9557,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.httpPrefix, self.server.httpPrefix,
self.server.translate, self.server.translate,
timelinePath, timelinePath,
authorized).encode('utf-8') authorized,
self.server.rssIconAtTop).encode('utf-8')
self._set_headers('text/html', len(msg), cookie, callingDomain) self._set_headers('text/html', len(msg), cookie, callingDomain)
self._write(msg) self._write(msg)
self.server.GETbusy = False self.server.GETbusy = False

21
webinterface.py
View File

@ -3298,7 +3298,8 @@ def htmlSharesTimeline(translate: {}, pageNumber: int, itemsPerPage: int,
return timelineStr return timelineStr
def htmlProfile(cssCache: {}, iconsAsButtons: bool, def htmlProfile(rssIconAtTop: bool,
cssCache: {}, iconsAsButtons: bool,
defaultTimeline: str, defaultTimeline: str,
recentPostsCache: {}, maxRecentPosts: int, recentPostsCache: {}, maxRecentPosts: int,
translate: {}, projectVersion: str, translate: {}, projectVersion: str,
@ -3518,7 +3519,7 @@ def htmlProfile(cssCache: {}, iconsAsButtons: bool,
getLeftColumnContent(baseDir, 'news', domainFull, getLeftColumnContent(baseDir, 'news', domainFull,
httpPrefix, translate, httpPrefix, translate,
iconsDir, False, iconsDir, False,
False, None, False, True) False, None, rssIconAtTop, True)
profileHeaderStr += ' </td>\n' profileHeaderStr += ' </td>\n'
profileHeaderStr += ' <td valign="top" class="col-center">\n' profileHeaderStr += ' <td valign="top" class="col-center">\n'
else: else:
@ -5607,7 +5608,7 @@ def getLeftColumnContent(baseDir: str, nickname: str, domainFull: str,
translate['RSS feed for this site'] + \ translate['RSS feed for this site'] + \
'" title="' + translate['RSS feed for this site'] + \ '" title="' + translate['RSS feed for this site'] + \
'" src="/' + iconsDir + '/logorss.png" /></a>\n' '" src="/' + iconsDir + '/logorss.png" /></a>\n'
if rssIconAtTop: if rssIconAtTop and showHeaderImage:
htmlStr += rssIconStr htmlStr += rssIconStr
if editImageClass == 'leftColEdit': if editImageClass == 'leftColEdit':
@ -5662,7 +5663,8 @@ def getLeftColumnContent(baseDir: str, nickname: str, domainFull: str,
' <p>' + lineStr + '</p>\n' ' <p>' + lineStr + '</p>\n'
linksFileContainsEntries = True linksFileContainsEntries = True
if linksFileContainsEntries and not rssIconAtTop: rssAtBottom = not rssIconAtTop or not showHeaderImage
if linksFileContainsEntries and rssAtBottom:
htmlStr += '<br>' + rssIconStr htmlStr += '<br>' + rssIconStr
return htmlStr return htmlStr
@ -5887,7 +5889,8 @@ def getRightColumnContent(baseDir: str, nickname: str, domainFull: str,
def htmlLinksMobile(cssCache: {}, baseDir: str, def htmlLinksMobile(cssCache: {}, baseDir: str,
nickname: str, domainFull: str, nickname: str, domainFull: str,
httpPrefix: str, translate, httpPrefix: str, translate,
timelinePath: str, authorized: bool) -> str: timelinePath: str, authorized: bool,
rssIconAtTop: bool) -> str:
"""Show the left column links within mobile view """Show the left column links within mobile view
""" """
htmlStr = '' htmlStr = ''
@ -5923,7 +5926,8 @@ def htmlLinksMobile(cssCache: {}, baseDir: str,
getLeftColumnContent(baseDir, nickname, domainFull, getLeftColumnContent(baseDir, nickname, domainFull,
httpPrefix, translate, httpPrefix, translate,
iconsDir, editor, iconsDir, editor,
False, timelinePath, True, False) False, timelinePath,
rssIconAtTop, False)
htmlStr += '</div>\n' + htmlFooter() htmlStr += '</div>\n' + htmlFooter()
return htmlStr return htmlStr
@ -5935,7 +5939,8 @@ def htmlNewswireMobile(cssCache: {}, baseDir: str, nickname: str,
positiveVoting: bool, positiveVoting: bool,
timelinePath: str, timelinePath: str,
showPublishAsIcon: bool, showPublishAsIcon: bool,
authorized: bool) -> str: authorized: bool,
rssIconAtTop: bool) -> str:
"""Shows the mobile version of the newswire right column """Shows the mobile version of the newswire right column
""" """
htmlStr = '' htmlStr = ''
@ -5980,7 +5985,7 @@ def htmlNewswireMobile(cssCache: {}, baseDir: str, nickname: str,
iconsDir, moderator, editor, iconsDir, moderator, editor,
newswire, positiveVoting, newswire, positiveVoting,
False, timelinePath, showPublishButton, False, timelinePath, showPublishButton,
showPublishAsIcon, True, False, showPublishAsIcon, rssIconAtTop, False,
authorized, False) authorized, False)
htmlStr += htmlFooter() htmlStr += htmlFooter()
return htmlStr return htmlStr