hak8or/blog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix nav active indicator, remove useless default values

Browse Source
This commit is contained in:
daudix
2024-06-16 05:20:06 +03:00
parent 7bb9b19e77
commit 88cf05a654
9 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config.toml
View File

@ -75,7 +75,7 @@ skip_to_content = "Перейти к основному содержанию"
table_of_contents = "Оглавление"
tags = "Теги"
tags_in_total = "тегов в общем"
trigger_warning = "Предупреждение о неожиданности"
trigger_warning = "Предупреждение о Тревоге"
[markdown]
highlight_code = true

18
templates/article.html
View File

@ -11,7 +11,7 @@
</time>
{%- if page.authors %}
<span>•</span>
<span>{{ trans(key="author", lang=lang) | default(value="Author") }}: {{ page.authors[0] }}</span>
<span>{{ trans(key="author", lang=lang) }}: {{ page.authors[0] }}</span>
{%- endif %}
{%- if page.taxonomies %}
{%- for name, taxon in page.taxonomies %}
@ -32,7 +32,7 @@
<div class="statement-container archive">
<strong class="big">
<i class="icon"></i>
{{ trans(key="archived", lang=lang) | default(value="Archived") }}
{{ trans(key="archived", lang=lang) }}
</strong>
{{ page.extra.archive | markdown | safe }}
</div>
@ -42,7 +42,7 @@
<div class="statement-container trigger">
<strong class="big">
<i class="icon"></i>
{{ trans(key="trigger_warning", lang=lang) | default(value="Trigger Warning") }}
{{ trans(key="trigger_warning", lang=lang) }}
</strong>
{{ page.extra.trigger | markdown | safe }}
</div>
@ -52,14 +52,14 @@
<div class="statement-container disclaimer">
<strong class="big">
<i class="icon"></i>
{{ trans(key="disclaimer", lang=lang) | default(value="Disclaimer") }}
{{ trans(key="disclaimer", lang=lang) }}
</strong>
{{ page.extra.disclaimer | markdown | safe }}
</div>
{% endif %}
{% if page.extra.toc %}
<h2>{{ trans(key="table_of_contents", lang=lang) | default(value="Table of Contents") }}</h2>
<h2>{{ trans(key="table_of_contents", lang=lang) }}</h2>
<ul>
{% for h1 in page.toc %}
<li>
@ -90,13 +90,13 @@
<nav id="post-nav">
{% if page.higher %}
<a class="post-nav-item post-nav-prev" href="{{ page.higher.permalink }}">
<div class="nav-arrow">← {{ trans(key="page_previous", lang=lang) | default(value="Previous") }}</div>
<div class="nav-arrow">← {{ trans(key="page_previous", lang=lang) }}</div>
<span class="post-title">{{ page.higher.title }}</span>
</a>
{% endif %}
{% if page.lower %}
<a class="post-nav-item post-nav-next" href="{{ page.lower.permalink }}">
<div class="nav-arrow">{{ trans(key="page_next", lang=lang) | default(value="Next") }} →</div>
<div class="nav-arrow">{{ trans(key="page_next", lang=lang) }} →</div>
<span class="post-title">{{ page.lower.title }}</span>
</a>
{% endif %}
@ -104,9 +104,9 @@
{% endif %}
<div class="dialog-buttons">
<a class="inline-button" href="#top">{{ trans(key="go_to_top", lang=lang) | default(value="Go to Top") }}</a>
<a class="inline-button" href="#top">{{ trans(key="go_to_top", lang=lang) }}</a>
{% if config.extra.issues_url %}
<a class="inline-button colored" href="{{ config.extra.issues_url }}">{{ trans(key="file_an_issue", lang=lang) | default(value="File an Issue") }}</a>
<a class="inline-button colored" href="{{ config.extra.issues_url }}">{{ trans(key="file_an_issue", lang=lang) }}</a>
{% endif %}
</div>
{% endblock content %}

10
templates/article_list.html
View File

@ -6,9 +6,9 @@
{{ section.description | markdown | safe }}
<small>
<a class="link-page" href="{{ get_url(path='tags', lang=lang) }}">{{ trans(key="filter_by_tag", lang=lang) | default(value="Filter by tag") }}</a>
<a class="link-page" href="{{ get_url(path='tags', lang=lang) }}">{{ trans(key="filter_by_tag", lang=lang) }}</a>
<br />
{{ trans(key="newest_to_oldest", lang=lang) | default(value="From newest to oldest") }} ↓
{{ trans(key="newest_to_oldest", lang=lang) }} ↓
</small>
<div id="article-list">
@ -18,13 +18,13 @@
{%- if page.draft %}
<span class="draft-badge">
<i class="icon"></i>
{{ trans(key="drafted", lang=lang) | default(value="Drafted") }}
{{ trans(key="drafted", lang=lang) }}
</span>
{%- endif %}
{%- if page.extra.archive %}
<span class="archive-badge">
<i class="icon"></i>
{{ trans(key="archived", lang=lang) | default(value="Archived") }}
{{ trans(key="archived", lang=lang) }}
</span>
{%- endif %}
{%- if page.description %}
@ -35,7 +35,7 @@
<time datetime="{{ page.date | date(format='%+') }}" pubdate>{{- page.date | date(format=config.extra.date_format) -}}</time>
{%- if page.authors %}
<span>•</span>
<span>{{ trans(key="author", lang=lang) | default(value="Author") }}: {{ page.authors[0] }}</span>
<span>{{ trans(key="author", lang=lang) }}: {{ page.authors[0] }}</span>
{%- endif %}
{%- if page.taxonomies %}
{%- for name, taxon in page.taxonomies %}

2
templates/page.html
View File

@ -5,7 +5,7 @@
<div class="statement-container archive">
<strong class="big">
<i class="icon"></i>
{{ trans(key="archived", lang=lang) | default(value="Archived") }}
{{ trans(key="archived", lang=lang) }}
</strong>
{{ page.extra.archive | markdown | safe }}
</div>

10
templates/partials/comments.html
View File

