forked from indymedia/epicyon
Button on search screen to go back
parent
b8b720ccad
commit
e87f66f62d
|
@ -1674,7 +1674,8 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
self.path=self.path.split('?')[0]
|
||||
# show the search screen
|
||||
msg=htmlSearch(self.server.translate, \
|
||||
self.server.baseDir,self.path).encode()
|
||||
self.server.baseDir,self.path, \
|
||||
self.server.defaultTimeline).encode()
|
||||
self._set_headers('text/html',len(msg),cookie)
|
||||
self._write(msg)
|
||||
self.server.GETbusy=False
|
||||
|
|
|
@ -3808,13 +3808,16 @@ def htmlHashTagSwarm(baseDir: str,actor: str) -> str:
|
|||
return tagSwarmHtml
|
||||
|
||||
def htmlSearch(translate: {}, \
|
||||
baseDir: str,path: str) -> str:
|
||||
baseDir: str,path: str, \
|
||||
defaultTimeline:str) -> str:
|
||||
"""Search called from the timeline icon
|
||||
"""
|
||||
actor=path.replace('/search','')
|
||||
nickname=getNicknameFromActor(actor)
|
||||
domain,port=getDomainFromActor(actor)
|
||||
|
||||
|
||||
backUrl=actor+'/'+defaultTimeline
|
||||
|
||||
if os.path.isfile(baseDir+'/img/search-background.png'):
|
||||
if not os.path.isfile(baseDir+'/accounts/search-background.png'):
|
||||
copyfile(baseDir+'/img/search-background.png',baseDir+'/accounts/search-background.png')
|
||||
|
@ -3832,6 +3835,7 @@ def htmlSearch(translate: {}, \
|
|||
followStr+=' <form method="POST" accept-charset="UTF-8" action="'+actor+'/searchhandle">'
|
||||
followStr+=' <input type="hidden" name="actor" value="'+actor+'">'
|
||||
followStr+=' <input type="text" name="searchtext" autofocus><br>'
|
||||
followStr+=' <a href="'+backUrl+'"><button class="button">'+translate['Go Back']+'</button></a>'
|
||||
followStr+=' <button type="submit" class="button" name="submitSearch">'+translate['Submit']+'</button>'
|
||||
followStr+=' </form>'
|
||||
followStr+=' <p class="hashtagswarm">'+htmlHashTagSwarm(baseDir,actor)+'</p>'
|
||||
|
|
Loading…
Reference in New Issue