fix(frontend): align search and header components with reference
This commit is contained in:
kate522 committed
1 parent
4c13ef478c
commit
542daca457
34 files changed
+803
-705
No files matched your search
@@ -180,15 +180,6 @@ if (!function_exists('aksrt_get_search_box')) :
|
||||
}
|
||||
$args['placeholder'] = esc_attr((string) $args['placeholder']);
|
||||
|
||||
// Settings gates when caller left defaults on.
|
||||
if (class_exists('\AKSRT\Settings\Settings')) {
|
||||
if (!array_key_exists('show_keywords_forced', $args)
|
||||
&& method_exists('\AKSRT\Settings\Settings', 'hot_search_enabled')
|
||||
&& !\AKSRT\Settings\Settings::hot_search_enabled()) {
|
||||
// Keep explicit false from caller; only gate when show_keywords true by default path.
|
||||
}
|
||||
}
|
||||
|
||||
$form_html = '';
|
||||
if (!empty($args['show_form'])) {
|
||||
$state = function_exists('aksrt_get_search_form_state')
|
||||
@@ -201,33 +192,36 @@ if (!function_exists('aksrt_get_search_box')) :
|
||||
'categories' => [],
|
||||
];
|
||||
|
||||
$type_html = '';
|
||||
$types = is_array($state['types'] ?? null) ? $state['types'] : [];
|
||||
$in_type = (string) ($args['in_type'] ?: ($state['type'] ?? 'post'));
|
||||
if (!empty($args['show_type']) && count($types) > 1) {
|
||||
$type_items = '';
|
||||
foreach ($types as $k => $v) {
|
||||
$cls = $in_type === (string) $k ? ' active' : '';
|
||||
$type_items .= '<a class="but' . esc_attr($cls) . '" data-for="type" data-value="'
|
||||
. esc_attr((string) $k) . '" href="javascript:;">' . esc_html((string) $v) . '</a>';
|
||||
}
|
||||
$type_html = '<div class="flex jc mb10 search-type-but-average">';
|
||||
$type_html .= '<div class="but-average radius">' . $type_items . '</div></div>';
|
||||
}
|
||||
|
||||
$cat_html = '';
|
||||
if (!empty($args['show_input_cat']) && !empty($state['category_enabled'])
|
||||
&& !empty($state['categories']) && is_array($state['categories'])) {
|
||||
$in_cat_id = (int) ($args['in_cat'] ?: ($state['category_id'] ?? 0));
|
||||
$in_cat_name = '';
|
||||
$all_cat = '<li data-for="trem" data-value="null"><a href="javascript:;" class="text-ellipsis">'
|
||||
$category_terms = [];
|
||||
if (!empty($args['show_input_cat'])) {
|
||||
$category_ids = is_array($args['more_cats'])
|
||||
? $args['more_cats']
|
||||
: (preg_split('/[,，\s]+/', (string) $args['more_cats']) ?: []);
|
||||
if ($category_ids && function_exists('aksrt_get_search_categories')) {
|
||||
$category_terms = aksrt_get_search_categories($category_ids);
|
||||
}
|
||||
if ((int) $args['in_cat'] > 0) {
|
||||
$selected_term = get_term((int) $args['in_cat']);
|
||||
if ($selected_term && !is_wp_error($selected_term)) {
|
||||
$selected_term_name = (string) $selected_term->name;
|
||||
if (!$category_terms) {
|
||||
$category_terms = [$selected_term];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($category_terms) {
|
||||
$in_cat_id = (int) $args['in_cat'];
|
||||
$in_cat_name = $in_cat_id > 0 ? (string) ($selected_term_name ?? '') : '';
|
||||
$all_cat = '<li data-for="trem" data-value="null"><a href="javascript:;" class="text-ellipsis">'
|
||||
. esc_html__('全部', 'aksrt') . '</a></li>';
|
||||
foreach ($state['categories'] as $cat) {
|
||||
if (!is_array($cat)) {
|
||||
foreach ($category_terms as $cat) {
|
||||
if (!$cat instanceof WP_Term) {
|
||||
continue;
|
||||
}
|
||||
$cid = (int) ($cat['id'] ?? 0);
|
||||
$cname = (string) ($cat['name'] ?? '');
|
||||
$cid = (int) $cat->term_id;
|
||||
$cname = (string) $cat->name;
|
||||
if ($cid <= 0 || $cname === '') {
|
||||
continue;
|
||||
}
|
||||
@@ -249,37 +243,57 @@ if (!function_exists('aksrt_get_search_box')) :
|
||||
. $input_cat . '</div></div>';
|
||||
}
|
||||
|
||||
$s = esc_attr(wp_strip_all_tags((string) $args['s']));
|
||||
if ($s === '' && is_search()) {
|
||||
$s = esc_attr(get_search_query());
|
||||
$type_html = '';
|
||||
$type_dropdown_html = '';
|
||||
$types = is_array($state['types'] ?? null) ? $state['types'] : [];
|
||||
$in_type = (string) ($args['in_type'] ?: ($state['type'] ?? 'post'));
|
||||
if (!empty($args['show_type']) && count($types) > 1) {
|
||||
$type_name = (string) ($types[$in_type] ?? reset($types));
|
||||
if ($cat_html !== '') {
|
||||
$type_items = '';
|
||||
foreach ($types as $key => $label) {
|
||||
$cls = $in_type === (string) $key ? ' active' : '';
|
||||
$type_items .= '<a class="but' . esc_attr($cls) . '" data-for="type" data-value="'
|
||||
. esc_attr((string) $key) . '" href="javascript:;">' . esc_html((string) $label) . '</a>';
|
||||
}
|
||||
$type_html = '<div class="flex jc mb10 search-type-but-average"><div class="but-average radius">'
|
||||
. $type_items . '</div></div>';
|
||||
} else {
|
||||
$type_items = '';
|
||||
foreach ($types as $key => $label) {
|
||||
$type_items .= '<li><a href="javascript:;" class="text-ellipsis" data-for="type" data-value="'
|
||||
. esc_attr((string) $key) . '">' . esc_html((string) $label) . '</a></li>';
|
||||
}
|
||||
$type_dropdown_html = '<div class="option-dropdown splitters-this-r search-drop"><div class="dropdown">'
|
||||
. '<a href="javascript:;" class="padding-h10" data-toggle="dropdown"><span name="type">'
|
||||
. esc_html($type_name) . '</span><i class="fa ml6 fa-sort opacity5" aria-hidden="true"></i></a>'
|
||||
. '<ul class="dropdown-menu">' . $type_items . '</ul></div></div>';
|
||||
}
|
||||
}
|
||||
|
||||
$s = esc_attr(wp_strip_all_tags((string) $args['s']));
|
||||
$input_html = '<div class="search-input-text">';
|
||||
$input_html .= '<input type="text" name="s" class="line-form-input" tabindex="1" value="' . $s . '">';
|
||||
$input_html .= '<i class="line-form-line"></i>';
|
||||
$input_html .= '<div class="scale-placeholder' . ($s !== '' ? ' is-focus' : '') . '" default="'
|
||||
. $args['placeholder'] . '">' . $args['placeholder'] . '</div>';
|
||||
$input_html .= '<div class="abs-right muted-color"><button type="submit" tabindex="2" class="null" aria-label="'
|
||||
. esc_attr__('搜索', 'aksrt') . '"><i class="fa fas fa-search" aria-hidden="true"></i></button></div>';
|
||||
. esc_attr__('搜索', 'aksrt') . '"><svg class="icon" aria-hidden="true"><use xlink:href="#icon-search"></use></svg></button></div>';
|
||||
$input_html .= '</div>';
|
||||
|
||||
$input_html .= '<input type="hidden" name="type" value="' . esc_attr($in_type) . '">';
|
||||
if ($cat_html !== '' || (string) $args['in_cat'] !== '') {
|
||||
$input_html .= '<input type="hidden" name="trem" value="'
|
||||
. esc_attr((string) ($args['in_cat'] !== '' ? $args['in_cat'] : ($state['category_id'] ?? 0))) . '">';
|
||||
. esc_attr((string) $args['in_cat']) . '">';
|
||||
}
|
||||
if ((string) $args['in_user'] !== '') {
|
||||
$input_html .= '<input type="hidden" name="user" value="' . esc_attr((string) $args['in_user']) . '">';
|
||||
}
|
||||
|
||||
if ($cat_html === '') {
|
||||
$cat_html = $type_html;
|
||||
$type_html = '';
|
||||
}
|
||||
|
||||
$form_html = '<form method="get" class="padding-10 search-form" action="'
|
||||
. esc_url(home_url('/')) . '">'
|
||||
. $type_html
|
||||
. '<div class="line-form">' . $cat_html . $input_html . '</div>'
|
||||
. '<div class="line-form">' . ($cat_html !== '' ? $cat_html : $type_dropdown_html) . $input_html . '</div>'
|
||||
. '</form>';
|
||||
}
|
||||
|
||||
@@ -318,7 +332,8 @@ if (!function_exists('aksrt_get_search_box')) :
|
||||
if ($keyword_link !== '') {
|
||||
$history_html = '<div class="search-keywords history-search">';
|
||||
$history_html .= '<p class="muted-color"><span>' . esc_html__('历史搜索', 'aksrt') . '</span>';
|
||||
$history_html .= '<a class="pull-right trash-history-search muted-3-color" href="javascript:;" aria-label="'
|
||||
$history_html .= '<a class="pull-right trash-history-search muted-3-color" href="javascript:;" data-cookie-path="'
|
||||
. esc_attr(COOKIEPATH ?: '/') . '" data-cookie-domain="' . esc_attr(COOKIE_DOMAIN) . '" aria-label="'
|
||||
. esc_attr__('清空历史', 'aksrt') . '"><i class="fa fas fa-trash-alt em12" aria-hidden="true"></i></a></p>';
|
||||
$history_html .= '<div>' . $keyword_link . '</div></div>';
|
||||
}
|
||||
@@ -345,7 +360,9 @@ if (!function_exists('aksrt_get_search_box')) :
|
||||
}
|
||||
}
|
||||
|
||||
$class = $args['class'] ? ' ' . sanitize_html_class((string) $args['class']) : '';
|
||||
$class_tokens = preg_split('/\s+/', trim((string) $args['class'])) ?: [];
|
||||
$class_tokens = array_values(array_filter(array_map('sanitize_html_class', $class_tokens)));
|
||||
$class = $class_tokens ? ' ' . implode(' ', $class_tokens) : '';
|
||||
$html = '<div class="search-input' . esc_attr($class) . '">'
|
||||
. $form_html . $keywords_html . $history_html . $posts_html
|
||||
. '</div>';
|
||||
|
||||
Reference in new issue
Block a user