From a9ee8c451fce96b9a1c534c6c5f0a0d6be3bb447 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 9 Jul 2026 22:10:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=20archive/category/tag/searc?= =?UTF-8?q?h=20=E4=B8=BB=E5=86=85=E5=AE=B9=E6=B5=81=E5=A3=B3=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 抽出 aksrt-archive 共享 shell/stream/render config， 四类列表页统一 content-shell + shared renderer + page-owned sidebar。 --- archive.php | 122 +++++------ category.php | 315 +++++++++++++--------------- inc/bootstrap.php | 1 + inc/helpers/aksrt-archive.php | 288 +++++++++++++++++++++++++ search.php | 381 +++++++++++++++++----------------- tag.php | 225 +++++++++----------- 6 files changed, 777 insertions(+), 555 deletions(-) create mode 100644 inc/helpers/aksrt-archive.php diff --git a/archive.php b/archive.php index 12ea2423..1792a1b5 100644 --- a/archive.php +++ b/archive.php @@ -11,47 +11,19 @@ get_header(); global $wp_query; -$list_settings = class_exists('AKSRT_Settings') - ? AKSRT_Settings::get_post_list_style_settings() - : ['render_mode' => 'card', 'card_style' => 'standard']; -$render_config = [ - 'context' => 'archive', - 'mode' => (string) ($list_settings['render_mode'] ?? 'card'), - 'card_style' => (string) ($list_settings['card_style'] ?? 'standard'), -]; +$render_config = function_exists('aksrt_archive_get_render_config') + ? aksrt_archive_get_render_config(['context' => 'archive']) + : ['context' => 'archive', 'mode' => 'card', 'card_style' => 'standard']; +$has_sidebar = function_exists('aksrt_archive_has_sidebar') + ? aksrt_archive_has_sidebar() + : (function_exists('aksrt_is_show_sidebar') ? aksrt_is_show_sidebar() : false); -// Per-category card mode override: if visiting a category in card_cat_ids, force card mode -if (is_category() && !empty($list_settings['card_cat_ids'])) { - $current_cat_id = (int) get_queried_object_id(); - if (in_array($current_cat_id, $list_settings['card_cat_ids'], true)) { - $render_config['mode'] = 'card'; - } -} - -// Per-category multi-thumb override -if (is_category() && class_exists('AKSRT_Settings')) { - $thumb_settings = AKSRT_Settings::get_post_thumb_settings(); - if (!empty($thumb_settings['mult_thumb_cat_ids'])) { - $current_cat_id = (int) get_queried_object_id(); - if (in_array($current_cat_id, $thumb_settings['mult_thumb_cat_ids'], true)) { - $render_config['multi_thumb_enabled'] = true; - $render_config['multi_thumb_limit'] = (int) ($thumb_settings['multi_count'] ?? 4); - } - } -} - -$has_sidebar = function_exists('aksrt_is_show_sidebar') ? aksrt_is_show_sidebar() : false; -$archive_description = trim(strip_tags((string) get_the_archive_description())); +$archive_description = trim(wp_strip_all_tags((string) get_the_archive_description())); $archive_summary = ''; - if (is_author()) { $author = get_queried_object(); if ($author instanceof WP_User) { - $archive_summary = sprintf( - /* translators: %s: author display name */ - __('作者：%s', 'aksrt'), - $author->display_name - ); + $archive_summary = sprintf(__('作者：%s', 'aksrt'), $author->display_name); } } elseif ($archive_description !== '') { $archive_summary = $archive_description; @@ -61,43 +33,51 @@ if (is_author()) { (int) $wp_query->found_posts ); } + +if (function_exists('aksrt_archive_open_shell')) { + aksrt_archive_open_shell([ + 'main_class' => 'site-main content-shell content-shell--stream', + 'has_sidebar' => $has_sidebar, + 'page_kind' => 'archive', + ]); +} else { + echo '
'; +} ?> +
+ -
-
-
-
- - - - -
- - 'content-stream__list'])); ?> -
- 'archive', 'render_config' => $render_config]); ?> -
- -
-

