From 009f8e40c25e4e47a6303fb575ca295f8b6e30c9 Mon Sep 17 00:00:00 2001 From: argoexpert press Date: Fri, 24 May 2024 21:37:57 +0300 Subject: [PATCH] add folder EN --- category-en.php | 6 +- en/category-en-sub.php | 24 ++++ en/category-menu-en.php | 35 ++++++ en/category-menu-for-category-en.php | 36 ++++++ en/content-post-en.php | 20 ++++ en/latest-legislation-posts-en.php | 28 +++++ {partials => en}/mainmenu-en.php | 0 en/most-read-posts-en.php | 46 ++++++++ en/pinned-post-en.php | 25 ++++ en/pinned-post-mob-en.php | 25 ++++ en/post-list-en.php | 23 ++++ en/related-posts-en.php | 33 ++++++ footer-en.php | 18 ++- functions.php | 168 ++++++++++++++++++--------- header-en.php | 20 ++-- page-contacts.php | 122 +++++++++++++++++++ partials/most-read-posts.php | 33 +++++- partials/pinned-post-mob.php | 2 +- partials/pinned-post.php | 2 +- sidebar-left-en.php | 39 +++++++ sidebar-right-en.php | 27 +++++ single-en.php | 80 +++++++++++++ 22 files changed, 732 insertions(+), 80 deletions(-) create mode 100644 en/category-en-sub.php create mode 100644 en/category-menu-en.php create mode 100644 en/category-menu-for-category-en.php create mode 100644 en/content-post-en.php create mode 100644 en/latest-legislation-posts-en.php rename {partials => en}/mainmenu-en.php (100%) create mode 100644 en/most-read-posts-en.php create mode 100644 en/pinned-post-en.php create mode 100644 en/pinned-post-mob-en.php create mode 100644 en/post-list-en.php create mode 100644 en/related-posts-en.php create mode 100644 page-contacts.php create mode 100644 sidebar-left-en.php create mode 100644 sidebar-right-en.php create mode 100644 single-en.php diff --git a/category-en.php b/category-en.php index b91d623..b85c2c1 100644 --- a/category-en.php +++ b/category-en.php @@ -1,7 +1,7 @@
- +
'date', // сортировка по дате 'order' => 'DESC', // по убыванию (сначала новые) 'ignore_sticky_posts' => 1, - 'cat' => get_expression_en() + 'cat' => EN_PARTS ); $query = new WP_Query($args); ?> - false, 'query' => $query]); ?> + false, 'query' => $query]); ?>
diff --git a/en/category-en-sub.php b/en/category-en-sub.php new file mode 100644 index 0000000..cd23b07 --- /dev/null +++ b/en/category-en-sub.php @@ -0,0 +1,24 @@ + +
+ +
+ +

name ?>

