From dad997e986093298d844cb99ef0595d373ac6185 Mon Sep 17 00:00:00 2001 From: randogoth Date: Wed, 24 May 2023 00:04:11 +0300 Subject: [PATCH] URL bugfix --- README.md | 2 +- theme/templates/authors.mu | 2 +- theme/templates/base.mu | 2 +- theme/templates/categories.mu | 2 +- theme/templates/index.mu | 2 +- theme/templates/pagination.mu | 2 +- theme/templates/period_archives.mu | 2 +- theme/templates/tags.mu | 2 +- theme/templates/translations.mu | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index e622a0c..0e1b801 100644 --- a/README.md +++ b/README.md @@ -100,7 +100,7 @@ will be rendered as: If you want the same settings to be honoured by the templates, they need to be implemented respecively. The settings are accessible by the templates: ```jinja -{{ MICRON_LINK_FORMAT[0] }}`[{{ p.title }}`:/{{ p.url }}]{{ MICRON_LINK_FORMAT[1] }} +{{ MICRON_LINK_FORMAT[0] }}`[{{ p.title }}`:/page/{{ p.url }}]{{ MICRON_LINK_FORMAT[1] }} ``` ## Dynamic Content diff --git a/theme/templates/authors.mu b/theme/templates/authors.mu index c53cf6d..5e4c612 100644 --- a/theme/templates/authors.mu +++ b/theme/templates/authors.mu @@ -3,7 +3,7 @@ >Authors on {{ SITENAME }} {%- for author, articles in authors|sort %} -+ `[{{ author }}`:/{{ author.url }}] ({{ articles|count }}) ++ `[{{ author }}`:/page/{{ author.url }}] ({{ articles|count }}) {% endfor %} {% endblock %} diff --git a/theme/templates/base.mu b/theme/templates/base.mu index dc48ef1..3815b7c 100644 --- a/theme/templates/base.mu +++ b/theme/templates/base.mu @@ -3,7 +3,7 @@ > {% block title %}{{ SITENAME }}{% endblock title %} {% endblock head %} -{% for title, link in MENUITEMS %}`[{{ title }}`{{ link }}]{% endfor %}{% if DISPLAY_PAGES_ON_MENU %}{% for p in PAGES %}`[{{ p.title }}`/{{ p.url }}]{% endfor %}{% else %}{% if DISPLAY_CATEGORIES_ON_MENU %}{% for cat, null in categories %}`[{% if cat == category %}`_{% endif %}{{ cat }}{% if cat == category %}`_{% endif %}`/{{ cat.url }}]{% endfor %}{% endif %}{% endif %} +{% for title, link in MENUITEMS %}`[{{ title }}`{{ link }}]{% endfor %}{% if DISPLAY_PAGES_ON_MENU %}{% for p in PAGES %}`[{{ p.title }}`:/page/{{ p.url }}]{% endfor %}{% endif %} {% block content %} {% endblock %} diff --git a/theme/templates/categories.mu b/theme/templates/categories.mu index 5393ef7..2bfeff1 100644 --- a/theme/templates/categories.mu +++ b/theme/templates/categories.mu @@ -1,6 +1,6 @@ {% extends "base.mu" %} {% block content %} {% for category, articles in categories %} -+ `[{{ category }}`:/{{ category.url }}] ++ `[{{ category }}`:/page/{{ category.url }}] {% endfor %} {% endblock %} diff --git a/theme/templates/index.mu b/theme/templates/index.mu index 84fe50e..dad2c56 100644 --- a/theme/templates/index.mu +++ b/theme/templates/index.mu @@ -3,7 +3,7 @@ {% block content_title %} {% endblock %} {% for article in articles %} -+ [{{ article.locale_date }}] `!`_`[{{ article.title }}`:/{{ article.url }}]`_`! ++ [{{ article.locale_date }}] `!`_`[{{ article.title }}`:/page/{{ article.url }}]`_`! {% endfor %} diff --git a/theme/templates/pagination.mu b/theme/templates/pagination.mu index f2305d9..eda77c6 100644 --- a/theme/templates/pagination.mu +++ b/theme/templates/pagination.mu @@ -1,5 +1,5 @@ {% if DEFAULT_PAGINATION %} - -{% if articles_page.has_previous() %}`[<<`:/{{ articles_previous_page.url }}] {% endif %}Page {{ articles_page.number }} / {{ articles_paginator.num_pages }}{% if articles_page.has_next() %} `[>>`:/{{ articles_next_page.url }}]{% endif %} +{% if articles_page.has_previous() %}`[<<`:/page/{{ articles_previous_page.url }}] {% endif %}Page {{ articles_page.number }} / {{ articles_paginator.num_pages }}{% if articles_page.has_next() %} `[>>`:/page/{{ articles_next_page.url }}]{% endif %} {% endif %} diff --git a/theme/templates/period_archives.mu b/theme/templates/period_archives.mu index c850265..eb0b5b9 100644 --- a/theme/templates/period_archives.mu +++ b/theme/templates/period_archives.mu @@ -4,7 +4,7 @@ {% for article in dates %} +[{{ article.locale_date }}] ->>>>`[`!{{ article.title }}`!`:/{{ article.url }}] +>>>>`[`!{{ article.title }}`!`:/page/{{ article.url }}] >>>>{{ article.summary }} {% endfor %} {% endblock %} diff --git a/theme/templates/tags.mu b/theme/templates/tags.mu index 049641b..04d3e16 100644 --- a/theme/templates/tags.mu +++ b/theme/templates/tags.mu @@ -1,6 +1,6 @@ {% extends "base.mu" %} {% block content %} {% for tag, articles in tags %} -+ `[{{ tag }}`:/{{ tag.url }}] ++ `[{{ tag }}`:/page/{{ tag.url }}] {% endfor %} {% endblock %} diff --git a/theme/templates/translations.mu b/theme/templates/translations.mu index 7bce60d..11d0a09 100644 --- a/theme/templates/translations.mu +++ b/theme/templates/translations.mu @@ -1,7 +1,7 @@ {% macro translations_for(article) %} {% if article.translations %} {% for translation in article.translations %} -`[{{ translation.lang }}`:/{{ translation.url }}] +`[{{ translation.lang }}`:/page/{{ translation.url }}] {% endfor %} {% endif %} {% endmacro %}