-
- -
-
-
- - - - -
-
+ + 'archive', + 'query_context' => 'archive', + 'stream_class' => 'content-stream--archive', + 'empty_text' => __('暂无文章', 'aksrt'), + ]); + } + ?> +
$has_sidebar]); +} else { + echo '
'; + if ($has_sidebar) { get_sidebar(); } + echo '
'; +} + get_footer(); diff --git a/category.php b/category.php index 07b5ece5..43c096d1 100644 --- a/category.php +++ b/category.php @@ -11,22 +11,22 @@ get_header(); $term = get_queried_object(); if (class_exists('AKSRT_Docs_Presenter')) { - $docs_presenter = AKSRT_Docs_Presenter::get_instance(); - if ($term instanceof WP_Term && $term->taxonomy === 'category') { - $doc_candidates = get_posts([ - 'post_type' => 'page', - 'post_status' => 'publish', - 'posts_per_page' => 1, - 'meta_key' => '_aksrt_doc_category', - 'meta_value' => (string) $term->term_id, - 'fields' => 'ids', - ]); - if (!empty($doc_candidates)) { - get_template_part('templates/pages/page-documentnav'); - get_footer(); - return; - } - } + $docs_presenter = AKSRT_Docs_Presenter::get_instance(); + if ($term instanceof WP_Term && $term->taxonomy === 'category') { + $doc_candidates = get_posts([ + 'post_type' => 'page', + 'post_status' => 'publish', + 'posts_per_page' => 1, + 'meta_key' => '_aksrt_doc_category', + 'meta_value' => (string) $term->term_id, + 'fields' => 'ids', + ]); + if (!empty($doc_candidates)) { + get_template_part('templates/pages/page-documentnav'); + get_footer(); + return; + } + } } if (!$term instanceof WP_Term) { get_footer(); @@ -44,10 +44,12 @@ $archive_settings = class_exists('AKSRT_Term_Meta') 'filter_bar' => true, 'cover_url' => '', 'description' => (string) $term->description, + 'card_style' => 'standard', ]; -$sidebar_id = is_active_sidebar('cat_sidebar') ? 'cat_sidebar' : 'sidebar-blog'; -$has_sidebar = !empty($archive_settings['show_sidebar']) && is_active_sidebar($sidebar_id); +$has_sidebar = function_exists('aksrt_archive_has_sidebar') + ? aksrt_archive_has_sidebar('cat_sidebar', !empty($archive_settings['show_sidebar'])) + : (!empty($archive_settings['show_sidebar']) && (is_active_sidebar('cat_sidebar') || is_active_sidebar('sidebar-blog'))); $description = !empty($archive_settings['show_desc']) ? wp_kses_post((string) $archive_settings['description']) : ''; $header_style = (string) $archive_settings['header_style']; $layout_mode = (string) $archive_settings['layout_mode']; @@ -63,37 +65,29 @@ $cat_filter_config = class_exists('AKSRT_Settings') ? AKSRT_Settings::get_filter_config_for_category((int) $term->term_id) : ['dimensions' => [], 'show_cat' => true, 'show_tag' => false, 'show_topics' => false, 'show_orderby' => true]; $custom_dimensions = $cat_filter_config['dimensions']; -$current_orderby = sanitize_key((string) get_query_var('orderby')); -$current_order = strtoupper(sanitize_key((string) get_query_var('order'))); -$current_sort = 'latest'; - -if ($current_orderby === 'date' && $current_order === 'ASC') { - $current_sort = 'oldest'; -} elseif ($current_orderby === 'comment_count') { - $current_sort = 'popular'; -} - -$render_config = [ - 'context' => 'category', - 'mode' => $layout_mode, - 'card_style' => $card_style, -]; -$sort_links = [ - 'latest' => remove_query_arg(['orderby', 'order', 'paged']), - 'oldest' => add_query_arg(['orderby' => 'date', 'order' => 'asc', 'paged' => false]), - 'popular' => add_query_arg(['orderby' => 'comment_count', 'order' => 'desc', 'paged' => false]), -]; +$sort_state = function_exists('aksrt_archive_get_sort_state') ? aksrt_archive_get_sort_state() : ['current' => 'latest', 'links' => []]; +$current_sort = $sort_state['current']; +$sort_links = $sort_state['links']; +$render_config = function_exists('aksrt_archive_get_render_config') + ? aksrt_archive_get_render_config([ + 'context' => 'category', + 'mode' => $layout_mode, + 'card_style' => $card_style, + ]) + : [ + 'context' => 'category', + 'mode' => $layout_mode, + 'card_style' => $card_style, + ]; $filter_terms = []; $filter_all_url = get_category_link($term->term_id); if (!empty($archive_settings['filter_bar'])) { - $filter_parent = $term->term_id; $filter_terms = get_terms([ 'taxonomy' => 'category', 'hide_empty' => true, - 'parent' => $filter_parent, + 'parent' => $term->term_id, ]); - if (empty($filter_terms) && !empty($term->parent)) { $filter_all_url = get_category_link((int) $term->parent); $filter_terms = get_terms([ @@ -102,7 +96,6 @@ if (!empty($archive_settings['filter_bar'])) { 'parent' => (int) $term->parent, ]); } - if (is_wp_error($filter_terms)) { $filter_terms = []; } @@ -126,145 +119,123 @@ if ($ajax_filter && !empty($filter_settings['cat_show_tag'])) { $tag_filter_terms = []; } } + +if (function_exists('aksrt_archive_open_shell')) { + aksrt_archive_open_shell([ + 'main_class' => 'site-main container content-shell content-shell--stream', + 'has_sidebar' => $has_sidebar, + 'top_fluid' => ['cat_top_fluid'], + 'page_kind' => 'category', + ]); +} ?> + -
- '; - dynamic_sidebar('cat_top_fluid'); - echo ''; - } - ?> -
-
-
+
+ - - -
- - - -
- -
-
+ +
+ +
+
+
+ +
+
+

+

+ +

+ +
+
+ +
+ +
-
-
-

-

- -

- + + +
data-ajax-archive="category" data-term-id="term_id; ?>" data-query-context="archive" data-render-mode="" data-card-style=""> + +
+ +
+ data-filter-cat="0"> + + term_id === (int) $term->term_id) || ($current_filter_cat !== '' && (int) $current_filter_cat === (int) $filter_term->term_id); ?> + data-filter-cat="term_id; ?>">name); ?> + +
- + + + +
+ +
+ data-filter-tag=""> + + term_id); ?> + data-filter-tag="term_id; ?>">name); ?> + +
+
+ + +
+ count, 'aksrt')), (int) $term->count); ?> +
+ + +
+ $sort_url) : ?> + data-filter-sort=""> + + + +
+ + + +
+ +
+ + data-filter-cf="" data-filter-cf-val=""> + + + data-filter-cf="" data-filter-cf-val=""> + +
+
+
- -
-
- - -
data-ajax-archive="category" data-term-id="term_id; ?>" data-query-context="archive" data-render-mode="" data-card-style=""> - -
- -
- data-filter-cat="0"> - - - - term_id === (int) $term->term_id) || ($current_filter_cat !== '' && (int) $current_filter_cat === (int) $filter_term->term_id); ?> - data-filter-cat="term_id; ?>"> - name); ?> - - -
+ 'category', + 'query_context' => 'archive', + 'stream_class' => 'archive__ajax-wrap content-stream--archive content-stream--category', + 'empty_text' => __('该分类下暂无文章', 'aksrt'), + 'ajax_enabled' => $ajax_filter, + 'show_loading' => $ajax_filter, + ]); + } + ?> + +
- - -
- -
- data-filter-tag=""> - - - - term_id); ?> - data-filter-tag="term_id; ?>"> - name); ?> - - -
-
- -
- count, 'aksrt')), (int) $term->count); ?> -
- -
- $sort_url) : ?> - data-filter-sort=""> - - - -
- - -
- -
- - data-filter-cf="" data-filter-cf-val=""> - - - - - data-filter-cf="" data-filter-cf-val=""> - - - -
-
- -
- - -
data-ajax-wrap data-query-context="archive"> - - - 'content-stream__list'])); ?> -
- 'archive', 'render_config' => $render_config]); ?> -
- -
-

