From 20fe6e82dd8519f18ae2ffbb3f17fe698c5eb70e Mon Sep 17 00:00:00 2001 From: daudix Date: Tue, 24 Sep 2024 02:24:26 +0300 Subject: [PATCH] Replace "From newest to oldest" with the total amount of posts (fixes #85) --- CHANGELOG.md | 1 + i18n/ar.toml | 1 - i18n/en.toml | 1 - i18n/ms.toml | 1 - i18n/ru.toml | 1 - sass/_article-list.scss | 1 + sass/_tags.scss | 5 +++-- templates/article_list.html | 20 ++++++++++++-------- templates/taxonomy_list.html | 9 +++++---- templates/taxonomy_single.html | 16 +++++++++------- 10 files changed, 31 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb41ad0..ef98c7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- Change "From newest to oldest" in the article list to total amount of posts (#85). - Convert code block header to a flexbox. - Get rid of dashed outline on article hover in article list. - Make comment actions slimmer. diff --git a/i18n/ar.toml b/i18n/ar.toml index 8d5dae8..c338986 100644 --- a/i18n/ar.toml +++ b/i18n/ar.toml @@ -44,7 +44,6 @@ load_comments = "تحميل التعليقات" loading = "التحميل" many_minutes_read = "$NUMBER دقائق القراءة" minutes_read = "$NUMBER دقائق القراءة" -newest_to_oldest = "من الأحدث إلى الأقدم" next = "التالي" no_comments = "لا توجد تعليقات حتى الآن :/" note = "ملاحظة" diff --git a/i18n/en.toml b/i18n/en.toml index e0523ef..8055364 100644 --- a/i18n/en.toml +++ b/i18n/en.toml @@ -46,7 +46,6 @@ many_minutes_read = "$NUMBER minutes read" many_posts = "$NUMBER posts in total" many_tags = "$NUMBER tags in total" minutes_read = "$NUMBER minute read" -newest_to_oldest = "From newest to oldest" next = "Next" no_comments = "No Comments yet :/" note = "Note" diff --git a/i18n/ms.toml b/i18n/ms.toml index 90bdf44..fbd5498 100644 --- a/i18n/ms.toml +++ b/i18n/ms.toml @@ -46,7 +46,6 @@ many_minutes_read = "$NUMBER minit membaca" many_posts = "$NUMBER siaran kesemuanya" many_tags = "$NUMBER tag kesemuanya" minutes_read = "$NUMBER minit membaca" -newest_to_oldest = "Dari terkini hingga tertua" next = "Seterusnya" no_comments = "Tiada komen lagi :/" note = "Nota" diff --git a/i18n/ru.toml b/i18n/ru.toml index c650ae9..eb58ff4 100644 --- a/i18n/ru.toml +++ b/i18n/ru.toml @@ -53,7 +53,6 @@ many_minutes_read = "$NUMBER минуты чтения" many_posts = "Всего $NUMBER постов" many_tags = "Всего $NUMBER тегов" minutes_read = "$NUMBER минута чтения" -newest_to_oldest = "От новейшего к старейшему" next = "Следующий" no_comments = "Комментариев пока нет :/" note = "Заметьте" diff --git a/sass/_article-list.scss b/sass/_article-list.scss index 4dbfd53..ab44361 100644 --- a/sass/_article-list.scss +++ b/sass/_article-list.scss @@ -50,6 +50,7 @@ .tags { justify-content: flex-end; + margin: 0; a { background-color: var(--accent-color-alpha); diff --git a/sass/_tags.scss b/sass/_tags.scss index 65cc639..686e65c 100644 --- a/sass/_tags.scss +++ b/sass/_tags.scss @@ -1,13 +1,14 @@ .tags { - display: inline-flex; + display: flex; flex-wrap: wrap; gap: 0.25rem; margin: 0; + margin-block-start: 2rem; padding: 0; list-style: none; li { - display: inline-flex; + display: flex; transition: var(--transition); margin: 0; padding: 0; diff --git a/templates/article_list.html b/templates/article_list.html index d82222d..46cc1c4 100644 --- a/templates/article_list.html +++ b/templates/article_list.html @@ -3,22 +3,26 @@ {% block content %} {%- set date_format = macros_translate::translate(key="date_format", default="%B %d, %Y", language_strings=language_strings) -%} {%- set date_locale = macros_translate::translate(key="date_locale", default="en_US", language_strings=language_strings) -%} + +{%- if paginator.pages -%} + {%- set number_of_posts = paginator.total_pages -%} +{%- elif section.pages -%} + {%- set number_of_posts = section.pages | length -%} +{%- endif -%} +

{{ section.title }}

{{ section.content | safe }}

- {%- if config.taxonomies | length > 0 -%} - + + {%- if config.taxonomies | length > 0 -%} {{ macros_translate::translate(key="filter_by_tag", default="Filter by tag", language_strings=language_strings) }} - -
- {%- endif %} - - - {{ macros_translate::translate(key="newest_to_oldest", default="From newest to oldest", language_strings=language_strings) }} ↓ +
+ {%- endif %} + {{ macros_translate::translate(key="posts", number=number_of_posts, default="$NUMBER posts", language_strings=language_strings) }}

diff --git a/templates/taxonomy_list.html b/templates/taxonomy_list.html index b3ce39a..257bf8f 100644 --- a/templates/taxonomy_list.html +++ b/templates/taxonomy_list.html @@ -3,10 +3,11 @@ {% block content %} {%- set number_of_tags = terms | length -%}

{{ macros_translate::translate(key="tags_title", default="Tags", language_strings=language_strings) }}

-{{ macros_translate::translate(key="tags", number=number_of_tags, default="$NUMBER tags", language_strings=language_strings) }} - -
-
+ +

+ {{ macros_translate::translate(key="tags", number=number_of_tags, default="$NUMBER tags", language_strings=language_strings) }} +

+