+ +
+
+ 'post', + 'posts_per_page' => 5, + 'paged' => $paged, + 'category__in' => get_queried_object_id() + ); + $query = new WP_Query($args); + ?> + $query]); ?> +
+ +
+ \ No newline at end of file diff --git a/en/category-menu-en.php b/en/category-menu-en.php new file mode 100644 index 0000000..1745957 --- /dev/null +++ b/en/category-menu-en.php @@ -0,0 +1,35 @@ + EN_PARTS, + 'orderby' => 'name', + 'order' => 'ASC', + 'hide_empty' => false +)); + + +$firstElement = array_shift($categories); +array_push($categories, $firstElement); + +foreach ($categories as $category) { + if ($category->slug === 'uncategorized') continue; + + $icon = get_field('icon', 'category_' . $category->term_id); + $bg_image = get_field('bg_image', 'category_' . $category->term_id); + $category_link = get_category_link($category->term_id); +?> + +
+ + <?php echo esc_attr($category->name); ?> + +
+
+ + <?php echo esc_attr($category->name); ?> + +
+ name); ?> + + \ No newline at end of file diff --git a/en/category-menu-for-category-en.php b/en/category-menu-for-category-en.php new file mode 100644 index 0000000..3a1b2fb --- /dev/null +++ b/en/category-menu-for-category-en.php @@ -0,0 +1,36 @@ + EN_PARTS, + 'taxonomy' => 'category', + 'orderby' => 'ID', + 'order' => 'ASC', + 'hide_empty' => false +); +$categories = get_categories($arg_cat); +$current_term = get_queried_object(); + +// Получаем ID текущей категории или категорий поста +$current_term_ids = []; +if (is_single()) { + $current_term_ids = wp_get_post_categories($current_term->ID); +} elseif (is_category()) { + $current_term_ids[] = $current_term->term_id; +} + +$firstElement = array_shift($categories); +array_push($categories, $firstElement); + + foreach ($categories ?? [] as $cat) { + if ($cat->slug === 'uncategorized') continue; + $icon = get_field('icon', 'category_' . $cat->term_id); + $bg_image = get_field('bg_image', 'category_' . $cat->term_id); + + $class = in_array($cat->term_id, $current_term_ids) ? 'is-active' : ''; + + echo " + + $cat->name + + "; + } diff --git a/en/content-post-en.php b/en/content-post-en.php new file mode 100644 index 0000000..ed2dd1d --- /dev/null +++ b/en/content-post-en.php @@ -0,0 +1,20 @@ + +
+ + +
+ +
+
+ +
+ + +

+ +
+
\ No newline at end of file diff --git a/en/latest-legislation-posts-en.php b/en/latest-legislation-posts-en.php new file mode 100644 index 0000000..d1a5fd8 --- /dev/null +++ b/en/latest-legislation-posts-en.php @@ -0,0 +1,28 @@ +
+

Regulation

+
+ 'regulation', // Slug категории + 'posts_per_page' => 3, // Количество постов + 'orderby' => 'date', // Сортировка по дате + 'order' => 'DESC' // В порядке убывания (самые свежие) + ); + + $legislation_posts = new WP_Query($args); + + if ($legislation_posts->have_posts()) { + while ($legislation_posts->have_posts()) { + $legislation_posts->the_post(); + + echo '
+ ' . get_the_title() . ' +
'; + } + wp_reset_postdata(); + } else { + echo '

Посты в категории "законодательство" не найдены.

'; + } + ?> +
+
\ No newline at end of file diff --git a/partials/mainmenu-en.php b/en/mainmenu-en.php similarity index 100% rename from partials/mainmenu-en.php rename to en/mainmenu-en.php diff --git a/en/most-read-posts-en.php b/en/most-read-posts-en.php new file mode 100644 index 0000000..4d5d440 --- /dev/null +++ b/en/most-read-posts-en.php @@ -0,0 +1,46 @@ +prepare(" + SELECT DISTINCT p.ID, p.post_title, p.post_content, m.meta_value AS top_participation_position + FROM $wpdb->posts p + INNER JOIN $wpdb->postmeta m ON p.ID = m.post_id + LEFT JOIN $wpdb->term_relationships tr ON p.ID = tr.object_id + LEFT JOIN $wpdb->term_taxonomy tt ON tr.term_taxonomy_id = tt.term_taxonomy_id + WHERE p.post_type = 'post' + AND m.meta_key = 'top_participation_position' + AND m.meta_value != '' + AND tt.term_id IN ($included_category_ids_in) + ORDER BY CAST(m.meta_value AS UNSIGNED) ASC +"); + + +$top_posts = $wpdb->get_results($query); + +// Вывод результатов +if (!empty($top_posts)) { + foreach ($top_posts as $post) { + $permalink = get_permalink($post->ID); + $title = get_the_title($post->ID); +?> +
+ + + +
+Нет просмотренных постов.

