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

Merge pull request 'display taxonomy names other than 'tags,', following config; also, support and display multiple simultaneous taxonomies' (#131) from apisashla/duckquill:main into main

Browse Source 
Reviewed-on: https://codeberg.org/daudix/duckquill/pulls/131
This commit is contained in:
David Lapshin
2025-04-23 00:31:51 +00:00
parent 7157ea479d 5f96530dcf
commit 71c4fd5a8c
5 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
templates/article.html
View File

@ -62,10 +62,12 @@
{%- if page.taxonomies -%}
{%- for name, taxon in page.taxonomies %}
<ul class="tags">
{%-for item in taxon -%}
<li><a class="tag" href="{{ get_taxonomy_url(kind=name, name=item, lang=lang) }}">{{ item }}</a></li>
<a class="tag" href="{{- get_url(path='$TAXON', lang=lang) | replace(from="$TAXON", to=name) | lower -}}">{{ name }}:</a>
{%- for item in taxon -%}
<li><a class="tag" href="{{ get_taxonomy_url(kind=name, name=item, lang=lang) }}">{{ item }}</a></li>
{%- endfor %}
</ul>
<br />
{%- endfor -%}
{%- endif %}
</div>

13
templates/article_list.html
View File

@ -33,12 +33,15 @@
<p>
<small>
{%- if config.taxonomies | length > 0 -%}
<a href="{{ get_url(path='tags', lang=lang) }}">
{{ macros_translate::translate(key="filter_by_tag", default="Filter by tag", language_strings=language_strings) }}
</a>
<br />
{%- for taxon in config.taxonomies -%}
{%- set taxon_name = taxon.name -%}
<a href="{{- get_url(path='$TAXON', lang=lang) | replace(from="$TAXON", to=taxon.name) | lower -}}">
{{ macros_translate::translate(key='filter_by_taxon', default='Filter by $TAXON', language_strings=language_strings) | replace(from="$TAXON", to=taxon.name) }}
</a>
<br />
{%- endfor %}
{%- endif %}
{{ macros_translate::translate(key="posts", number=number_of_posts, default="$NUMBER posts in total", language_strings=language_strings) }}
{{ macros_translate::translate(key='posts', number=number_of_posts, default='$NUMBER posts in total', language_strings=language_strings) }}
</small>
</p>

3
templates/partials/articles.html
View File

@ -53,7 +53,8 @@
{%- for name, taxon in page.taxonomies %}
<small>
<ul class="tags">
{%-for item in taxon -%}
<a class="tag" href="{{- get_url(path='$TAXON', lang=lang) | replace(from="$TAXON", to=name) | lower -}}">{{ name }}:</a>
{%- for item in taxon -%}
<li><a class="tag" href="{{ get_taxonomy_url(kind=name, name=item, lang=lang) }}">{{ item }}</a></li>
{%- endfor %}
</ul>

11
templates/taxonomy_list.html
View File

@ -1,16 +1,17 @@
{% extends "base.html" %}
{% block content %}
{%- set number_of_tags = terms | length -%}
<h1>{{ macros_translate::translate(key="tags_title", default="Tags", language_strings=language_strings) }}</h1>
{%- set number_of_terms = terms | length -%}
{%- set taxon_name = taxonomy.name -%}
<h1>{{- macros_translate::translate(key="tags_title", default="$TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}</h1>
<p>
<small>{{ macros_translate::translate(key="tags", number=number_of_tags, default="$NUMBER tags", language_strings=language_strings) }}</small>
<small>{{- macros_translate::translate(key="tags", number=number_of_terms, default="$NUMBER $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}</small>
</p>
<ul class="tags">
{%- for tag in terms -%}
<li><a href="{{ current_url }}{{ tag.slug }}"><span class="tag">{{ tag.name }}</span><span class="count">{{ tag.pages | length }}</span></a></li>
{%- for term in terms -%}
<li><a href="{{ current_url }}{{ term.slug }}"><span class="tag">{{ term.name }}</span><span class="count">{{ term.pages | length }}</span></a></li>
{%- endfor -%}
</ul>
{% endblock content %}

9
templates/taxonomy_single.html
View File

@ -5,19 +5,20 @@
{%- set date_locale = macros_translate::translate(key="date_locale", default="en_US", language_strings=language_strings) -%}
{%- set number_of_posts = term.pages | length -%}
{%- set taxon_name = taxonomy.name -%}
{%- set term_name = "“" ~ term.name ~ "”" -%}
<h1>
{{- macros_translate::translate(key="posts_with_tag", default="Posts with tag $TAG", language_strings=language_strings) | replace(from="$TAG", to=term_name) -}}
{{- macros_translate::translate(key='posts_with_taxon', default='Posts with $TAXON $TERM', language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) | replace(from="$TERM", to=term_name) -}}
<a href="{{ current_url ~ 'atom.xml' }}"><i class="icon feed"></i></a>
</h1>
<p>
<small>
<a href="{{ get_url(path='tags', lang=lang) }}">
{{ macros_translate::translate(key="all_tags", default="See all tags", language_strings=language_strings) }}
<a href="{{- get_url(path='$TAXON', lang=lang) | replace(from="$TAXON", to=taxon_name) | lower -}}">
{{- macros_translate::translate(key="all_taxa", default="See all $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}
</a>
<br />
{{ macros_translate::translate(key="posts", number=number_of_posts, default="$NUMBER posts", language_strings=language_strings) }}
{{ macros_translate::translate(key='posts', number=number_of_posts, default='$NUMBER posts', language_strings=language_strings) }}
</small>
</p>