From f585592d7c70f58577bb0e089c72728eeb4671a0 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 3 Sep 2022 14:43:52 +0100 Subject: [PATCH] Banner on shared items search screen --- daemon.py | 10 ++++++++-- webapp_search.py | 22 +++++++++++++++++++++- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/daemon.py b/daemon.py index 1719d6242..1647cd26b 100644 --- a/daemon.py +++ b/daemon.py @@ -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) diff --git a/webapp_search.py b/webapp_search.py index 48cbee0ae..e4fd17867 100644 --- a/webapp_search.py +++ b/webapp_search.py @@ -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 += \ + '
\n' + \ + '\n' + shared_items_form += \ + '\n' + \ + '
\n' + shared_items_form += \ '

' + \ '' + title_str + '

'