'; +} +?> \ No newline at end of file diff --git a/en/pinned-post-en.php b/en/pinned-post-en.php new file mode 100644 index 0000000..de8a9d9 --- /dev/null +++ b/en/pinned-post-en.php @@ -0,0 +1,25 @@ + + + +
+ ID); ?> +
+ +
+

+ ID); ?> +

+

+ ID); ?> +

+
+
+ + + \ No newline at end of file diff --git a/en/pinned-post-mob-en.php b/en/pinned-post-mob-en.php new file mode 100644 index 0000000..86db508 --- /dev/null +++ b/en/pinned-post-mob-en.php @@ -0,0 +1,25 @@ +ID; +?> + +
Top
+ +
+ + + + ID ); ?> +
ID) );?>
+ +
+ ID); ?> +

ID); ?>

+
+ +
+ + \ No newline at end of file diff --git a/en/post-list-en.php b/en/post-list-en.php new file mode 100644 index 0000000..1b8dc30 --- /dev/null +++ b/en/post-list-en.php @@ -0,0 +1,23 @@ +have_posts()) { + while ($query->have_posts()) { + $post_count++; + $query->the_post(); + get_template_part('en/content', 'post-en', ['full_width' => $post_count === 1 && $large_first_image]); + if ($post_count === ($large_first_image ? 5 : 4)) : ?> + + + + \ No newline at end of file diff --git a/en/related-posts-en.php b/en/related-posts-en.php new file mode 100644 index 0000000..acf95e6 --- /dev/null +++ b/en/related-posts-en.php @@ -0,0 +1,33 @@ +term_id; + }, $categories); + + $args = array( + 'category__in' => $category_ids, + 'post__not_in' => array($current_post_id), + 'posts_per_page' => 4, + ); + + $related_posts_query = new WP_Query($args); + + if ($related_posts_query->have_posts()) { + + echo '
Read also:
'; + echo '
'; + + while ($related_posts_query->have_posts()) { + $related_posts_query->the_post(); + get_template_part('en/content', 'post-en'); + } + + echo '
'; + wp_reset_postdata(); + } +} +?> \ No newline at end of file diff --git a/footer-en.php b/footer-en.php index f6e2090..0cc51c1 100644 --- a/footer-en.php +++ b/footer-en.php @@ -1,7 +1,7 @@
- +
@@ -17,11 +17,11 @@ agroexpert.press
- Наверх + Up @@ -34,14 +34,20 @@
-
- +
- + url).'" class="footer-bottom__text footer-bottom__link" traget="_blank">'.esc_html($item->title).''; + } + + ?>
diff --git a/functions.php b/functions.php index 1c81834..b7d685a 100644 --- a/functions.php +++ b/functions.php @@ -1,6 +1,10 @@ $sticky_posts, + 'posts_per_page' => -1, // Получаем все закрепленные посты + 'ignore_sticky_posts' => 1, // Игнорируем параметры отображения закрепленных постов + ); + + $posts = get_posts($args); + + // Получаем ID всех подрубрик рубрики + $category_ids = get_term_children($category_id, 'category'); + $category_ids[] = $category_id; // Включаем основную рубрику + + // Фильтрация постов по категории и её подрубрикам + $filtered_posts = array_filter($posts, function($post) use ($category_ids) { + $post_categories = wp_get_post_categories($post->ID); + return array_intersect($post_categories, $category_ids); + }); + + if (empty($filtered_posts)) { + return null; + } + + // Сортировка постов по дате в обратном порядке + usort($filtered_posts, function($a, $b) { + return strtotime($b->post_date) - strtotime($a->post_date); + }); + + // Возвращаем самый последний пост + return $filtered_posts[0]; +} + // отправка писем через свой почтовый сервис function agroxpert_send_smtp_email( $phpmailer ) { @@ -778,7 +836,7 @@ add_action('wpcf7_mail_sent', 'my_custom_mail_sent' ); //все рубрики англ версии -function get_expression_en() { +function get_expression_en( $str = false ) { #cache result static $res = null; @@ -834,69 +892,71 @@ function get_expression_parts() { } - - - - - -//свой шаблон для категории и подкатегории -add_filter('category_template', function (){ - - $category = get_queried_object(); - $parent_id = $category->category_parent; // ID родителя - - $template = array(); //массив для поиска шаблонов - - $templates[] = "category-{$category->slug}.php"; - $templates[] = "category-{$category->term_id}.php"; +function get_priority_category_en($post_id = null) { - if ($parent_id > 0){ - - $parent = get_category($parent_id); - $templates[] = "category-{$parent->slug}.php"; - $templates[] = "category-{$parent->term_id}.php"; - + if ($post_id === null) { + $post_id = get_the_ID(); + } + + // Получаем массив категорий поста + $categories = get_the_category($post_id); + + if (empty($categories)) { + return null; } - $templates[] = 'category.php'; + $en_category = null; - return locate_template($templates); + // Проходим по всем категориям поста + foreach ($categories as $category) { + // Проверяем, содержит ли название категории 'en' + if (stripos($category->name, 'en') !== false) { + $en_category = $category->name; + } else { + // Если нашли категорию, не содержащую 'en', возвращаем её название + return $category->name; + } + } - -}); + // Если нет категорий, кроме 'en', возвращаем категорию 'en' + return $en_category; +} +// рубрики английской версии +function use_custom_template_for_en_subcategories($template) { + + + if (is_category()) { + $category = get_queried_object(); + // Проверяем, является ли текущая категория подрубрикой "EN" + $parent_id = $category->parent; + if ($parent_id && $parent_id == get_cat_ID('EN')) { + // Устанавливаем путь к вашему новому шаблону + $new_template = locate_template('en/category-en-sub.php'); + if ($new_template) { + return $new_template; + } + } + } else if (is_single()) { + $categories = get_the_category(); + foreach ($categories as $category) { + // Проверяем, является ли текущая категория или ее родительская категория "EN" + if ($category->term_id == get_cat_ID('EN') || $category->parent == get_cat_ID('EN')) { + // Устанавливаем путь к вашему новому шаблону + $new_template = locate_template('single-en.php'); + if ($new_template) { + return $new_template; + } + } + } + } + return $template; +} - - - -//свой шаблон для категории и подкатегории -add_filter( 'single_template', function ( $single_template ) { - - $category = (array) get_the_category(); - - foreach( $category as $cat ) { - - if ( file_exists(TEMPLATEPATH . "/single-{$cat->term_id}.php") ){ - return TEMPLATEPATH . "/single-{$cat->term_id}.php"; - } - - $parent_id = $cat->parent; // шаблон гл рубрики - - if ($parent_id > 0){ - $parent = get_category($parent_id); - if (file_exists(TEMPLATEPATH . "/single-{$parent->term_id}.php") ) - return TEMPLATEPATH . "/single-{$parent->term_id}.php"; - } - - } - return $single_template; - - -}, PHP_INT_MAX, 2 ); - +add_filter('template_include', 'use_custom_template_for_en_subcategories'); diff --git a/header-en.php b/header-en.php index c2d4fd3..652c701 100644 --- a/header-en.php +++ b/header-en.php @@ -49,17 +49,15 @@ height="0" width="0" style="display:none;visibility:hidden"> >
- -
-
@@ -104,7 +102,7 @@ height="0" width="0" style="display:none;visibility:hidden">
@@ -119,16 +117,16 @@ height="0" width="0" style="display:none;visibility:hidden">
- +
- +
-