-
- -
- - -
- - - - -
-
- - '; - dynamic_sidebar('cat_bottom_fluid'); - echo '
'; - } - ?> -
- $has_sidebar, + 'bottom_fluid' => ['cat_bottom_fluid'], + ]); +} + get_footer(); diff --git a/inc/bootstrap.php b/inc/bootstrap.php index 03d2d572..c175bb3c 100644 --- a/inc/bootstrap.php +++ b/inc/bootstrap.php @@ -28,6 +28,7 @@ require_once AKSRT_DIR . '/inc/helpers/aksrt-frontend-tags.php'; require_once AKSRT_DIR . '/inc/helpers/aksrt-flow.php'; require_once AKSRT_DIR . '/inc/helpers/aksrt-homepage.php'; require_once AKSRT_DIR . '/inc/helpers/aksrt-single.php'; +require_once AKSRT_DIR . '/inc/helpers/aksrt-archive.php'; require_once AKSRT_DIR . '/inc/helpers/aksrt-slider.php'; require_once AKSRT_DIR . '/inc/helpers/aksrt-vip.php'; require_once AKSRT_DIR . '/inc/helpers/aksrt-i18n-switch.php'; diff --git a/inc/helpers/aksrt-archive.php b/inc/helpers/aksrt-archive.php new file mode 100644 index 00000000..bdeac772 --- /dev/null +++ b/inc/helpers/aksrt-archive.php @@ -0,0 +1,288 @@ +} + */ + function aksrt_archive_get_list_style_settings(): array { + $settings = class_exists('AKSRT_Settings') + ? AKSRT_Settings::get_post_list_style_settings() + : []; + + return [ + 'render_mode' => (string) ($settings['render_mode'] ?? 'card'), + 'card_style' => (string) ($settings['card_style'] ?? 'standard'), + 'card_cat_ids' => is_array($settings['card_cat_ids'] ?? null) ? array_map('intval', $settings['card_cat_ids']) : [], + ]; + } +endif; + +if (!function_exists('aksrt_archive_get_render_config')) : + /** + * Build render config for archive-like pages. + * + * @param array $overrides Context/mode overrides. + * @return array + */ + function aksrt_archive_get_render_config(array $overrides = []): array { + $list = aksrt_archive_get_list_style_settings(); + $config = array_merge([ + 'context' => 'archive', + 'mode' => $list['render_mode'], + 'card_style' => $list['card_style'], + ], $overrides); + + if (is_category() && !empty($list['card_cat_ids'])) { + $current_cat_id = (int) get_queried_object_id(); + if (in_array($current_cat_id, $list['card_cat_ids'], true)) { + $config['mode'] = 'card'; + } + } + + if (is_category() && class_exists('AKSRT_Settings')) { + $thumb_settings = AKSRT_Settings::get_post_thumb_settings(); + if (!empty($thumb_settings['mult_thumb_cat_ids'])) { + $current_cat_id = (int) get_queried_object_id(); + if (in_array($current_cat_id, array_map('intval', (array) $thumb_settings['mult_thumb_cat_ids']), true)) { + $config['multi_thumb_enabled'] = true; + $config['multi_thumb_limit'] = (int) ($thumb_settings['multi_count'] ?? 4); + } + } + } + + return $config; + } +endif; + +if (!function_exists('aksrt_archive_get_sort_state')) : + /** + * Shared latest/oldest/popular sort state for term archives. + * + * @return array{current:string,links:array} + */ + function aksrt_archive_get_sort_state(): array { + $current_orderby = sanitize_key((string) get_query_var('orderby')); + $current_order = strtoupper(sanitize_key((string) get_query_var('order'))); + $current = 'latest'; + + if ($current_orderby === 'date' && $current_order === 'ASC') { + $current = 'oldest'; + } elseif ($current_orderby === 'comment_count') { + $current = 'popular'; + } + + return [ + 'current' => $current, + 'links' => [ + 'latest' => remove_query_arg(['orderby', 'order', 'paged']), + 'oldest' => add_query_arg(['orderby' => 'date', 'order' => 'asc', 'paged' => false]), + 'popular' => add_query_arg(['orderby' => 'comment_count', 'order' => 'desc', 'paged' => false]), + ], + ]; + } +endif; + +if (!function_exists('aksrt_archive_has_sidebar')) : + /** + * Resolve whether a stream page should show an aside. + * + * @param string $preferred Preferred sidebar id. + * @param bool $enabled Page-level sidebar toggle. + */ + function aksrt_archive_has_sidebar(string $preferred = '', bool $enabled = true): bool { + if (!$enabled || wp_is_mobile()) { + return false; + } + + if ($preferred !== '' && is_active_sidebar($preferred)) { + return true; + } + + if (function_exists('aksrt_is_show_sidebar')) { + return aksrt_is_show_sidebar(); + } + + $fallback = function_exists('aksrt_resolve_sidebar_id') ? aksrt_resolve_sidebar_id() : 'sidebar-blog'; + return is_active_sidebar($fallback) + || is_active_sidebar('all_sidebar_top') + || is_active_sidebar('all_sidebar_bottom'); + } +endif; + +if (!function_exists('aksrt_archive_render_widget_zone')) : + /** + * Render stacked sidebars when active. + * + * @param string[] $sidebar_ids Sidebar ids. + * @param string $wrapper_class Wrapper class. + */ + function aksrt_archive_render_widget_zone(array $sidebar_ids, string $wrapper_class = ''): void { + $active = []; + foreach ($sidebar_ids as $sidebar_id) { + if (is_active_sidebar($sidebar_id)) { + $active[] = $sidebar_id; + } + } + if (empty($active)) { + return; + } + + if ($wrapper_class !== '') { + echo '
'; + } + foreach ($active as $sidebar_id) { + dynamic_sidebar($sidebar_id); + } + if ($wrapper_class !== '') { + echo '
'; + } + } +endif; + +if (!function_exists('aksrt_archive_render_stream')) : + /** + * Shared list + pagination + empty state for archive surfaces. + * + * @param WP_Query|null $query Query or null for main loop. + * @param array $render_config Renderer config. + * @param array $args Stream args. + */ + function aksrt_archive_render_stream(?WP_Query $query, array $render_config, array $args = []): void { + $args = wp_parse_args($args, [ + 'page_kind' => 'archive', + 'query_context' => 'archive', + 'empty_text' => __('暂无文章', 'aksrt'), + 'stream_class' => '', + 'ajax_enabled' => false, + 'ajax_attrs' => '', + 'show_loading' => false, + ]); + + $classes = [ + 'content-stream', + 'content-stream--' . sanitize_html_class((string) $args['page_kind']), + ]; + if (!empty($args['stream_class'])) { + foreach (preg_split('/\s+/', trim((string) $args['stream_class'])) ?: [] as $class) { + $class = sanitize_html_class($class); + if ($class !== '') { + $classes[] = $class; + } + } + } + if (!empty($args['ajax_enabled'])) { + $classes[] = 'is-ajax-enabled'; + } + + $mode = (string) ($render_config['mode'] ?? 'card'); + $card_style = (string) ($render_config['card_style'] ?? 'standard'); + $has_posts = $query instanceof WP_Query ? $query->have_posts() : have_posts(); + ?> +
+ data-ajax-wrap + data-query-context="" + + + > + + + + + + 'content-stream__list'])); + } + ?> +
+ (string) $args['query_context'], + 'render_config' => $render_config, + ]); + } + ?> +
+ +
+

