mirror of https://gitlab.com/bashrc2/epicyon
parent
9ff712a039
commit
acd85cc3c2
|
@ -3589,11 +3589,7 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
base_dir,
|
||||
users_path,
|
||||
options_actor,
|
||||
options_avatar_url,
|
||||
chooser_nickname,
|
||||
domain, self.server.theme_name,
|
||||
self.server.default_timeline,
|
||||
self.server.access_keys).encode('utf-8')
|
||||
options_avatar_url).encode('utf-8')
|
||||
msglen = len(msg)
|
||||
self._set_headers('text/html', msglen,
|
||||
cookie, calling_domain, False)
|
||||
|
|
|
@ -18,7 +18,6 @@ from utils import get_config_param
|
|||
from utils import get_alt_path
|
||||
from utils import acct_dir
|
||||
from utils import get_account_timezone
|
||||
from webapp_utils import get_banner_file
|
||||
from webapp_utils import set_custom_background
|
||||
from webapp_utils import html_header_with_external_style
|
||||
from webapp_utils import html_footer
|
||||
|
@ -351,19 +350,13 @@ def html_confirm_unblock(translate: {}, base_dir: str,
|
|||
def html_confirm_block(translate: {}, base_dir: str,
|
||||
origin_path_str: str,
|
||||
block_actor: str,
|
||||
block_profile_url: str,
|
||||
nickname: str, domain: str, theme: str,
|
||||
default_timeline: str,
|
||||
access_keys: {}) -> str:
|
||||
block_profile_url: str) -> str:
|
||||
"""Asks to confirm blocking an actor
|
||||
"""
|
||||
block_domain, _ = get_domain_from_actor(block_actor)
|
||||
|
||||
set_custom_background(base_dir, 'block-background', 'follow-background')
|
||||
|
||||
banner_file, _ = \
|
||||
get_banner_file(base_dir, nickname, domain, theme)
|
||||
|
||||
css_filename = base_dir + '/epicyon-follow.css'
|
||||
if os.path.isfile(base_dir + '/follow.css'):
|
||||
css_filename = base_dir + '/follow.css'
|
||||
|
@ -371,20 +364,6 @@ def html_confirm_block(translate: {}, base_dir: str,
|
|||
instance_title = get_config_param(base_dir, 'instanceTitle')
|
||||
block_str = html_header_with_external_style(css_filename,
|
||||
instance_title, None)
|
||||
|
||||
block_str += \
|
||||
'<header>\n' + \
|
||||
'<a href="/users/' + nickname + '/' + \
|
||||
default_timeline + '" title="' + \
|
||||
translate['Switch to timeline view'] + '" alt="' + \
|
||||
translate['Switch to timeline view'] + '" ' + \
|
||||
'aria-flowto="containerHeader" tabindex="1" accesskey="' + \
|
||||
access_keys['menuProfile'] + '">\n'
|
||||
block_str += '<img loading="lazy" decoding="async" ' + \
|
||||
'class="timeline-banner" alt="" ' + \
|
||||
'src="/users/' + nickname + '/' + banner_file + '" /></a>\n' + \
|
||||
'</header>\n'
|
||||
|
||||
block_str += '<div class="block">\n'
|
||||
block_str += ' <div class="blockAvatar">\n'
|
||||
block_str += ' <center>\n'
|
||||
|
|
Loading…
Reference in New Issue