Changeset 3399794
- Timestamp:
- 11/20/2025 02:06:44 PM (4 months ago)
- Location:
- cookiebot/trunk
- Files:
-
- 15 edited
-
assets/css/backend/addons_page.css (modified) (1 diff)
-
assets/css/backend/dashboard-old.css (modified) (4 diffs)
-
assets/css/backend/settings-page.css (modified) (1 diff)
-
assets/js/backend/network-settings-page.js (modified) (2 diffs)
-
assets/js/backend/settings-page.js (modified) (2 diffs)
-
readme.txt (modified) (1 diff)
-
src/lib/Cookiebot_Javascript_Helper.php (modified) (1 diff)
-
src/lib/Cookiebot_WP.php (modified) (1 diff)
-
src/settings/pages/Support_Page.php (modified) (1 diff)
-
src/view/admin/cb_frame/settings/general-page.php (modified) (1 diff)
-
src/view/admin/common/dashboard-cookiebot.php (modified) (4 diffs)
-
src/view/admin/common/dashboard-page.php (modified) (2 diffs)
-
src/view/admin/common/network-settings-page.php (modified) (2 diffs)
-
src/view/admin/common/settings-page.php (modified) (2 diffs)
-
src/view/admin/uc_frame/settings/general-page.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
cookiebot/trunk/assets/css/backend/addons_page.css
r2957257 r3399794 52 52 line-height: initial; 53 53 cursor: pointer; 54 white-space: normal; 55 word-wrap: break-word; 56 overflow-wrap: break-word; 54 57 } 55 58 -
cookiebot/trunk/assets/css/backend/dashboard-old.css
r3366362 r3399794 28 28 .cb-main__dashboard__card:not(:last-child) { 29 29 width: 100%; 30 display: grid;31 30 margin-bottom: 30px; 32 31 } … … 34 33 .cb-main__dashboard__card__cookiebot { 35 34 width: 100%; 36 display: grid; 35 } 36 .cb-main__dashboard__card__cookiebot--flex { 37 display: flex; 38 flex-direction: column; 39 height: 100%; 40 width: 100%; 41 } 42 43 .cb-main__dashboard__card__cookiebot--flex .cb-main__card__inner { 44 flex: 1; 45 } 46 .cb-main__dashboard__card__cookiebot--flex .cb-main__card__subtitle { 47 margin-top: 16px; 48 font-size: 18px; 49 } 50 .cb-main__dashboard__card__cookiebot--flex .cb-main__card__subtitle a{ 51 font-weight: 700; 52 font-size: 18px; 53 margin-top: 0; 54 } 55 .cb-main__dashboard__card__cookiebot--flex .cb-main__card__subtitle a:hover{ 56 text-decoration: underline; 37 57 } 38 58 … … 51 71 align-self: start; 52 72 padding: 0; 73 } 74 75 .cb-main__card__inner.setup-steps { 76 background-color: #efefef; 77 padding: 30px; 78 } 79 80 .setup-steps-title { 81 color: #141414 !important; 82 font-size: 24px !important; 83 line-height: 1.3; 84 margin-bottom: 20px !important; 85 max-width: 100% !important; 86 } 87 88 .cb-setup-steps-list { 89 margin: 0; 90 padding-left: 0; 91 list-style: none; 92 counter-reset: step-counter; 93 } 94 95 .cb-setup-steps-list li { 96 font-size: 16px; 97 line-height: 1.6; 98 color: #141414; 99 margin-bottom: 16px; 100 padding-left: 45px; 101 position: relative; 102 counter-increment: step-counter; 103 } 104 105 .cb-setup-steps-list li:last-child { 106 margin-bottom: 0; 107 } 108 109 .cb-setup-steps-list li::before { 110 content: counter(step-counter); 111 position: absolute; 112 left: 0; 113 top: -0.2em; 114 width: 30px; 115 height: 30px; 116 background-color: #1032cf; 117 color: #ffffff; 118 border-radius: 50%; 119 display: flex; 120 align-items: center; 121 justify-content: center; 122 font-weight: 700; 123 font-size: 14px; 53 124 } 54 125 … … 154 225 .new_card .cb-main__card__label { 155 226 background-color: #00008d; 227 color: #ffffff; 228 } 229 230 .account_card .cb-main__card__label { 231 background-color: #1032cf; 156 232 color: #ffffff; 157 233 } -
cookiebot/trunk/assets/css/backend/settings-page.css
r3289355 r3399794 70 70 text-align: center; 71 71 cursor: pointer; 72 white-space: normal; 73 word-wrap: break-word; 74 overflow-wrap: break-word; 72 75 } 73 76 -
cookiebot/trunk/assets/js/backend/network-settings-page.js
r3343491 r3399794 67 67 const cbidRulesetSelector = jQuery('#cookiebot-ruleset-id-selector'); 68 68 const cbidSubmit = jQuery('.cookiebot-cbid-container p.submit #submit'); 69 const cbidError = jQuery('.cookiebot-cbid-error'); 69 70 70 71 cbidCheck.removeClass('check-progress'); … … 75 76 cbidRulesetSelector.addClass('hidden'); 76 77 cbidSubmit.addClass('disabled'); 78 cbidError.addClass('hidden'); 77 79 return; 78 80 } 81 82 // Validate that the field has exactly 14 or 36 characters 83 const fieldLength = cbidField.val().length; 84 if(fieldLength !== 14 && fieldLength !== 36){ 85 cbidCheck.removeClass('check-pass'); 86 cbidRulesetSelector.addClass('hidden'); 87 cbidSubmit.addClass('disabled'); 88 cbidError.removeClass('hidden'); 89 return; 90 } 91 92 // Valid input - hide error message 93 cbidError.addClass('hidden'); 79 94 80 95 !check_id_frame() ? cbidRulesetSelector.removeClass('hidden') : cbidRulesetSelector.addClass('hidden'); -
cookiebot/trunk/assets/js/backend/settings-page.js
r3343491 r3399794 52 52 const cbidCheck = jQuery( '.cookiebot-cbid-check' ); 53 53 const cbidRulesetSelector = jQuery('#cookiebot-ruleset-id-selector'); 54 const cbidError = jQuery('.cookiebot-cbid-error'); 54 55 55 56 cbidCheck.removeClass('check-progress'); … … 59 60 cbidCheck.removeClass('check-pass'); 60 61 cbidRulesetSelector.addClass('hidden'); 62 cbidError.addClass('hidden'); 61 63 jQuery('.cookiebot-cbid-container p.submit #submit').addClass('disabled'); 62 64 return; 63 65 } 66 67 // Validate that the field has exactly 14 or 36 characters 68 const fieldLength = cbidField.val().length; 69 if(fieldLength !== 14 && fieldLength !== 36){ 70 cbidCheck.removeClass('check-pass'); 71 cbidRulesetSelector.addClass('hidden'); 72 cbidError.removeClass('hidden'); 73 jQuery('.cookiebot-cbid-container p.submit #submit').addClass('disabled'); 74 return; 75 } 76 77 // Valid input - hide error message 78 cbidError.addClass('hidden'); 64 79 65 80 !check_id_frame() ? cbidRulesetSelector.removeClass('hidden') : cbidRulesetSelector.addClass('hidden'); -
cookiebot/trunk/readme.txt
r3366381 r3399794 197 197 ## Changelog ## 198 198 **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.** 199 200 ### 4.6.1 ### 201 Release date: November 20th 2025 202 203 Cookiebot CMP version 4.6.1 is out! This release has some bugfixes and new features 204 205 ####What's new#### 206 207 * Improved dashboard with clearer information on how to complete the configuration 208 209 ####Bugfixes#### 210 211 * Improved validation of field “Settings ID / Domain Group ID” when connecting to an existing account 212 * Fixed issue detected when using option: Compliance with multiple privacy laws (geolocation) 213 * Added missing language translations for FAQ article 199 214 200 215 ### 4.6.0 ### -
cookiebot/trunk/src/lib/Cookiebot_Javascript_Helper.php
r3343491 r3399794 88 88 if ( $return_html ) { 89 89 $this->debug_log( 'Returning HTML' ); 90 return wp_kses_post( $banner_script ); 90 // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Script HTML is generated internally and is safe 91 return $banner_script; 91 92 } else { 92 93 $this->debug_log( 'Echoing HTML' ); -
cookiebot/trunk/src/lib/Cookiebot_WP.php
r3366381 r3399794 574 574 } 575 575 576 $data_label = ! empty( get_option( 'cookiebot-ruleset-id' ) ) ? get_option( 'cookiebot-ruleset-id' ) : 'settings'; 576 577 // Add main banner script 577 578 // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript 578 579 $script_html .= sprintf( 579 '<script id="usercentrics-cmp" data-settings-id="%s" data-usercentrics="%s" src="%s" async></script>', 580 '<script id="usercentrics-cmp" data-%s-id="%s" data-usercentrics="%s" src="%s" async></script>', 581 esc_attr( $data_label ), 580 582 esc_attr( $cbid ), 581 583 esc_attr( 'Usercentrics Consent Management Platform' ), -
cookiebot/trunk/src/settings/pages/Support_Page.php
r3284229 r3399794 125 125 $debug_output .= 'Declaration tag: ' . Cookiebot_Declaration_Shortcode::show_declaration() . "\n"; 126 126 } else { 127 $debug_output .= 'Banner tag: ' . "\n" . $cookiebot_javascript_helper->include_uc_cmp_js( true ) . "\n ";127 $debug_output .= 'Banner tag: ' . "\n" . $cookiebot_javascript_helper->include_uc_cmp_js( true ) . "\n\n"; 128 128 } 129 129 -
cookiebot/trunk/src/view/admin/cb_frame/settings/general-page.php
r3343491 r3399794 80 80 </div> 81 81 <?php if ( ! empty( $network_cbid ) ) : ?> 82 <div class="cookiebot-cbid-error-container"> 83 <div class="cookiebot-cbid-error hidden" style="color: #d63638; margin-top: 8px; font-size: 14px;"> 84 <?php esc_html_e( 'Invalid ID length. Please enter a Settings ID (14 characters) or Domain Group ID (36 characters).', 'cookiebot' ); ?> 85 </div> 86 </div> 82 87 <div id="cb-network-id-override"> 83 88 <label class="switch-checkbox" for="cookiebot-cbid-override"> -
cookiebot/trunk/src/view/admin/common/dashboard-cookiebot.php
r3366362 r3399794 25 25 <div class="cb-main__content"> 26 26 <div class="cb-main__dashboard__card--container"> 27 <div class="cb-main__dashboard__card__cookiebot ">27 <div class="cb-main__dashboard__card__cookiebot--flex"> 28 28 <div class="cb-main__card__inner account_card"> 29 29 <img src="<?php echo esc_html( $cb_wp ); ?>" alt="Cookiebot for WordPress" class="cb-wp"> 30 30 <div class="cb-main__card__content"> 31 <p class="cb-main__card__label"><?php echo esc_html__( 'Get started', 'cookiebot' ); ?></p> 31 32 <h2 class="cb-main__card__title"> 32 <?php echo esc_html__( ' I already have aCookiebot CMP account', 'cookiebot' ); ?>33 <?php echo esc_html__( 'Create a new Cookiebot CMP account', 'cookiebot' ); ?> 33 34 </h2> 34 <a href="https://plugins.trac.wordpress.org/wp-admin/admin.php?page=<?php echo esc_html( Settings_Page::ADMIN_SLUG ); ?>" 35 class="cb-btn cb-main-btn"> 36 <?php echo esc_html__( 'Connect my existing account', 'cookiebot' ); ?> 35 <a 36 target="_blank" 37 rel="noopener" 38 href="https://admin.cookiebot.com/en/signup/?utm_source=wordpress&utm_medium=referral&utm_campaign=banner" 39 class="cb-btn cb-main-btn"> 40 <?php echo esc_html__( 'Create account', 'cookiebot' ); ?> 37 41 </a> 38 42 </div> 39 43 </div> 44 <p class="cb-main__card__subtitle"> 45 Already have an account? 46 <a href="https://plugins.trac.wordpress.org/wp-admin/admin.php?page=<?php echo esc_html( Settings_Page::ADMIN_SLUG ); ?>" 47 class="cb-btn cb-link-btn" rel="noopener"> 48 <?php echo esc_html__( 'Connect it', 'cookiebot' ); ?> 49 </a> 50 </p> 40 51 </div> 41 52 42 53 <div class="cb-main__dashboard__card__cookiebot"> 43 <div class="cb-main__card__inner new_card"> 44 <div class="cb-main__card__content"> 45 <p class="cb-main__card__label"> 46 <?php echo esc_html__( 'Get started', 'cookiebot' ); ?> 47 </p> 54 <div class="cb-main__card__inner start_card"> 55 <div class="cb-main__video"> 56 <iframe src="https://www.youtube.com/embed/1-lvuJa42P0" 57 title="Cookiebot WordPress Installation" 58 allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" 59 allowfullscreen></iframe> 60 </div> 61 <div class="cb-main__card--content"> 62 <p class="cb-main__card__label"><?php echo esc_html__( 'Video guide', 'cookiebot' ); ?></p> 48 63 <h2 class="cb-main__card__title"> 49 <?php echo esc_html__( ' Create a new Cookiebot CMP account', 'cookiebot' ); ?>64 <?php echo esc_html__( 'How to get started with Cookiebot CMP', 'cookiebot' ); ?> 50 65 </h2> 51 <a href="https:// admin.cookiebot.com/en/signup/?utm_source=wordpress&utm_medium=organic&utm_campaign=banner"52 target="_blank" class="cb-btn cb- white-btn" rel="noopener">53 <?php echo esc_html__( ' Create a new account', 'cookiebot' ); ?>66 <a href="https://support.cookiebot.com/hc/en-us/articles/4408356523282-Getting-started" 67 target="_blank" class="cb-btn cb-link-btn" rel="noopener"> 68 <?php echo esc_html__( 'Learn more about Cookiebot CMP', 'cookiebot' ); ?> 54 69 </a> 55 70 </div> … … 59 74 60 75 <div class="cb-main__dashboard__card--container"> 61 <div class="cb-main__dashboard__card"> 62 <div class="cb-main__card__inner start_card"> 63 <div class="cb-main__video"> 64 <iframe src="https://www.youtube.com/embed/1-lvuJa42P0" 65 title="Cookiebot WordPress Installation" 66 allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" 67 allowfullscreen></iframe> 68 </div> 69 <div class="cb-main__card--content"> 70 <p class="cb-main__card__label"><?php echo esc_html__( 'Video guide', 'cookiebot' ); ?></p> 71 <h2 class="cb-main__card__title"> 72 <?php echo esc_html__( 'How to get started with Cookiebot CMP', 'cookiebot' ); ?> 73 </h2> 74 <a href="https://support.cookiebot.com/hc/en-us/articles/4408356523282-Getting-started" 75 target="_blank" class="cb-btn cb-link-btn" rel="noopener"> 76 <?php echo esc_html__( 'Learn more about Cookiebot CMP', 'cookiebot' ); ?> 77 </a> 78 </div> 76 <div class="cb-main__dashboard__card"> 77 <div class="cb-main__card__inner setup-steps"> 78 <h2 class="cb-main__card__title setup-steps-title"> 79 <?php echo esc_html__( 'Steps to setup your banner', 'cookiebot' ); ?> 80 </h2> 81 <ol class="cb-setup-steps-list"> 82 <li><?php echo esc_html__( 'Create a new account on Cookiebot', 'cookiebot' ); ?></li> 83 <li><?php echo esc_html__( 'Copy and paste your domain group ID', 'cookiebot' ); ?></li> 84 <li><?php echo esc_html__( 'Connect it to your WordPress plugin', 'cookiebot' ); ?></li> 85 </ol> 79 86 </div> 80 87 </div> … … 92 99 </div> 93 100 <a href="https://www.cookiebot.com/en/gdpr/" target="_blank" 94 class="cb-btn cb-link-btn external-icon legislation-link" rel="noopener">101 class="cb-btn cb-link-btn external-icon legislation-link" rel="noopener"> 95 102 <?php echo esc_html__( 'Learn More', 'cookiebot' ); ?> 96 103 <img src="<?php echo esc_html( $link_icon ); ?>" 97 alt="<?php echo esc_html__( 'Learn More', 'cookiebot' ); ?>">104 alt="<?php echo esc_html__( 'Learn More', 'cookiebot' ); ?>"> 98 105 </a> 99 106 </div> … … 109 116 </div> 110 117 <a href="https://www.cookiebot.com/en/what-is-ccpa/" target="_blank" 111 class="cb-btn cb-link-btn external-icon legislation-link" rel="noopener">118 class="cb-btn cb-link-btn external-icon legislation-link" rel="noopener"> 112 119 <?php echo esc_html__( 'Learn More', 'cookiebot' ); ?> 113 120 <img src="<?php echo esc_html( $link_icon ); ?>" 114 alt="<?php echo esc_html__( 'Learn More', 'cookiebot' ); ?>">121 alt="<?php echo esc_html__( 'Learn More', 'cookiebot' ); ?>"> 115 122 </a> 116 123 </div> 117 124 <a href="https://www.cookiebot.com/en/blog/" target="_blank" 118 class="cb-btn cb-link-btn cb-right-btn" rel="noopener">125 class="cb-btn cb-link-btn cb-right-btn" rel="noopener"> 119 126 <?php echo esc_html__( 'See other legislations', 'cookiebot' ); ?> 120 127 </a> 121 128 </div> 122 129 </div> 130 123 131 </div> 124 132 </div> -
cookiebot/trunk/src/view/admin/common/dashboard-page.php
r3343491 r3399794 147 147 <div class="divider"></div> 148 148 <p class="step-description"> 149 • Instant setup & automatic cookie blocking<br>150 • 14 days of all-access premium features (no card needed)<br>151 • Keep it live afterwards on our Free plan or upgrade any time149 • <?php echo \esc_html__( 'Instant setup & automatic cookie blocking', 'cookiebot' ); ?><br> 150 • <?php echo \esc_html__( '14 days of all-access premium features (no card needed)', 'cookiebot' ); ?><br> 151 • <?php echo \esc_html__( 'Keep it live afterwards on our Free plan or upgrade any time', 'cookiebot' ); ?> 152 152 </p> 153 153 <div class="banner-images"> … … 175 175 <div> 176 176 <div class="cb-general__info__text"> 177 <span class="note-text"> Already have a Cookiebot or Usercentrics account?</span>177 <span class="note-text"><?php echo esc_html__( 'Already have a Cookiebot or Usercentrics account?', 'cookiebot' ); ?></span> 178 178 179 179 <a href="<?php echo esc_url( add_query_arg( 'page', Settings_Page::ADMIN_SLUG, admin_url( 'admin.php' ) ) ); ?>" -
cookiebot/trunk/src/view/admin/common/network-settings-page.php
r3343491 r3399794 62 62 <div class="cookiebot-cbid-container"> 63 63 <div class="cookiebot-cbid-input"> 64 <input placeholder=" XxxXXXxx"64 <input placeholder="<14 chars> or <36 chars>" 65 65 type="text" id="cookiebot-cbid" class="initial-cbid-setup" 66 66 name="cookiebot-cbid" … … 69 69 </div> 70 70 <?php submit_button( esc_html__( 'Connect account', 'cookiebot' ), 'disabled' ); ?> 71 <div class="cookiebot-cbid-error hidden" style="color: #d63638; margin-top: 8px; font-size: 14px;"> 72 <?php esc_html_e( 'Invalid ID length. Please enter a Settings ID (14 characters) or Domain Group ID (36 characters).', 'cookiebot' ); ?> 73 </div> 71 74 </div> 72 75 </div> -
cookiebot/trunk/src/view/admin/common/settings-page.php
r3289355 r3399794 66 66 <div class="cookiebot-cbid-container"> 67 67 <div class="cookiebot-cbid-input"> 68 <input placeholder=" XxxXXXxx"68 <input placeholder="<14 chars> or <36 chars>" 69 69 type="text" id="cookiebot-cbid" class="initial-cbid-setup" 70 70 name="cookiebot-cbid" … … 73 73 </div> 74 74 <?php submit_button( esc_html__( 'Connect account', 'cookiebot' ), 'disabled' ); ?> 75 <div class="cookiebot-cbid-error hidden" style="color: #d63638; margin-top: 8px; font-size: 14px;"> 76 <?php esc_html_e( 'Invalid ID length. Please enter a Settings ID (14 characters) or Domain Group ID (36 characters).', 'cookiebot' ); ?> 77 </div> 75 78 </div> 76 79 </div> -
cookiebot/trunk/src/view/admin/uc_frame/settings/general-page.php
r3343491 r3399794 99 99 </div> 100 100 <?php if ( ! empty( $network_cbid ) ) : ?> 101 <div class="cookiebot-cbid-error-container"> 102 <div class="cookiebot-cbid-error hidden" style="color: #d63638; margin-top: 8px; font-size: 14px;"> 103 <?php esc_html_e( 'Invalid ID length. Please enter a Settings ID (14 characters) or Domain Group ID (36 characters).', 'cookiebot' ); ?> 104 </div> 105 </div> 101 106 <div id="cb-network-id-override"> 102 107 <label class="switch-checkbox" for="cookiebot-cbid-override">
Note: See TracChangeset
for help on using the changeset viewer.