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

Banner on shared items search screen

merge-requests/30/head
Bob Mottram 2022-09-03 14:43:52 +01:00
parent e20954b75b
commit f585592d7c
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
daemon.py
View File

@ -4379,6 +4379,7 @@ class PubServer(BaseHTTPRequestHandler):
# wanted items search
shared_items_federated_domains = \
self.server.shared_items_federated_domains
nickname = get_nickname_from_actor(actor_str)
wanted_items_str = \
html_search_shared_items(self.server.translate,
base_dir,
@ -4388,7 +4389,9 @@ class PubServer(BaseHTTPRequestHandler):
domain_full,
actor_str, calling_domain,
shared_items_federated_domains,
'wanted')
'wanted', nickname, domain,
self.server.theme_name,
self.server.access_keys)
if wanted_items_str:
msg = wanted_items_str.encode('utf-8')
msglen = len(msg)
@ -4401,6 +4404,7 @@ class PubServer(BaseHTTPRequestHandler):
# shared items search
shared_items_federated_domains = \
self.server.shared_items_federated_domains
nickname = get_nickname_from_actor(actor_str)
shared_items_str = \
html_search_shared_items(self.server.translate,
base_dir,
@ -4410,7 +4414,9 @@ class PubServer(BaseHTTPRequestHandler):
domain_full,
actor_str, calling_domain,
shared_items_federated_domains,
'shares')
'shares', nickname, domain,
self.server.theme_name,
self.server.access_keys)
if shared_items_str:
msg = shared_items_str.encode('utf-8')
msglen = len(msg)

22
webapp_search.py
View File

@ -249,7 +249,9 @@ def html_search_shared_items(translate: {},
domain_full: str, actor: str,
calling_domain: str,
shared_items_federated_domains: [],
shares_file_type: str) -> str:
shares_file_type: str,
nickname: str, domain: str, theme_name: str,
access_keys: {}) -> str:
"""Search results for shared items
"""
curr_page = 1
@ -270,6 +272,24 @@ def html_search_shared_items(translate: {},
title_str = translate['Shared Items Search']
else:
title_str = translate['Wanted Items Search']
# show top banner
if nickname and domain and theme_name:
banner_file, _ = \
get_banner_file(base_dir, nickname, domain, theme_name)
shared_items_form += \
'<header>\n' + \
'<a href="/users/' + nickname + '/search" title="' + \
translate['Search and follow'] + '" alt="' + \
translate['Search and follow'] + '" ' + \
'aria-flowto="containerHeader" tabindex="1" accesskey="' + \
access_keys['menuSearch'] + '">\n'
shared_items_form += \
'<img loading="lazy" decoding="async" ' + \
'class="timeline-banner" alt="" ' + \
'src="/users/' + nickname + '/' + banner_file + '" /></a>\n' + \
'</header>\n'
shared_items_form += \
'<center><h1>' + \
'<a href="' + actor + '/search">' + title_str + '</a></h1></center>'