From a85ae6afb6b71b10c5035aaffdfd220151200378 Mon Sep 17 00:00:00 2001 From: maksim Date: Thu, 3 Jul 2025 18:02:28 +0300 Subject: [PATCH] Andrei | blog module fixes --- .../most-read/component-controller.php | 5 ---- .../most-read/component-template.twig | 28 ------------------- .../cosmopet/templates/blog/blog-archive.twig | 11 ++++++-- .../cosmopet/templates/blog/blog-single.twig | 2 +- .../cosmopet/templates/blog/most-read.twig | 5 ++-- .../cosmopet/templates/blog/themes.twig | 4 +-- 6 files changed, 15 insertions(+), 40 deletions(-) delete mode 100644 wp-content/themes/cosmopet/modules/blog/components/most-read/component-template.twig diff --git a/wp-content/themes/cosmopet/modules/blog/components/most-read/component-controller.php b/wp-content/themes/cosmopet/modules/blog/components/most-read/component-controller.php index 5b1e8fc..1531628 100644 --- a/wp-content/themes/cosmopet/modules/blog/components/most-read/component-controller.php +++ b/wp-content/themes/cosmopet/modules/blog/components/most-read/component-controller.php @@ -34,10 +34,5 @@ add_filter('timber/context', function($context) { $context['current_category'] = $category_name; $context['category_list'] = get_categories(); - // Отладочная информация (опционально) - global $wpdb; - $debug_info = $wpdb->get_results("SELECT post_id, meta_key, meta_value FROM {$wpdb->postmeta} WHERE meta_key = 'post_views_count' LIMIT 5"); - $context['debug_info'] = $debug_info; - return $context; }); \ No newline at end of file diff --git a/wp-content/themes/cosmopet/modules/blog/components/most-read/component-template.twig b/wp-content/themes/cosmopet/modules/blog/components/most-read/component-template.twig deleted file mode 100644 index a0acaff..0000000 --- a/wp-content/themes/cosmopet/modules/blog/components/most-read/component-template.twig +++ /dev/null @@ -1,28 +0,0 @@ -
-

{{ function('pll_e', 'САМЫЕ ЧИТАЕМЫЕ') }}:

- -
- - diff --git a/wp-content/themes/cosmopet/templates/blog/blog-archive.twig b/wp-content/themes/cosmopet/templates/blog/blog-archive.twig index 7599afb..444d085 100644 --- a/wp-content/themes/cosmopet/templates/blog/blog-archive.twig +++ b/wp-content/themes/cosmopet/templates/blog/blog-archive.twig @@ -14,13 +14,20 @@ -
+
{% include '/blog/themes.twig' %} {% include '/blog/most-read.twig' %}
-

{{ function('pll_e', 'ВСЕ СТАТЬИ') }}

+

+ {% if not fn('is_category') %} + {{ function('pll_e', 'ВСЕ СТАТЬИ') }} + {% else %} + {% set term = fn('get_queried_object') %} + {{ term.name }} + {% endif %} +

    {% include '/blog/news-list.twig' %} diff --git a/wp-content/themes/cosmopet/templates/blog/blog-single.twig b/wp-content/themes/cosmopet/templates/blog/blog-single.twig index 05d08fe..52be51a 100644 --- a/wp-content/themes/cosmopet/templates/blog/blog-single.twig +++ b/wp-content/themes/cosmopet/templates/blog/blog-single.twig @@ -7,7 +7,7 @@ diff --git a/wp-content/themes/cosmopet/templates/blog/most-read.twig b/wp-content/themes/cosmopet/templates/blog/most-read.twig index 81c41f7..1e2965d 100644 --- a/wp-content/themes/cosmopet/templates/blog/most-read.twig +++ b/wp-content/themes/cosmopet/templates/blog/most-read.twig @@ -1,5 +1,5 @@ {% set current_path = template_path ~ '/modules/blog/components/most-read' %} - +{% if not fn('is_category') %}

    {{ function('pll_e', 'САМЫЕ ЧИТАЕМЫЕ') }}:

    @@ -47,4 +47,5 @@ {% else %}

    Нет доступных постов для отображения.

    {% endif %} -
    \ No newline at end of file +
+{% endif %} \ No newline at end of file diff --git a/wp-content/themes/cosmopet/templates/blog/themes.twig b/wp-content/themes/cosmopet/templates/blog/themes.twig index 39b3c4b..10c8f20 100644 --- a/wp-content/themes/cosmopet/templates/blog/themes.twig +++ b/wp-content/themes/cosmopet/templates/blog/themes.twig @@ -2,11 +2,11 @@

{{ function('pll_e', 'Темы') }}: