Page up and down buttons

merge-requests/30/head
Bob Mottram 2021-07-27 11:05:57 +01:00
parent af4bff1f72
commit ae917d3bba
1 changed files with 23 additions and 36 deletions

View File

@ -169,16 +169,25 @@ def _htmlSearchResultShare(sharedItem: {}, translate: {},
return sharedItemsForm return sharedItemsForm
def _htmlSearchResultSharePrev(actor: str, domainFull: str, def _htmlSearchResultSharePage(actor: str, domainFull: str,
callingDomain: str, pageNumber: int, callingDomain: str, pageNumber: int,
searchStrLower: str, translate: {}) -> str: searchStrLower: str, translate: {},
previous: bool) -> str:
"""Returns the html for the previous button on shared items search results """Returns the html for the previous button on shared items search results
""" """
postActor = getAltPath(actor, domainFull, callingDomain) postActor = getAltPath(actor, domainFull, callingDomain)
# previous page link, needs to be a POST # previous page link, needs to be a POST
if previous:
pageNumber -= 1
titleStr = translate['Page up']
imageUrl = 'pageup.png'
else:
pageNumber += 1
titleStr = translate['Page down']
imageUrl = 'pagedown.png'
sharedItemsForm = \ sharedItemsForm = \
'<form method="POST" action="' + postActor + '/searchhandle?page=' + \ '<form method="POST" action="' + postActor + '/searchhandle?page=' + \
str(pageNumber - 1) + '">\n' str(pageNumber) + '">\n'
sharedItemsForm += \ sharedItemsForm += \
' <input type="hidden" ' + 'name="actor" value="' + actor + '">\n' ' <input type="hidden" ' + 'name="actor" value="' + actor + '">\n'
sharedItemsForm += \ sharedItemsForm += \
@ -189,8 +198,8 @@ def _htmlSearchResultSharePrev(actor: str, domainFull: str,
'" type="submit" name="submitSearch">\n' '" type="submit" name="submitSearch">\n'
sharedItemsForm += \ sharedItemsForm += \
' <img loading="lazy" ' + 'class="pageicon" src="/icons' + \ ' <img loading="lazy" ' + 'class="pageicon" src="/icons' + \
'/pageup.png" title="' + translate['Page up'] + \ '/' + imageUrl + '" title="' + titleStr + \
'" alt="' + translate['Page up'] + '"/></a>\n' '" alt="' + titleStr + '"/></a>\n'
sharedItemsForm += ' </center>\n' sharedItemsForm += ' </center>\n'
sharedItemsForm += '</form>\n' sharedItemsForm += '</form>\n'
return sharedItemsForm return sharedItemsForm
@ -249,47 +258,25 @@ def htmlSearchSharedItems(cssCache: {}, translate: {},
contactNickname, contactNickname,
name, actor) name, actor)
if not resultsExist and currPage > 1: if not resultsExist and currPage > 1:
# show the previous button # show the previous page button
sharedItemsForm += \ sharedItemsForm += \
_htmlSearchResultSharePrev(actor, domainFull, _htmlSearchResultSharePage(actor, domainFull,
callingDomain, callingDomain,
pageNumber, pageNumber,
searchStrLower, searchStrLower,
translate) translate, True)
resultsExist = True resultsExist = True
ctr += 1 ctr += 1
if ctr >= resultsPerPage: if ctr >= resultsPerPage:
currPage += 1 currPage += 1
if currPage > pageNumber: if currPage > pageNumber:
postActor = \ # show the next page button
getAltPath(actor, domainFull,
callingDomain)
# next page link, needs to be a POST
sharedItemsForm += \ sharedItemsForm += \
'<form method="POST" action="' + \ _htmlSearchResultSharePage(actor, domainFull,
postActor + \ callingDomain,
'/searchhandle?page=' + \ pageNumber,
str(pageNumber + 1) + '">\n' searchStrLower,
sharedItemsForm += \ translate, False)
' <input type="hidden" ' + \
'name="actor" value="' + actor + '">\n'
sharedItemsForm += \
' <input type="hidden" ' + \
'name="searchtext" value="' + \
searchStrLower + '"><br>\n'
sharedItemsForm += \
' <center>\n' + \
' <a href="' + actor + \
'" type="submit" name="submitSearch">\n'
sharedItemsForm += \
' <img loading="lazy" ' + \
'class="pageicon" src="/icons' + \
'/pagedown.png" title="' + \
translate['Page down'] + \
'" alt="' + translate['Page down'] + \
'"/></a>\n'
sharedItemsForm += ' </center>\n'
sharedItemsForm += '</form>\n'
break break
ctr = 0 ctr = 0
break break