+
+ +
+ $args Shell args. + */ + function aksrt_archive_open_shell(array $args = []): void { + $args = wp_parse_args($args, [ + 'main_class' => 'site-main container', + 'has_sidebar' => false, + 'top_fluid' => [], + 'page_kind' => 'archive', + ]); + + $main_class = trim((string) $args['main_class']); + ?> +
+ +
+
+
+ $args Shell args. + */ + function aksrt_archive_close_shell(array $args = []): void { + $args = wp_parse_args($args, [ + 'has_sidebar' => false, + 'bottom_fluid' => [], + ]); + ?> +
+ + + +
+
+ +
+ 0 && $search_type === 'post') { $search_count = isset($loop_query->found_posts) ? (int) $loop_query->found_posts : 0; -$render_config = [ - 'context' => 'search', - 'mode' => (string) ($list_settings['render_mode'] ?? 'card'), - 'card_style' => (string) ($list_settings['card_style'] ?? 'standard'), - 'highlight_query' => $search_query, -]; +$render_config = function_exists('aksrt_archive_get_render_config') + ? aksrt_archive_get_render_config([ + 'context' => 'search', + 'mode' => (string) ($list_settings['render_mode'] ?? 'card'), + 'card_style' => (string) ($list_settings['card_style'] ?? 'standard'), + 'highlight_query' => $search_query, + ]) + : [ + 'context' => 'search', + 'mode' => (string) ($list_settings['render_mode'] ?? 'card'), + 'card_style' => (string) ($list_settings['card_style'] ?? 'standard'), + 'highlight_query' => $search_query, + ]; $search_sort_options = [ 'relevance' => [ @@ -109,207 +114,205 @@ $search_sort_options = [ 'args' => ['orderby' => 'comment_count', 'order' => 'desc'], ], ]; + +$has_sidebar = function_exists('aksrt_archive_has_sidebar') + ? aksrt_archive_has_sidebar('search_sidebar', !empty($other_page_settings['page_search_sidebar'])) + : (!empty($other_page_settings['page_search_sidebar']) && (is_active_sidebar('search_sidebar') || is_active_sidebar('sidebar-blog'))); + +if (function_exists('aksrt_archive_open_shell')) { + aksrt_archive_open_shell([ + 'main_class' => 'site-main container content-shell content-shell--stream', + 'has_sidebar' => $has_sidebar, + 'top_fluid' => ['search_top_fluid'], + 'page_kind' => 'search', + ]); +} ?> + -
- -
- -
- +
+ -
-
-
- + -
- - - - -
- - -
-
- $type_label) : ?> - - -
- -
- - -
- -
- - - - -
+
+ -
- -
+
+
$type_label) : ?> - $type_key, - 'paged' => false, - ]; - if ($type_key !== 'post') { - $type_args['aksrt_category'] = false; - } elseif ($search_category_enabled && $current_category > 0) { - $type_args['aksrt_category'] = $current_category; - } - ?> - - - +
-
- - - -
- -
- + + +
+
+ - -
- -
- $sort_option) : ?> - $sort_option['args']['orderby'], - 'order' => $sort_option['args']['order'], - 'paged' => false, - ]; - if ($search_type !== 'post') { - $sort_args['aksrt_category'] = false; - } elseif ($search_category_enabled && $current_category > 0) { - $sort_args['aksrt_category'] = $current_category; - } - $sort_url = add_query_arg(array_filter($sort_args, static function ($value): bool { - return false !== $value; - })); - if ($sort_key === 'relevance') { - $sort_url = remove_query_arg(['orderby', 'order', 'paged'], $sort_url); - if ($search_type !== 'post') { - $sort_url = remove_query_arg('aksrt_category', $sort_url); + +
+ +
+ +
+ $type_label) : ?> + $type_key, + 'paged' => false, + ]; + if ($type_key !== 'post') { + $type_args['aksrt_category'] = false; } elseif ($search_category_enabled && $current_category > 0) { - $sort_url = add_query_arg('aksrt_category', $current_category, $sort_url); + $type_args['aksrt_category'] = $current_category; } - } - ?> - - - - -
-
- -
- - -
- - - - -
- - have_posts()) : ?> - 'content-stream__list'])); ?> -
- 'search', 'render_config' => $render_config]); ?> -
- - -
- -

