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

Banner on skills search screen

merge-requests/30/head
Bob Mottram 2022-09-03 14:21:06 +01:00
parent a0f38af3f3
commit e20954b75b
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
daemon.py
View File

@ -3995,13 +3995,16 @@ class PubServer(BaseHTTPRequestHandler):
break break
# skill search # skill search
search_str = search_str.replace('*', '').strip() search_str = search_str.replace('*', '').strip()
nickname = get_nickname_from_actor(actor_str)
skill_str = \ skill_str = \
html_skills_search(actor_str, html_skills_search(actor_str,
self.server.translate, self.server.translate,
base_dir, base_dir,
search_str, search_str,
self.server.instance_only_skills_search, self.server.instance_only_skills_search,
64) 64, nickname, domain,
self.server.theme_name,
self.server.access_keys)
if skill_str: if skill_str:
msg = skill_str.encode('utf-8') msg = skill_str.encode('utf-8')
msglen = len(msg) msglen = len(msg)

22
webapp_search.py
View File

@ -502,7 +502,9 @@ def html_search(translate: {}, base_dir: str, path: str, domain: str,
def html_skills_search(actor: str, translate: {}, base_dir: str, def html_skills_search(actor: str, translate: {}, base_dir: str,
skillsearch: str, instance_only: bool, skillsearch: str, instance_only: bool,
posts_per_page: int) -> str: posts_per_page: int,
nickname: str, domain: str, theme_name: str,
access_keys: {}) -> str:
"""Show a page containing search results for a skill """Show a page containing search results for a skill
""" """
if skillsearch.startswith('*'): if skillsearch.startswith('*'):
@ -596,6 +598,24 @@ def html_skills_search(actor: str, translate: {}, base_dir: str,
get_config_param(base_dir, 'instanceTitle') get_config_param(base_dir, 'instanceTitle')
skill_search_form = \ skill_search_form = \
html_header_with_external_style(css_filename, instance_title, None) html_header_with_external_style(css_filename, instance_title, None)
# show top banner
if nickname and domain and theme_name:
banner_file, _ = \
get_banner_file(base_dir, nickname, domain, theme_name)
skill_search_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'
skill_search_form += \
'<img loading="lazy" decoding="async" ' + \
'class="timeline-banner" alt="" ' + \
'src="/users/' + nickname + '/' + banner_file + '" /></a>\n' + \
'</header>\n'
skill_search_form += \ skill_search_form += \
'<center><h1><a href = "' + actor + '/search">' + \ '<center><h1><a href = "' + actor + '/search">' + \
translate['Skills search'] + ': ' + \ translate['Skills search'] + ': ' + \