+ +
++ + +
++ + + +
render_common_form_section($instance); ?> update_common_fields($new_instance, $old_instance, [ - 'title' => sanitize_text_field((string) ($new_instance['title'] ?? '')), - 'user_id' => max(0, (int) ($new_instance['user_id'] ?? 0)), - 'show_img_bg' => !empty($new_instance['show_img_bg']) ? 1 : 0, - 'show_stats' => !empty($new_instance['show_stats']) ? 1 : 0, - 'show_follow' => !empty($new_instance['show_follow']) ? 1 : 0, - 'show_badge' => !empty($new_instance['show_badge']) ? 1 : 0, - 'show_posts' => !empty($new_instance['show_posts']) ? 1 : 0, - 'limit' => max(0, min(12, (int) ($new_instance['limit'] ?? 6))), - 'post_style' => $post_style, - 'orderby' => $orderby, + 'title' => sanitize_text_field((string) ($new_instance['title'] ?? '')), + 'user_id' => max(0, (int) ($new_instance['user_id'] ?? 0)), + 'show_img_bg' => !empty($new_instance['show_img_bg']) ? 1 : 0, + 'show_stats' => !empty($new_instance['show_stats']) ? 1 : 0, + 'show_follow' => !empty($new_instance['show_follow']) ? 1 : 0, + 'show_badge' => !empty($new_instance['show_badge']) ? 1 : 0, + 'show_posts' => !empty($new_instance['show_posts']) ? 1 : 0, + 'show_button' => !empty($new_instance['show_button']) ? 1 : 0, + 'limit' => max(0, min(12, (int) ($new_instance['limit'] ?? 6))), + 'post_style' => $post_style, + 'orderby' => $orderby, + 'button_1' => 'post', + 'button_1_text'=> sanitize_text_field((string) ($new_instance['button_1_text'] ?? '')), + 'button_1_class'=> WidgetUserCard::sanitize_palette((string) ($new_instance['button_1_class'] ?? 'jb-pink'), 'jb-pink'), + 'button_2' => in_array((string) ($new_instance['button_2'] ?? 'center'), ['home', 'center'], true) ? $new_instance['button_2'] : 'center', + 'button_2_text'=> sanitize_text_field((string) ($new_instance['button_2_text'] ?? '')), + 'button_2_class'=> WidgetUserCard::sanitize_palette((string) ($new_instance['button_2_class'] ?? 'jb-blue'), 'jb-blue'), ]); } } diff --git a/src/AKSRT/Widgets/WidgetSlider.php b/src/AKSRT/Widgets/WidgetSlider.php index f19c96de..e5c34c38 100644 --- a/src/AKSRT/Widgets/WidgetSlider.php +++ b/src/AKSRT/Widgets/WidgetSlider.php @@ -39,17 +39,27 @@ class WidgetSlider extends \WP_Widget { return; } - $interval = max(2, min(20, (int) ($instance['interval'] ?? 4))); + $interval = max(0, min(20, (int) ($instance['interval'] ?? 4))); $loop = !isset($instance['loop']) || !empty($instance['loop']); $dots = !isset($instance['pagination']) || !empty($instance['pagination']); $nav = !isset($instance['button']) || !empty($instance['button']); $blank = !empty($instance['blank']); - $height = max(80, min(800, (int) ($instance['height'] ?? 220))); + $height = max(80, min(800, (int) ($instance['height'] ?? $instance['pc_height'] ?? 400))); $m_height = max(60, min(800, (int) ($instance['m_height'] ?? $height))); $effect = sanitize_key((string) ($instance['effect'] ?? 'slide')); if (!in_array($effect, ['slide', 'fade', 'cube', 'coverflow', 'flip'], true)) { $effect = 'slide'; } + // Zibll CFS_Module::slide() options parity. + $direction = sanitize_key((string) ($instance['direction'] ?? 'horizontal')); + if (!in_array($direction, ['horizontal', 'vertical'], true)) { + $direction = 'horizontal'; + } + $autoplay = !isset($instance['autoplay']) || !empty($instance['autoplay']); + $speed = max(0, min(3000, (int) ($instance['speed'] ?? 0))); + $spacebetween= max(0, min(500, (int) ($instance['spacebetween'] ?? 15))); + $scale_height= !empty($instance['scale_height']) || !isset($instance['scale_height']); + $scale = max(10, min(300, (int) ($instance['scale'] ?? 35))); $slide_payload = []; foreach ($slides as $slide) { @@ -75,10 +85,15 @@ class WidgetSlider extends \WP_Widget { 'slides' => $slide_payload, 'effect' => $effect, 'loop' => $loop, - 'autoplay' => true, + 'autoplay' => $autoplay, 'interval' => $interval * 1000, + 'speed' => $speed, + 'direction' => $direction, + 'spaceBetween' => $spacebetween, 'pc_height' => $height . 'px', 'm_height' => $m_height . 'px', + 'scale_height' => $scale_height && $direction !== 'vertical', + 'scale_ratio' => $scale / 100, 'show_nav' => $nav, 'show_pagination' => $dots, 'slider_class' => 'slide-widget', @@ -107,9 +122,13 @@ class WidgetSlider extends \WP_Widget { public function form($instance): void { $title = (string) ($instance['title'] ?? ''); $interval = (int) ($instance['interval'] ?? 4); - $height = (int) ($instance['height'] ?? 220); + $height = (int) ($instance['height'] ?? $instance['pc_height'] ?? 400); $m_height = (int) ($instance['m_height'] ?? $height); $effect = sanitize_key((string) ($instance['effect'] ?? 'slide')); + $direction = sanitize_key((string) ($instance['direction'] ?? 'horizontal')); + $speed = (int) ($instance['speed'] ?? 0); + $spacebetween = (int) ($instance['spacebetween'] ?? 15); + $scale = (int) ($instance['scale'] ?? 35); $slides = $this->normalize_slides($instance['slides'] ?? []); if (!$slides) { $slides = [ @@ -124,18 +143,11 @@ class WidgetSlider extends \WP_Widget {- -
-- -
--
@@ -149,10 +161,38 @@ class WidgetSlider extends \WP_Widget {
++ + +
++ + +
++ + +
++ +
+
+ +
@@ -307,8 +334,12 @@ class WidgetUserCard extends \WP_Widget {
'title' => sanitize_text_field((string) ($new_instance['title'] ?? '')),
'user_id' => max(0, (int) ($new_instance['user_id'] ?? 0)),
'loged_title' => sanitize_text_field((string) ($new_instance['loged_title'] ?? '')),
+ 'button_1' => 'post',
'button_1_text' => sanitize_text_field((string) ($new_instance['button_1_text'] ?? '')),
+ 'button_1_class'=> self::sanitize_palette((string) ($new_instance['button_1_class'] ?? 'jb-pink'), 'jb-pink'),
+ 'button_2' => in_array((string) ($new_instance['button_2'] ?? 'center'), ['home', 'center'], true) ? $new_instance['button_2'] : 'center',
'button_2_text' => sanitize_text_field((string) ($new_instance['button_2_text'] ?? '')),
+ 'button_2_class'=> self::sanitize_palette((string) ($new_instance['button_2_class'] ?? 'jb-blue'), 'jb-blue'),
'show_img_bg' => !empty($new_instance['show_img_bg']) ? 1 : 0,
'show_stats' => !empty($new_instance['show_stats']) ? 1 : 0,
'show_button' => !empty($new_instance['show_button']) ? 1 : 0,
@@ -319,4 +350,31 @@ class WidgetUserCard extends \WP_Widget {
'orderby' => $orderby,
]);
}
+
+ /** Zibll CFS_Module::zib_palette() gradient/solid keys (c/b/jb families). */
+ public static function palette_opts(): array {
+ return [
+ 'jb-red' => __('红', 'aksrt'),
+ 'jb-yellow' => __('橙', 'aksrt'),
+ 'jb-pink' => __('粉', 'aksrt'),
+ 'jb-cyan' => __('青', 'aksrt'),
+ 'jb-blue' => __('蓝', 'aksrt'),
+ 'jb-green' => __('绿', 'aksrt'),
+ 'jb-purple' => __('紫', 'aksrt'),
+ 'jb-vip1' => __('会员金', 'aksrt'),
+ 'jb-vip2' => __('会员灰', 'aksrt'),
+ 'b-red' => __('红(纯色)', 'aksrt'),
+ 'b-yellow' => __('橙(纯色)', 'aksrt'),
+ 'b-cyan' => __('青(纯色)', 'aksrt'),
+ 'b-blue' => __('蓝(纯色)', 'aksrt'),
+ 'b-green' => __('绿(纯色)', 'aksrt'),
+ 'b-purple' => __('紫(纯色)', 'aksrt'),
+ 'b-black' => __('黑(纯色)', 'aksrt'),
+ ];
+ }
+
+ public static function sanitize_palette(string $value, string $fallback): string {
+ $value = sanitize_html_class($value);
+ return array_key_exists($value, self::palette_opts()) ? $value : $fallback;
+ }
}
diff --git a/src/AKSRT/Widgets/WidgetUserRanking.php b/src/AKSRT/Widgets/WidgetUserRanking.php
index bae78ec7..639a8870 100644
--- a/src/AKSRT/Widgets/WidgetUserRanking.php
+++ b/src/AKSRT/Widgets/WidgetUserRanking.php
@@ -27,8 +27,21 @@ class WidgetUserRanking extends \WP_Widget {
public function widget($args, $instance): void {
$title = !empty($instance['title']) ? (string) $instance['title'] : __('排行榜', 'aksrt');
- $rank_by = !empty($instance['rank_by']) ? (string) $instance['rank_by'] : 'credits';
- $count = max(1, min(20, (int) ($instance['count'] ?? 5)));
+ // Zibll zib_widget_ui_user_ranking: `orderby` (default checkin_all_day) + `number`.
+ // Accept AKSRT legacy `rank_by`/`count` as aliases.
+ $rank_by = (string) ($instance['orderby'] ?? $instance['rank_by'] ?? 'checkin_all_day');
+ // Map Zibll `points` → AKSRT `credits`; `followed-user-count` → `followers`.
+ $rank_aliases = [
+ 'points' => 'credits',
+ 'followed-user-count' => 'followers',
+ 'checkin_all_day' => 'checkin_all_day',
+ 'checkin_continuous_day' => 'checkin_continuous_day',
+ 'credits' => 'credits',
+ 'posts' => 'posts',
+ 'followers' => 'followers',
+ ];
+ $rank_by = $rank_aliases[$rank_by] ?? 'checkin_all_day';
+ $count = max(1, min(20, (int) ($instance['number'] ?? $instance['count'] ?? 6)));
$show_avatar = !isset($instance['show_avatar']) || !empty($instance['show_avatar']);
$desc_mode = sanitize_key((string) ($instance['desc'] ?? 'desc'));
$top_badge = !empty($instance['top_badge']);
@@ -292,8 +305,9 @@ class WidgetUserRanking extends \WP_Widget {
public function form($instance): void {
$title = !empty($instance['title']) ? $instance['title'] : __('排行榜', 'aksrt');
- $rank_by = !empty($instance['rank_by']) ? $instance['rank_by'] : 'credits';
- $count = !empty($instance['count']) ? (int) $instance['count'] : 5;
+ // Zibll field is `orderby` (default checkin_all_day); accept legacy `rank_by`.
+ $rank_by = (string) ($instance['orderby'] ?? $instance['rank_by'] ?? 'checkin_all_day');
+ $count = !empty($instance['number']) ? (int) $instance['number'] : (!empty($instance['count']) ? (int) $instance['count'] : 6);
$show_avatar = !isset($instance['show_avatar']) || !empty($instance['show_avatar']);
?>
@@ -301,18 +315,17 @@ class WidgetUserRanking extends \WP_Widget {
- -
- - + +
render_common_form_section($instance); ?> @@ -346,10 +359,17 @@ class WidgetUserRanking extends \WP_Widget { } public function update($new_instance, $old_instance): array { + $rank_by = (string) ($new_instance['orderby'] ?? $new_instance['rank_by'] ?? 'checkin_all_day'); + $allowed = ['checkin_all_day', 'checkin_continuous_day', 'points', 'followed-user-count', 'credits', 'posts', 'followers']; + if (!in_array($rank_by, $allowed, true)) { + $rank_by = 'checkin_all_day'; + } return $this->update_common_fields($new_instance, $old_instance, [ 'title' => sanitize_text_field($new_instance['title'] ?? ''), - 'rank_by' => in_array($new_instance['rank_by'] ?? '', ['credits', 'posts', 'followers', 'checkin_all_day', 'checkin_continuous_day'], true) ? $new_instance['rank_by'] : 'credits', - 'count' => max(1, min(20, (int) ($new_instance['count'] ?? 5))), + 'orderby' => $rank_by, + 'rank_by' => $rank_by, // keep alias for any legacy readers. + 'number' => max(1, min(20, (int) ($new_instance['number'] ?? $new_instance['count'] ?? 6))), + 'count' => max(1, min(20, (int) ($new_instance['number'] ?? $new_instance['count'] ?? 6))), 'show_avatar' => !empty($new_instance['show_avatar']) ? 1 : 0, 'checkin_btn' => !empty($new_instance['checkin_btn']) ? 1 : 0, 'top_badge' => !empty($new_instance['top_badge']) ? 1 : 0,