-

-
- - - - -
-
- - - - name); ?> + ?> + + + - +
+ + + +
+ +
+ +
+
+ + + +
+ +
+ $sort_option) : ?> + $sort_option['args']['orderby'], + 'order' => $sort_option['args']['order'], + 'paged' => false, + ]; + if ($search_type !== 'post') { + $sort_args['aksrt_category'] = false; + } elseif ($search_category_enabled && $current_category > 0) { + $sort_args['aksrt_category'] = $current_category; + } + $sort_url = add_query_arg(array_filter($sort_args, static function ($value): bool { + return false !== $value; + })); + if ($sort_key === 'relevance') { + $sort_url = remove_query_arg(['orderby', 'order', 'paged'], $sort_url); + if ($search_type !== 'post') { + $sort_url = remove_query_arg('aksrt_category', $sort_url); + } elseif ($search_category_enabled && $current_category > 0) { + $sort_url = add_query_arg('aksrt_category', $current_category, $sort_url); + } + } + ?> + + + + +
+
+
- -
-
+ - -
+
+ + + + +
- - - -
-
+ have_posts() && function_exists('aksrt_render_post_list')) : ?> + 'content-stream__list'])); ?> +
+ 'search', 'render_config' => $render_config]); ?> +
+ +
+ +

+