@ -20,16 +20,16 @@
<img id="qrcode" class="no-hover pixels" alt="QR code to a Mastodon post" src="https://api.qrserver.com/v1/create-qr-code/?data={{ post_url }}&format=gif" />
{% endif %}
<h2>{{ trans(key="comments", lang=lang) | default(value="Comments") }}</h2>
<p>{{ trans(key="comments_description", lang=lang) | default(value="You can comment on this blog post by publicly replying to this post using a Mastodon or other ActivityPub/Fediverse account. Known non-private replies are displayed below.") }}</p>
<h2>{{ trans(key="comments", lang=lang) }}</h2>
<p>{{ trans(key="comments_description", lang=lang) }}</p>
<p>
<a id="load-comments" class="inline-button" onclick="loadComments()" onkeypress="loadComments()" tabindex="0">{{ trans(key="load_comments", lang=lang) | default(value="Load Comments") }}</a>
<a id="load-comments" class="inline-button" onclick="loadComments()" onkeypress="loadComments()" tabindex="0">{{ trans(key="load_comments", lang=lang) }}</a>
</p>
<div id="comments-wrapper">
<noscript>
<p>{{ trans(key="comments_noscript", lang=lang) | default(value="Loading comments relies on JavaScript. Try enabling JavaScript and reloading, or visit the original post on Mastodon.") }}</p>
<p>{{ trans(key="comments_noscript", lang=lang) }}</p>
</noscript>
</div>
<script type="text/javascript">
@ -68,7 +68,7 @@
function loadComments() {
let commentsWrapper = document.getElementById("comments-wrapper");
document.getElementById("load-comments").innerHTML = "{{ trans(key='comments_loading', lang=lang) | default(value='Loading…') }}";
document.getElementById("load-comments").innerHTML = "{{ trans(key='comments_loading', lang=lang) }}";
fetch("https://{{ host }}/api/v1/statuses/{{ id }}/context")
.then(function (response) {
return response.json();

4
templates/partials/footer.html
View File

@ -5,14 +5,14 @@
{% if config.extra.source_url and config.extra.footer.show_source %}
<p>
<a href="{{ config.extra.source_url }}">{{ trans(key='footer_source', lang=lang) | default(value="Website source") }}</a>
<a href="{{ config.extra.source_url }}">{{ trans(key='footer_source', lang=lang) }}</a>
</p>
{% endif %}
{% if config.extra.footer.show_powered_by %}
<p>
<small>
{{ trans(key="footer_powered_by", lang=lang) | default(value="Powered by") }} <a href="https://www.getzola.org">Zola</a> {{ trans(key="footer_powered_by_and", lang=lang) | default(value="and") }} <a href="https://daudix.codeberg.page/duckquill">Duckquill</a>
{{ trans(key="footer_powered_by", lang=lang) }} <a href="https://www.getzola.org">Zola</a> {{ trans(key="footer_powered_by_and", lang=lang) }} <a href="https://daudix.codeberg.page/duckquill">Duckquill</a>
</small>
</p>
{% endif %}

12
templates/partials/nav.html
View File

@ -7,11 +7,11 @@
{% if config.extra.nav.links %}
<header id="site-nav">
<nav>
<a href="#main" id="main-content" tabindex="0">{{ trans(key="skip_to_content", lang=lang) | default(value="Skip to main content") }}</a>
<a href="#main" id="main-content" tabindex="0">{{ trans(key="skip_to_content", lang=lang) }}</a>
<ul>
<li id="home">
<a href="{{ get_url(path='/', lang=lang) }}"
{% if current_url | default(value='/') | trim_end_matches(pat='/') == get_url(path='/') %}
<a href="{{ get_url(path="/", lang=lang) }}"
{% if current_url | default(value="/") | trim_end_matches(pat="/") | safe == get_url(path="/", lang=lang) | trim_end_matches(pat='/') | safe %}
class="active"
{% endif %}>
{{ config.title }}
@ -27,7 +27,7 @@
{%- if link.url is matching('https?://') %}
<li class="link">
<a href="{{ link.url }}"
{% if current_url | default(value='/') == link.url %}
{% if current_url | default(value='/') | trim_end_matches(pat='/') | safe == link.url | trim_end_matches(pat='/') | safe %}
class="active"
{% endif %}>
{{ title }}
@ -36,7 +36,7 @@
{%- else %}
<li class="link">
<a href="{{ get_url(path=link.url, lang=lang)}}"
{% if current_url | default(value='/') == get_url(path=link.url, lang=lang) %}
{% if current_url | default(value='/') | trim_end_matches(pat='/') | safe == get_url(path=link.url, lang=lang) | trim_end_matches(pat='/') | safe %}
class="active"
{% endif %}>
{{ title }}
@ -48,7 +48,7 @@
<li id="feed">
<a href="{{ get_url(path=config.feed_filename) }}">
<i class="icon"></i>
<span>{{ trans(key="feed", lang=lang) | default(value="Feed") }}</span>
<span>{{ trans(key="feed", lang=lang) }}</span>
</a>
</li>
{% endif %}

4
templates/taxonomy_list.html
View File

@ -1,8 +1,8 @@
{% extends "base.html" %}
{% block content %}
<h1>{{ trans(key="tags", lang=lang) | default(value="Tags") }}</h1>
<small>{{ terms | length }} {{ trans(key="tags_in_total", lang=lang) | default(value="tags in total") }}</small>
<h1>{{ trans(key="tags", lang=lang) }}</h1>
<small>{{ terms | length }} {{ trans(key="tags_in_total", lang=lang) }}</small>
<br />
<small>
<ul class="tags">

6
templates/taxonomy_single.html
View File

@ -1,11 +1,11 @@
{% extends "base.html" %}
{% block content %}
<h1>{{ trans(key="posts_with_tag", lang=lang) | default(value="Posts with tag") }} “{{ term.name }}”</h1>
<h1>{{ trans(key="posts_with_tag", lang=lang) }} “{{ term.name }}”</h1>
<small>
<a class="link-page" href="{{ get_url(path='tags', lang=lang) }}">{{ trans(key="see_all_tags", lang=lang) | default(value="See all tags") }}</a>
<a class="link-page" href="{{ get_url(path='tags', lang=lang) }}">{{ trans(key="see_all_tags", lang=lang) }}</a>
<br />
{{ term.pages | length }} {{ trans(key="posts_in_total", lang=lang) | default(value="posts in total") }}
{{ term.pages | length }} {{ trans(key="posts_in_total", lang=lang) }}
</small>
<article>
{% for page in term.pages %}