fix(theme): align reference layouts and restore passing contracts
Align homepage and category discovery, modern widgets, admin controls, quotes, and comments with the reference theme. Remove superseded paths and add rendering and behavior coverage. Update stale asset and finance contracts; all 760 Node tests and 139 widget assertions pass.
This commit is contained in:
kate522 committed
1 parent
b520d29368
commit
8aa116ec43
63 files changed
+1985
-2304
No files matched your search
+43
-113
@@ -33,124 +33,54 @@ if (!$term instanceof WP_Term) {
|
||||
return;
|
||||
}
|
||||
|
||||
$archive_settings = class_exists('\AKSRT\Core\TermMeta')
|
||||
? \AKSRT\Core\TermMeta::resolve_archive_settings($term)
|
||||
: [
|
||||
'header_style' => 'cover',
|
||||
'show_sidebar' => true,
|
||||
'show_cover' => false,
|
||||
'show_desc' => !empty($term->description),
|
||||
'filter_bar' => true,
|
||||
'cover_url' => '',
|
||||
'description' => (string) $term->description,
|
||||
];
|
||||
|
||||
$has_sidebar = function_exists('aksrt_archive_has_sidebar')
|
||||
? aksrt_archive_has_sidebar(!empty($archive_settings['show_sidebar']))
|
||||
: (!empty($archive_settings['show_sidebar']) && is_active_sidebar('cat_sidebar'));
|
||||
$description = !empty($archive_settings['show_desc']) ? wp_kses_post((string) $archive_settings['description']) : '';
|
||||
$header_style = (string) $archive_settings['header_style'];
|
||||
$archive_settings = \AKSRT\Core\TermMeta::resolve_archive_settings($term);
|
||||
$has_sidebar = aksrt_archive_has_sidebar(!empty($archive_settings['show_sidebar']));
|
||||
$ajax_filter = !empty($archive_settings['filter_bar']);
|
||||
$sort_state = function_exists('aksrt_archive_get_sort_state')
|
||||
? aksrt_archive_get_sort_state((array) ($archive_settings['orderby_option'] ?? []))
|
||||
: ['current' => 'date', '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'])
|
||||
: ['context' => 'category'];
|
||||
|
||||
$sort_state = aksrt_archive_get_sort_state((array) ($archive_settings['orderby_option'] ?? []));
|
||||
$filter_groups = [];
|
||||
if (!empty($archive_settings['ajax_category_enabled']) && function_exists('aksrt_archive_build_term_filter_group')) {
|
||||
$group = aksrt_archive_build_term_filter_group('category', (array) ($archive_settings['ajax_category'] ?? []), __('分类', 'aksrt'), $ajax_filter);
|
||||
if ($group !== []) {
|
||||
$filter_groups[] = $group;
|
||||
foreach (['category' => __('分类', 'aksrt'), 'post_tag' => __('标签', 'aksrt')] as $taxonomy => $label) {
|
||||
$key = $taxonomy === 'category' ? 'ajax_category' : 'ajax_tag';
|
||||
if (!empty($archive_settings[$key . '_enabled'])) {
|
||||
$group = aksrt_archive_build_term_filter_group($taxonomy, (array) $archive_settings[$key], $label);
|
||||
if ($group) {
|
||||
$filter_groups[] = $group;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!empty($archive_settings['ajax_tag_enabled']) && function_exists('aksrt_archive_build_term_filter_group')) {
|
||||
$group = aksrt_archive_build_term_filter_group('post_tag', (array) ($archive_settings['ajax_tag'] ?? []), __('标签', 'aksrt'), $ajax_filter);
|
||||
if ($group !== []) {
|
||||
$filter_groups[] = $group;
|
||||
}
|
||||
if (!empty($archive_settings['custom_filter_enabled'])) {
|
||||
$filter_groups = array_merge($filter_groups, aksrt_archive_build_custom_filter_groups(
|
||||
(array) $archive_settings['custom_dimensions'], $archive_settings['custom_filter_keys']
|
||||
));
|
||||
}
|
||||
if (!empty($archive_settings['custom_filter_enabled']) && function_exists('aksrt_archive_build_custom_filter_groups')) {
|
||||
$filter_groups = array_merge(
|
||||
$filter_groups,
|
||||
aksrt_archive_build_custom_filter_groups(
|
||||
(array) ($archive_settings['custom_dimensions'] ?? []),
|
||||
$archive_settings['custom_filter_keys'] ?? 'all',
|
||||
$ajax_filter
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
if (function_exists('aksrt_archive_open_shell')) {
|
||||
aksrt_archive_open_shell([
|
||||
'main_class' => 'site-main container',
|
||||
'has_sidebar' => $has_sidebar,
|
||||
'top_fluid' => ['cat_top_fluid'],
|
||||
'page_kind' => 'category',
|
||||
aksrt_archive_open_shell([
|
||||
'main_class' => 'site-main container', 'has_sidebar' => $has_sidebar,
|
||||
'top_fluid' => ['cat_top_fluid'], 'page_kind' => 'category',
|
||||
]);
|
||||
aksrt_archive_render_widget_zone(['cat_top_content']);
|
||||
aksrt_archive_render_term_header([
|
||||
'header_style' => $archive_settings['header_style'],
|
||||
'show_cover' => !empty($archive_settings['show_cover']),
|
||||
'cover_url' => (string) $archive_settings['cover_url'],
|
||||
'title' => single_cat_title('', false),
|
||||
'description' => !empty($archive_settings['show_desc']) ? $archive_settings['description'] : '',
|
||||
'post_count' => !empty($archive_settings['post_count']),
|
||||
]);
|
||||
ob_start();
|
||||
if ($ajax_filter) {
|
||||
aksrt_archive_render_filter_bar([
|
||||
'aria_label' => __('分类筛选', 'aksrt'), 'groups' => $filter_groups,
|
||||
'sort_enabled' => !empty($archive_settings['orderby_enabled']),
|
||||
'sort_current' => $sort_state['current'], 'sort_links' => $sort_state['links'],
|
||||
'sort_labels' => \AKSRT\Settings\Settings::homepage_sort_labels(),
|
||||
'sort_option' => (array) $archive_settings['orderby_option'],
|
||||
]);
|
||||
}
|
||||
?>
|
||||
<?php if (function_exists('aksrt_archive_render_widget_zone')) { aksrt_archive_render_widget_zone(['cat_top_content']); } elseif (is_active_sidebar('cat_top_content')) { dynamic_sidebar('cat_top_content'); } ?>
|
||||
|
||||
<div class="content-main content-main--archive content-main--category">
|
||||
<?php if (function_exists('aksrt_breadcrumbs')) { aksrt_breadcrumbs(); } ?>
|
||||
|
||||
<?php
|
||||
if (function_exists('aksrt_archive_render_term_header')) {
|
||||
aksrt_archive_render_term_header([
|
||||
'header_style' => $header_style,
|
||||
'show_cover' => !empty($archive_settings['show_cover']),
|
||||
'cover_url' => (string) ($archive_settings['cover_url'] ?? ''),
|
||||
'eyebrow' => __('分类归档', 'aksrt'),
|
||||
'title' => single_cat_title('', false),
|
||||
'description' => $description,
|
||||
'admin_path' => 'page-display/category',
|
||||
'admin_label' => __('分类页设置', 'aksrt'),
|
||||
]);
|
||||
}
|
||||
?>
|
||||
|
||||
<?php
|
||||
if (!empty($archive_settings['filter_bar']) && function_exists('aksrt_archive_render_filter_bar')) {
|
||||
aksrt_archive_render_filter_bar([
|
||||
'ajax' => $ajax_filter,
|
||||
'ajax_archive' => 'category',
|
||||
'term_id' => (int) $term->term_id,
|
||||
'aria_label' => __('分类筛选', 'aksrt'),
|
||||
'meta_text' => !empty($archive_settings['post_count']) ? sprintf(_n('%d 篇文章', '%d 篇文章', (int) $term->count, 'aksrt'), (int) $term->count) : '',
|
||||
'groups' => $filter_groups,
|
||||
'sort_enabled' => !empty($archive_settings['orderby_enabled']),
|
||||
'sort_current' => $current_sort,
|
||||
'sort_links' => $sort_links,
|
||||
'sort_labels' => class_exists('\AKSRT\Settings\Settings') ? \AKSRT\Settings\Settings::homepage_sort_labels() : [],
|
||||
'sort_as_main' => false,
|
||||
]);
|
||||
}
|
||||
?>
|
||||
|
||||
<?php
|
||||
if (function_exists('aksrt_archive_render_stream')) {
|
||||
aksrt_archive_render_stream(null, $render_config, [
|
||||
'page_kind' => 'category',
|
||||
'query_context' => 'archive',
|
||||
'stream_class' => 'archive__ajax-wrap content-stream--archive content-stream--category',
|
||||
'empty_text' => __('该分类下暂无文章', 'aksrt'),
|
||||
'ajax_enabled' => $ajax_filter,
|
||||
]);
|
||||
}
|
||||
?>
|
||||
|
||||
<?php if (function_exists('aksrt_archive_render_widget_zone')) { aksrt_archive_render_widget_zone(['cat_bottom_content']); } elseif (is_active_sidebar('cat_bottom_content')) { dynamic_sidebar('cat_bottom_content'); } ?>
|
||||
</div>
|
||||
<?php
|
||||
if (function_exists('aksrt_archive_close_shell')) {
|
||||
aksrt_archive_close_shell([
|
||||
'has_sidebar' => $has_sidebar,
|
||||
'bottom_fluid' => ['cat_bottom_fluid'],
|
||||
]);
|
||||
}
|
||||
|
||||
$filter_html = (string) ob_get_clean();
|
||||
aksrt_archive_render_stream(null, aksrt_archive_get_render_config(['context' => 'category']), [
|
||||
'page_kind' => 'category', 'query_context' => 'archive',
|
||||
'empty_text' => __('暂无内容', 'aksrt'),
|
||||
'filter_html' => $filter_html,
|
||||
]);
|
||||
aksrt_archive_render_widget_zone(['cat_bottom_content']);
|
||||
aksrt_archive_close_shell(['has_sidebar' => $has_sidebar, 'bottom_fluid' => ['cat_bottom_fluid']]);
|
||||
get_footer();
|
||||
Reference in new issue
Block a user