Самое читаемое

+

Popular

- +
@@ -138,7 +136,7 @@ height="0" width="0" style="display:none;visibility:hidden">
- +
@@ -148,7 +146,7 @@ height="0" width="0" style="display:none;visibility:hidden">
- +
\ No newline at end of file diff --git a/page-contacts.php b/page-contacts.php new file mode 100644 index 0000000..b38217f --- /dev/null +++ b/page-contacts.php @@ -0,0 +1,122 @@ + + + +
+ +
+

+
+
+
+
+
+ +
+
+

Address

+

Office 12, 102/31 Prospekt Mira
129626, Moscow

+
+
+

Telephone

+

+
+
+

E-mail

+

+
+
+

To inquire about advertising, contact us

+

+7 (926) 366 37 00

+

pr@agroexpert.press

+ +
+
+ +
+ On top +
+
+
+
+
+ + + + + + diff --git a/partials/most-read-posts.php b/partials/most-read-posts.php index 82d3a0f..ee93dea 100644 --- a/partials/most-read-posts.php +++ b/partials/most-read-posts.php @@ -1,16 +1,41 @@ prepare(" + SELECT DISTINCT p.ID, p.post_title, p.post_content, m.meta_value AS position + FROM $wpdb->posts p + INNER JOIN $wpdb->postmeta m ON p.ID = m.post_id + LEFT JOIN $wpdb->term_relationships tr ON p.ID = tr.object_id + LEFT JOIN $wpdb->term_taxonomy tt ON tr.term_taxonomy_id = tt.term_taxonomy_id + WHERE p.post_type = 'post' + AND m.meta_key = 'top_participation_position' + AND m.meta_value != '' + AND tt.term_id NOT IN ($excluded_category_ids_in) + ORDER BY CAST(m.meta_value AS UNSIGNED) ASC +"); + +/** $query = $wpdb->prepare(" SELECT p.ID, p.post_title, p.post_content, m.meta_value AS position FROM $wpdb->posts p INNER JOIN $wpdb->postmeta m ON p.ID = m.post_id WHERE p.post_type = 'post' - AND m.meta_key = 'top_participation_position' - AND m.meta_value != '' + AND m.meta_key = 'top_participation_position' + AND m.meta_value != '' ORDER BY CAST(m.meta_value AS UNSIGNED) ASC -"); +");*/ $top_posts = $wpdb->get_results($query); diff --git a/partials/pinned-post-mob.php b/partials/pinned-post-mob.php index d81ad6e..d9d6f7a 100644 --- a/partials/pinned-post-mob.php +++ b/partials/pinned-post-mob.php @@ -1,6 +1,6 @@ ID; diff --git a/partials/pinned-post.php b/partials/pinned-post.php index 37da94f..08ef04e 100644 --- a/partials/pinned-post.php +++ b/partials/pinned-post.php @@ -1,6 +1,6 @@ +
+
+ +
+
+ + + + + + + + + + +
+
+

Самое читаемое

+
+ +
+
+
+ + + + + + + \ No newline at end of file diff --git a/sidebar-right-en.php b/sidebar-right-en.php new file mode 100644 index 0000000..db77172 --- /dev/null +++ b/sidebar-right-en.php @@ -0,0 +1,27 @@ + +
+
+

Popular

+
+ +
+
+
+ + + + + + + + + + \ No newline at end of file diff --git a/single-en.php b/single-en.php new file mode 100644 index 0000000..32ec812 --- /dev/null +++ b/single-en.php @@ -0,0 +1,80 @@ + + + + + +
+ + +
+
+ + + + +
+ +
+ +

+ +

+ + + + display_name !== 'agroexpert.press') : ?> +
+
+ display_name; ?>
+ description !== '' ):?> + description?> + +
+
+ + +
+ +
+
+ + + + + + + +
+

Еще по теме

+
+ +
+ 'partners', + 'post_status' => 'publish', + 'order' => 'ASC', + 'posts_per_page' => 4 + ]; + $posts = get_posts($args); + $counter = 0; + foreach ($posts as $post) : ?> +
+ +

+ +
+ +
+ + On Top +
+
+
+
+
+ + + \ No newline at end of file