+
+ + + + +
+
+ + + + name); ?> + + +
+
+ + +
- -
- -
- -
+ + $has_sidebar, + 'bottom_fluid' => ['search_bottom_fluid'], + ]); +} - +get_footer(); diff --git a/tag.php b/tag.php index e686bbef..dad64a13 100644 --- a/tag.php +++ b/tag.php @@ -25,10 +25,12 @@ $archive_settings = class_exists('AKSRT_Term_Meta') 'show_desc' => !empty($term->description), 'cover_url' => '', 'description' => (string) $term->description, + 'card_style' => 'standard', ]; -$sidebar_id = is_active_sidebar('tag_sidebar') ? 'tag_sidebar' : 'sidebar-blog'; -$has_sidebar = !empty($archive_settings['show_sidebar']) && is_active_sidebar($sidebar_id); +$has_sidebar = function_exists('aksrt_archive_has_sidebar') + ? aksrt_archive_has_sidebar('tag_sidebar', !empty($archive_settings['show_sidebar'])) + : (!empty($archive_settings['show_sidebar']) && (is_active_sidebar('tag_sidebar') || is_active_sidebar('sidebar-blog'))); $description = !empty($archive_settings['show_desc']) ? wp_kses_post((string) $archive_settings['description']) : ''; $header_style = (string) $archive_settings['header_style']; $layout_mode = (string) $archive_settings['layout_mode']; @@ -40,30 +42,23 @@ if (!empty($filter_settings['enabled']) && !in_array('tag', $filter_settings['cu $filter_settings['enabled'] = false; } $ajax_filter = !empty($filter_settings['ajax_enabled']) && !empty($filter_settings['enabled']); -$current_orderby = sanitize_key((string) get_query_var('orderby')); -$current_order = strtoupper(sanitize_key((string) get_query_var('order'))); -$current_sort = 'latest'; - -if ($current_orderby === 'date' && $current_order === 'ASC') { - $current_sort = 'oldest'; -} elseif ($current_orderby === 'comment_count') { - $current_sort = 'popular'; -} - -$render_config = [ - 'context' => 'tag', - 'mode' => $layout_mode, - 'card_style' => $card_style, -]; -$sort_links = [ - 'latest' => remove_query_arg(['orderby', 'order', 'paged']), - 'oldest' => add_query_arg(['orderby' => 'date', 'order' => 'asc', 'paged' => false]), - 'popular' => add_query_arg(['orderby' => 'comment_count', 'order' => 'desc', 'paged' => false]), -]; +$sort_state = function_exists('aksrt_archive_get_sort_state') ? aksrt_archive_get_sort_state() : ['current' => 'latest', 'links' => []]; +$current_sort = $sort_state['current']; +$sort_links = $sort_state['links']; +$render_config = function_exists('aksrt_archive_get_render_config') + ? aksrt_archive_get_render_config([ + 'context' => 'tag', + 'mode' => $layout_mode, + 'card_style' => $card_style, + ]) + : [ + 'context' => 'tag', + 'mode' => $layout_mode, + 'card_style' => $card_style, + ]; $cat_filter_terms = []; $current_filter_cat = sanitize_text_field((string) get_query_var('aksrt_filter_cat', '')); -$current_filter_tag = sanitize_text_field((string) get_query_var('aksrt_filter_tag', '')); if ($ajax_filter && !empty($filter_settings['tag_show_cat'])) { $cat_filter_terms = get_terms([ 'taxonomy' => 'category', @@ -75,115 +70,99 @@ if ($ajax_filter && !empty($filter_settings['tag_show_cat'])) { $cat_filter_terms = []; } } + +if (function_exists('aksrt_archive_open_shell')) { + aksrt_archive_open_shell([ + 'main_class' => 'site-main container content-shell content-shell--stream', + 'has_sidebar' => $has_sidebar, + 'top_fluid' => ['tag_top_fluid'], + 'page_kind' => 'tag', + ]); +} ?> + -
- '; - dynamic_sidebar('tag_top_fluid'); - echo ''; - } - ?> -
-
-
+
+ - - -
- - - -
- -
-
+ +
+ +
+
+
+ +
+
+

+

+ +

+ +
+
+ +
+ +
-
-
-

-

- -

- + + +
data-ajax-archive="tag" data-term-id="term_id; ?>" data-query-context="archive" data-render-mode="" data-card-style=""> + +
+ +
+ data-filter-cat=""> + + term_id); ?> + data-filter-cat="term_id; ?>">name); ?> + +
+
+ + + +
+ +
+ $sort_url) : ?> + data-filter-sort=""> + + + +
+
+ + +
+ count, 'aksrt')), (int) $term->count); ?>
-
- -
-
- - -
data-ajax-archive="tag" data-term-id="term_id; ?>" data-query-context="archive" data-render-mode="" data-card-style=""> - -
- -
- data-filter-cat=""> - - - - term_id); ?> - data-filter-cat="term_id; ?>"> - name); ?> - - -
+ 'tag', + 'query_context' => 'archive', + 'stream_class' => 'archive__ajax-wrap content-stream--archive content-stream--tag', + 'empty_text' => __('该标签下暂无文章', 'aksrt'), + 'ajax_enabled' => $ajax_filter, + 'show_loading' => $ajax_filter, + ]); + } + ?> + +
- - -
- -
- $sort_url) : ?> - data-filter-sort=""> - - - -
-
- -
- count, 'aksrt')), (int) $term->count); ?> -
-
- - -
data-ajax-wrap data-query-context="archive"> - - - 'content-stream__list'])); ?> -
- 'archive', 'render_config' => $render_config]); ?> -
- -
-

-
- -
- - -
- - - - -
-
- - '; - dynamic_sidebar('tag_bottom_fluid'); - echo '
'; - } - ?> -
- $has_sidebar, + 'bottom_fluid' => ['tag_bottom_fluid'], + ]); +} + get_footer();