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

Newlines for readability

merge-requests/30/head
Bob Mottram 2020-09-19 10:44:22 +01:00
parent df43bc988f
commit 3472e63e9d
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
webinterface.py
View File

@ -524,20 +524,20 @@ def htmlSearchSharedItems(translate: {},
break break
if matched: if matched:
if currPage == pageNumber: if currPage == pageNumber:
sharedItemsForm += '<div class="container">' sharedItemsForm += '<div class="container">\n'
sharedItemsForm += \ sharedItemsForm += \
'<p class="share-title">' + \ '<p class="share-title">' + \
sharedItem['displayName'] + '</p>' sharedItem['displayName'] + '</p>\n'
if sharedItem.get('imageUrl'): if sharedItem.get('imageUrl'):
sharedItemsForm += \ sharedItemsForm += \
'<a href="' + \ '<a href="' + \
sharedItem['imageUrl'] + '">' sharedItem['imageUrl'] + '">\n'
sharedItemsForm += \ sharedItemsForm += \
'<img loading="lazy" src="' + \ '<img loading="lazy" src="' + \
sharedItem['imageUrl'] + \ sharedItem['imageUrl'] + \
'" alt="Item image"></a>' '" alt="Item image"></a>\n'
sharedItemsForm += \ sharedItemsForm += \
'<p>' + sharedItem['summary'] + '</p>' '<p>' + sharedItem['summary'] + '</p>\n'
sharedItemsForm += \ sharedItemsForm += \
'<p><b>' + translate['Type'] + \ '<p><b>' + translate['Type'] + \
':</b> ' + sharedItem['itemType'] + ' ' ':</b> ' + sharedItem['itemType'] + ' '
@ -546,7 +546,7 @@ def htmlSearchSharedItems(translate: {},
':</b> ' + sharedItem['category'] + ' ' ':</b> ' + sharedItem['category'] + ' '
sharedItemsForm += \ sharedItemsForm += \
'<b>' + translate['Location'] + \ '<b>' + translate['Location'] + \
':</b> ' + sharedItem['location'] + '</p>' ':</b> ' + sharedItem['location'] + '</p>\n'
contactActor = \ contactActor = \
httpPrefix + '://' + domainFull + \ httpPrefix + '://' + domainFull + \
'/users/' + contactNickname '/users/' + contactNickname
@ -556,13 +556,13 @@ def htmlSearchSharedItems(translate: {},
sharedItem['displayName'] + \ sharedItem['displayName'] + \
'?mention=' + contactActor + \ '?mention=' + contactActor + \
'"><button class="button">' + \ '"><button class="button">' + \
translate['Contact'] + '</button></a>' translate['Contact'] + '</button></a>\n'
if actor.endswith('/users/' + contactNickname): if actor.endswith('/users/' + contactNickname):
sharedItemsForm += \ sharedItemsForm += \
' <a href="' + actor + '?rmshare=' + \ ' <a href="' + actor + '?rmshare=' + \
name + '"><button class="button">' + \ name + '"><button class="button">' + \
translate['Remove'] + '</button></a>' translate['Remove'] + '</button></a>\n'
sharedItemsForm += '</p></div>' sharedItemsForm += '</p></div>\n'
if not resultsExist and currPage > 1: if not resultsExist and currPage > 1:
postActor = \ postActor = \
getAltPath(actor, domainFull, getAltPath(actor, domainFull,
@ -572,26 +572,26 @@ def htmlSearchSharedItems(translate: {},
'<form method="POST" action="' + \ '<form method="POST" action="' + \
postActor + \ postActor + \
'/searchhandle?page=' + \ '/searchhandle?page=' + \
str(pageNumber - 1) + '">' str(pageNumber - 1) + '">\n'
sharedItemsForm += \ sharedItemsForm += \
' <input type="hidden" ' + \ ' <input type="hidden" ' + \
'name="actor" value="' + actor + '">' 'name="actor" value="' + actor + '">\n'
sharedItemsForm += \ sharedItemsForm += \
' <input type="hidden" ' + \ ' <input type="hidden" ' + \
'name="searchtext" value="' + \ 'name="searchtext" value="' + \
searchStrLower + '"><br>' searchStrLower + '"><br>\n'
sharedItemsForm += \ sharedItemsForm += \
' <center><a href="' + actor + \ ' <center><a href="' + actor + \
'" type="submit" name="submitSearch">' '" type="submit" name="submitSearch">\n'
sharedItemsForm += \ sharedItemsForm += \
' <img loading="lazy" ' + \ ' <img loading="lazy" ' + \
'class="pageicon" src="/' + iconsDir + \ 'class="pageicon" src="/' + iconsDir + \
'/pageup.png" title="' + \ '/pageup.png" title="' + \
translate['Page up'] + \ translate['Page up'] + \
'" alt="' + translate['Page up'] + \ '" alt="' + translate['Page up'] + \
'"/></a>' '"/></a>\n'
sharedItemsForm += ' </center>' sharedItemsForm += ' </center>\n'
sharedItemsForm += '</form>' sharedItemsForm += '</form>\n'
resultsExist = True resultsExist = True
ctr += 1 ctr += 1
if ctr >= resultsPerPage: if ctr >= resultsPerPage:
@ -605,31 +605,31 @@ def htmlSearchSharedItems(translate: {},
'<form method="POST" action="' + \ '<form method="POST" action="' + \
postActor + \ postActor + \
'/searchhandle?page=' + \ '/searchhandle?page=' + \
str(pageNumber + 1) + '">' str(pageNumber + 1) + '">\n'
sharedItemsForm += \ sharedItemsForm += \
' <input type="hidden" ' + \ ' <input type="hidden" ' + \
'name="actor" value="' + actor + '">' 'name="actor" value="' + actor + '">\n'
sharedItemsForm += \ sharedItemsForm += \
' <input type="hidden" ' + \ ' <input type="hidden" ' + \
'name="searchtext" value="' + \ 'name="searchtext" value="' + \
searchStrLower + '"><br>' searchStrLower + '"><br>\n'
sharedItemsForm += \ sharedItemsForm += \
' <center><a href="' + actor + \ ' <center><a href="' + actor + \
'" type="submit" name="submitSearch">' '" type="submit" name="submitSearch">\n'
sharedItemsForm += \ sharedItemsForm += \
' <img loading="lazy" ' + \ ' <img loading="lazy" ' + \
'class="pageicon" src="/' + iconsDir + \ 'class="pageicon" src="/' + iconsDir + \
'/pagedown.png" title="' + \ '/pagedown.png" title="' + \
translate['Page down'] + \ translate['Page down'] + \
'" alt="' + translate['Page down'] + \ '" alt="' + translate['Page down'] + \
'"/></a>' '"/></a>\n'
sharedItemsForm += ' </center>' sharedItemsForm += ' </center>\n'
sharedItemsForm += '</form>' sharedItemsForm += '</form>\n'
break break
ctr = 0 ctr = 0
if not resultsExist: if not resultsExist:
sharedItemsForm += \ sharedItemsForm += \
'<center><h5>' + translate['No results'] + '</h5></center>' '<center><h5>' + translate['No results'] + '</h5></center>\n'
sharedItemsForm += htmlFooter() sharedItemsForm += htmlFooter()
return sharedItemsForm return sharedItemsForm
@ -1913,7 +1913,7 @@ def htmlNewPost(mediaInstance: bool, translate: {},
' <a href="' + inReplyTo + '">' + \ ' <a href="' + inReplyTo + '">' + \
translate['this post'] + '</a></p>\n' translate['this post'] + '</a></p>\n'
replyStr = '<input type="hidden" ' + \ replyStr = '<input type="hidden" ' + \
'name="replyTo" value="' + inReplyTo + '">' 'name="replyTo" value="' + inReplyTo + '">\n'
# if replying to a non-public post then also make # if replying to a non-public post then also make
# this post non-public # this post non-public
@ -6199,7 +6199,7 @@ def htmlPersonOptions(translate: {}, baseDir: str,
if optionsLink: if optionsLink:
optionsLinkStr = \ optionsLinkStr = \
' <input type="hidden" name="postUrl" value="' + \ ' <input type="hidden" name="postUrl" value="' + \
optionsLink + '">' optionsLink + '">\n'
cssFilename = baseDir + '/epicyon-options.css' cssFilename = baseDir + '/epicyon-options.css'
if os.path.isfile(baseDir + '/options.css'): if os.path.isfile(baseDir + '/options.css'):
cssFilename = baseDir + '/options.css' cssFilename = baseDir + '/options.css'