diff --git a/assets/js/cms-download.js b/assets/js/cms-download.js index f720f287..3779fed4 100644 --- a/assets/js/cms-download.js +++ b/assets/js/cms-download.js @@ -698,7 +698,7 @@ if (preview.balance_enough === false) { if (preview.credits_url) { body += '' + - '抱歉！余额不足，请先充值 '; + '抱歉！余额不足，请先充值 '; } else { body += '
抱歉！余额不足，请先充值
'; } diff --git a/assets/js/comment-ajax.js b/assets/js/comment-ajax.js index db38d3a9..4cf3541a 100644 --- a/assets/js/comment-ajax.js +++ b/assets/js/comment-ajax.js @@ -133,7 +133,7 @@ if (!result.success) { notyf((result.data && result.data.message) || result.message || '操作失败', 'danger'); return; } var pinned = !!(result.data && result.data.pinned); btn.setAttribute('data-pinned', pinned ? '1' : '0'); - btn.innerHTML = '' + (pinned ? '取消置顶' : '设置置顶'); + btn.innerHTML = '' + (pinned ? '取消置顶' : '设置置顶'); syncPinnedBadge(commentEl, pinned); notyf(result.message || (pinned ? '评论已置顶。' : '已取消置顶。'), 'success'); }) @@ -148,7 +148,7 @@ badge = document.createElement('badge'); badge.className = 'badge-topping jb-blue mr6 flex0'; badge.title = '置顶评论'; - badge.innerHTML = ''; + badge.innerHTML = ''; name.insertBefore(badge, name.firstChild); } else if (!pinned && badge) { badge.remove(); diff --git a/inc/helpers/aksrt-comments.php b/inc/helpers/aksrt-comments.php index 1176d10d..8089315d 100644 --- a/inc/helpers/aksrt-comments.php +++ b/inc/helpers/aksrt-comments.php @@ -403,7 +403,7 @@ if (!function_exists('aksrt_comments_render_signarea')) :

- + @@ -508,7 +508,7 @@ if (!function_exists('aksrt_comments_render_form')) : $req_mark = $require_name_email ? '(' . __('必填', 'aksrt') . ')' : ''; ?> > - +

@@ -516,20 +516,20 @@ if (!function_exists('aksrt_comments_render_form')) :
  • -
    +
  • -
    +
  • -
    +
    • diff --git a/inc/helpers/aksrt-identity.php b/inc/helpers/aksrt-identity.php index ecce4f3d..da4a6a02 100644 --- a/inc/helpers/aksrt-identity.php +++ b/inc/helpers/aksrt-identity.php @@ -328,7 +328,7 @@ if (!function_exists('aksrt_get_user_badges')) { $html .= '' . aksrt_renderer_svg_icon('post') . $post_n . ''; $html .= '' . aksrt_renderer_svg_icon('comment') . $com_n . ''; if ($followed_n) { - $html .= '' . $followed_n . ''; + $html .= '' . $followed_n . ''; } elseif ($like_n) { $html .= '' . aksrt_renderer_svg_icon('like') . $like_n . ''; } diff --git a/inc/helpers/aksrt-pay.php b/inc/helpers/aksrt-pay.php index 5de56b07..7f504992 100644 --- a/inc/helpers/aksrt-pay.php +++ b/inc/helpers/aksrt-pay.php @@ -1344,18 +1344,18 @@ if (!function_exists('aksrt_get_paywall_html')) { : __('开通会员', 'aksrt'); $action_class = is_user_logged_in() ? 'pay-vip' : 'signin-loader'; $icon = aksrt_get_pay_vip_icon_html($level_settings); - $button = '
    ' . esc_html(sprintf(__('您暂无购买权限，请先%s', 'aksrt'), $vip_action)) . '
    '; + $button = '
    ' . esc_html(sprintf(__('您暂无购买权限，请先%s', 'aksrt'), $vip_action)) . '
    '; $button .= '' . $icon . esc_html($vip_action) . ''; } elseif (!is_user_logged_in()) { if ($amount_minor > 0 && $modo === '0' && aksrt_allow_guest_content_pay($post)) { - $button = ''; + $button = ''; } else { - $button = ''; + $button = ''; } } elseif ($amount_minor > 0) { - $button = ''; + $button = ''; } else { - $button = ''; + $button = ''; } $price = aksrt_get_show_pay_price_html($meta, $priced); $vip = aksrt_get_posts_vip_price($meta); @@ -1374,12 +1374,12 @@ if (!function_exists('aksrt_get_paywall_html')) { if ($is_widget && aksrt_has_paid_access($post)) { $view_labels = [ - AKSRT_PAY_TYPE_DOWNLOAD => '' . esc_html__('获取下载地址', 'aksrt'), - AKSRT_PAY_TYPE_GALLERY => '' . esc_html__('查看图片', 'aksrt'), - AKSRT_PAY_TYPE_VIDEO => '' . esc_html__('查看视频', 'aksrt'), + AKSRT_PAY_TYPE_DOWNLOAD => '' . esc_html__('获取下载地址', 'aksrt'), + AKSRT_PAY_TYPE_GALLERY => '' . esc_html__('查看图片', 'aksrt'), + AKSRT_PAY_TYPE_VIDEO => '' . esc_html__('查看视频', 'aksrt'), ]; - $view_label = $view_labels[$pay_type] ?? '' . esc_html__('查看内容', 'aksrt'); - return ''; + $view_label = $view_labels[$pay_type] ?? '' . esc_html__('查看内容', 'aksrt'); + return ''; } if ($is_widget) { @@ -1388,7 +1388,7 @@ if (!function_exists('aksrt_get_paywall_html')) { $thumb = get_the_post_thumbnail($post, 'medium', ['class' => 'fit-cover', 'alt' => '']); if ($thumb === '') { - $thumb = '
    '; + $thumb = '
    '; } $graphic_actions = ''; if ($demo !== '' || $discount_text !== '') { @@ -1402,7 +1402,7 @@ if (!function_exists('aksrt_get_paywall_html')) { $gallery_count = count((array) ($meta['gallery'] ?? [])); $graphic = '
    ' . $thumb . '
    ' . esc_html(sprintf(__('共%s张图片', 'aksrt'), $gallery_count)) . '
    ' . esc_html__('请付费后查看', 'aksrt') . '
    ' . $graphic_actions . '
    '; } elseif ($pay_type === AKSRT_PAY_TYPE_VIDEO) { - $graphic = '
    ' . $thumb . '
    ' . $graphic_actions . '
    '; + $graphic = '
    ' . $thumb . '
    ' . $graphic_actions . '
    '; } else { $graphic = '
    ' . $thumb . $graphic_actions . '
    '; } @@ -1471,10 +1471,10 @@ if (!function_exists('aksrt_get_paid_download_actions_html')) { $buttons .= '
    '; if ($direct_download) { $buttons .= ''; - $buttons .= '' . esc_html($label) . ''; + $buttons .= '' . esc_html($label) . ''; } else { $buttons .= ''; + $buttons .= '' . esc_html($label) . ''; } if ($copy_value !== '') { $buttons .= ''; @@ -1552,12 +1552,12 @@ if (!function_exists('aksrt_get_paid_box_html')) { $paid_info .= '
    ' . esc_html__('支付时间', 'aksrt') . '' . esc_html($paid_at) . '
    '; } $paid_info .= '
    ' . esc_html__('支付金额', 'aksrt') . '' . esc_html($amount_text) . '
    '; - $paid_box = '
    ' . esc_html__('已购买', 'aksrt') . '
    '; + $paid_box = '
    ' . esc_html__('已购买', 'aksrt') . '
    '; } elseif ($vip_level > 0 || $pay_type === AKSRT_PAY_TYPE_VIP) { $level = max(1, $vip_level); $price_label = aksrt_get_pay_price_label($post); $price = '
    ' . esc_html((string) ($price_label['text'] ?? '')) . '
    '; - $paid_box = '
    ' . $price . '
    ' . esc_html(sprintf(__('VIP%d 会员免费', 'aksrt'), $level)) . '
    '; + $paid_box = '
    ' . $price . '
    ' . esc_html(sprintf(__('VIP%d 会员免费', 'aksrt'), $level)) . '
    '; } else { $type_label = str_replace(__('付费', 'aksrt'), __('免费', 'aksrt'), $type_label); } @@ -1574,7 +1574,7 @@ if (!function_exists('aksrt_get_paid_box_html')) { if ($pay_type === AKSRT_PAY_TYPE_DOWNLOAD) { $captcha_active = function_exists('aksrt_is_captcha_enabled_for') && aksrt_is_captcha_enabled_for('download'); $root_data = ' data-aksrt-download-box data-post-id="' . esc_attr((string) $post->ID) . '" data-captcha="' . ($captcha_active ? '1' : '0') . '"'; - $download_box = '
    ' . esc_html__('资源下载', 'aksrt') . '
    ' . aksrt_get_paid_download_actions_html($meta) . '
    '; + $download_box = '
    ' . esc_html__('资源下载', 'aksrt') . '
    ' . aksrt_get_paid_download_actions_html($meta) . '
    '; $demo = aksrt_get_demo_link_html($post, 'but jb-yellow padding-lg'); if ($demo !== '') { $download_box .= '
    ' . $demo . '
    '; diff --git a/inc/helpers/comments/form-parts.php b/inc/helpers/comments/form-parts.php index bdba85d9..60fed99f 100644 --- a/inc/helpers/comments/form-parts.php +++ b/inc/helpers/comments/form-parts.php @@ -50,7 +50,7 @@ if (!function_exists('aksrt_get_input_expand_but')) : switch ($type) { case 'link': - $but = '' . esc_html__('链接', 'aksrt') . ''; + $but = '' . esc_html__('链接', 'aksrt') . ''; $dropdown = '
    '; $dropdown .= '

    ' . esc_html__('请输入链接：', 'aksrt') . '

    '; $dropdown .= '

    '; @@ -60,7 +60,7 @@ if (!function_exists('aksrt_get_input_expand_but')) : break; case 'code': - $but = '' . esc_html__('代码', 'aksrt') . ''; + $but = '' . esc_html__('代码', 'aksrt') . ''; $dropdown = '
    '; $dropdown .= '

    ' . esc_html__('请输入代码：', 'aksrt') . '

    '; $dropdown .= '

    '; @@ -70,7 +70,7 @@ if (!function_exists('aksrt_get_input_expand_but')) : case 'image': $upload = !empty($arg1) || !empty($ctx['upload']); - $but = '' . esc_html__('图片', 'aksrt') . ''; + $but = '' . esc_html__('图片', 'aksrt') . ''; $dropdown = '
    '; $dropdown .= '

    ' . esc_html__('请填写图片地址：', 'aksrt') . '

    '; diff --git a/inc/helpers/comments/item.php b/inc/helpers/comments/item.php index cab6a8de..7b150e8a 100644 --- a/inc/helpers/comments/item.php +++ b/inc/helpers/comments/item.php @@ -163,10 +163,10 @@ if (!function_exists('aksrt_get_comments_action_dropdown_html')) : $label = $is_pinned ? __('取消置顶', 'aksrt') : __('设置置顶', 'aksrt'); // 不带 legacy 的 wp-ajax-submit 类：vendor main.min.js 会全局代理该类并向 // admin-ajax 发空 action 请求（400 "0"），置顶走 data-comment-action REST。 - $lists .= '
  • ' . esc_html($label) . '
    • '; + $lists .= '
  • ' . esc_html($label) . '
    • '; } if (!empty($perms['can_edit'])) { - $lists .= '
  • ' . esc_html__('编辑', 'aksrt') . '
    • '; + $lists .= '
  • ' . esc_html__('编辑', 'aksrt') . '
    • '; } if (!empty($perms['can_moderate'])) { $text = $is_pending ? __('批准', 'aksrt') : __('驳回', 'aksrt'); @@ -176,7 +176,7 @@ if (!function_exists('aksrt_get_comments_action_dropdown_html')) : $lists .= '
  • ' . $approve_icon . '' . esc_html($text) . '
    • '; } if (!empty($perms['can_delete'])) { - $lists .= '
  • ' . esc_html__('删除', 'aksrt') . '
    • '; + $lists .= '
  • ' . esc_html__('删除', 'aksrt') . '
    • '; } if ($lists === '') { diff --git a/inc/helpers/template-tags/search-meta.php b/inc/helpers/template-tags/search-meta.php index cc091115..a24d71eb 100644 --- a/inc/helpers/template-tags/search-meta.php +++ b/inc/helpers/template-tags/search-meta.php @@ -588,8 +588,8 @@ if (!function_exists('aksrt_render_comment_pagination')) { 'base' => $base, 'type' => 'array', 'mid_size' => $is_mobile ? 1 : 2, - 'prev_text' => '' . __('上一页', 'aksrt') . '', - 'next_text' => '' . __('下一页', 'aksrt') . '', + 'prev_text' => '' . __('上一页', 'aksrt') . '', + 'next_text' => '' . __('下一页', 'aksrt') . '', 'total' => $max_pages, 'current' => $paged, 'add_fragment' => '#comments', @@ -601,7 +601,7 @@ if (!function_exists('aksrt_render_comment_pagination')) { } if ($max_pages > 8) { - $array[] = '' . __('跳转', 'aksrt') . ''; + $array[] = '' . __('跳转', 'aksrt') . ''; } echo '
    '; diff --git a/src/Admin/Schema/SchemaPageDisplay.php b/src/Admin/Schema/SchemaPageDisplay.php index c2e25b76..e94ae279 100644 --- a/src/Admin/Schema/SchemaPageDisplay.php +++ b/src/Admin/Schema/SchemaPageDisplay.php @@ -53,7 +53,7 @@ class SchemaPageDisplay { self::field('nav_newposts', 'Add发布按钮', 'switcher', true, ['description' => '顶部导航显示文章投稿按钮。']), self::field('nav_newposts_radius', '按钮圆角', 'switcher', true, ['dependsOn' => self::enabled('nav_newposts')]), self::field('nav_newposts_class', '按钮颜色', 'palette', 'jb-blue', ['dependsOn' => self::enabled('nav_newposts'), 'options' => self::aksrt_palette()]), - self::field('nav_newposts_text', '按钮文案', 'textarea', '发布', ['dependsOn' => self::enabled('nav_newposts'), 'sanitize_type' => 'html', 'rows' => 1]), + self::field('nav_newposts_text', '按钮文案', 'textarea', '发布', ['dependsOn' => self::enabled('nav_newposts'), 'sanitize_type' => 'html', 'rows' => 1]), ]); } @@ -94,7 +94,7 @@ class SchemaPageDisplay { self::field('footer_contact_weibo', '微博链接', 'url', 'https://weibo.com/'), self::field('footer_contact_email', '邮箱', 'text', '1234567788@QQ.COM'), self::field('footer_contact_more', '更多图标联系方式', 'group', [], ['button_title' => '添加图标联系方式', 'fields' => [ - self::field('desc', '按钮名称', 'text', ''), self::field('icon', '按钮图标', 'icon', 'fa fa-heart'), self::field('link', '按钮链接', 'url', '', ['dependsOn' => ['key' => 'img', 'operator' => 'empty']]), self::field('img', '二维码图片', 'upload', ''), + self::field('desc', '按钮名称', 'text', ''), self::field('icon', '按钮图标', 'icon', 'fa fas fa-heart'), self::field('link', '按钮链接', 'url', '', ['dependsOn' => ['key' => 'img', 'operator' => 'empty']]), self::field('img', '二维码图片', 'upload', ''), ]]), self::field('footer_mini_img_m_s', '版块三移动端显示', 'switcher', true), self::field('footer_mini_img', '版块三大图片', 'group', [['image' => $img . 'qrcode.png', 'text' => '扫码加QQ群'], ['image' => $img . 'qrcode.png', 'text' => '扫码加微信']], ['max' => 4, 'button_title' => '添加图片', 'fields' => self::footer_image_fields()]), @@ -181,7 +181,7 @@ class SchemaPageDisplay { } private static function card_fields(): array { - return [self::field('icon_radius4', '方形图标', 'switcher', false), self::field('cards', '添加卡片', 'group', [], ['button_title' => '添加内容', 'fields' => [self::field('title', '文案标题', 'textarea', '', ['sanitize_type' => 'html']), self::field('desc', '文案简介', 'textarea', '', ['sanitize_type' => 'html']), self::field('icon', '选择图标', 'icon', 'fa fa-magic'), self::field('customize_icon', '自定义图标', 'textarea', '', ['sanitize_type' => 'html']), self::field('icon_class', '图标颜色', 'palette', 'c-yellow', ['options' => self::aksrt_palette(true)]), self::field('link', '跳转链接', 'link', [])]])]; + return [self::field('icon_radius4', '方形图标', 'switcher', false), self::field('cards', '添加卡片', 'group', [], ['button_title' => '添加内容', 'fields' => [self::field('title', '文案标题', 'textarea', '', ['sanitize_type' => 'html']), self::field('desc', '文案简介', 'textarea', '', ['sanitize_type' => 'html']), self::field('icon', '选择图标', 'icon', 'fa fas fa-magic'), self::field('customize_icon', '自定义图标', 'textarea', '', ['sanitize_type' => 'html']), self::field('icon_class', '图标颜色', 'palette', 'c-yellow', ['options' => self::aksrt_palette(true)]), self::field('link', '跳转链接', 'link', [])]])]; } private static function orderby_fields(): array { return [self::field('lists', '显示排序方式', 'select', ['modified', 'views', 'like', 'comment_count'], ['multiple' => true, 'sortable' => true, 'options' => self::post_order_options(false)]), self::field('dropdown', '更多排序方式', 'switcher', false)]; } @@ -190,7 +190,7 @@ class SchemaPageDisplay { private static function header_slider_defaults(): array { $img = self::asset('assets/img/'); return [['background' => $img . 'slider-bg.jpg', 'link' => ['url' => home_url('/'), 'target' => '_blank'], 'text' => ['title' => '', 'desc' => ''], 'text_align' => 'left-bottom', 'text_parallax' => 30, 'text_size_m' => 20, 'text_size_pc' => 30], ['background' => $img . 'user_t.jpg', 'link' => ['url' => home_url('/'), 'target' => '_blank'], 'text' => ['title' => '', 'desc' => ''], 'text_align' => 'left-bottom', 'text_parallax' => 30, 'text_size_m' => 20, 'text_size_pc' => 30]]; } private static function slider_options_defaults(): array { return ['direction' => 'horizontal', 'loop' => true, 'button' => true, 'pagination' => true, 'effect' => 'slide', 'scale_height' => false, 'auto_height' => false, 'pc_height' => 550, 'm_height' => 280, 'spacebetween' => 0, 'speed' => 0, 'autoplay' => true, 'interval' => 6]; } private static function search_defaults(): array { return ['show_keywords' => true, 'popular_limit' => 6, 'show_input_cat' => false, 'in_cat' => '', 'more_cats' => '', 'show_type' => false, 'in_type' => 'post', 'before_html' => '
    更优雅的Wordpress主题
    ' . "\n" . '
    这是导航栏幻灯片多功能组件，可在后台进行配置
    ', 'after_html' => '']; } - private static function card_defaults(): array { return ['icon_radius4' => false, 'cards' => [['icon' => 'fa fas fa-gem', 'customize_icon' => '', 'icon_class' => 'c-yellow', 'link' => [], 'title' => '图标卡片', 'desc' => '这是一个图标卡片示例'], ['icon' => 'fa fas fa-star', 'customize_icon' => '', 'icon_class' => 'c-blue-2', 'link' => [], 'title' => '原创作品', 'desc' => '这是一个图标卡片示例'], ['icon' => 'fa fas fa-fire', 'customize_icon' => '', 'icon_class' => 'jb-pink', 'link' => [], 'title' => '灵感来源NEW', 'desc' => '这是一个图标卡片示例'], ['icon' => 'fa fas fa-wrench', 'customize_icon' => '', 'icon_class' => 'jb-cyan', 'link' => [], 'title' => '系统工具 GO ', 'desc' => '这是一个图标卡片示例']]]; } + private static function card_defaults(): array { return ['icon_radius4' => false, 'cards' => [['icon' => 'fa fas fa-gem', 'customize_icon' => '', 'icon_class' => 'c-yellow', 'link' => [], 'title' => '图标卡片', 'desc' => '这是一个图标卡片示例'], ['icon' => 'fa fas fa-star', 'customize_icon' => '', 'icon_class' => 'c-blue-2', 'link' => [], 'title' => '原创作品', 'desc' => '这是一个图标卡片示例'], ['icon' => 'fa fas fa-fire', 'customize_icon' => '', 'icon_class' => 'jb-pink', 'link' => [], 'title' => '灵感来源NEW', 'desc' => '这是一个图标卡片示例'], ['icon' => 'fa fas fa-wrench', 'customize_icon' => '', 'icon_class' => 'jb-cyan', 'link' => [], 'title' => '系统工具 GO ', 'desc' => '这是一个图标卡片示例']]]; } private static function field(string $key, string $label, string $type, $default = null, array $extra = []): array { return array_merge(['key' => $key, 'label' => $label, 'type' => $type, 'default' => $default], $extra); } private static function notice(string $content): array { return ['key' => '_notice_' . md5($content), 'type' => 'notice', 'content' => $content, 'tone' => 'warning']; } diff --git a/src/Content/VipServiceModal.php b/src/Content/VipServiceModal.php index 1b980003..ef0b4645 100644 --- a/src/Content/VipServiceModal.php +++ b/src/Content/VipServiceModal.php @@ -172,7 +172,7 @@ trait VipServiceModal { $html .= $equity_html; $html .= '' . esc_html(sprintf(__('开通%s', 'aksrt'), $name)) - . ''; + . ''; $html .= '
    '; return $html; } diff --git a/src/WidgetSystem/Renderers/UserRenderer.php b/src/WidgetSystem/Renderers/UserRenderer.php index 4a717178..125cb227 100644 --- a/src/WidgetSystem/Renderers/UserRenderer.php +++ b/src/WidgetSystem/Renderers/UserRenderer.php @@ -232,7 +232,7 @@ final class UserRenderer { if ($url === '') { return ''; } - return '' . esc_html($text) . ''; + return '' . esc_html($text) . ''; } private static function card_link(string $url, string $class, string $text, bool $nofollow = false): string { diff --git a/src/WidgetSystem/WidgetSchemas.php b/src/WidgetSystem/WidgetSchemas.php index 63bd3433..2cdecf0c 100644 --- a/src/WidgetSystem/WidgetSchemas.php +++ b/src/WidgetSystem/WidgetSchemas.php @@ -392,7 +392,7 @@ final class WidgetSchemas { ['id' => 'm_row', 'type' => 'button_set', 'label' => '移动端单行排列数量', 'default' => 2, 'options' => [1 => '1个', 2 => '2个', 3 => '3个', 4 => '4个', 6 => '6个', 12 => '12个']], ['id' => 'size', 'type' => 'slider', 'label' => '图标尺寸微调', 'default' => 0, 'min' => -10, 'max' => 10, 'step' => 1], ['id' => 'cards', 'type' => 'group', 'label' => '添加图标', 'max_items' => 40, 'default' => [], 'fields' => [ - ['id' => 'icon', 'type' => 'icon', 'label' => '选择图标', 'default' => 'fa fa-magic'], + ['id' => 'icon', 'type' => 'icon', 'label' => '选择图标', 'default' => 'fa fas fa-magic'], ['id' => 'customize_icon', 'type' => 'textarea', 'label' => '自定义图标', 'default' => '', 'allow_html' => true, 'attributes' => ['rows' => 1]], ['id' => 'link', 'type' => 'link', 'label' => '跳转链接', 'default' => []], ['id' => 'icon_radius', 'type' => 'switcher', 'label' => '显示图标背景', 'default' => false], @@ -414,7 +414,7 @@ final class WidgetSchemas { ['id' => 'cards', 'type' => 'group', 'label' => '添加卡片', 'max_items' => 40, 'default' => [], 'fields' => [ ['id' => 'title', 'type' => 'textarea', 'label' => '文案标题', 'default' => '', 'allow_html' => true, 'attributes' => ['rows' => 1]], ['id' => 'desc', 'type' => 'textarea', 'label' => '文案简介', 'default' => '', 'allow_html' => true, 'attributes' => ['rows' => 2]], - ['id' => 'icon', 'type' => 'icon', 'label' => '选择图标', 'default' => 'fa fa-magic'], + ['id' => 'icon', 'type' => 'icon', 'label' => '选择图标', 'default' => 'fa fas fa-magic'], ['id' => 'customize_icon', 'type' => 'textarea', 'label' => '自定义图标', 'default' => '', 'allow_html' => true, 'attributes' => ['rows' => 1]], ['id' => 'icon_class', 'type' => 'palette', 'label' => '图标颜色', 'default' => 'c-yellow', 'options' => self::icon_background_palette()], ['id' => 'link', 'type' => 'link', 'label' => '跳转链接', 'default' => []],