template: add {{nav}} placeholder, separate from {{content}}

This commit is contained in:
blankie 2026-06-14 08:00:57 +00:00
parent 1461c62c91
commit 501d9e1838

View file

@ -34,21 +34,25 @@ ul + .forum-form { margin-top: 1rem; }
.section ul { margin: 0.3rem 0; } .section ul { margin: 0.3rem 0; }
</style>""" </style>"""
DEFAULT_TEMPLATE = "<html>\n<head>\n<meta name=\"referrer\" content=\"no-referrer\">\n<meta http-equiv=\"x-dns-prefetch-control\" content=\"off\">\n" + FORUM_CSS + "</head>\n<body>\n{{content}}\n</body>\n</html>" def _nav_html():
def _default_template():
name = esc(get_setting("site_name", "tinyweb")) name = esc(get_setting("site_name", "tinyweb"))
forum_link = ' | <a href="/forum">forum</a>' if FORUM_ENABLED else "" forum_link = ' | <a href="/forum">forum</a>' if FORUM_ENABLED else ""
return ( return (
'<html>\n<head>\n<meta name="referrer" content="no-referrer">\n<meta http-equiv="x-dns-prefetch-control" content="off">\n'
f'{FORUM_CSS}</head>\n<body>\n'
f'<p><b><a href="/">{name}</a></b>' f'<p><b><a href="/">{name}</a></b>'
' | <a href="/">search</a> | <a href="/pages">browse</a>' ' | <a href="/">search</a> | <a href="/pages">browse</a>'
' | <a href="/tags">tags</a> | <a href="/subscriptions">subscriptions</a>' ' | <a href="/tags">tags</a> | <a href="/subscriptions">subscriptions</a>'
f'{forum_link}' f'{forum_link}'
' | <a href="/style">customize</a> | <a href="/about">about</a></p>\n' ' | <a href="/style">customize</a> | <a href="/about">about</a></p>\n'
"<hr>\n{{content}}\n</body>\n</html>" "<hr>\n"
)
DEFAULT_TEMPLATE = "<html>\n<head>\n<meta name=\"referrer\" content=\"no-referrer\">\n<meta http-equiv=\"x-dns-prefetch-control\" content=\"off\">\n" + FORUM_CSS + "</head>\n<body>\n{{nav}}{{content}}\n</body>\n</html>"
def _default_template():
return (
'<html>\n<head>\n<meta name="referrer" content="no-referrer">\n<meta http-equiv="x-dns-prefetch-control" content="off">\n'
+ FORUM_CSS + '</head>\n<body>\n{{nav}}{{content}}\n</body>\n</html>'
) )
@ -62,6 +66,7 @@ def wrap_page(body_html, use_default=False):
forum_link = ' <a href="/forum">forum</a>' if FORUM_ENABLED else "" forum_link = ' <a href="/forum">forum</a>' if FORUM_ENABLED else ""
template = template.replace("{{forum_link}}", forum_link) template = template.replace("{{forum_link}}", forum_link)
template = template.replace("{{site_name}}", esc(get_setting("site_name", "tinyweb"))) template = template.replace("{{site_name}}", esc(get_setting("site_name", "tinyweb")))
template = template.replace("{{nav}}", _nav_html())
# Inject forum layout CSS into <head> for any template # Inject forum layout CSS into <head> for any template
head_end = "</head>" head_end = "</head>"
if head_end in template and FORUM_CSS not in template: if head_end in template and FORUM_CSS not in template: