fix(header): align publish and VIP CTAs with reference theme
The top-nav publish chip and open-membership chip carried an AKSRT-only class layer (navbar-cta / navbar-cta-text / navbar-newposts / navbar-vip-hover) plus a matching set of CSS overrides that replaced the legacy .but geometry: margin 0.4em -> 0, an extra min-height and flex gap, an FA5 pencil glyph that is not the reference pencil, and label text wrapped in a span. The VIP hover card also had its own positioning override instead of the reference static position. Drop that layer and emit the reference class combination verbatim so the already byte-identical legacy stylesheet owns the geometry again: - publish chip renders newadd-btns but nowave <skin> [radius] btn-newadd with the label echoed as saved (no injected icon, no span) - VIP chip renders pay-vip|signin-loader but jb-red radius payvip-icon with the vip_1 SVG at em12 mr3, inside span.hover-show.inline-block - user-card CTA uses the vip_1 SVG (em12 mr6) instead of fa-gem and drops vip-level, matching zib_get_header_payvip_icon() - both buttons now honour Settings::close_sign(), matching the reference zib_is_close_sign() gate and the floating publish button - header-userbox.css keeps one rule that restores the hover wrapper to a plain block container so .sub-vip-card takes its reference static position; every other override is gone - nav_newposts_text default drops the duplicated fas and uses the FA5 spelling of the reference pencil (fa-pencil-alt, not fa-pen) Dead code removed: aksrt_normalize_header_cta_label(), the unreachable multi-type dropdown branch of aksrt_render_new_add_btns() (only 'post' is supported and only ['post'] is ever passed), and the newadd-btns__toggle / newadd-btns__item / drop-newadd markup it emitted. ml10 is no longer set on the VIP anchor: .aksrt-navbar-actions already supplies the 10px gap the reference gets from ml10, and keeping both would double it to 20px. No migration for sites that already stored the old nav_newposts_text. Verified: node --test across tests/ (603 passing), php -l on the changed PHP files, and a stubbed render of every publish/VIP branch.
This commit is contained in:
kate522 committed
1 parent
ce6fbb4e39
commit
4f2edebab6
7 files changed
+81
-199
No files matched your search
@@ -2757,29 +2757,6 @@ main.container,
|
|||||||
float: none;
|
float: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.navbar-top .aksrt-navbar-actions .navbar-cta {
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
gap: 4px;
|
|
||||||
min-height: 29px;
|
|
||||||
margin: 0;
|
|
||||||
padding: .3em 1em !important;
|
|
||||||
border-radius: var(--radius-btn, 4px);
|
|
||||||
font-size: .8em;
|
|
||||||
line-height: 1.44;
|
|
||||||
}
|
|
||||||
|
|
||||||
.navbar-top .aksrt-navbar-actions .navbar-cta.radius {
|
|
||||||
border-radius: 50px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.navbar-top .aksrt-navbar-actions .navbar-cta > .icon {
|
|
||||||
width: 1.2em;
|
|
||||||
height: 1.2em;
|
|
||||||
flex: 0 0 auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.navbar-top .aksrt-nav-icon,
|
.navbar-top .aksrt-nav-icon,
|
||||||
.navbar-top .aksrt-nav-avatar {
|
.navbar-top .aksrt-nav-avatar {
|
||||||
display: inline-flex !important;
|
display: inline-flex !important;
|
||||||
@@ -2822,23 +2799,12 @@ main.container,
|
|||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Anchor the VIP preview to the full navigation row instead of relying on
|
/* The reference keeps the publish/VIP hover wrapper a plain inline-block, so the
|
||||||
* the absolute panel's static position beside the compact CTA. */
|
* absolutely positioned .sub-vip-card takes its normal-flow static position.
|
||||||
.navbar-top .aksrt-navbar-actions .navbar-vip-hover {
|
* The shared action cluster otherwise forces inline-flex on every child, which
|
||||||
position: relative;
|
* would move that static position to the flex container's cross-start. */
|
||||||
align-self: stretch;
|
.navbar-top .aksrt-navbar-actions > .hover-show {
|
||||||
align-items: center;
|
display: inline-block;
|
||||||
overflow: visible;
|
|
||||||
}
|
|
||||||
|
|
||||||
.navbar-top .aksrt-navbar-actions .navbar-vip-hover > .sub-vip-card {
|
|
||||||
top: 100%;
|
|
||||||
right: 0;
|
|
||||||
left: auto;
|
|
||||||
width: max-content;
|
|
||||||
max-width: calc(100vw - 24px);
|
|
||||||
margin: 0;
|
|
||||||
z-index: 1002;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Keep the drop-down search panel above a fixed header (z-index: 999). */
|
/* Keep the drop-down search panel above a fixed header (z-index: 999). */
|
||||||
|
|||||||
Vendored
+1
-1
@@ -1 +1 @@
|
|||||||
:root{--color-primary: #f04494;--color-primary-hover: #e0307e;--color-primary-active: #c9206d;--color-primary-soft: rgba(240, 68, 148, .1);--color-primary-softer: rgba(240, 68, 148, .05);--color-on-primary: #FFFFFF;--color-ink: #333333;--color-ink-2: #4e5358;--color-ink-3: #777777;--color-ink-4: #999999;--surface-page: #f5f6f7;--surface-1: #FFFFFF;--surface-2: #eeeeee;--surface-3: #e9ecef;--surface-4: #f8f8f8;--color-line: rgba(50, 50, 50, .06);--color-line-soft: rgba(0, 0, 0, .03);--color-line-stronger: rgba(50, 50, 50, .12);--color-success: #10B981;--color-warning: #F59E0B;--color-error: #EF4444;--color-info: #3B82F6;--color-accent: #18a058;--color-accent-soft: rgba(24, 160, 88, .12);--color-accent-shadow: rgba(24, 160, 88, .28);--font-display: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans SC", "PingFang SC", "Microsoft YaHei", sans-serif;--font-body: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans SC", "PingFang SC", "Microsoft YaHei", sans-serif;--font-ui: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans SC", "PingFang SC", "Microsoft YaHei", sans-serif;--font-mono: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;--text-xs: .75rem;--text-sm: .875rem;--text-base: .875rem;--text-md: 1.125rem;--text-lg: 1.25rem;--text-xl: 1.5rem;--text-2xl: 1.875rem;--text-3xl: 2.25rem;--text-4xl: 3rem;--text-5xl: 3.75rem;--leading-tight: 1.2;--leading-snug: 1.4;--leading-normal: 1.6;--leading-relaxed: 1.6;--space-1: 4px;--space-2: 8px;--space-3: 12px;--space-4: 16px;--space-5: 20px;--space-6: 24px;--space-7: 32px;--space-8: 40px;--space-9: 48px;--space-10: 64px;--space-11: 80px;--space-12: 96px;--radius-xs: 3px;--radius-sm: 4px;--radius: 8px;--radius-lg: 8px;--radius-xl: 12px;--radius-2xl: 16px;--radius-pill: 100px;--radius-avatar: 50%;--shadow-xs: 0 1px 2px rgba(0, 0, 0, .03);--shadow-sm: 0 0 10px rgba(116, 116, 116, .08);--shadow: 0 0 10px rgba(116, 116, 116, .12);--shadow-lg: 0 12px 32px rgba(18, 18, 18, .1);--shadow-drawer: 0 18px 60px rgba(0, 0, 0, .2);--nav-height: 60px;--container: 1200px;--container-wide: 1440px;--container-read: 760px;--container-page: 880px;--sidebar-width: 311px;--content-gap: 24px;--section-gap: 24px;--sidebar-bp: 992px;--ease: cubic-bezier(.4, 0, .2, 1);--ease-out: cubic-bezier(.16, 1, .3, 1);--ease-spring: cubic-bezier(.34, 1.56, .64, 1);--dur-fast: .15s;--dur: .25s;--dur-slow: .4s;--focus-ring: 0 0 2px 3px rgba(253, 83, 161, .4);--z-dropdown: 100;--z-sticky: 200;--z-fixed: 300;--z-overlay: 400;--z-modal: 500;--z-popover: 600;--z-toast: 700;--z-tooltip: 800;--radius-btn: 4px;--btn-sm-h: 28px;--btn-md-h: 34px;--btn-lg-h: 44px;--card-padding: 15px;--card-padding-sm: 10px;--card-gap: 16px;--card-gap-lg: 20px;--color-primary-light: var(--color-primary-soft);--color-surface: var(--surface-1);--color-line-strong: var(--color-line);--color-bg-hover: var(--surface-2);--color-border-light: var(--color-line-soft);--color-fill: var(--surface-2);--color-warning-bg: #fffbe6;--color-warning-text: #ad6800;--text-secondary: var(--color-ink-3);--text-tertiary: var(--color-ink-4);--surface-active: var(--surface-2);--surface-card: var(--surface-1);--surface-hover: var(--surface-2);--surface-secondary: var(--surface-2);--radius-code: var(--radius);--radius-full: 100px;--shadow-xl: 0 0 10px rgba(116, 116, 116, .12);--space-16: 64px;--z-floating: 900;--transition-fast: .15s ease;--transition-base: .25s ease;--header-bg: var(--blur-bg);--header-color: var(--color-ink-2);--footer-bg: var(--surface-1);--footer-color: var(--color-ink-4);--blur-bg: rgba(255, 255, 255, .8);--float-btn-bg: rgba(200, 200, 200, .4);--font-heading: var(--font-ui);--radius-card: var(--radius);--radius-md: var(--radius);--color-primary-50: var(--color-primary-soft);--color-primary-dark: var(--color-primary-active);--shadow-md: var(--shadow);--mini-radius: calc(var(--radius) / 1.4);--aksrt-avatar-size-xs: 24px;--aksrt-avatar-size-sm: 32px;--aksrt-avatar-size: 40px;--aksrt-avatar-size-lg: 56px;--aksrt-avatar-size-xl: 80px;--aksrt-card-thumb-scale: 56.25%;--aksrt-rose: #f43f5e;--aksrt-rose-soft: rgba(244, 63, 94, .12);--aksrt-blue: #3b82f6;--aksrt-blue-soft: rgba(59, 130, 246, .12);--aksrt-green: #10b981;--aksrt-green-soft: rgba(16, 185, 129, .12);--aksrt-orange: #f97316;--aksrt-orange-soft:rgba(249, 115, 22, .12);--aksrt-purple: #8b5cf6;--aksrt-purple-soft:rgba(139, 92, 246, .12);--aksrt-cyan: #06b6d4;--aksrt-cyan-soft: rgba(6, 182, 212, .12);--aksrt-yellow: #eab308;--aksrt-yellow-soft:rgba(234, 179, 8, .12);--aksrt-red: #ef4444;--aksrt-red-soft: rgba(239, 68, 68, .12);--aksrt-teal: #14b8a6;--aksrt-teal-soft: rgba(20, 184, 166, .12);--aksrt-indigo: #6366f1;--aksrt-indigo-soft:rgba(99, 102, 241, .12);--aksrt-pink: #ec4899;--aksrt-pink-soft: rgba(236, 72, 153, .12);--aksrt-vip-gold-1: #f6d365;--aksrt-vip-gold-2: #fda085;--aksrt-grad-sunset-1: #f093fb;--aksrt-grad-sunset-2: #f5576c;--aksrt-graLine truncated
|
:root{--color-primary: #f04494;--color-primary-hover: #e0307e;--color-primary-active: #c9206d;--color-primary-soft: rgba(240, 68, 148, .1);--color-primary-softer: rgba(240, 68, 148, .05);--color-on-primary: #FFFFFF;--color-ink: #333333;--color-ink-2: #4e5358;--color-ink-3: #777777;--color-ink-4: #999999;--surface-page: #f5f6f7;--surface-1: #FFFFFF;--surface-2: #eeeeee;--surface-3: #e9ecef;--surface-4: #f8f8f8;--color-line: rgba(50, 50, 50, .06);--color-line-soft: rgba(0, 0, 0, .03);--color-line-stronger: rgba(50, 50, 50, .12);--color-success: #10B981;--color-warning: #F59E0B;--color-error: #EF4444;--color-info: #3B82F6;--color-accent: #18a058;--color-accent-soft: rgba(24, 160, 88, .12);--color-accent-shadow: rgba(24, 160, 88, .28);--font-display: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans SC", "PingFang SC", "Microsoft YaHei", sans-serif;--font-body: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans SC", "PingFang SC", "Microsoft YaHei", sans-serif;--font-ui: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans SC", "PingFang SC", "Microsoft YaHei", sans-serif;--font-mono: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;--text-xs: .75rem;--text-sm: .875rem;--text-base: .875rem;--text-md: 1.125rem;--text-lg: 1.25rem;--text-xl: 1.5rem;--text-2xl: 1.875rem;--text-3xl: 2.25rem;--text-4xl: 3rem;--text-5xl: 3.75rem;--leading-tight: 1.2;--leading-snug: 1.4;--leading-normal: 1.6;--leading-relaxed: 1.6;--space-1: 4px;--space-2: 8px;--space-3: 12px;--space-4: 16px;--space-5: 20px;--space-6: 24px;--space-7: 32px;--space-8: 40px;--space-9: 48px;--space-10: 64px;--space-11: 80px;--space-12: 96px;--radius-xs: 3px;--radius-sm: 4px;--radius: 8px;--radius-lg: 8px;--radius-xl: 12px;--radius-2xl: 16px;--radius-pill: 100px;--radius-avatar: 50%;--shadow-xs: 0 1px 2px rgba(0, 0, 0, .03);--shadow-sm: 0 0 10px rgba(116, 116, 116, .08);--shadow: 0 0 10px rgba(116, 116, 116, .12);--shadow-lg: 0 12px 32px rgba(18, 18, 18, .1);--shadow-drawer: 0 18px 60px rgba(0, 0, 0, .2);--nav-height: 60px;--container: 1200px;--container-wide: 1440px;--container-read: 760px;--container-page: 880px;--sidebar-width: 311px;--content-gap: 24px;--section-gap: 24px;--sidebar-bp: 992px;--ease: cubic-bezier(.4, 0, .2, 1);--ease-out: cubic-bezier(.16, 1, .3, 1);--ease-spring: cubic-bezier(.34, 1.56, .64, 1);--dur-fast: .15s;--dur: .25s;--dur-slow: .4s;--focus-ring: 0 0 2px 3px rgba(253, 83, 161, .4);--z-dropdown: 100;--z-sticky: 200;--z-fixed: 300;--z-overlay: 400;--z-modal: 500;--z-popover: 600;--z-toast: 700;--z-tooltip: 800;--radius-btn: 4px;--btn-sm-h: 28px;--btn-md-h: 34px;--btn-lg-h: 44px;--card-padding: 15px;--card-padding-sm: 10px;--card-gap: 16px;--card-gap-lg: 20px;--color-primary-light: var(--color-primary-soft);--color-surface: var(--surface-1);--color-line-strong: var(--color-line);--color-bg-hover: var(--surface-2);--color-border-light: var(--color-line-soft);--color-fill: var(--surface-2);--color-warning-bg: #fffbe6;--color-warning-text: #ad6800;--text-secondary: var(--color-ink-3);--text-tertiary: var(--color-ink-4);--surface-active: var(--surface-2);--surface-card: var(--surface-1);--surface-hover: var(--surface-2);--surface-secondary: var(--surface-2);--radius-code: var(--radius);--radius-full: 100px;--shadow-xl: 0 0 10px rgba(116, 116, 116, .12);--space-16: 64px;--z-floating: 900;--transition-fast: .15s ease;--transition-base: .25s ease;--header-bg: var(--blur-bg);--header-color: var(--color-ink-2);--footer-bg: var(--surface-1);--footer-color: var(--color-ink-4);--blur-bg: rgba(255, 255, 255, .8);--float-btn-bg: rgba(200, 200, 200, .4);--font-heading: var(--font-ui);--radius-card: var(--radius);--radius-md: var(--radius);--color-primary-50: var(--color-primary-soft);--color-primary-dark: var(--color-primary-active);--shadow-md: var(--shadow);--mini-radius: calc(var(--radius) / 1.4);--aksrt-avatar-size-xs: 24px;--aksrt-avatar-size-sm: 32px;--aksrt-avatar-size: 40px;--aksrt-avatar-size-lg: 56px;--aksrt-avatar-size-xl: 80px;--aksrt-card-thumb-scale: 56.25%;--aksrt-rose: #f43f5e;--aksrt-rose-soft: rgba(244, 63, 94, .12);--aksrt-blue: #3b82f6;--aksrt-blue-soft: rgba(59, 130, 246, .12);--aksrt-green: #10b981;--aksrt-green-soft: rgba(16, 185, 129, .12);--aksrt-orange: #f97316;--aksrt-orange-soft:rgba(249, 115, 22, .12);--aksrt-purple: #8b5cf6;--aksrt-purple-soft:rgba(139, 92, 246, .12);--aksrt-cyan: #06b6d4;--aksrt-cyan-soft: rgba(6, 182, 212, .12);--aksrt-yellow: #eab308;--aksrt-yellow-soft:rgba(234, 179, 8, .12);--aksrt-red: #ef4444;--aksrt-red-soft: rgba(239, 68, 68, .12);--aksrt-teal: #14b8a6;--aksrt-teal-soft: rgba(20, 184, 166, .12);--aksrt-indigo: #6366f1;--aksrt-indigo-soft:rgba(99, 102, 241, .12);--aksrt-pink: #ec4899;--aksrt-pink-soft: rgba(236, 72, 153, .12);--aksrt-vip-gold-1: #f6d365;--aksrt-vip-gold-2: #fda085;--aksrt-grad-sunset-1: #f093fb;--aksrt-grad-sunset-2: #f5576c;--aksrt-graLine truncated
|
||||||
@@ -50,29 +50,6 @@
|
|||||||
float: none;
|
float: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.navbar-top .aksrt-navbar-actions .navbar-cta {
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
gap: 4px;
|
|
||||||
min-height: 29px;
|
|
||||||
margin: 0;
|
|
||||||
padding: .3em 1em !important;
|
|
||||||
border-radius: var(--radius-btn, 4px);
|
|
||||||
font-size: .8em;
|
|
||||||
line-height: 1.44;
|
|
||||||
}
|
|
||||||
|
|
||||||
.navbar-top .aksrt-navbar-actions .navbar-cta.radius {
|
|
||||||
border-radius: 50px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.navbar-top .aksrt-navbar-actions .navbar-cta > .icon {
|
|
||||||
width: 1.2em;
|
|
||||||
height: 1.2em;
|
|
||||||
flex: 0 0 auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.navbar-top .aksrt-nav-icon,
|
.navbar-top .aksrt-nav-icon,
|
||||||
.navbar-top .aksrt-nav-avatar {
|
.navbar-top .aksrt-nav-avatar {
|
||||||
display: inline-flex !important;
|
display: inline-flex !important;
|
||||||
@@ -115,23 +92,12 @@
|
|||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Anchor the VIP preview to the full navigation row instead of relying on
|
/* The reference keeps the publish/VIP hover wrapper a plain inline-block, so the
|
||||||
* the absolute panel's static position beside the compact CTA. */
|
* absolutely positioned .sub-vip-card takes its normal-flow static position.
|
||||||
.navbar-top .aksrt-navbar-actions .navbar-vip-hover {
|
* The shared action cluster otherwise forces inline-flex on every child, which
|
||||||
position: relative;
|
* would move that static position to the flex container's cross-start. */
|
||||||
align-self: stretch;
|
.navbar-top .aksrt-navbar-actions > .hover-show {
|
||||||
align-items: center;
|
display: inline-block;
|
||||||
overflow: visible;
|
|
||||||
}
|
|
||||||
|
|
||||||
.navbar-top .aksrt-navbar-actions .navbar-vip-hover > .sub-vip-card {
|
|
||||||
top: 100%;
|
|
||||||
right: 0;
|
|
||||||
left: auto;
|
|
||||||
width: max-content;
|
|
||||||
max-width: calc(100vw - 24px);
|
|
||||||
margin: 0;
|
|
||||||
z-index: 1002;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Keep the drop-down search panel above a fixed header (z-index: 999). */
|
/* Keep the drop-down search panel above a fixed header (z-index: 999). */
|
||||||
|
|||||||
@@ -37,102 +37,33 @@ if (!function_exists('aksrt_get_new_add_actions')) :
|
|||||||
}
|
}
|
||||||
endif;
|
endif;
|
||||||
|
|
||||||
if (!function_exists('aksrt_normalize_header_cta_label')) :
|
|
||||||
/**
|
|
||||||
* Normalize CTA label HTML: map FA5 classes and keep a single leading icon.
|
|
||||||
*/
|
|
||||||
function aksrt_normalize_header_cta_label(string $label, string $fallback_icon = 'fa fas fa-pen'): string {
|
|
||||||
$label = trim($label);
|
|
||||||
if ($label === '') {
|
|
||||||
return '<i class="' . esc_attr($fallback_icon) . '" aria-hidden="true"></i> ' . esc_html__('发布', 'aksrt');
|
|
||||||
}
|
|
||||||
|
|
||||||
if (stripos($label, '<i') === false) {
|
|
||||||
// No space between icon and label — spacing via CSS margin (legacy .but > .fa).
|
|
||||||
$label = '<i class="' . esc_attr($fallback_icon) . '" aria-hidden="true"></i><span class="navbar-cta-text">' . esc_html(wp_strip_all_tags($label)) . '</span>';
|
|
||||||
} else {
|
|
||||||
$label = preg_replace(
|
|
||||||
'/(<\/i>)\s*([^<].*)$/u',
|
|
||||||
'$1<span class="navbar-cta-text">$2</span>',
|
|
||||||
$label
|
|
||||||
) ?? $label;
|
|
||||||
}
|
|
||||||
|
|
||||||
return $label;
|
|
||||||
}
|
|
||||||
endif;
|
|
||||||
|
|
||||||
if (!function_exists('aksrt_render_new_add_btns')) :
|
if (!function_exists('aksrt_render_new_add_btns')) :
|
||||||
/**
|
/**
|
||||||
* Multi-type publish button (legacy newadd-btns).
|
* Publish chip (legacy newadd-btns, single action).
|
||||||
|
*
|
||||||
|
* Mirrors the single-button branch of the reference zib_get_new_add_btns():
|
||||||
|
* the paint classes ride on the anchor itself and the label is emitted
|
||||||
|
* verbatim. Only the post action exists, so there is no dropdown branch.
|
||||||
*
|
*
|
||||||
* @param string[] $types
|
* @param string[] $types
|
||||||
*/
|
*/
|
||||||
function aksrt_render_new_add_btns(array $types, string $class = '', string $label = ''): string {
|
function aksrt_render_new_add_btns(array $types, string $class = '', string $label = ''): string {
|
||||||
|
if (class_exists('\AKSRT\Settings\Settings') && \AKSRT\Settings\Settings::close_sign()) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
$actions = aksrt_get_new_add_actions($types);
|
$actions = aksrt_get_new_add_actions($types);
|
||||||
if (!$actions) {
|
if (!$actions) {
|
||||||
// Last resort: keep a write-post entry so the top-nav chip is never blank.
|
return '';
|
||||||
$fallback = function_exists('aksrt_get_new_post_url') ? (string) aksrt_get_new_post_url() : '';
|
|
||||||
if ($fallback === '') {
|
|
||||||
$fallback = admin_url('post-new.php');
|
|
||||||
}
|
|
||||||
$actions = [[
|
|
||||||
'type' => 'post',
|
|
||||||
'url' => $fallback,
|
|
||||||
'label' => __('写文章', 'aksrt'),
|
|
||||||
'icon' => 'fa fas fa-file-alt',
|
|
||||||
]];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$a = $actions[0];
|
||||||
if ($label === '') {
|
if ($label === '') {
|
||||||
$label = __('发布', 'aksrt');
|
$label = __('发布', 'aksrt');
|
||||||
}
|
}
|
||||||
$label_html = aksrt_normalize_header_cta_label((string) $label, 'fa fas fa-pen');
|
|
||||||
|
|
||||||
// Split paint classes vs wrapper tokens.
|
return '<a rel="nofollow" class="newadd-btns ' . esc_attr($class) . ' btn-newadd" href="' . esc_url($a['url']) . '">'
|
||||||
$class_tokens = preg_split('/\s+/', trim($class), -1, PREG_SPLIT_NO_EMPTY) ?: [];
|
. $label . '</a>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Saved through sanitize_type 'html' (wp_kses_post).
|
||||||
$cta_tokens = [];
|
|
||||||
$wrap_tokens = ['newadd-btns'];
|
|
||||||
foreach ($class_tokens as $token) {
|
|
||||||
if ($token === 'newadd-btns') {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if ($token === 'btn-primary' || $token === 'but' || $token === 'navbar-cta' || $token === 'radius' || $token === 'main-radius' || $token === 'mini-radius' || str_starts_with($token, 'jb-') || str_starts_with($token, 'b-')) {
|
|
||||||
$cta_tokens[] = $token;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
$wrap_tokens[] = $token;
|
|
||||||
}
|
|
||||||
if (!$cta_tokens) {
|
|
||||||
$cta_tokens[] = 'jb-blue';
|
|
||||||
}
|
|
||||||
if (!in_array('but', $cta_tokens, true)) {
|
|
||||||
$cta_tokens[] = 'but';
|
|
||||||
}
|
|
||||||
$cta_class = trim(implode(' ', array_unique($cta_tokens)));
|
|
||||||
|
|
||||||
if (count($actions) === 1) {
|
|
||||||
$a = $actions[0];
|
|
||||||
return '<a rel="nofollow" class="' . esc_attr(trim(implode(' ', $wrap_tokens) . ' ' . $cta_class . ' navbar-cta')) . '" href="' . esc_url($a['url']) . '">'
|
|
||||||
. $label_html
|
|
||||||
. '</a>';
|
|
||||||
}
|
|
||||||
|
|
||||||
// legacy: span.newadd-btns.hover-show > toggle chip + .hover-show-con.drop-newadd
|
|
||||||
// Paint classes (jb-*, but, radius) MUST live on the toggle — wrapper is layout-only
|
|
||||||
// (background forced transparent). Bare navbar-but has no .navbar-but-cluster shell.
|
|
||||||
// data-aksrt-newadd: JS may portal menu to body so chip width cannot track menu.
|
|
||||||
$html = '<span class="' . esc_attr(trim(implode(' ', $wrap_tokens) . ' hover-show')) . '" data-aksrt-newadd="1">';
|
|
||||||
$html .= '<span class="newadd-btns__toggle navbar-cta ' . esc_attr($cta_class) . '">' . $label_html
|
|
||||||
. '<i class="fa fas fa-caret-down" aria-hidden="true"></i></span>';
|
|
||||||
$html .= '<div class="hover-show-con dropdown-menu drop-newadd" role="menu">';
|
|
||||||
foreach ($actions as $a) {
|
|
||||||
$html .= '<a rel="nofollow" class="btn-newadd newadd-btns__item" role="menuitem" href="' . esc_url($a['url']) . '">';
|
|
||||||
$html .= '<i class="' . esc_attr($a['icon']) . '" aria-hidden="true"></i> '
|
|
||||||
. '<text>' . esc_html($a['label']) . '</text>';
|
|
||||||
$html .= '</a>';
|
|
||||||
}
|
|
||||||
$html .= '</div></span>';
|
|
||||||
return $html;
|
|
||||||
}
|
}
|
||||||
endif;
|
endif;
|
||||||
|
|
||||||
@@ -142,26 +73,19 @@ if (!function_exists('aksrt_render_header_menu_buttons')) :
|
|||||||
*/
|
*/
|
||||||
function aksrt_render_header_menu_buttons(): string {
|
function aksrt_render_header_menu_buttons(): string {
|
||||||
$settings = class_exists('\AKSRT\Settings\Settings') ? \AKSRT\Settings\Settings::read_domain('page_display', 'header-nav') : [];
|
$settings = class_exists('\AKSRT\Settings\Settings') ? \AKSRT\Settings\Settings::read_domain('page_display', 'header-nav') : [];
|
||||||
$cfg = [
|
$enabled = !isset($settings['nav_newposts']) || !empty($settings['nav_newposts']);
|
||||||
'enabled' => !isset($settings['nav_newposts']) || !empty($settings['nav_newposts']),
|
$text = trim((string) ($settings['nav_newposts_text'] ?? ''));
|
||||||
'text' => trim((string) ($settings['nav_newposts_text'] ?? __('发布', 'aksrt'))),
|
$pill = !isset($settings['nav_newposts_radius']) || !empty($settings['nav_newposts_radius']);
|
||||||
'radius_pill' => !isset($settings['nav_newposts_radius']) || !empty($settings['nav_newposts_radius']),
|
$skin = sanitize_html_class((string) (($settings['nav_newposts_class'] ?? '') ?: 'jb-blue'));
|
||||||
'class' => sanitize_html_class((string) (($settings['nav_newposts_class'] ?? '') ?: 'jb-blue')),
|
|
||||||
];
|
|
||||||
$html = '';
|
$html = '';
|
||||||
if (!empty($cfg['enabled'])) {
|
if ($enabled) {
|
||||||
// legacy default: but nowave jb-blue (+ radius).
|
// legacy default: but nowave jb-blue (+ radius).
|
||||||
$class = 'but nowave navbar-newposts';
|
$class = 'but nowave ' . $skin;
|
||||||
$skin = trim((string) ($cfg['class'] ?? ''));
|
|
||||||
if ($skin === '') {
|
|
||||||
$skin = 'jb-blue';
|
|
||||||
}
|
|
||||||
$class .= ' ' . $skin;
|
|
||||||
$pill = !empty($cfg['radius_pill']);
|
|
||||||
if ($pill && !str_contains($class, 'radius')) {
|
if ($pill && !str_contains($class, 'radius')) {
|
||||||
$class .= ' radius';
|
$class .= ' radius';
|
||||||
}
|
}
|
||||||
$label = (string) ($cfg['text'] ?? __('发布', 'aksrt'));
|
$label = $text !== '' ? $text : __('发布', 'aksrt');
|
||||||
$btn = aksrt_render_new_add_btns(['post'], $class, $label);
|
$btn = aksrt_render_new_add_btns(['post'], $class, $label);
|
||||||
if ($btn !== '') {
|
if ($btn !== '') {
|
||||||
$html .= $btn;
|
$html .= $btn;
|
||||||
@@ -173,7 +97,8 @@ if (!function_exists('aksrt_render_header_menu_buttons')) :
|
|||||||
$show_vip = false;
|
$show_vip = false;
|
||||||
if (class_exists('\AKSRT\Settings\Settings')) {
|
if (class_exists('\AKSRT\Settings\Settings')) {
|
||||||
$vs = \AKSRT\Settings\Settings::get_payment_vip_settings();
|
$vs = \AKSRT\Settings\Settings::get_payment_vip_settings();
|
||||||
$show_vip = !empty($vs['enabled']) && !empty($vs['nav_pay_vip']);
|
$show_vip = !empty($vs['enabled']) && !empty($vs['nav_pay_vip'])
|
||||||
|
&& !\AKSRT\Settings\Settings::close_sign();
|
||||||
}
|
}
|
||||||
if ($show_vip) {
|
if ($show_vip) {
|
||||||
$is_vip = false;
|
$is_vip = false;
|
||||||
@@ -188,17 +113,15 @@ if (!function_exists('aksrt_render_header_menu_buttons')) :
|
|||||||
if (method_exists($svc, 'render_vip_card')) {
|
if (method_exists($svc, 'render_vip_card')) {
|
||||||
$cards = $svc->render_vip_card(1, $user_id) . $svc->render_vip_card(2, $user_id);
|
$cards = $svc->render_vip_card(1, $user_id) . $svc->render_vip_card(2, $user_id);
|
||||||
if ($cards !== '') {
|
if ($cards !== '') {
|
||||||
$hover = '<div class="hover-show-con sub-menu sub-vip-card">' . $cards . '</div>';
|
$hover = '<div class="sub-menu hover-show-con sub-vip-card">' . $cards . '</div>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// legacy: span.hover-show wraps button + .hover-show-con.sub-vip-card
|
// legacy: span.hover-show wraps button + .sub-menu.sub-vip-card
|
||||||
$html .= '<span class="hover-show inline-block navbar-vip-hover">';
|
$html .= '<span class="hover-show inline-block">';
|
||||||
$html .= '<a class="but jb-red radius payvip-icon ml10 navbar-cta ' . esc_attr($cls) . '" href="javascript:;"'
|
$html .= '<a class="' . esc_attr($cls) . ' but jb-red radius payvip-icon" href="javascript:;">'
|
||||||
. ($user_id > 0 ? ' vip-level="1"' : '') . '>';
|
. '<svg class="em12 mr3" aria-hidden="true"><use xlink:href="#icon-vip_1"></use></svg>'
|
||||||
$html .= '<svg class="icon em12 mr3" aria-hidden="true"><use xlink:href="#icon-vip_1"></use></svg>'
|
. esc_html__('开通会员', 'aksrt') . '</a>' . $hover . '</span>';
|
||||||
. '<span class="navbar-cta-text">' . esc_html__('开通会员', 'aksrt') . '</span>';
|
|
||||||
$html .= '</a>' . $hover . '</span>';
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -230,11 +230,11 @@ if (!function_exists('aksrt_header_payvip_bar')) :
|
|||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
// 几何对齐参考主题 CTA（通栏、radius4）——不是顶导 navbar-cta chips。
|
// 1:1 对齐参考主题 zib_get_header_payvip_icon()：通栏、radius4、vip_1 SVG 图标、裸文案。
|
||||||
return '<div class="mt10 em09" style="padding:2px;">'
|
return '<div class="mt10 em09" style="padding:2px;">'
|
||||||
. '<a class="pay-vip but radius4 payvip-icon btn-block" href="javascript:;" vip-level="1">'
|
. '<a class="pay-vip but radius4 payvip-icon btn-block" href="javascript:;">'
|
||||||
. '<i class="fa fas fa-gem em12 mr6" aria-hidden="true"></i>'
|
. '<svg class="em12 mr6" aria-hidden="true"><use xlink:href="#icon-vip_1"></use></svg>'
|
||||||
. '<span>' . esc_html__('开通会员 尊享会员权益', 'aksrt') . '</span>'
|
. esc_html__('开通会员 尊享会员权益', 'aksrt')
|
||||||
. '</a></div>';
|
. '</a></div>';
|
||||||
}
|
}
|
||||||
endif;
|
endif;
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ class SchemaPageDisplay {
|
|||||||
self::field('nav_newposts', 'Add发布按钮', 'switcher', true, ['description' => '顶部导航显示文章投稿按钮。']),
|
self::field('nav_newposts', 'Add发布按钮', 'switcher', true, ['description' => '顶部导航显示文章投稿按钮。']),
|
||||||
self::field('nav_newposts_radius', '按钮圆角', 'switcher', true, ['dependsOn' => self::enabled('nav_newposts')]),
|
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_class', '按钮颜色', 'palette', 'jb-blue', ['dependsOn' => self::enabled('nav_newposts'), 'options' => self::aksrt_palette()]),
|
||||||
self::field('nav_newposts_text', '按钮文案', 'textarea', '<i class="fa fas fa-fw fas fa-pencil-alt"></i>发布', ['dependsOn' => self::enabled('nav_newposts'), 'sanitize_type' => 'html', 'rows' => 1]),
|
self::field('nav_newposts_text', '按钮文案', 'textarea', '<i class="fa fas fa-fw fa-pencil-alt"></i>发布', ['dependsOn' => self::enabled('nav_newposts'), 'sanitize_type' => 'html', 'rows' => 1]),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -120,6 +120,10 @@ test('defaults, nested structures, dependencies, and excluded product families a
|
|||||||
}
|
}
|
||||||
assert.equal(headerMenuButtons.includes('nav_newposts_btns'), false)
|
assert.equal(headerMenuButtons.includes('nav_newposts_btns'), false)
|
||||||
assert.match(headerMenuButtons, /aksrt_render_new_add_btns\(\['post'\], \$class, \$label\)/)
|
assert.match(headerMenuButtons, /aksrt_render_new_add_btns\(\['post'\], \$class, \$label\)/)
|
||||||
|
// FA5 spelling of the reference '<i class="fa fa-fw fa-pencil"></i>发布'
|
||||||
|
// default: fa-pencil does not exist in the bundled FA 5.15.4 free set.
|
||||||
|
assert.match(schema, /'nav_newposts_text', '按钮文案', 'textarea', '<i class="fa fas fa-fw fa-pencil-alt"><\/i>发布'/)
|
||||||
|
assert.doesNotMatch(schema, /fa fas fa-fw fas /)
|
||||||
})
|
})
|
||||||
|
|
||||||
test('VIP navigation purchase switches are saved and consumed end to end', () => {
|
test('VIP navigation purchase switches are saved and consumed end to end', () => {
|
||||||
@@ -136,8 +140,15 @@ test('VIP navigation purchase switches are saved and consumed end to end', () =>
|
|||||||
})
|
})
|
||||||
|
|
||||||
test('header VIP hover cards match the legacy markup and style contract', () => {
|
test('header VIP hover cards match the legacy markup and style contract', () => {
|
||||||
assert.match(headerMenuButtons, /<span class="hover-show inline-block navbar-vip-hover">/)
|
assert.match(headerMenuButtons, /<span class="hover-show inline-block">/)
|
||||||
assert.match(headerMenuButtons, /<div class="hover-show-con sub-menu sub-vip-card">/)
|
assert.match(headerMenuButtons, /<div class="sub-menu hover-show-con sub-vip-card">/)
|
||||||
|
assert.match(headerMenuButtons, /'<a class="' \. esc_attr\(\$cls\) \. ' but jb-red radius payvip-icon" href="javascript:;">'/)
|
||||||
|
assert.match(headerMenuButtons, /<svg class="em12 mr3" aria-hidden="true"><use xlink:href="#icon-vip_1"><\/use><\/svg>'/)
|
||||||
|
assert.match(headerMenuButtons, /'<a rel="nofollow" class="newadd-btns ' \. esc_attr\(\$class\) \. ' btn-newadd"/)
|
||||||
|
assert.equal((headerMenuButtons.match(/Settings::close_sign\(\)/g) || []).length, 2)
|
||||||
|
for (const dead of ['navbar-cta', 'navbar-cta-text', 'navbar-newposts', 'navbar-vip-hover', 'newadd-btns__', 'vip-level', 'fa-gem']) {
|
||||||
|
assert.equal(headerMenuButtons.includes(dead), false, `AKSRT-only header CTA token remains: ${dead}`)
|
||||||
|
}
|
||||||
assert.match(vipCardRenderer, /aksrt_get_lazy_attr\('lazy_other', \$icon_url, 'img-icon'\)/)
|
assert.match(vipCardRenderer, /aksrt_get_lazy_attr\('lazy_other', \$icon_url, 'img-icon'\)/)
|
||||||
assert.match(vipCardRenderer, /<div class=\"abs-center vip-baicon\"[^>]*>/)
|
assert.match(vipCardRenderer, /<div class=\"abs-center vip-baicon\"[^>]*>/)
|
||||||
assert.match(vipCardRenderer, /<div class=\"vip-img abs-right\">/)
|
assert.match(vipCardRenderer, /<div class=\"vip-img abs-right\">/)
|
||||||
@@ -154,8 +165,21 @@ test('header VIP hover cards match the legacy markup and style contract', () =>
|
|||||||
assert.match(legacyMainCss, /\.sub-vip-card \.vip-card\s*\{[^}]*display:\s*inline-block;[^}]*width:\s*240px;[^}]*margin:\s*5px;/s)
|
assert.match(legacyMainCss, /\.sub-vip-card \.vip-card\s*\{[^}]*display:\s*inline-block;[^}]*width:\s*240px;[^}]*margin:\s*5px;/s)
|
||||||
assert.match(legacyMainCss, /\.sub-vip-card \.vip-baicon\.abs-center\s*\{[^}]*font-size:\s*10em;[^}]*left:\s*55%;/s)
|
assert.match(legacyMainCss, /\.sub-vip-card \.vip-baicon\.abs-center\s*\{[^}]*font-size:\s*10em;[^}]*left:\s*55%;/s)
|
||||||
assert.match(legacyMainCss, /\.sub-vip-card \.vip-img\s*\{[^}]*display:\s*none;/s)
|
assert.match(legacyMainCss, /\.sub-vip-card \.vip-img\s*\{[^}]*display:\s*none;/s)
|
||||||
assert.match(headerCss, /\.navbar-top \.aksrt-navbar-actions \.navbar-vip-hover\s*\{[^}]*align-self:\s*stretch;[^}]*overflow:\s*visible;/s)
|
// The hover wrapper must stay a plain block container so the legacy static
|
||||||
assert.match(headerCss, /\.navbar-top \.aksrt-navbar-actions \.navbar-vip-hover > \.sub-vip-card\s*\{[^}]*top:\s*100%;[^}]*right:\s*0;[^}]*left:\s*auto;[^}]*max-width:\s*calc\(100vw - 24px\);/s)
|
// position of .sub-vip-card matches the reference theme.
|
||||||
|
assert.match(headerCss, /\.navbar-top \.aksrt-navbar-actions > \.hover-show\s*\{[^}]*display:\s*inline-block;/s)
|
||||||
|
assert.doesNotMatch(headerCss, /\.navbar-cta|\.navbar-vip-hover/)
|
||||||
|
assert.match(legacyMainCss, /\.navbar-top \.navbar-right \.sub-menu\s*\{[^}]*right:\s*0;/s)
|
||||||
|
})
|
||||||
|
|
||||||
|
test('user card VIP CTA matches the reference zib_get_header_payvip_icon()', () => {
|
||||||
|
assert.match(headerUserbox, /'<a class="pay-vip but radius4 payvip-icon btn-block" href="javascript:;">'/)
|
||||||
|
assert.match(headerUserbox, /<svg class="em12 mr6" aria-hidden="true"><use xlink:href="#icon-vip_1"><\/use><\/svg>'/)
|
||||||
|
assert.match(headerUserbox, /esc_html__\('开通会员 尊享会员权益', 'aksrt'\)/)
|
||||||
|
for (const dead of ['fa-gem', 'vip-level']) {
|
||||||
|
assert.equal(headerUserbox.includes(dead), false, `AKSRT-only user card CTA token remains: ${dead}`)
|
||||||
|
}
|
||||||
|
assert.doesNotMatch(headerUserbox, /<span>' \. esc_html__\('开通会员 尊享会员权益'/)
|
||||||
})
|
})
|
||||||
|
|
||||||
test('VIP purchase modal matches legacy desktop-center and mobile-bottom positioning', () => {
|
test('VIP purchase modal matches legacy desktop-center and mobile-bottom positioning', () => {
|
||||||
@@ -327,8 +351,11 @@ test('desktop header actions share one row without generic button masks', () =>
|
|||||||
assert.doesNotMatch(headerNavbar, /class="btn nav-search-btn main-search-btn"/)
|
assert.doesNotMatch(headerNavbar, /class="btn nav-search-btn main-search-btn"/)
|
||||||
assert.match(headerCss, /\.navbar-top \.aksrt-navbar-actions\s*\{[^}]*display:\s*flex;[^}]*align-items:\s*center;/s)
|
assert.match(headerCss, /\.navbar-top \.aksrt-navbar-actions\s*\{[^}]*display:\s*flex;[^}]*align-items:\s*center;/s)
|
||||||
assert.match(headerCss, /\.navbar-top \.aksrt-nav-icon,[\s\S]*?background:\s*transparent !important;/)
|
assert.match(headerCss, /\.navbar-top \.aksrt-nav-icon,[\s\S]*?background:\s*transparent !important;/)
|
||||||
assert.match(headerCss, /\.navbar-top \.aksrt-navbar-actions \.navbar-cta\.radius\s*\{[^}]*border-radius:\s*50px;/s)
|
// The publish and VIP chips ride the legacy .but geometry verbatim; nothing in
|
||||||
assert.match(headerCss, /\.navbar-top \.aksrt-navbar-actions \.navbar-cta > \.icon\s*\{[^}]*width:\s*1\.2em;[^}]*height:\s*1\.2em;[^}]*flex:\s*0 0 auto;/s)
|
// the header module may restate their padding, margin, radius or icon size.
|
||||||
|
assert.match(legacyMainCss, /\.navbar-top \.navbar-but > \.but\s*\{[^}]*font-size:\s*0\.8em;[^}]*padding:\s*0\.3em 1em !important;[^}]*margin:\s*0\.4em;/s)
|
||||||
|
assert.doesNotMatch(headerCss, /\.navbar-cta|\.navbar-vip-hover/)
|
||||||
|
assert.match(headerCss, /\.navbar-top \.aksrt-navbar-actions\s*\{[^}]*gap:\s*10px;/s)
|
||||||
assert.match(headerCss, /\.navbar-top \.aksrt-navbar-account > li\s*\{[^}]*position:\s*relative;/s)
|
assert.match(headerCss, /\.navbar-top \.aksrt-navbar-account > li\s*\{[^}]*position:\s*relative;/s)
|
||||||
assert.match(headerCss, /\.navbar-top \.aksrt-navbar-account > li > \.sub-menu\s*\{[^}]*top:\s*calc\(100% \+ 5px\);[^}]*right:\s*0;/s)
|
assert.match(headerCss, /\.navbar-top \.aksrt-navbar-account > li > \.sub-menu\s*\{[^}]*top:\s*calc\(100% \+ 5px\);[^}]*right:\s*0;/s)
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in new issue
Block a user