indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Show left and right column buttons when there are no entries

merge-requests/30/head
Bob Mottram 2021-11-30 22:28:00 +00:00
parent 7a145a98cc
commit d940238c00
3 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
city.py
View File

@ -334,6 +334,8 @@ def _pointInPolygon(poly: [], x: float, y: float) -> bool:
def pointInNogo(nogo: [], latitude: float, longitude: float) -> bool: def pointInNogo(nogo: [], latitude: float, longitude: float) -> bool:
"""Returns true of the given geolocation is within a nogo area
"""
for polygon in nogo: for polygon in nogo:
if _pointInPolygon(polygon, latitude, longitude): if _pointInPolygon(polygon, latitude, longitude):
return True return True

26
webapp_column_left.py
View File

@ -380,20 +380,18 @@ def htmlLinksMobile(cssCache: {}, baseDir: str,
headerButtonsFrontScreen(translate, nickname, headerButtonsFrontScreen(translate, nickname,
'links', authorized, 'links', authorized,
iconsAsButtons) + '</center>' iconsAsButtons) + '</center>'
if _linksExist(baseDir): htmlStr += \
htmlStr += \ getLeftColumnContent(baseDir, nickname, domainFull,
getLeftColumnContent(baseDir, nickname, domainFull, httpPrefix, translate,
httpPrefix, translate, editor,
editor, False, timelinePath,
False, timelinePath, rssIconAtTop, False, False,
rssIconAtTop, False, False, theme, accessKeys,
theme, accessKeys, sharedItemsFederatedDomains)
sharedItemsFederatedDomains) if editor and not _linksExist(baseDir):
else: htmlStr += '<br><br><br>\n<center>\n '
if editor: htmlStr += translate['Select the edit icon to add web links']
htmlStr += '<br><br><br>\n<center>\n ' htmlStr += '\n</center>\n'
htmlStr += translate['Select the edit icon to add web links']
htmlStr += '\n</center>\n'
# end of col-left-mobile # end of col-left-mobile
htmlStr += '</div>\n' htmlStr += '</div>\n'

30
webapp_column_right.py
View File

@ -494,22 +494,20 @@ def htmlNewswireMobile(cssCache: {}, baseDir: str, nickname: str,
headerButtonsFrontScreen(translate, nickname, headerButtonsFrontScreen(translate, nickname,
'newswire', authorized, 'newswire', authorized,
iconsAsButtons) + '</center>' iconsAsButtons) + '</center>'
if newswire: htmlStr += \
htmlStr += \ getRightColumnContent(baseDir, nickname, domainFull,
getRightColumnContent(baseDir, nickname, domainFull, httpPrefix, translate,
httpPrefix, translate, moderator, editor,
moderator, editor, newswire, positiveVoting,
newswire, positiveVoting, False, timelinePath, showPublishButton,
False, timelinePath, showPublishButton, showPublishAsIcon, rssIconAtTop, False,
showPublishAsIcon, rssIconAtTop, False, authorized, False, theme,
authorized, False, theme, defaultTimeline, accessKeys)
defaultTimeline, accessKeys) if editor and not newswire:
else: htmlStr += '<br><br><br>\n'
if editor: htmlStr += '<center>\n '
htmlStr += '<br><br><br>\n' htmlStr += translate['Select the edit icon to add RSS feeds']
htmlStr += '<center>\n ' htmlStr += '\n</center>\n'
htmlStr += translate['Select the edit icon to add RSS feeds']
htmlStr += '\n</center>\n'
# end of col-right-mobile # end of col-right-mobile
htmlStr += '</div\n>' htmlStr += '</div\n>'