Changeset 3302726
- Timestamp:
- 05/29/2025 07:41:01 AM (9 months ago)
- Location:
- cookiebot/trunk
- Files:
-
- 2 added
- 9 edited
-
assets/css/backend/cookiebot_admin_main.css (modified) (1 diff)
-
assets/img/icons/customize.svg (added)
-
assets/img/icons/settings.svg (modified) (1 diff)
-
assets/img/icons/settings_old.svg (added)
-
readme.txt (modified) (1 diff)
-
src/lib/Consent_API_Helper.php (modified) (1 diff)
-
src/view/admin/common/dashboard-page-session-expired.php (modified) (2 diffs)
-
src/view/admin/common/dashboard-page.php (modified) (10 diffs)
-
src/view/admin/common/dashboard-trial-expired.php (modified) (3 diffs)
-
src/view/admin/common/templates/main-tabs.php (modified) (5 diffs)
-
src/view/frontend/scripts/common/google-consent-mode-js.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
cookiebot/trunk/assets/css/backend/cookiebot_admin_main.css
r3284229 r3302726 96 96 -webkit-mask-image: url(../../img/icons/dashboard.svg); 97 97 mask-image: url(../../img/icons/dashboard.svg); 98 } 99 100 .customize-icon { 101 -webkit-mask-image: url(../../img/icons/customize.svg); 102 mask-image: url(../../img/icons/customize.svg); 98 103 } 99 104 -
cookiebot/trunk/assets/img/icons/settings.svg
r2826913 r3302726 1 <svg width=" 19" height="18" viewBox="0 0 19 18" fill="none" xmlns="http://www.w3.org/2000/svg">2 <path d="M 0.5 14V16H6.5V14H0.5ZM0.5 2V4H10.5V2H0.5ZM10.5 18V16H18.5V14H10.5V12H8.5V18H10.5ZM4.5 6V8H0.5V10H4.5V12H6.5V6H4.5ZM18.5 10V8H8.5V10H18.5ZM12.5 6H14.5V4H18.5V2H14.5V0H12.5V6Z" fill="#141414"/>1 <svg width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg"> 2 <path d="M19.9322 12.98C19.9722 12.66 20.0022 12.34 20.0022 12C20.0022 11.66 19.9722 11.34 19.9322 11.02L22.0422 9.37C22.2322 9.22 22.2822 8.95 22.1622 8.73L20.1622 5.27C20.0722 5.11 19.9022 5.02 19.7222 5.02C19.6622 5.02 19.6022 5.03 19.5522 5.05L17.0622 6.05C16.5422 5.65 15.9822 5.32 15.3722 5.07L14.9922 2.42C14.9622 2.18 14.7522 2 14.5022 2H10.5022C10.2522 2 10.0422 2.18 10.0122 2.42L9.6322 5.07C9.0222 5.32 8.4622 5.66 7.9422 6.05L5.4522 5.05C5.3922 5.03 5.3322 5.02 5.2722 5.02C5.1022 5.02 4.9322 5.11 4.8422 5.27L2.8422 8.73C2.7122 8.95 2.7722 9.22 2.9622 9.37L5.0722 11.02C5.0322 11.34 5.0022 11.67 5.0022 12C5.0022 12.33 5.0322 12.66 5.0722 12.98L2.9622 14.63C2.7722 14.78 2.7222 15.05 2.8422 15.27L4.8422 18.73C4.9322 18.89 5.1022 18.98 5.2822 18.98C5.3422 18.98 5.4022 18.97 5.4522 18.95L7.9422 17.95C8.4622 18.35 9.0222 18.68 9.6322 18.93L10.0122 21.58C10.0422 21.82 10.2522 22 10.5022 22H14.5022C14.7522 22 14.9622 21.82 14.9922 21.58L15.3722 18.93C15.9822 18.68 16.5422 18.34 17.0622 17.95L19.5522 18.95C19.6122 18.97 19.6722 18.98 19.7322 18.98C19.9022 18.98 20.0722 18.89 20.1622 18.73L22.1622 15.27C22.2822 15.05 22.2322 14.78 22.0422 14.63L19.9322 12.98ZM17.9522 11.27C17.9922 11.58 18.0022 11.79 18.0022 12C18.0022 12.21 17.9822 12.43 17.9522 12.73L17.8122 13.86L18.7022 14.56L19.7822 15.4L19.0822 16.61L17.8122 16.1L16.7722 15.68L15.8722 16.36C15.4422 16.68 15.0322 16.92 14.6222 17.09L13.5622 17.52L13.4022 18.65L13.2022 20H11.8022L11.4522 17.52L10.3922 17.09C9.9622 16.91 9.5622 16.68 9.1622 16.38L8.2522 15.68L7.1922 16.11L5.9222 16.62L5.2222 15.41L6.3022 14.57L7.1922 13.87L7.0522 12.74C7.0222 12.43 7.0022 12.2 7.0022 12C7.0022 11.8 7.0222 11.57 7.0522 11.27L7.1922 10.14L6.3022 9.44L5.2222 8.6L5.9222 7.39L7.1922 7.9L8.2322 8.32L9.1322 7.64C9.5622 7.32 9.9722 7.08 10.3822 6.91L11.4422 6.48L11.6022 5.35L11.8022 4H13.1922L13.5422 6.48L14.6022 6.91C15.0322 7.09 15.4322 7.32 15.8322 7.62L16.7422 8.32L17.8022 7.89L19.0722 7.38L19.7722 8.59L18.7022 9.44L17.8122 10.14L17.9522 11.27ZM12.5022 8C10.2922 8 8.5022 9.79 8.5022 12C8.5022 14.21 10.2922 16 12.5022 16C14.7122 16 16.5022 14.21 16.5022 12C16.5022 9.79 14.7122 8 12.5022 8ZM12.5022 14C11.4022 14 10.5022 13.1 10.5022 12C10.5022 10.9 11.4022 10 12.5022 10C13.6022 10 14.5022 10.9 14.5022 12C14.5022 13.1 13.6022 14 12.5022 14Z" fill="#141414"/> 3 3 </svg> -
cookiebot/trunk/readme.txt
r3298638 r3302726 201 201 **Cookiebot CMP Plugin will soon no longer support PHP 5. If your website still runs on this version we recommend upgrading so you can continue enjoying the features Cookiebot CMP offers.** 202 202 203 ### 4.5.8 ### 204 Release date: May 29th 2025 205 206 Cookiebot CMP version 4.5.8 is out! This release has some new features and bugfixes 207 208 ####What's new#### 209 210 * Improved "Get started" page to highlight free banner activation 211 * Updated “Your banner is live” message to be clearer and more helpful 212 213 ####Bugfixes#### 214 215 * Resolved a line break issue in the Google Consent Mode script 216 * Fixed loading order for the WP Consent API script to ensure proper functionality 217 203 218 ### 4.5.7 ### 204 Release date: May 22 nd2025219 Release date: May 22th 2025 205 220 206 221 Cookiebot CMP version 4.5.7 is out! This release has some bugfixes -
cookiebot/trunk/src/lib/Consent_API_Helper.php
r3230472 r3302726 52 52 'cookiebot-wp-consent-level-api-integration', 53 53 $is_cb_frame ? asset_url( self::CB_FRAME_SCRIPT_PATH ) : asset_url( self::UC_FRAME_SCRIPT_PATH ), 54 null,54 array( 'wp-consent-api' ), 55 55 Cookiebot_WP::COOKIEBOT_PLUGIN_VERSION, 56 56 false -
cookiebot/trunk/src/view/admin/common/dashboard-page-session-expired.php
r3289355 r3302726 29 29 <div class="header-section-no-margin"> 30 30 <img src="<?php echo \esc_url( CYBOT_COOKIEBOT_PLUGIN_URL . 'assets/img/icons/set-up-icon.svg' ); ?>" alt="Usercentrics Logo"> 31 <h1><?php echo \esc_html__( 'Set up your co nsentbanner', 'cookiebot' ); ?></h1>31 <h1><?php echo \esc_html__( 'Set up your cookie banner', 'cookiebot' ); ?></h1> 32 32 </div> 33 33 <div class="header-section"> 34 34 <p class="subtitle"> 35 <?php echo esc_html__( 'Get your site GDPR-compliant in ', 'cookiebot' ); ?>35 <?php echo esc_html__( 'Get your site GDPR-compliant in ', 'cookiebot' ); ?> 36 36 <strong><?php echo esc_html__( 'just a few clicks.', 'cookiebot' ); ?></strong> 37 37 <?php echo esc_html__( 'Enter your email, verify it, and create your password.', 'cookiebot' ); ?> … … 57 57 <div class="divider"></div> 58 58 <p class="step-description"> 59 <?php 60 echo wp_kses( 61 __( 'Instant setup with automatic cookie blocking. Try all features free for 14 days - no credit card needed.<br> Choose Free or Premium before your trial ends to stay live.', 'cookiebot' ), 62 array( 63 'strong' => array(), 64 'br' => array(), 65 ) 66 ); 67 ?> 68 </p> 59 • Instant setup & automatic cookie blocking<br> 60 • 14 days of all-access premium features (no card needed)<br> 61 • Keep it live afterwards on our Free plan or upgrade any time 62 </p> 69 63 <div class="banner-images"> 70 64 <?php -
cookiebot/trunk/src/view/admin/common/dashboard-page.php
r3298601 r3302726 79 79 <p> 80 80 <?php 81 echo esc_html__( ' Stay live after your trial by choosing a Free or Premium plan.', 'cookiebot' );81 echo esc_html__( 'Choose your plan to stay live: pick our Free plan or upgrade to Premium for full control.', 'cookiebot' ); 82 82 ?> 83 83 <!-- <a href="https://account.usercentrics.eu/subscription/<?php echo isset( $template_args['user_data']['subscriptions']['active']['subscription_id'] ) ? esc_attr( $template_args['user_data']['subscriptions']['active']['subscription_id'] ) . '/' : ''; ?>manage" target="_blank" style="text-decoration: underline; color: inherit;" onclick="window.trackAmplitudeEvent('Choose Plan Link Clicked', { price_plan: '<?php echo esc_js( $template_args['user_data']['subscriptions']['active']['price_plan'] ? $template_args['user_data']['subscriptions']['active']['price_plan'] : '' ); ?>', account_id: '<?php echo esc_js( $template_args['cbid'] ); ?>' });"><?php echo esc_html__( 'Choose plan', 'cookiebot' ); ?></a> --> … … 107 107 <div class="header-section-no-margin"> 108 108 <img src="<?php echo \esc_url( CYBOT_COOKIEBOT_PLUGIN_URL . 'assets/img/icons/set-up-icon.svg' ); ?>" alt="Usercentrics Logo"> 109 <h1><?php echo \esc_html__( 'Set up your co nsentbanner', 'cookiebot' ); ?></h1>109 <h1><?php echo \esc_html__( 'Set up your cookie banner', 'cookiebot' ); ?></h1> 110 110 </div> 111 111 <div class="header-section"> 112 <?php if ( empty( $template_args['user_data'] ) ) : ?> 112 113 <p class="subtitle"> 113 114 <?php echo esc_html__( 'Get your site GDPR-compliant in', 'cookiebot' ); ?> … … 115 116 <?php echo esc_html__( 'Enter your email, verify it, and create your password.', 'cookiebot' ); ?> 116 117 </p> 118 <?php endif; ?> 117 119 </div> 118 120 … … 127 129 </div> 128 130 <div class="step-content"> 129 <h2><?php echo \esc_html__( ' Get your banner live in seconds', 'cookiebot' ); ?></h2>131 <h2><?php echo \esc_html__( 'Activate your banner', 'cookiebot' ); ?></h2> 130 132 </div> 131 133 <span class="done-status">Done!</span> … … 144 146 <div class="divider"></div> 145 147 <p class="step-description"> 146 <?php 147 echo wp_kses( 148 __( 'Instant setup with automatic cookie blocking. Try all features free for 14 days - no credit card needed.<br> Choose Free or Premium before your trial ends to stay live.', 'cookiebot' ), 149 array( 150 'strong' => array(), 151 'br' => array(), 152 ) 153 ); 154 ?> 148 • Instant setup & automatic cookie blocking<br> 149 • 14 days of all-access premium features (no card needed)<br> 150 • Keep it live afterwards on our Free plan or upgrade any time 155 151 </p> 156 152 <div class="banner-images"> … … 169 165 <div class="activate-container"> 170 166 <button id="get-started-button" class="cb-btn cb-primary-btn cb-get-started-btn"> 171 <?php echo esc_html__( ' Get Started', 'cookiebot' ); ?>167 <?php echo esc_html__( 'Activate free banner', 'cookiebot' ); ?> 172 168 </button> 173 169 <img src="<?php echo \esc_url( $arrow_url ); ?>" … … 202 198 </div> 203 199 <div class="step-content"> 204 <h2><?php echo \esc_html__( 'Scan website', 'cookiebot' ); ?></h2>200 <h2><?php echo \esc_html__( 'Scan your website', 'cookiebot' ); ?></h2> 205 201 </div> 206 202 <div class="step-status"> … … 270 266 </div> 271 267 <div class="step-content"> 272 <h2><?php echo \esc_html__( ' Upgrade your plan', 'cookiebot' ); ?></h2>268 <h2><?php echo \esc_html__( 'Choose your plan', 'cookiebot' ); ?></h2> 273 269 </div> 274 270 <div class="step-status"> … … 318 314 <?php if ( Cookiebot_WP::is_in_trial() && ! $trial_expired ) : ?> 319 315 <img src="<?php echo \esc_url( CYBOT_COOKIEBOT_PLUGIN_URL . 'assets/img/icons/clock-icon-blue.svg' ); ?>" alt="Clock Icon"> 320 <p class="step-message"><strong> Your trial ends in</strong> <span class="days-highlight"><?php echo absint( Cookiebot_WP::get_trial_days_left() ); ?> days</span>.</p>316 <p class="step-message"><strong>Enjoy all Premium features for</strong> <span class="days-highlight"><?php echo absint( Cookiebot_WP::get_trial_days_left() ); ?> days</span>.</p> 321 317 <?php endif; ?> 322 318 </div> 323 319 324 <p class="step-message"> Upgrade to get full access to premium features. <br>Premium includes:</p>320 <p class="step-message">Remember to choose a Free or Premium plan to keep your banner live. Premium includes:</p> 325 321 326 322 <ul class="upgrade-features"> … … 332 328 <div class="upgrade-container"> 333 329 <button id="upgrade-now-button" class="cb-btn cb-primary-btn" onclick="/* window.trackAmplitudeEvent('Bottom Upgrade Now Clicked', { settingsId: '<?php echo esc_js( $template_args['cbid'] ); ?>', account_id: '<?php echo esc_js( $template_args['cbid'] ); ?>' }); */ window.open('https://account.usercentrics.eu/subscription/<?php echo isset( $template_args['user_data']['subscriptions']['active']['subscription_id'] ) ? esc_attr( $template_args['user_data']['subscriptions']['active']['subscription_id'] ) . '/' : ''; ?>manage', '_blank')"> 334 <?php echo esc_html__( ' Upgrade now', 'cookiebot' ); ?>330 <?php echo esc_html__( 'Choose my plan', 'cookiebot' ); ?> 335 331 </button> 336 332 </div> -
cookiebot/trunk/src/view/admin/common/dashboard-trial-expired.php
r3270515 r3302726 46 46 <div class="header-section-no-margin"> 47 47 <img src="<?php echo \esc_url( CYBOT_COOKIEBOT_PLUGIN_URL . 'assets/img/icons/set-up-icon.svg' ); ?>" alt="Setup Icon"> 48 <h1><?php echo \esc_html__( 'Set up your co nsentbanner', 'cookiebot' ); ?></h1>48 <h1><?php echo \esc_html__( 'Set up your cookie banner', 'cookiebot' ); ?></h1> 49 49 </div> 50 50 … … 71 71 </div> 72 72 <div class="step-content"> 73 <h2><?php echo \esc_html__( 'Scan website', 'cookiebot' ); ?></h2>73 <h2><?php echo \esc_html__( 'Scan your website', 'cookiebot' ); ?></h2> 74 74 </div> 75 75 </div> … … 108 108 <div class="upgrade-container"> 109 109 <button id="upgrade-now-button" class="cb-btn cb-primary-btn" onclick="window.open('https://account.usercentrics.eu/subscription/<?php echo isset( $template_args['user_data']['subscriptions']['active']['subscription_id'] ) ? esc_attr( $template_args['user_data']['subscriptions']['active']['subscription_id'] ) . '/' : ''; ?>manage', '_blank')"> 110 <?php echo esc_html__( ' Upgrade now', 'cookiebot' ); ?>110 <?php echo esc_html__( 'Choose my plan', 'cookiebot' ); ?> 111 111 </button> 112 112 </div> -
cookiebot/trunk/src/view/admin/common/templates/main-tabs.php
r3289355 r3302726 27 27 class="cb-main__tabs__link"> 28 28 <div class="cb-main__tabs__icon dashboard-icon"></div> 29 <span><?php esc_html_e( 'Dashboard', 'cookiebot' ); ?></span> 29 <span><?php esc_html_e( 'View dashboard', 'cookiebot' ); ?></span> 30 </a> 31 </div> 32 <?php endif; ?> 33 34 <?php if ( ! empty( $cbid ) ) : ?> 35 <div class="cb-main__tabs_item <?php echo $active_tab === 'customize' ? 'active-item' : ''; ?>"> 36 <a href="https://admin.usercentrics.eu/#/v3/appearance/styling?settingsId=<?php echo esc_attr( $cbid ); ?>" 37 class="cb-main__tabs__link" target="_blank"> 38 <div class="cb-main__tabs__icon customize-icon"></div> 39 <span><?php esc_html_e( 'Customize banner', 'cookiebot' ); ?></span> 30 40 </a> 31 41 </div> … … 41 51 <?php endif; ?> 42 52 <div class="cb-main__tabs__icon support-icon"></div> 43 <span><?php esc_html_e( ' Support', 'cookiebot' ); ?></span>53 <span><?php esc_html_e( 'Get support', 'cookiebot' ); ?></span> 44 54 </a> 45 55 </div> … … 49 59 class="cb-main__tabs__link"> 50 60 <div class="cb-main__tabs__icon plugins-icon"></div> 51 <span><?php esc_html_e( ' Plugins', 'cookiebot' ); ?></span>61 <span><?php esc_html_e( 'Manage add-ons', 'cookiebot' ); ?></span> 52 62 </a> 53 63 </div> … … 64 74 <?php endif; ?> 65 75 <div class="cb-main__tabs__icon settings-icon"></div> 66 <span><?php esc_html_e( ' Settings', 'cookiebot' ); ?></span>76 <span><?php esc_html_e( 'Configure settings', 'cookiebot' ); ?></span> 67 77 </a> 68 78 </div> … … 70 80 71 81 <div class="cb-feedback_link"> 72 <a href="<?php echo esc_url( $feedback_url ); ?>" target="_blank"><?php echo esc_html__( ' Share feedback', 'cookiebot' ); ?></a>82 <a href="<?php echo esc_url( $feedback_url ); ?>" target="_blank"><?php echo esc_html__( 'Help us improve', 'cookiebot' ); ?></a> 73 83 </div> 74 84 -
cookiebot/trunk/src/view/frontend/scripts/common/google-consent-mode-js.php
r3230472 r3302726 12 12 13 13 function gtag() { 14 <?php echo esc_js( $data_layer ); ?>. 15 push(arguments); 14 <?php echo esc_js( $data_layer ); ?>.push(arguments); 16 15 } 17 16 18 17 gtag("consent", "default", { 19 ad_user_data: "denied",20 18 ad_personalization: "denied", 21 19 ad_storage: "denied", 20 ad_user_data: "denied", 22 21 analytics_storage: "denied", 23 22 functionality_storage: "denied",
Note: See TracChangeset
for help on using the changeset viewer.