Changeset 3810562
- Timestamp:
- 11/19/2026 02:58:16 AM (less than one hour ago)
- Location:
- softlinkster-reviews-for-google
- Files:
-
- 12 edited
- 11 copied
-
tags/0.2.13 (copied) (copied from softlinkster-reviews-for-google/trunk )
-
tags/0.2.13/assets/css/admin.css (copied) (copied from softlinkster-reviews-for-google/trunk/assets/css/admin.css ) (1 diff)
-
tags/0.2.13/assets/css/frontend.css (copied) (copied from softlinkster-reviews-for-google/trunk/assets/css/frontend.css ) (9 diffs)
-
tags/0.2.13/assets/js/frontend.js (copied) (copied from softlinkster-reviews-for-google/trunk/assets/js/frontend.js ) (1 diff)
-
tags/0.2.13/includes/Admin/SettingsPage.php (copied) (copied from softlinkster-reviews-for-google/trunk/includes/Admin/SettingsPage.php ) (6 diffs)
-
tags/0.2.13/includes/Api/BusinessProfileClient.php (copied) (copied from softlinkster-reviews-for-google/trunk/includes/Api/BusinessProfileClient.php ) (1 diff)
-
tags/0.2.13/includes/Core/Plugin.php (copied) (copied from softlinkster-reviews-for-google/trunk/includes/Core/Plugin.php ) (9 diffs)
-
tags/0.2.13/includes/Database/ReviewRepository.php (modified) (1 diff)
-
tags/0.2.13/includes/Frontend/Shortcode.php (copied) (copied from softlinkster-reviews-for-google/trunk/includes/Frontend/Shortcode.php ) (4 diffs)
-
tags/0.2.13/readme.txt (copied) (copied from softlinkster-reviews-for-google/trunk/readme.txt ) (3 diffs)
-
tags/0.2.13/softlinkster-reviews-for-google.php (copied) (copied from softlinkster-reviews-for-google/trunk/softlinkster-reviews-for-google.php ) (2 diffs)
-
tags/0.2.13/templates/reviews/default.php (copied) (copied from softlinkster-reviews-for-google/trunk/templates/reviews/default.php ) (5 diffs)
-
trunk/assets/css/admin.css (modified) (1 diff)
-
trunk/assets/css/frontend.css (modified) (9 diffs)
-
trunk/assets/js/frontend.js (modified) (1 diff)
-
trunk/includes/Admin/SettingsPage.php (modified) (6 diffs)
-
trunk/includes/Api/BusinessProfileClient.php (modified) (1 diff)
-
trunk/includes/Core/Plugin.php (modified) (9 diffs)
-
trunk/includes/Database/ReviewRepository.php (modified) (1 diff)
-
trunk/includes/Frontend/Shortcode.php (modified) (4 diffs)
-
trunk/readme.txt (modified) (3 diffs)
-
trunk/softlinkster-reviews-for-google.php (modified) (2 diffs)
-
trunk/templates/reviews/default.php (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
softlinkster-reviews-for-google/tags/0.2.13/assets/css/admin.css
r3686624 r3810562 1062 1062 } 1063 1063 } 1064 1065 .softrefo-admin__color-grid + .softrefo-admin__inline-grid { 1066 margin-top: 14px; 1067 } 1068 1069 .softrefo-admin__inline-grid .regular-text, 1070 .softrefo-admin__inline-grid select { 1071 box-sizing: border-box; 1072 max-width: 100%; 1073 } 1074 1075 .softrefo-admin__inline-grid p > label { 1076 display: block; 1077 margin-bottom: 4px; 1078 } -
softlinkster-reviews-for-google/tags/0.2.13/assets/css/frontend.css
r3694881 r3810562 26 26 --softrefo-review-lines: 8; 27 27 --softrefo-star-color: #f59e0b; 28 /* Fill the parent even inside flex rows (page builders), so motion tracks size from the column, not their content. */ 29 box-sizing: border-box; 30 width: 100%; 31 max-width: 100%; 32 min-width: 0; 33 /* Cards per row follow the width of this block (not the screen), so narrow page-builder columns stay readable. */ 34 container: softrefo / inline-size; 28 35 background: var(--softrefo-panel-bg); 29 36 border: 1px solid color-mix(in srgb, var(--softrefo-card-border) 70%, #ffffff 30%); … … 190 197 191 198 .softrefo-reviews__marquee-window { 199 container-type: inline-size; 192 200 display: flex; 193 201 gap: 18px; … … 204 212 205 213 .softrefo-reviews__list--marquee-track { 214 --softrefo-marquee-visible: var(--softrefo-marquee-columns); 206 215 animation: softrefo-marquee-scroll var(--softrefo-marquee-duration) linear infinite; 207 216 display: grid; 208 flex: 0 0 100%; 217 /* The track is as wide as all of its cards, so the duplicate track starts after the last card instead of on top of it. */ 218 flex: 0 0 auto; 209 219 gap: 18px; 210 grid-auto-columns: calc((100 % - (18px * (var(--softrefo-marquee-columns) - 1))) / var(--softrefo-marquee-columns));220 grid-auto-columns: calc((100cqw - (18px * (var(--softrefo-marquee-visible) - 1))) / var(--softrefo-marquee-visible)); 211 221 grid-auto-flow: column; 212 222 grid-template-columns: none; … … 231 241 display: grid; 232 242 gap: 18px; 233 grid-auto-columns: calc((100% - (18px * (var(--softrefo-carousel-columns) - 1))) / var(--softrefo-carousel-columns)); 243 --softrefo-carousel-visible: var(--softrefo-carousel-columns); 244 grid-auto-columns: calc((100cqw - (18px * (var(--softrefo-carousel-visible) - 1))) / var(--softrefo-carousel-visible)); 234 245 grid-auto-flow: column; 235 246 grid-template-columns: none; … … 266 277 267 278 .softrefo-review { 279 /* Padding and border count inside the card's height, so equal-height cards fit their grid row even when the theme does not set border-box. */ 280 box-sizing: border-box; 268 281 background: var(--softrefo-card-bg); 269 282 border: 1px solid var(--softrefo-card-border); … … 544 557 } 545 558 546 .softrefo-reviews--layout-carousel .softrefo-review { 547 min-width: 280px; 559 .softrefo-reviews--layout-carousel .softrefo-review, 560 .softrefo-reviews__list--marquee-track .softrefo-review, 561 .softrefo-reviews--layout-grid .softrefo-review { 562 min-width: 0; 563 } 564 565 @container softrefo (max-width: 720px) { 566 .softrefo-reviews--grid-cols-3 .softrefo-reviews__list { 567 grid-template-columns: repeat(2, minmax(0, 1fr)); 568 } 569 570 .softrefo-reviews--layout-carousel .softrefo-reviews__list { 571 --softrefo-carousel-visible: min(var(--softrefo-carousel-columns), 2); 572 } 573 574 .softrefo-reviews__list--marquee-track { 575 --softrefo-marquee-visible: min(var(--softrefo-marquee-columns), 2); 576 } 577 } 578 579 @container softrefo (max-width: 480px) { 580 .softrefo-reviews--layout-grid .softrefo-reviews__list { 581 grid-template-columns: minmax(0, 1fr); 582 } 583 584 .softrefo-reviews--layout-carousel .softrefo-reviews__list { 585 --softrefo-carousel-visible: 1; 586 } 587 588 .softrefo-reviews__list--marquee-track { 589 --softrefo-marquee-visible: 1; 590 } 548 591 } 549 592 … … 577 620 border-color: color-mix(in srgb, var(--softrefo-card-accent) 35%, var(--softrefo-card-border) 65%); 578 621 color: var(--softrefo-card-text); 622 } 623 624 .softrefo-reviews--load-more .softrefo-review[data-softrefo-deferred] { 625 display: none; 626 } 627 628 .softrefo-reviews--load-more .softrefo-review:focus { 629 outline: 2px solid var(--softrefo-card-accent); 630 outline-offset: 2px; 631 } 632 633 .softrefo-reviews__load-more { 634 display: flex; 635 justify-content: center; 636 margin-top: 24px; 637 } 638 639 .softrefo-reviews__load-more--left { 640 justify-content: flex-start; 641 } 642 643 .softrefo-reviews__load-more--right { 644 justify-content: flex-end; 645 } 646 647 .softrefo-reviews__load-more--full .softrefo-reviews__load-more-button { 648 width: 100%; 649 } 650 651 .softrefo-reviews__load-more-button { 652 cursor: pointer; 653 max-width: 100%; 654 } 655 656 .softrefo-reviews__load-more-button--custom { 657 background: var(--softrefo-more-bg, var(--softrefo-card-bg)); 658 border: 1px solid var(--softrefo-more-border, var(--softrefo-card-border)); 659 border-radius: var(--softrefo-more-radius, 99px); 660 box-shadow: none; 661 color: var(--softrefo-more-text, var(--softrefo-card-text)); 662 font-family: var(--softrefo-font-family); 663 font-size: var(--softrefo-more-size, 15px); 664 font-weight: var(--softrefo-more-weight, 700); 665 letter-spacing: normal; 666 line-height: 1.3; 667 padding: var(--softrefo-more-pad-y, 12px) var(--softrefo-more-pad-x, 24px); 668 text-transform: var(--softrefo-more-transform, none); 669 transition: background-color 0.2s ease, border-color 0.2s ease, color 0.2s ease; 670 } 671 672 .softrefo-reviews__load-more-button--custom:hover, 673 .softrefo-reviews__load-more-button--custom:focus-visible { 674 background: var(--softrefo-more-hover-bg, var(--softrefo-card-bg)); 675 border-color: var(--softrefo-more-hover-bg, var(--softrefo-card-border)); 676 color: var(--softrefo-more-hover-text, var(--softrefo-card-text)); 677 } 678 679 .softrefo-reviews__load-more-button:focus-visible { 680 outline: 2px solid var(--softrefo-card-accent); 681 outline-offset: 2px; 682 } 683 684 .softrefo-reviews__load-more-button[hidden] { 685 display: none; 579 686 } 580 687 … … 612 719 } 613 720 614 @media (max-width: 900px) { 615 .softrefo-reviews--layout-grid .softrefo-reviews__list { 616 grid-template-columns: minmax(0, 1fr); 617 } 618 619 .softrefo-reviews--layout-carousel .softrefo-reviews__list { 620 grid-auto-columns: minmax(0, 1fr); 621 } 622 623 .softrefo-reviews__list--marquee-track .softrefo-review { 624 min-width: 0; 625 } 626 627 .softrefo-reviews__list--marquee-track { 628 grid-auto-columns: calc((100% - 18px) / 2); 721 /* Older browsers without container queries fall back to screen-width breakpoints. */ 722 @supports not (container-type: inline-size) { 723 @media (max-width: 900px) { 724 .softrefo-reviews--layout-grid .softrefo-reviews__list { 725 grid-template-columns: minmax(0, 1fr); 726 } 629 727 } 630 728 } … … 658 756 flex: 1 1 0; 659 757 } 660 661 .softrefo-reviews__list--marquee-track {662 grid-auto-columns: 100%;663 }664 758 } 665 759 -
softlinkster-reviews-for-google/tags/0.2.13/assets/js/frontend.js
r3679755 r3810562 404 404 } ); 405 405 406 const mobileQuery = window.matchMedia ? window.matchMedia( '(max-width: 640px)' ) : null; 407 408 document.querySelectorAll( '.softrefo-reviews--load-more' ).forEach( function ( block ) { 409 const button = block.querySelector( '[data-softrefo-load-more]' ); 410 const status = block.querySelector( '[data-softrefo-load-more-status]' ); 411 const cards = Array.from( block.querySelectorAll( '.softrefo-review' ) ); 412 const perPage = Math.max( 1, parseInt( block.getAttribute( 'data-per-page' ), 10 ) || 9 ); 413 const perPageMobile = Math.max( 1, parseInt( block.getAttribute( 'data-per-page-mobile' ), 10 ) || perPage ); 414 let hasLoadedMore = false; 415 416 if ( ! button || ! cards.length ) { 417 return; 418 } 419 420 const getPageSize = function () { 421 return mobileQuery && mobileQuery.matches ? perPageMobile : perPage; 422 }; 423 424 let visibleCount = getPageSize(); 425 426 const apply = function () { 427 cards.forEach( function ( card, index ) { 428 if ( index < visibleCount ) { 429 card.removeAttribute( 'data-softrefo-deferred' ); 430 } else { 431 card.setAttribute( 'data-softrefo-deferred', '' ); 432 } 433 } ); 434 435 button.hidden = visibleCount >= cards.length; 436 }; 437 438 button.addEventListener( 'click', function () { 439 const firstNewIndex = visibleCount; 440 441 visibleCount = Math.min( cards.length, visibleCount + getPageSize() ); 442 hasLoadedMore = true; 443 apply(); 444 445 cards.slice( firstNewIndex, visibleCount ).forEach( function ( card ) { 446 syncExpandableReview( card ); 447 } ); 448 449 if ( status ) { 450 const template = status.getAttribute( 'data-softrefo-status-template' ) || 'Showing %1$s of %2$s reviews'; 451 452 status.textContent = template.replace( '%1$s', String( visibleCount ) ).replace( '%2$s', String( cards.length ) ); 453 } 454 455 // Keep keyboard users in place: move focus to the first newly shown review without scrolling. 456 if ( cards[ firstNewIndex ] ) { 457 cards[ firstNewIndex ].setAttribute( 'tabindex', '-1' ); 458 cards[ firstNewIndex ].focus( { preventScroll: true } ); 459 } 460 } ); 461 462 if ( mobileQuery ) { 463 const onBreakpointChange = function () { 464 if ( ! hasLoadedMore ) { 465 visibleCount = getPageSize(); 466 apply(); 467 } 468 }; 469 470 if ( mobileQuery.addEventListener ) { 471 mobileQuery.addEventListener( 'change', onBreakpointChange ); 472 } else if ( mobileQuery.addListener ) { 473 mobileQuery.addListener( onBreakpointChange ); 474 } 475 } 476 477 apply(); 478 } ); 479 406 480 window.addEventListener( 'resize', function () { 407 481 allReviewBlocks.forEach( function ( block ) { -
softlinkster-reviews-for-google/tags/0.2.13/includes/Admin/SettingsPage.php
r3687820 r3810562 894 894 <tr> 895 895 <th scope="row"><label for="softrefo_default_limit"><?php echo esc_html__( 'Default review count', 'softlinkster-reviews-for-google' ); ?></label></th> 896 <td><input type="number" class="small-text" min="1" max="50" id="softrefo_default_limit" name="default_limit" value="<?php echo esc_attr( (string) $settings['default_limit'] ); ?>" /></td> 896 <td> 897 <input type="number" class="small-text" min="1" max="200" id="softrefo_default_limit" name="default_limit" value="<?php echo esc_attr( (string) $settings['default_limit'] ); ?>" /> 898 <p class="description"><?php echo esc_html__( 'Up to 50 reviews, or up to 200 when the load more button is on (Layout & Styling tab).', 'softlinkster-reviews-for-google' ); ?></p> 899 </td> 897 900 </tr> 898 901 <tr> … … 1095 1098 </td> 1096 1099 </tr> 1100 <tr data-softrefo-layout-targets="stacked,grid,compact"> 1101 <th scope="row"><?php echo esc_html__( 'Load more button', 'softlinkster-reviews-for-google' ); ?></th> 1102 <td class="softrefo-admin__inline-grid"> 1103 <p class="softrefo-admin__inline-grid-wide"> 1104 <?php $this->renderCheckboxField( 'load_more', __( 'Show the first reviews, then a button that reveals more', 'softlinkster-reviews-for-google' ), (bool) $settings['load_more'] ); ?> 1105 <span class="description"><?php echo esc_html__( 'All reviews up to the default review count are in the page; the button only reveals them. Set the default review count to how many reviews the list should hold in total.', 'softlinkster-reviews-for-google' ); ?></span> 1106 </p> 1107 <p> 1108 <label for="softrefo_per_page"><?php echo esc_html__( 'Reviews per step', 'softlinkster-reviews-for-google' ); ?></label> 1109 <input type="number" class="small-text" min="1" max="50" id="softrefo_per_page" name="per_page" value="<?php echo esc_attr( (string) $settings['per_page'] ); ?>" /> 1110 <span class="description"><?php echo esc_html__( 'shown at first and added per click', 'softlinkster-reviews-for-google' ); ?></span> 1111 </p> 1112 <p> 1113 <label for="softrefo_per_page_mobile"><?php echo esc_html__( 'Reviews per step on phones', 'softlinkster-reviews-for-google' ); ?></label> 1114 <input type="number" class="small-text" min="1" max="50" id="softrefo_per_page_mobile" name="per_page_mobile" value="<?php echo esc_attr( (string) $settings['per_page_mobile'] ); ?>" /> 1115 <span class="description"><?php echo esc_html__( 'screens up to 640px wide', 'softlinkster-reviews-for-google' ); ?></span> 1116 </p> 1117 <p> 1118 <label for="softrefo_load_more_text"><?php echo esc_html__( 'Button text', 'softlinkster-reviews-for-google' ); ?></label> 1119 <input type="text" class="regular-text" id="softrefo_load_more_text" name="load_more_text" value="<?php echo esc_attr( (string) $settings['load_more_text'] ); ?>" /> 1120 </p> 1121 <p> 1122 <label for="softrefo_load_more_align"><?php echo esc_html__( 'Button position', 'softlinkster-reviews-for-google' ); ?></label> 1123 <select id="softrefo_load_more_align" name="load_more_align"> 1124 <?php $this->renderOption( 'left', __( 'Left', 'softlinkster-reviews-for-google' ), (string) $settings['load_more_align'] ); ?> 1125 <?php $this->renderOption( 'center', __( 'Centre', 'softlinkster-reviews-for-google' ), (string) $settings['load_more_align'] ); ?> 1126 <?php $this->renderOption( 'right', __( 'Right', 'softlinkster-reviews-for-google' ), (string) $settings['load_more_align'] ); ?> 1127 <?php $this->renderOption( 'full', __( 'Full width', 'softlinkster-reviews-for-google' ), (string) $settings['load_more_align'] ); ?> 1128 </select> 1129 </p> 1130 <p class="softrefo-admin__inline-grid-wide"> 1131 <label for="softrefo_load_more_button_style"><?php echo esc_html__( 'Button look', 'softlinkster-reviews-for-google' ); ?></label> 1132 <select id="softrefo_load_more_button_style" name="load_more_button_style"> 1133 <?php $this->renderOption( 'custom', __( 'Use the button settings below', 'softlinkster-reviews-for-google' ), (string) $settings['load_more_button_style'] ); ?> 1134 <?php $this->renderOption( 'theme', __( 'Use my theme\'s button style', 'softlinkster-reviews-for-google' ), (string) $settings['load_more_button_style'] ); ?> 1135 </select> 1136 <span class="description"><?php echo esc_html__( 'Choose the theme option and add your theme\'s button class below to match the site\'s other buttons exactly.', 'softlinkster-reviews-for-google' ); ?></span> 1137 </p> 1138 <p class="softrefo-admin__inline-grid-wide"> 1139 <label for="softrefo_load_more_button_class"><?php echo esc_html__( 'Extra button CSS classes', 'softlinkster-reviews-for-google' ); ?></label> 1140 <input type="text" class="regular-text" id="softrefo_load_more_button_class" name="load_more_button_class" value="<?php echo esc_attr( (string) $settings['load_more_button_class'] ); ?>" placeholder="<?php echo esc_attr__( 'e.g. button x-btn', 'softlinkster-reviews-for-google' ); ?>" /> 1141 </p> 1142 </td> 1143 </tr> 1144 <tr data-softrefo-layout-targets="stacked,grid,compact"> 1145 <th scope="row"><?php echo esc_html__( 'Load more button style', 'softlinkster-reviews-for-google' ); ?></th> 1146 <td> 1147 <div class="softrefo-admin__color-grid"> 1148 <?php $this->renderColorField( 'load_more_button_bg', __( 'Background', 'softlinkster-reviews-for-google' ), (string) $settings['load_more_button_bg'] ); ?> 1149 <?php $this->renderColorField( 'load_more_button_text_color', __( 'Text', 'softlinkster-reviews-for-google' ), (string) $settings['load_more_button_text_color'] ); ?> 1150 <?php $this->renderColorField( 'load_more_button_border_color', __( 'Border', 'softlinkster-reviews-for-google' ), (string) $settings['load_more_button_border_color'] ); ?> 1151 <?php $this->renderColorField( 'load_more_button_hover_bg', __( 'Hover background', 'softlinkster-reviews-for-google' ), (string) $settings['load_more_button_hover_bg'] ); ?> 1152 <?php $this->renderColorField( 'load_more_button_hover_text_color', __( 'Hover text', 'softlinkster-reviews-for-google' ), (string) $settings['load_more_button_hover_text_color'] ); ?> 1153 </div> 1154 <div class="softrefo-admin__inline-grid"> 1155 <p> 1156 <label for="softrefo_load_more_button_radius"><?php echo esc_html__( 'Corner radius', 'softlinkster-reviews-for-google' ); ?></label> 1157 <input type="number" class="small-text" min="0" max="99" id="softrefo_load_more_button_radius" name="load_more_button_radius" value="<?php echo esc_attr( (string) $settings['load_more_button_radius'] ); ?>" /> 1158 <span class="description"><?php echo esc_html__( 'px (99 = pill)', 'softlinkster-reviews-for-google' ); ?></span> 1159 </p> 1160 <p> 1161 <label for="softrefo_load_more_button_font_size"><?php echo esc_html__( 'Text size', 'softlinkster-reviews-for-google' ); ?></label> 1162 <input type="number" class="small-text" min="12" max="24" id="softrefo_load_more_button_font_size" name="load_more_button_font_size" value="<?php echo esc_attr( (string) $settings['load_more_button_font_size'] ); ?>" /> 1163 <span class="description"><?php echo esc_html__( 'px', 'softlinkster-reviews-for-google' ); ?></span> 1164 </p> 1165 <p> 1166 <label for="softrefo_load_more_button_font_weight"><?php echo esc_html__( 'Text weight', 'softlinkster-reviews-for-google' ); ?></label> 1167 <input type="number" class="small-text" min="100" max="900" step="100" id="softrefo_load_more_button_font_weight" name="load_more_button_font_weight" value="<?php echo esc_attr( (string) $settings['load_more_button_font_weight'] ); ?>" /> 1168 </p> 1169 <p> 1170 <label for="softrefo_load_more_button_padding_y"><?php echo esc_html__( 'Padding (top / bottom)', 'softlinkster-reviews-for-google' ); ?></label> 1171 <input type="number" class="small-text" min="4" max="32" id="softrefo_load_more_button_padding_y" name="load_more_button_padding_y" value="<?php echo esc_attr( (string) $settings['load_more_button_padding_y'] ); ?>" /> 1172 <span class="description"><?php echo esc_html__( 'px', 'softlinkster-reviews-for-google' ); ?></span> 1173 </p> 1174 <p> 1175 <label for="softrefo_load_more_button_padding_x"><?php echo esc_html__( 'Padding (left / right)', 'softlinkster-reviews-for-google' ); ?></label> 1176 <input type="number" class="small-text" min="8" max="64" id="softrefo_load_more_button_padding_x" name="load_more_button_padding_x" value="<?php echo esc_attr( (string) $settings['load_more_button_padding_x'] ); ?>" /> 1177 <span class="description"><?php echo esc_html__( 'px', 'softlinkster-reviews-for-google' ); ?></span> 1178 </p> 1179 <p> 1180 <?php $this->renderCheckboxField( 'load_more_button_uppercase', __( 'Uppercase text', 'softlinkster-reviews-for-google' ), (bool) $settings['load_more_button_uppercase'] ); ?> 1181 </p> 1182 </div> 1183 <p class="description"><?php echo esc_html__( 'Used when the button look is set to "Use the button settings below".', 'softlinkster-reviews-for-google' ); ?></p> 1184 </td> 1185 </tr> 1097 1186 <tr data-softrefo-layout-targets="all"> 1098 1187 <th scope="row"><label for="softrefo_border_radius"><?php echo esc_html__( 'Card border radius', 'softlinkster-reviews-for-google' ); ?></label></th> … … 1544 1633 1545 1634 <?php if ( '' !== $business_profile_state['error'] ) : ?> 1546 <div class="softrefo-admin__callout softrefo-admin__callout--<?php echo $business_profile_state['is_connected'] ? 'info' : 'warning'; ?>"> 1635 <?php 1636 // Only call it rate limiting when Google actually returned HTTP 429. 1637 $softrefo_is_rate_limited = $business_profile_state['is_connected'] 1638 && false !== strpos( (string) $business_profile_state['error'], 'status 429' ); 1639 ?> 1640 <div class="softrefo-admin__callout softrefo-admin__callout--<?php echo $softrefo_is_rate_limited ? 'info' : 'warning'; ?>"> 1547 1641 <strong> 1548 1642 <?php 1549 echo esc_html( 1550 $business_profile_state['is_connected'] 1551 ? __( 'Connected, but Google is temporarily rate-limiting account lookup', 'softlinkster-reviews-for-google' ) 1552 : __( 'Connection note', 'softlinkster-reviews-for-google' ) 1553 ); 1643 if ( $softrefo_is_rate_limited ) { 1644 echo esc_html__( 'Connected, but Google is temporarily rate-limiting account lookup', 'softlinkster-reviews-for-google' ); 1645 } elseif ( $business_profile_state['is_connected'] ) { 1646 echo esc_html__( 'Connected, but Google rejected the request', 'softlinkster-reviews-for-google' ); 1647 } else { 1648 echo esc_html__( 'Connection note', 'softlinkster-reviews-for-google' ); 1649 } 1554 1650 ?> 1555 1651 </strong> 1556 <p> 1557 <?php 1558 echo esc_html( 1559 $business_profile_state['is_connected'] 1560 ? __( 'Your Google Business Profile connection is active. Google has temporarily limited the account list request; please wait a few minutes and refresh once. Do not reconnect.', 'softlinkster-reviews-for-google' ) 1561 : $business_profile_state['error'] 1562 ); 1563 ?> 1564 </p> 1652 <p><?php echo esc_html( (string) $business_profile_state['error'] ); ?></p> 1653 <?php if ( $softrefo_is_rate_limited ) : ?> 1654 <p><?php echo esc_html__( 'Wait a few minutes and refresh once. If this never clears, the Google Cloud project may not have Business Profile API access approved yet (quota 0).', 'softlinkster-reviews-for-google' ); ?></p> 1655 <?php endif; ?> 1565 1656 </div> 1566 1657 <?php endif; ?> … … 2146 2237 'enabled' => $this->readCheckboxInput( 'enabled' ), 2147 2238 'auto_sync_enabled' => $this->readCheckboxInput( 'auto_sync_enabled' ), 2148 'default_limit' => $this->readBoundedIntInput( 'default_limit', 1, 50, (int) $defaults['default_limit'] ),2239 'default_limit' => $this->readBoundedIntInput( 'default_limit', 1, Plugin::getMaxReviewLimit( 1 === $this->readCheckboxInput( 'load_more' ) ), (int) $defaults['default_limit'] ), 2149 2240 'default_min_rating' => $this->readBoundedFloatInput( 'default_min_rating', 0.0, 5.0, (float) $defaults['default_min_rating'] ), 2150 2241 'default_sort' => $this->readAllowedInput( 'default_sort', array( 'newest', 'oldest', 'rating_desc', 'rating_asc' ), (string) $defaults['default_sort'] ), … … 2212 2303 'panel_background_transparent' => $this->readCheckboxInput( 'panel_background_transparent' ), 2213 2304 'custom_css_class' => Plugin::sanitizeCssClassListSetting( $this->readTextInput( 'custom_css_class', (string) $defaults['custom_css_class'] ) ), 2305 'load_more' => $this->readCheckboxInput( 'load_more' ), 2306 'per_page' => $this->readBoundedIntInput( 'per_page', 1, 50, (int) $defaults['per_page'] ), 2307 'per_page_mobile' => $this->readBoundedIntInput( 'per_page_mobile', 1, 50, (int) $defaults['per_page_mobile'] ), 2308 'load_more_text' => $this->readTextInput( 'load_more_text', (string) $defaults['load_more_text'] ), 2309 'load_more_align' => $this->readAllowedInput( 'load_more_align', array( 'left', 'center', 'right', 'full' ), (string) $defaults['load_more_align'] ), 2310 'load_more_button_style' => $this->readAllowedInput( 'load_more_button_style', array( 'custom', 'theme' ), (string) $defaults['load_more_button_style'] ), 2311 'load_more_button_bg' => $this->readColorInput( 'load_more_button_bg', (string) $defaults['load_more_button_bg'] ), 2312 'load_more_button_text_color' => $this->readColorInput( 'load_more_button_text_color', (string) $defaults['load_more_button_text_color'] ), 2313 'load_more_button_border_color' => $this->readColorInput( 'load_more_button_border_color', (string) $defaults['load_more_button_border_color'] ), 2314 'load_more_button_hover_bg' => $this->readColorInput( 'load_more_button_hover_bg', (string) $defaults['load_more_button_hover_bg'] ), 2315 'load_more_button_hover_text_color' => $this->readColorInput( 'load_more_button_hover_text_color', (string) $defaults['load_more_button_hover_text_color'] ), 2316 'load_more_button_radius' => $this->readBoundedIntInput( 'load_more_button_radius', 0, 99, (int) $defaults['load_more_button_radius'] ), 2317 'load_more_button_font_size' => $this->readBoundedIntInput( 'load_more_button_font_size', 12, 24, (int) $defaults['load_more_button_font_size'] ), 2318 'load_more_button_font_weight' => $this->readBoundedIntInput( 'load_more_button_font_weight', 100, 900, (int) $defaults['load_more_button_font_weight'] ), 2319 'load_more_button_uppercase' => $this->readCheckboxInput( 'load_more_button_uppercase' ), 2320 'load_more_button_padding_y' => $this->readBoundedIntInput( 'load_more_button_padding_y', 4, 32, (int) $defaults['load_more_button_padding_y'] ), 2321 'load_more_button_padding_x' => $this->readBoundedIntInput( 'load_more_button_padding_x', 8, 64, (int) $defaults['load_more_button_padding_x'] ), 2322 'load_more_button_class' => Plugin::sanitizeCssClassListSetting( $this->readTextInput( 'load_more_button_class', (string) $defaults['load_more_button_class'] ) ), 2214 2323 ); 2215 2324 } … … 2364 2473 private function buildPreviewDocument( string $preview_html ): string { 2365 2474 $preview_styles = 'body{margin:0;padding:24px;background:#edf3f8;font-family:system-ui,-apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif;color:#102134}.softrefo-admin-preview-shell{max-width:1100px;margin:0 auto}.softrefo-admin-preview__empty{background:#fff;border:1px dashed #c8d5e1;border-radius:18px;padding:28px;text-align:center;color:#5e7083}'; 2366 $preview_script = '(function(){var sendHeight=function(){if(window.parent){window.parent.postMessage({type:"softrefoPreviewHeight",height:document.documentElement.scrollHeight},"*");}};window.addEventListener("load",sendHeight);window.addEventListener("resize",sendHeight);document.addEventListener("click",function(event){var toggle=event.target&&event.target.closest?event.target.closest("[data-softrefo-review-toggle] "):null;if(toggle){window.setTimeout(sendHeight,40);window.setTimeout(sendHeight,180);}});window.setTimeout(sendHeight,120);window.setTimeout(sendHeight,600);Array.prototype.forEach.call(document.images||[],function(img){if(!img.complete){img.addEventListener("load",sendHeight);img.addEventListener("error",sendHeight);}});}());';2475 $preview_script = '(function(){var sendHeight=function(){if(window.parent){window.parent.postMessage({type:"softrefoPreviewHeight",height:document.documentElement.scrollHeight},"*");}};window.addEventListener("load",sendHeight);window.addEventListener("resize",sendHeight);document.addEventListener("click",function(event){var toggle=event.target&&event.target.closest?event.target.closest("[data-softrefo-review-toggle],[data-softrefo-load-more]"):null;if(toggle){window.setTimeout(sendHeight,40);window.setTimeout(sendHeight,180);}});window.setTimeout(sendHeight,120);window.setTimeout(sendHeight,600);Array.prototype.forEach.call(document.images||[],function(img){if(!img.complete){img.addEventListener("load",sendHeight);img.addEventListener("error",sendHeight);}});}());'; 2367 2476 2368 2477 wp_add_inline_style( Plugin::FRONTEND_STYLE_HANDLE, $preview_styles ); -
softlinkster-reviews-for-google/tags/0.2.13/includes/Api/BusinessProfileClient.php
r3715051 r3810562 515 515 516 516 if ( is_array( $payload ) && isset( $payload['error'] ) && is_array( $payload['error'] ) && isset( $payload['error']['message'] ) && is_string( $payload['error']['message'] ) ) { 517 // Google API style: {"error":{"code":400,"message":"...","status":"INVALID_ARGUMENT"}}. 517 518 $message = sanitize_text_field( $payload['error']['message'] ); 519 520 if ( isset( $payload['error']['status'] ) && is_string( $payload['error']['status'] ) && '' !== $payload['error']['status'] ) { 521 $message .= ' (' . sanitize_text_field( $payload['error']['status'] ) . ')'; 522 } 523 } elseif ( is_array( $payload ) && isset( $payload['error'] ) && is_string( $payload['error'] ) ) { 524 // OAuth token endpoint style: {"error":"invalid_grant","error_description":"..."}. 525 $message = sanitize_text_field( $payload['error'] ); 526 527 if ( isset( $payload['error_description'] ) && is_string( $payload['error_description'] ) && '' !== $payload['error_description'] ) { 528 $message .= ': ' . sanitize_text_field( $payload['error_description'] ); 529 } 530 531 if ( 'invalid_grant' === $payload['error'] ) { 532 $message .= ' ' . __( 'The saved Google connection is no longer valid. Disconnect Google Business Profile and connect again.', 'softlinkster-reviews-for-google' ); 533 } 534 } elseif ( '' !== trim( $body ) ) { 535 // Non-JSON body (e.g. an HTML error page): show a short excerpt. 536 $message = wp_html_excerpt( trim( wp_strip_all_tags( $body ) ), 200, '...' ); 518 537 } 519 538 -
softlinkster-reviews-for-google/tags/0.2.13/includes/Core/Plugin.php
r3715051 r3810562 148 148 public function syncReviews(): void { 149 149 $repository = new ReviewRepository(); 150 $repository->pruneExpiredReviews();151 150 152 151 if ( ! self::isConfigured() ) { … … 187 186 } 188 187 188 // Only remove expired cache entries after every target synced successfully. 189 // A Google/OAuth outage must not make the site lose its last usable reviews. 189 190 $repository->pruneExpiredReviews(); 190 191 … … 324 325 'card_padding' => 24, 325 326 'custom_css_class' => '', 327 'load_more' => 0, 328 'per_page' => 9, 329 'per_page_mobile' => 4, 330 'load_more_text' => 'Load more reviews', 331 'load_more_align' => 'center', 332 'load_more_button_style' => 'custom', 333 'load_more_button_bg' => '#ffffff', 334 'load_more_button_text_color' => '#1f2937', 335 'load_more_button_border_color' => '#e5e7eb', 336 'load_more_button_hover_bg' => '#fef3c7', 337 'load_more_button_hover_text_color' => '#1f2937', 338 'load_more_button_radius' => 99, 339 'load_more_button_font_size' => 15, 340 'load_more_button_font_weight' => 700, 341 'load_more_button_uppercase' => 0, 342 'load_more_button_padding_y' => 12, 343 'load_more_button_padding_x' => 24, 344 'load_more_button_class' => '', 326 345 ); 327 346 } … … 399 418 'card_padding', 400 419 'custom_css_class', 420 'load_more', 421 'per_page', 422 'per_page_mobile', 423 'load_more_text', 424 'load_more_align', 425 'load_more_button_style', 426 'load_more_button_bg', 427 'load_more_button_text_color', 428 'load_more_button_border_color', 429 'load_more_button_hover_bg', 430 'load_more_button_hover_text_color', 431 'load_more_button_radius', 432 'load_more_button_font_size', 433 'load_more_button_font_weight', 434 'load_more_button_uppercase', 435 'load_more_button_padding_y', 436 'load_more_button_padding_x', 437 'load_more_button_class', 401 438 ); 402 439 } … … 435 472 'enabled' => (int) self::getSetting( 'enabled', $defaults['enabled'] ), 436 473 'auto_sync_enabled' => (int) self::getSetting( 'auto_sync_enabled', $defaults['auto_sync_enabled'] ), 437 'default_limit' => max( 1, min( 50, (int) self::getSetting( 'default_limit', $defaults['default_limit'] ) ) ),474 'default_limit' => max( 1, min( self::getMaxReviewLimit( (bool) self::getSetting( 'load_more', $defaults['load_more'] ) ), (int) self::getSetting( 'default_limit', $defaults['default_limit'] ) ) ), 438 475 'default_min_rating' => max( 0.0, min( 5.0, (float) self::getSetting( 'default_min_rating', $defaults['default_min_rating'] ) ) ), 439 476 'default_sort' => self::normalizeSortSetting( (string) self::getSetting( 'default_sort', $defaults['default_sort'] ) ), … … 499 536 'card_padding' => max( 12, min( 40, (int) self::getSetting( 'card_padding', $defaults['card_padding'] ) ) ), 500 537 'custom_css_class' => self::sanitizeCssClassListSetting( (string) self::getSetting( 'custom_css_class', $defaults['custom_css_class'] ) ), 501 ); 538 ) + self::sanitizeLoadMoreSettings( self::getStoredLoadMoreSettings() ); 539 } 540 541 /** 542 * Read the plugin-wide load more options. 543 * 544 * @return array<string, mixed> 545 */ 546 private static function getStoredLoadMoreSettings(): array { 547 $defaults = self::getDefaultSettings(); 548 $stored = array(); 549 550 foreach ( self::getLoadMoreSettingKeys() as $key ) { 551 $stored[ $key ] = self::getSetting( $key, $defaults[ $key ] ); 552 } 553 554 return $stored; 502 555 } 503 556 … … 954 1007 ); 955 1008 1009 if ( ! empty( $settings['load_more'] ) ) { 1010 $load_more = self::sanitizeLoadMoreSettings( $settings ); 1011 $variables += array( 1012 '--softrefo-more-bg' => (string) $load_more['load_more_button_bg'], 1013 '--softrefo-more-text' => (string) $load_more['load_more_button_text_color'], 1014 '--softrefo-more-border' => (string) $load_more['load_more_button_border_color'], 1015 '--softrefo-more-hover-bg' => (string) $load_more['load_more_button_hover_bg'], 1016 '--softrefo-more-hover-text' => (string) $load_more['load_more_button_hover_text_color'], 1017 '--softrefo-more-radius' => (int) $load_more['load_more_button_radius'] . 'px', 1018 '--softrefo-more-size' => (int) $load_more['load_more_button_font_size'] . 'px', 1019 '--softrefo-more-weight' => (string) (int) $load_more['load_more_button_font_weight'], 1020 '--softrefo-more-transform' => ! empty( $load_more['load_more_button_uppercase'] ) ? 'uppercase' : 'none', 1021 '--softrefo-more-pad-y' => (int) $load_more['load_more_button_padding_y'] . 'px', 1022 '--softrefo-more-pad-x' => (int) $load_more['load_more_button_padding_x'] . 'px', 1023 ); 1024 } 1025 956 1026 $parts = array(); 957 1027 … … 1450 1520 return array( 1451 1521 'location' => $location, 1452 'default_limit' => max( 1, min( 50, (int) ( $settings['default_limit'] ?? $defaults['default_limit'] ) ) ),1522 'default_limit' => max( 1, min( self::getMaxReviewLimit( ! empty( $settings['load_more'] ) ), (int) ( $settings['default_limit'] ?? $defaults['default_limit'] ) ) ), 1453 1523 'default_min_rating' => max( 0.0, min( 5.0, (float) ( $settings['default_min_rating'] ?? $defaults['default_min_rating'] ) ) ), 1454 1524 'default_sort' => self::normalizeSortSetting( (string) ( $settings['default_sort'] ?? $defaults['default_sort'] ) ), … … 1514 1584 'card_padding' => max( 12, min( 40, (int) ( $settings['card_padding'] ?? $defaults['card_padding'] ) ) ), 1515 1585 'custom_css_class' => self::sanitizeCssClassListSetting( (string) ( $settings['custom_css_class'] ?? $defaults['custom_css_class'] ) ), 1586 ) + self::sanitizeLoadMoreSettings( $settings ); 1587 } 1588 1589 /** 1590 * Keys used by the load more button. 1591 * 1592 * @return array<int, string> 1593 */ 1594 public static function getLoadMoreSettingKeys(): array { 1595 return array( 1596 'load_more', 1597 'per_page', 1598 'per_page_mobile', 1599 'load_more_text', 1600 'load_more_align', 1601 'load_more_button_style', 1602 'load_more_button_bg', 1603 'load_more_button_text_color', 1604 'load_more_button_border_color', 1605 'load_more_button_hover_bg', 1606 'load_more_button_hover_text_color', 1607 'load_more_button_radius', 1608 'load_more_button_font_size', 1609 'load_more_button_font_weight', 1610 'load_more_button_uppercase', 1611 'load_more_button_padding_y', 1612 'load_more_button_padding_x', 1613 'load_more_button_class', 1614 ); 1615 } 1616 1617 /** 1618 * Highest review count a view may request. Load more pages through a longer list. 1619 * 1620 * @param bool $load_more Whether the load more button is enabled. 1621 */ 1622 public static function getMaxReviewLimit( bool $load_more ): int { 1623 return $load_more ? 200 : 50; 1624 } 1625 1626 /** 1627 * Sanitize the load more button settings. 1628 * 1629 * @param array<string, mixed> $settings Raw settings; missing keys fall back to defaults. 1630 * @return array<string, mixed> 1631 */ 1632 public static function sanitizeLoadMoreSettings( array $settings ): array { 1633 $defaults = self::getDefaultSettings(); 1634 $value = static function ( string $key ) use ( $settings, $defaults ) { 1635 return $settings[ $key ] ?? $defaults[ $key ]; 1636 }; 1637 $text = sanitize_text_field( (string) $value( 'load_more_text' ) ); 1638 1639 return array( 1640 'load_more' => ! empty( $value( 'load_more' ) ) ? 1 : 0, 1641 'per_page' => max( 1, min( 50, (int) $value( 'per_page' ) ) ), 1642 'per_page_mobile' => max( 1, min( 50, (int) $value( 'per_page_mobile' ) ) ), 1643 'load_more_text' => '' !== $text ? $text : (string) $defaults['load_more_text'], 1644 'load_more_align' => in_array( (string) $value( 'load_more_align' ), array( 'left', 'center', 'right', 'full' ), true ) ? (string) $value( 'load_more_align' ) : (string) $defaults['load_more_align'], 1645 'load_more_button_style' => in_array( (string) $value( 'load_more_button_style' ), array( 'custom', 'theme' ), true ) ? (string) $value( 'load_more_button_style' ) : (string) $defaults['load_more_button_style'], 1646 'load_more_button_bg' => self::sanitizeHexColorSetting( (string) $value( 'load_more_button_bg' ), (string) $defaults['load_more_button_bg'] ), 1647 'load_more_button_text_color' => self::sanitizeHexColorSetting( (string) $value( 'load_more_button_text_color' ), (string) $defaults['load_more_button_text_color'] ), 1648 'load_more_button_border_color' => self::sanitizeHexColorSetting( (string) $value( 'load_more_button_border_color' ), (string) $defaults['load_more_button_border_color'] ), 1649 'load_more_button_hover_bg' => self::sanitizeHexColorSetting( (string) $value( 'load_more_button_hover_bg' ), (string) $defaults['load_more_button_hover_bg'] ), 1650 'load_more_button_hover_text_color' => self::sanitizeHexColorSetting( (string) $value( 'load_more_button_hover_text_color' ), (string) $defaults['load_more_button_hover_text_color'] ), 1651 'load_more_button_radius' => max( 0, min( 99, (int) $value( 'load_more_button_radius' ) ) ), 1652 'load_more_button_font_size' => max( 12, min( 24, (int) $value( 'load_more_button_font_size' ) ) ), 1653 'load_more_button_font_weight' => self::normalizeFontWeightSetting( (int) $value( 'load_more_button_font_weight' ) ), 1654 'load_more_button_uppercase' => ! empty( $value( 'load_more_button_uppercase' ) ) ? 1 : 0, 1655 'load_more_button_padding_y' => max( 4, min( 32, (int) $value( 'load_more_button_padding_y' ) ) ), 1656 'load_more_button_padding_x' => max( 8, min( 64, (int) $value( 'load_more_button_padding_x' ) ) ), 1657 'load_more_button_class' => self::sanitizeCssClassListSetting( (string) $value( 'load_more_button_class' ) ), 1516 1658 ); 1517 1659 } -
softlinkster-reviews-for-google/tags/0.2.13/includes/Database/ReviewRepository.php
r3666897 r3810562 157 157 158 158 $args = wp_parse_args( $args, $defaults ); 159 $limit = max( 1, min( 50, (int) $args['limit'] ) );159 $limit = max( 1, min( 200, (int) $args['limit'] ) ); 160 160 $min_rating = max( 0.0, min( 5.0, (float) $args['min_rating'] ) ); 161 161 $source = sanitize_key( (string) $args['source'] ); -
softlinkster-reviews-for-google/tags/0.2.13/includes/Frontend/Shortcode.php
r3679755 r3810562 86 86 87 87 $normalized_args = array( 88 'limit' => max( 1, min( 50, (int) $shortcode_args['limit'] ) ),88 'limit' => max( 1, min( Plugin::getMaxReviewLimit( self::isLoadMoreActive( $settings ) ), (int) $shortcode_args['limit'] ) ), 89 89 'min_rating' => max( 0.0, min( 5.0, (float) $shortcode_args['min_rating'] ) ), 90 90 'sort' => $this->normalizeSort( (string) $shortcode_args['sort'] ), … … 112 112 && ( 113 113 'carousel' === (string) $settings['layout'] 114 || self::isLoadMoreActive( $settings ) 114 115 || 'expand' === (string) $settings['review_text_display'] 115 116 || 'google_maps' === (string) $settings['review_text_display'] … … 192 193 $settings['custom_css_class'] = $this->getCssClassAttributeValue( $atts, array( 'custom_css_class', 'wrapper_class', 'css_class' ), (string) $settings['custom_css_class'] ); 193 194 195 // Load more defaults come from the saved view; these shortcode attributes override them per page. 196 $settings['load_more'] = $this->getBooleanAttributeValue( $atts, array( 'load_more' ), (int) ( $settings['load_more'] ?? 0 ) ); 197 $settings['per_page'] = $this->getIntAttributeValue( $atts, array( 'per_page' ), 1, 50, (int) ( $settings['per_page'] ?? 9 ) ); 198 $settings['per_page_mobile'] = $this->getIntAttributeValue( $atts, array( 'per_page_mobile' ), 1, 50, (int) ( $settings['per_page_mobile'] ?? 4 ) ); 199 $settings['load_more_text'] = $this->getTextAttributeValue( $atts, array( 'load_more_text' ), (string) ( $settings['load_more_text'] ?? '' ) ); 200 $settings['load_more_align'] = $this->getAllowedAttributeValue( $atts, array( 'load_more_align' ), array( 'left', 'center', 'right', 'full' ), (string) ( $settings['load_more_align'] ?? 'center' ) ); 201 $settings['load_more_button_style'] = $this->getAllowedAttributeValue( $atts, array( 'load_more_button_style' ), array( 'custom', 'theme' ), (string) ( $settings['load_more_button_style'] ?? 'custom' ) ); 202 $settings['load_more_button_class'] = $this->getCssClassAttributeValue( $atts, array( 'load_more_button_class' ), (string) ( $settings['load_more_button_class'] ?? '' ) ); 203 194 204 return $settings; 205 } 206 207 /** 208 * Load more only applies to the static layouts; carousel and marquee ignore it. 209 * 210 * @param array<string, mixed> $settings Presentation settings. 211 */ 212 private static function isLoadMoreActive( array $settings ): bool { 213 return ! empty( $settings['load_more'] ) && in_array( (string) ( $settings['layout'] ?? '' ), array( 'stacked', 'grid', 'compact' ), true ); 195 214 } 196 215 … … 203 222 public function renderPreview( array $settings, string $place_id = '' ): string { 204 223 $preview_args = array( 205 'limit' => max( 1, min( 50, (int) $settings['default_limit'] ) ),224 'limit' => max( 1, min( Plugin::getMaxReviewLimit( self::isLoadMoreActive( $settings ) ), (int) $settings['default_limit'] ) ), 206 225 'min_rating' => max( 0.0, min( 5.0, (float) $settings['default_min_rating'] ) ), 207 226 'sort' => $this->normalizeSort( (string) $settings['default_sort'] ), -
softlinkster-reviews-for-google/tags/0.2.13/readme.txt
r3715051 r3810562 5 5 Tested up to: 7.1 6 6 Requires PHP: 7.4 7 Stable tag: 0.2. 97 Stable tag: 0.2.13 8 8 License: GPL-2.0-or-later 9 9 License URI: https://www.gnu.org/licenses/gpl-2.0.html … … 86 86 * `place_id` - render a specific place ID 87 87 * `layout` - one of `stacked`, `grid`, `compact`, `carousel`, or `marquee` 88 * `load_more` - `1` or `0` to turn the "Load more" button on or off (stacked, grid and compact layouts only) 89 * `per_page` - reviews shown at first and added per click when `load_more` is on 90 * `per_page_mobile` - the same count on screens up to 640px wide 91 * `load_more_text` - button label 92 * `load_more_align` - `left`, `center`, `right` or `full` 93 * `load_more_button_style` - `custom` (use the view's button settings) or `theme` (use your theme's button style) 94 * `load_more_button_class` - extra CSS classes for the button, such as your theme's button class 95 96 All load more options, including the button colours, corner radius, text size, weight, padding and uppercase, are also in `Google Reviews > Views > Edit View > Layout & Styling`. Shortcode attributes override the saved view for one page. With load more on, `limit` can go up to `200`. 88 97 89 98 Example: 90 99 91 100 `[softlinkster_google_reviews view="homepage-slider" limit="6" min_rating="4" sort="rating_desc"]` 101 102 Grid with a load more button: 103 104 `[softlinkster_google_reviews view="testimonials" layout="grid" grid_columns="3" limit="200" load_more="1" per_page="9" per_page_mobile="4"]` 92 105 93 106 == Installation == … … 207 220 == Changelog == 208 221 222 = 0.2.13 = 223 * Fixed cards in the grid, stacked and compact layouts running into the card below when "Equal card height" is on and the theme does not set border-box sizing (also visible in the admin preview). 224 225 = 0.2.12 = 226 * Added a "Load more" button for stacked, grid and compact layouts, with its own settings in each saved view: reviews per step (desktop and phone), button text, position, colours, hover colours, corner radius, text size and weight, padding, uppercase, extra CSS classes, or your theme's button style. 227 * Allow up to 200 reviews when the load more button is enabled. 228 * Fixed the marquee layout drawing its looping copy on top of the original cards when there were more reviews than visible cards, which hid reviews and made cards overlap. 229 * Fixed carousel cards overlapping in narrow columns. 230 * Cards per row now follow the width of the reviews block instead of the screen, so page-builder columns and sidebars stay readable. 231 * Reviews block now fills its parent inside page-builder flex columns. 232 233 = 0.2.10 = 234 * Show the real Google OAuth and API error details in the admin. 235 * Preserve the last usable review cache when a sync fails. 236 * Avoid requiring the optional PHP mbstring extension for error formatting. 237 209 238 = 0.2.9 = 210 239 * Fixed Business Profile review requests to include the required account resource path. -
softlinkster-reviews-for-google/tags/0.2.13/softlinkster-reviews-for-google.php
r3715051 r3810562 4 4 * Plugin URI: https://mrkhuran.com/contact 5 5 * Description: Show Google reviews in WordPress with reusable shortcodes, live preview, and Google Places or Business Profile sync. 6 * Version: 0.2. 96 * Version: 0.2.13 7 7 * Requires at least: 6.2 8 8 * Requires PHP: 7.4 … … 40 40 41 41 if ( ! defined( 'SOFTLINKSTER_GOOGLE_REVIEWS_PLUGIN_VERSION' ) ) { 42 define( 'SOFTLINKSTER_GOOGLE_REVIEWS_PLUGIN_VERSION', '0.2. 9' );42 define( 'SOFTLINKSTER_GOOGLE_REVIEWS_PLUGIN_VERSION', '0.2.13' ); 43 43 } 44 44 -
softlinkster-reviews-for-google/tags/0.2.13/templates/reviews/default.php
r3679755 r3810562 28 28 if ( $softlinkster_google_reviews_is_marquee ) { 29 29 $softlinkster_google_reviews_track_class .= ' softrefo-reviews__list--marquee-track'; 30 } 31 32 $softlinkster_google_reviews_total = count( $softrefo_reviews ); 33 $softlinkster_google_reviews_per_page = max( 1, (int) ( $softrefo_settings['per_page'] ?? 9 ) ); 34 $softlinkster_google_reviews_per_page_mobile = max( 1, (int) ( $softrefo_settings['per_page_mobile'] ?? $softlinkster_google_reviews_per_page ) ); 35 $softlinkster_google_reviews_load_more = ! $softlinkster_google_reviews_has_motion 36 && ! empty( $softrefo_settings['load_more'] ) 37 && $softlinkster_google_reviews_total > min( $softlinkster_google_reviews_per_page, $softlinkster_google_reviews_per_page_mobile ); 38 $softlinkster_google_reviews_load_more_text = trim( (string) ( $softrefo_settings['load_more_text'] ?? '' ) ); 39 40 if ( '' === $softlinkster_google_reviews_load_more_text ) { 41 $softlinkster_google_reviews_load_more_text = __( 'Load more reviews', 'softlinkster-reviews-for-google' ); 42 } 43 44 $softlinkster_google_reviews_load_more_align = in_array( (string) ( $softrefo_settings['load_more_align'] ?? 'center' ), array( 'left', 'center', 'right', 'full' ), true ) ? (string) $softrefo_settings['load_more_align'] : 'center'; 45 $softlinkster_google_reviews_button_classes = 'softrefo-reviews__load-more-button'; 46 47 // "theme" leaves the look to the site's own button styles (plus any extra class); "custom" uses the view's button settings. 48 $softlinkster_google_reviews_button_classes .= 'theme' === (string) ( $softrefo_settings['load_more_button_style'] ?? 'custom' ) ? ' softrefo-reviews__load-more-button--theme' : ' softrefo-reviews__load-more-button--custom'; 49 50 if ( ! empty( $softrefo_settings['load_more_button_class'] ) ) { 51 $softlinkster_google_reviews_button_classes .= ' ' . (string) $softrefo_settings['load_more_button_class']; 30 52 } 31 53 … … 196 218 }; 197 219 198 $softlinkster_google_reviews_render_card = static function ( array $softlinkster_google_reviews_item ) use ( $softrefo_settings, $softlinkster_google_reviews_text_mode, $softlinkster_google_reviews_card_style, $softlinkster_google_reviews_build_initials, $softlinkster_google_reviews_render_author, $softlinkster_google_reviews_render_source_link, $softlinkster_google_reviews_render_rating, $softlinkster_google_reviews_render_content ): string {220 $softlinkster_google_reviews_render_card = static function ( array $softlinkster_google_reviews_item, bool $softlinkster_google_reviews_is_deferred = false ) use ( $softrefo_settings, $softlinkster_google_reviews_text_mode, $softlinkster_google_reviews_card_style, $softlinkster_google_reviews_build_initials, $softlinkster_google_reviews_render_author, $softlinkster_google_reviews_render_source_link, $softlinkster_google_reviews_render_rating, $softlinkster_google_reviews_render_content ): string { 199 221 $softlinkster_google_reviews_review_text = (string) $softlinkster_google_reviews_item['review_text']; 200 222 201 223 ob_start(); 202 224 ?> 203 <article class="softrefo-review<?php echo 'editorial' === $softlinkster_google_reviews_card_style ? ' softrefo-review--editorial' : ''; ?>" >225 <article class="softrefo-review<?php echo 'editorial' === $softlinkster_google_reviews_card_style ? ' softrefo-review--editorial' : ''; ?>"<?php echo $softlinkster_google_reviews_is_deferred ? ' data-softrefo-deferred' : ''; ?>> 204 226 <?php if ( 'editorial' === $softlinkster_google_reviews_card_style ) : ?> 205 227 <?php if ( (bool) $softrefo_settings['show_rating'] || (bool) $softrefo_settings['show_relative_time'] ) : ?> … … 307 329 ?> 308 330 <div 309 class="<?php echo esc_attr( trim( ( isset( $softrefo_wrapper_classes ) ? (string) $softrefo_wrapper_classes : 'softrefo-reviews' ) . ' softrefo-reviews--layout-' . $softlinkster_google_reviews_layout . ' softrefo-reviews--card-' . $softlinkster_google_reviews_card_style . ( $softlinkster_google_reviews_is_marquee && 'right' === (string) $softrefo_settings['marquee_direction'] ? ' softrefo-reviews--marquee-reverse' : '' ) . ( $softlinkster_google_reviews_is_marquee && (bool) $softrefo_settings['marquee_pause_on_hover'] ? ' softrefo-reviews--marquee-pause' : '' ) . ( $softlinkster_google_reviews_has_motion && (bool) $softrefo_settings['motion_edge_fade'] ? ' softrefo-reviews--motion-fade' : '' ) . ( (bool) $softrefo_settings['equal_card_height'] ? ' softrefo-reviews--equal-height' : '' ) . ( (bool) $softrefo_settings['panel_background_transparent'] ? ' softrefo-reviews--panel-transparent' : '' ) . ( empty( $softrefo_settings['underline_links'] ) ? ' softrefo-reviews--links-plain' : '' ) . ( 'truncate' === $softlinkster_google_reviews_text_mode ? ' softrefo-reviews--text-truncate' : '' ) . ( 'expand' === $softlinkster_google_reviews_text_mode ? ' softrefo-reviews--text-expand' : '' ) ) ); ?>"331 class="<?php echo esc_attr( trim( ( isset( $softrefo_wrapper_classes ) ? (string) $softrefo_wrapper_classes : 'softrefo-reviews' ) . ' softrefo-reviews--layout-' . $softlinkster_google_reviews_layout . ' softrefo-reviews--card-' . $softlinkster_google_reviews_card_style . ( $softlinkster_google_reviews_is_marquee && 'right' === (string) $softrefo_settings['marquee_direction'] ? ' softrefo-reviews--marquee-reverse' : '' ) . ( $softlinkster_google_reviews_is_marquee && (bool) $softrefo_settings['marquee_pause_on_hover'] ? ' softrefo-reviews--marquee-pause' : '' ) . ( $softlinkster_google_reviews_has_motion && (bool) $softrefo_settings['motion_edge_fade'] ? ' softrefo-reviews--motion-fade' : '' ) . ( (bool) $softrefo_settings['equal_card_height'] ? ' softrefo-reviews--equal-height' : '' ) . ( (bool) $softrefo_settings['panel_background_transparent'] ? ' softrefo-reviews--panel-transparent' : '' ) . ( empty( $softrefo_settings['underline_links'] ) ? ' softrefo-reviews--links-plain' : '' ) . ( 'truncate' === $softlinkster_google_reviews_text_mode ? ' softrefo-reviews--text-truncate' : '' ) . ( 'expand' === $softlinkster_google_reviews_text_mode ? ' softrefo-reviews--text-expand' : '' ) . ( $softlinkster_google_reviews_load_more ? ' softrefo-reviews--load-more' : '' ) . ( 'grid' === $softlinkster_google_reviews_layout ? ' softrefo-reviews--grid-cols-' . max( 1, min( 3, (int) ( $softrefo_settings['grid_columns'] ?? 2 ) ) ) : '' ) ) ); ?>" 310 332 data-source="google" 311 333 data-layout="<?php echo esc_attr( $softlinkster_google_reviews_layout ); ?>" … … 317 339 data-carousel-loop="<?php echo esc_attr( (string) (int) $softrefo_settings['carousel_loop'] ); ?>" 318 340 data-carousel-pause-on-hover="<?php echo esc_attr( (string) (int) $softrefo_settings['carousel_pause_on_hover'] ); ?>" 341 <?php if ( $softlinkster_google_reviews_load_more ) : ?> 342 data-per-page="<?php echo esc_attr( (string) $softlinkster_google_reviews_per_page ); ?>" 343 data-per-page-mobile="<?php echo esc_attr( (string) $softlinkster_google_reviews_per_page_mobile ); ?>" 344 <?php endif; ?> 319 345 style="<?php echo esc_attr( $softrefo_wrapper_style ); ?>" 320 346 > … … 366 392 <div class="<?php echo esc_attr( $softlinkster_google_reviews_is_carousel ? 'softrefo-reviews__motion-stage' : '' ); ?>"> 367 393 <div class="<?php echo esc_attr( $softlinkster_google_reviews_track_class ); ?>"> 368 <?php foreach ( $softrefo_reviews as$softlinkster_google_reviews_item ) : ?>369 <?php echo $softlinkster_google_reviews_render_card( $softlinkster_google_reviews_item ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Review cards are escaped inside the shared template renderer. ?>394 <?php foreach ( array_values( $softrefo_reviews ) as $softlinkster_google_reviews_index => $softlinkster_google_reviews_item ) : ?> 395 <?php echo $softlinkster_google_reviews_render_card( $softlinkster_google_reviews_item, $softlinkster_google_reviews_load_more && $softlinkster_google_reviews_index >= $softlinkster_google_reviews_per_page ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Review cards are escaped inside the shared template renderer. ?> 370 396 <?php endforeach; ?> 371 397 </div> 398 </div> 399 <?php endif; ?> 400 401 <?php if ( $softlinkster_google_reviews_load_more ) : ?> 402 <div class="softrefo-reviews__load-more softrefo-reviews__load-more--<?php echo esc_attr( $softlinkster_google_reviews_load_more_align ); ?>"> 403 <button type="button" class="<?php echo esc_attr( $softlinkster_google_reviews_button_classes ); ?>" data-softrefo-load-more<?php echo $softlinkster_google_reviews_total <= $softlinkster_google_reviews_per_page ? ' hidden' : ''; ?>> 404 <?php echo esc_html( $softlinkster_google_reviews_load_more_text ); ?> 405 </button> 406 <?php /* translators: 1: number of reviews shown, 2: total number of reviews. */ ?> 407 <p class="softrefo-screen-reader-text" aria-live="polite" data-softrefo-load-more-status data-softrefo-status-template="<?php echo esc_attr__( 'Showing %1$s of %2$s reviews', 'softlinkster-reviews-for-google' ); ?>"></p> 372 408 </div> 373 409 <?php endif; ?> -
softlinkster-reviews-for-google/trunk/assets/css/admin.css
r3686624 r3810562 1062 1062 } 1063 1063 } 1064 1065 .softrefo-admin__color-grid + .softrefo-admin__inline-grid { 1066 margin-top: 14px; 1067 } 1068 1069 .softrefo-admin__inline-grid .regular-text, 1070 .softrefo-admin__inline-grid select { 1071 box-sizing: border-box; 1072 max-width: 100%; 1073 } 1074 1075 .softrefo-admin__inline-grid p > label { 1076 display: block; 1077 margin-bottom: 4px; 1078 } -
softlinkster-reviews-for-google/trunk/assets/css/frontend.css
r3694881 r3810562 26 26 --softrefo-review-lines: 8; 27 27 --softrefo-star-color: #f59e0b; 28 /* Fill the parent even inside flex rows (page builders), so motion tracks size from the column, not their content. */ 29 box-sizing: border-box; 30 width: 100%; 31 max-width: 100%; 32 min-width: 0; 33 /* Cards per row follow the width of this block (not the screen), so narrow page-builder columns stay readable. */ 34 container: softrefo / inline-size; 28 35 background: var(--softrefo-panel-bg); 29 36 border: 1px solid color-mix(in srgb, var(--softrefo-card-border) 70%, #ffffff 30%); … … 190 197 191 198 .softrefo-reviews__marquee-window { 199 container-type: inline-size; 192 200 display: flex; 193 201 gap: 18px; … … 204 212 205 213 .softrefo-reviews__list--marquee-track { 214 --softrefo-marquee-visible: var(--softrefo-marquee-columns); 206 215 animation: softrefo-marquee-scroll var(--softrefo-marquee-duration) linear infinite; 207 216 display: grid; 208 flex: 0 0 100%; 217 /* The track is as wide as all of its cards, so the duplicate track starts after the last card instead of on top of it. */ 218 flex: 0 0 auto; 209 219 gap: 18px; 210 grid-auto-columns: calc((100 % - (18px * (var(--softrefo-marquee-columns) - 1))) / var(--softrefo-marquee-columns));220 grid-auto-columns: calc((100cqw - (18px * (var(--softrefo-marquee-visible) - 1))) / var(--softrefo-marquee-visible)); 211 221 grid-auto-flow: column; 212 222 grid-template-columns: none; … … 231 241 display: grid; 232 242 gap: 18px; 233 grid-auto-columns: calc((100% - (18px * (var(--softrefo-carousel-columns) - 1))) / var(--softrefo-carousel-columns)); 243 --softrefo-carousel-visible: var(--softrefo-carousel-columns); 244 grid-auto-columns: calc((100cqw - (18px * (var(--softrefo-carousel-visible) - 1))) / var(--softrefo-carousel-visible)); 234 245 grid-auto-flow: column; 235 246 grid-template-columns: none; … … 266 277 267 278 .softrefo-review { 279 /* Padding and border count inside the card's height, so equal-height cards fit their grid row even when the theme does not set border-box. */ 280 box-sizing: border-box; 268 281 background: var(--softrefo-card-bg); 269 282 border: 1px solid var(--softrefo-card-border); … … 544 557 } 545 558 546 .softrefo-reviews--layout-carousel .softrefo-review { 547 min-width: 280px; 559 .softrefo-reviews--layout-carousel .softrefo-review, 560 .softrefo-reviews__list--marquee-track .softrefo-review, 561 .softrefo-reviews--layout-grid .softrefo-review { 562 min-width: 0; 563 } 564 565 @container softrefo (max-width: 720px) { 566 .softrefo-reviews--grid-cols-3 .softrefo-reviews__list { 567 grid-template-columns: repeat(2, minmax(0, 1fr)); 568 } 569 570 .softrefo-reviews--layout-carousel .softrefo-reviews__list { 571 --softrefo-carousel-visible: min(var(--softrefo-carousel-columns), 2); 572 } 573 574 .softrefo-reviews__list--marquee-track { 575 --softrefo-marquee-visible: min(var(--softrefo-marquee-columns), 2); 576 } 577 } 578 579 @container softrefo (max-width: 480px) { 580 .softrefo-reviews--layout-grid .softrefo-reviews__list { 581 grid-template-columns: minmax(0, 1fr); 582 } 583 584 .softrefo-reviews--layout-carousel .softrefo-reviews__list { 585 --softrefo-carousel-visible: 1; 586 } 587 588 .softrefo-reviews__list--marquee-track { 589 --softrefo-marquee-visible: 1; 590 } 548 591 } 549 592 … … 577 620 border-color: color-mix(in srgb, var(--softrefo-card-accent) 35%, var(--softrefo-card-border) 65%); 578 621 color: var(--softrefo-card-text); 622 } 623 624 .softrefo-reviews--load-more .softrefo-review[data-softrefo-deferred] { 625 display: none; 626 } 627 628 .softrefo-reviews--load-more .softrefo-review:focus { 629 outline: 2px solid var(--softrefo-card-accent); 630 outline-offset: 2px; 631 } 632 633 .softrefo-reviews__load-more { 634 display: flex; 635 justify-content: center; 636 margin-top: 24px; 637 } 638 639 .softrefo-reviews__load-more--left { 640 justify-content: flex-start; 641 } 642 643 .softrefo-reviews__load-more--right { 644 justify-content: flex-end; 645 } 646 647 .softrefo-reviews__load-more--full .softrefo-reviews__load-more-button { 648 width: 100%; 649 } 650 651 .softrefo-reviews__load-more-button { 652 cursor: pointer; 653 max-width: 100%; 654 } 655 656 .softrefo-reviews__load-more-button--custom { 657 background: var(--softrefo-more-bg, var(--softrefo-card-bg)); 658 border: 1px solid var(--softrefo-more-border, var(--softrefo-card-border)); 659 border-radius: var(--softrefo-more-radius, 99px); 660 box-shadow: none; 661 color: var(--softrefo-more-text, var(--softrefo-card-text)); 662 font-family: var(--softrefo-font-family); 663 font-size: var(--softrefo-more-size, 15px); 664 font-weight: var(--softrefo-more-weight, 700); 665 letter-spacing: normal; 666 line-height: 1.3; 667 padding: var(--softrefo-more-pad-y, 12px) var(--softrefo-more-pad-x, 24px); 668 text-transform: var(--softrefo-more-transform, none); 669 transition: background-color 0.2s ease, border-color 0.2s ease, color 0.2s ease; 670 } 671 672 .softrefo-reviews__load-more-button--custom:hover, 673 .softrefo-reviews__load-more-button--custom:focus-visible { 674 background: var(--softrefo-more-hover-bg, var(--softrefo-card-bg)); 675 border-color: var(--softrefo-more-hover-bg, var(--softrefo-card-border)); 676 color: var(--softrefo-more-hover-text, var(--softrefo-card-text)); 677 } 678 679 .softrefo-reviews__load-more-button:focus-visible { 680 outline: 2px solid var(--softrefo-card-accent); 681 outline-offset: 2px; 682 } 683 684 .softrefo-reviews__load-more-button[hidden] { 685 display: none; 579 686 } 580 687 … … 612 719 } 613 720 614 @media (max-width: 900px) { 615 .softrefo-reviews--layout-grid .softrefo-reviews__list { 616 grid-template-columns: minmax(0, 1fr); 617 } 618 619 .softrefo-reviews--layout-carousel .softrefo-reviews__list { 620 grid-auto-columns: minmax(0, 1fr); 621 } 622 623 .softrefo-reviews__list--marquee-track .softrefo-review { 624 min-width: 0; 625 } 626 627 .softrefo-reviews__list--marquee-track { 628 grid-auto-columns: calc((100% - 18px) / 2); 721 /* Older browsers without container queries fall back to screen-width breakpoints. */ 722 @supports not (container-type: inline-size) { 723 @media (max-width: 900px) { 724 .softrefo-reviews--layout-grid .softrefo-reviews__list { 725 grid-template-columns: minmax(0, 1fr); 726 } 629 727 } 630 728 } … … 658 756 flex: 1 1 0; 659 757 } 660 661 .softrefo-reviews__list--marquee-track {662 grid-auto-columns: 100%;663 }664 758 } 665 759 -
softlinkster-reviews-for-google/trunk/assets/js/frontend.js
r3679755 r3810562 404 404 } ); 405 405 406 const mobileQuery = window.matchMedia ? window.matchMedia( '(max-width: 640px)' ) : null; 407 408 document.querySelectorAll( '.softrefo-reviews--load-more' ).forEach( function ( block ) { 409 const button = block.querySelector( '[data-softrefo-load-more]' ); 410 const status = block.querySelector( '[data-softrefo-load-more-status]' ); 411 const cards = Array.from( block.querySelectorAll( '.softrefo-review' ) ); 412 const perPage = Math.max( 1, parseInt( block.getAttribute( 'data-per-page' ), 10 ) || 9 ); 413 const perPageMobile = Math.max( 1, parseInt( block.getAttribute( 'data-per-page-mobile' ), 10 ) || perPage ); 414 let hasLoadedMore = false; 415 416 if ( ! button || ! cards.length ) { 417 return; 418 } 419 420 const getPageSize = function () { 421 return mobileQuery && mobileQuery.matches ? perPageMobile : perPage; 422 }; 423 424 let visibleCount = getPageSize(); 425 426 const apply = function () { 427 cards.forEach( function ( card, index ) { 428 if ( index < visibleCount ) { 429 card.removeAttribute( 'data-softrefo-deferred' ); 430 } else { 431 card.setAttribute( 'data-softrefo-deferred', '' ); 432 } 433 } ); 434 435 button.hidden = visibleCount >= cards.length; 436 }; 437 438 button.addEventListener( 'click', function () { 439 const firstNewIndex = visibleCount; 440 441 visibleCount = Math.min( cards.length, visibleCount + getPageSize() ); 442 hasLoadedMore = true; 443 apply(); 444 445 cards.slice( firstNewIndex, visibleCount ).forEach( function ( card ) { 446 syncExpandableReview( card ); 447 } ); 448 449 if ( status ) { 450 const template = status.getAttribute( 'data-softrefo-status-template' ) || 'Showing %1$s of %2$s reviews'; 451 452 status.textContent = template.replace( '%1$s', String( visibleCount ) ).replace( '%2$s', String( cards.length ) ); 453 } 454 455 // Keep keyboard users in place: move focus to the first newly shown review without scrolling. 456 if ( cards[ firstNewIndex ] ) { 457 cards[ firstNewIndex ].setAttribute( 'tabindex', '-1' ); 458 cards[ firstNewIndex ].focus( { preventScroll: true } ); 459 } 460 } ); 461 462 if ( mobileQuery ) { 463 const onBreakpointChange = function () { 464 if ( ! hasLoadedMore ) { 465 visibleCount = getPageSize(); 466 apply(); 467 } 468 }; 469 470 if ( mobileQuery.addEventListener ) { 471 mobileQuery.addEventListener( 'change', onBreakpointChange ); 472 } else if ( mobileQuery.addListener ) { 473 mobileQuery.addListener( onBreakpointChange ); 474 } 475 } 476 477 apply(); 478 } ); 479 406 480 window.addEventListener( 'resize', function () { 407 481 allReviewBlocks.forEach( function ( block ) { -
softlinkster-reviews-for-google/trunk/includes/Admin/SettingsPage.php
r3687820 r3810562 894 894 <tr> 895 895 <th scope="row"><label for="softrefo_default_limit"><?php echo esc_html__( 'Default review count', 'softlinkster-reviews-for-google' ); ?></label></th> 896 <td><input type="number" class="small-text" min="1" max="50" id="softrefo_default_limit" name="default_limit" value="<?php echo esc_attr( (string) $settings['default_limit'] ); ?>" /></td> 896 <td> 897 <input type="number" class="small-text" min="1" max="200" id="softrefo_default_limit" name="default_limit" value="<?php echo esc_attr( (string) $settings['default_limit'] ); ?>" /> 898 <p class="description"><?php echo esc_html__( 'Up to 50 reviews, or up to 200 when the load more button is on (Layout & Styling tab).', 'softlinkster-reviews-for-google' ); ?></p> 899 </td> 897 900 </tr> 898 901 <tr> … … 1095 1098 </td> 1096 1099 </tr> 1100 <tr data-softrefo-layout-targets="stacked,grid,compact"> 1101 <th scope="row"><?php echo esc_html__( 'Load more button', 'softlinkster-reviews-for-google' ); ?></th> 1102 <td class="softrefo-admin__inline-grid"> 1103 <p class="softrefo-admin__inline-grid-wide"> 1104 <?php $this->renderCheckboxField( 'load_more', __( 'Show the first reviews, then a button that reveals more', 'softlinkster-reviews-for-google' ), (bool) $settings['load_more'] ); ?> 1105 <span class="description"><?php echo esc_html__( 'All reviews up to the default review count are in the page; the button only reveals them. Set the default review count to how many reviews the list should hold in total.', 'softlinkster-reviews-for-google' ); ?></span> 1106 </p> 1107 <p> 1108 <label for="softrefo_per_page"><?php echo esc_html__( 'Reviews per step', 'softlinkster-reviews-for-google' ); ?></label> 1109 <input type="number" class="small-text" min="1" max="50" id="softrefo_per_page" name="per_page" value="<?php echo esc_attr( (string) $settings['per_page'] ); ?>" /> 1110 <span class="description"><?php echo esc_html__( 'shown at first and added per click', 'softlinkster-reviews-for-google' ); ?></span> 1111 </p> 1112 <p> 1113 <label for="softrefo_per_page_mobile"><?php echo esc_html__( 'Reviews per step on phones', 'softlinkster-reviews-for-google' ); ?></label> 1114 <input type="number" class="small-text" min="1" max="50" id="softrefo_per_page_mobile" name="per_page_mobile" value="<?php echo esc_attr( (string) $settings['per_page_mobile'] ); ?>" /> 1115 <span class="description"><?php echo esc_html__( 'screens up to 640px wide', 'softlinkster-reviews-for-google' ); ?></span> 1116 </p> 1117 <p> 1118 <label for="softrefo_load_more_text"><?php echo esc_html__( 'Button text', 'softlinkster-reviews-for-google' ); ?></label> 1119 <input type="text" class="regular-text" id="softrefo_load_more_text" name="load_more_text" value="<?php echo esc_attr( (string) $settings['load_more_text'] ); ?>" /> 1120 </p> 1121 <p> 1122 <label for="softrefo_load_more_align"><?php echo esc_html__( 'Button position', 'softlinkster-reviews-for-google' ); ?></label> 1123 <select id="softrefo_load_more_align" name="load_more_align"> 1124 <?php $this->renderOption( 'left', __( 'Left', 'softlinkster-reviews-for-google' ), (string) $settings['load_more_align'] ); ?> 1125 <?php $this->renderOption( 'center', __( 'Centre', 'softlinkster-reviews-for-google' ), (string) $settings['load_more_align'] ); ?> 1126 <?php $this->renderOption( 'right', __( 'Right', 'softlinkster-reviews-for-google' ), (string) $settings['load_more_align'] ); ?> 1127 <?php $this->renderOption( 'full', __( 'Full width', 'softlinkster-reviews-for-google' ), (string) $settings['load_more_align'] ); ?> 1128 </select> 1129 </p> 1130 <p class="softrefo-admin__inline-grid-wide"> 1131 <label for="softrefo_load_more_button_style"><?php echo esc_html__( 'Button look', 'softlinkster-reviews-for-google' ); ?></label> 1132 <select id="softrefo_load_more_button_style" name="load_more_button_style"> 1133 <?php $this->renderOption( 'custom', __( 'Use the button settings below', 'softlinkster-reviews-for-google' ), (string) $settings['load_more_button_style'] ); ?> 1134 <?php $this->renderOption( 'theme', __( 'Use my theme\'s button style', 'softlinkster-reviews-for-google' ), (string) $settings['load_more_button_style'] ); ?> 1135 </select> 1136 <span class="description"><?php echo esc_html__( 'Choose the theme option and add your theme\'s button class below to match the site\'s other buttons exactly.', 'softlinkster-reviews-for-google' ); ?></span> 1137 </p> 1138 <p class="softrefo-admin__inline-grid-wide"> 1139 <label for="softrefo_load_more_button_class"><?php echo esc_html__( 'Extra button CSS classes', 'softlinkster-reviews-for-google' ); ?></label> 1140 <input type="text" class="regular-text" id="softrefo_load_more_button_class" name="load_more_button_class" value="<?php echo esc_attr( (string) $settings['load_more_button_class'] ); ?>" placeholder="<?php echo esc_attr__( 'e.g. button x-btn', 'softlinkster-reviews-for-google' ); ?>" /> 1141 </p> 1142 </td> 1143 </tr> 1144 <tr data-softrefo-layout-targets="stacked,grid,compact"> 1145 <th scope="row"><?php echo esc_html__( 'Load more button style', 'softlinkster-reviews-for-google' ); ?></th> 1146 <td> 1147 <div class="softrefo-admin__color-grid"> 1148 <?php $this->renderColorField( 'load_more_button_bg', __( 'Background', 'softlinkster-reviews-for-google' ), (string) $settings['load_more_button_bg'] ); ?> 1149 <?php $this->renderColorField( 'load_more_button_text_color', __( 'Text', 'softlinkster-reviews-for-google' ), (string) $settings['load_more_button_text_color'] ); ?> 1150 <?php $this->renderColorField( 'load_more_button_border_color', __( 'Border', 'softlinkster-reviews-for-google' ), (string) $settings['load_more_button_border_color'] ); ?> 1151 <?php $this->renderColorField( 'load_more_button_hover_bg', __( 'Hover background', 'softlinkster-reviews-for-google' ), (string) $settings['load_more_button_hover_bg'] ); ?> 1152 <?php $this->renderColorField( 'load_more_button_hover_text_color', __( 'Hover text', 'softlinkster-reviews-for-google' ), (string) $settings['load_more_button_hover_text_color'] ); ?> 1153 </div> 1154 <div class="softrefo-admin__inline-grid"> 1155 <p> 1156 <label for="softrefo_load_more_button_radius"><?php echo esc_html__( 'Corner radius', 'softlinkster-reviews-for-google' ); ?></label> 1157 <input type="number" class="small-text" min="0" max="99" id="softrefo_load_more_button_radius" name="load_more_button_radius" value="<?php echo esc_attr( (string) $settings['load_more_button_radius'] ); ?>" /> 1158 <span class="description"><?php echo esc_html__( 'px (99 = pill)', 'softlinkster-reviews-for-google' ); ?></span> 1159 </p> 1160 <p> 1161 <label for="softrefo_load_more_button_font_size"><?php echo esc_html__( 'Text size', 'softlinkster-reviews-for-google' ); ?></label> 1162 <input type="number" class="small-text" min="12" max="24" id="softrefo_load_more_button_font_size" name="load_more_button_font_size" value="<?php echo esc_attr( (string) $settings['load_more_button_font_size'] ); ?>" /> 1163 <span class="description"><?php echo esc_html__( 'px', 'softlinkster-reviews-for-google' ); ?></span> 1164 </p> 1165 <p> 1166 <label for="softrefo_load_more_button_font_weight"><?php echo esc_html__( 'Text weight', 'softlinkster-reviews-for-google' ); ?></label> 1167 <input type="number" class="small-text" min="100" max="900" step="100" id="softrefo_load_more_button_font_weight" name="load_more_button_font_weight" value="<?php echo esc_attr( (string) $settings['load_more_button_font_weight'] ); ?>" /> 1168 </p> 1169 <p> 1170 <label for="softrefo_load_more_button_padding_y"><?php echo esc_html__( 'Padding (top / bottom)', 'softlinkster-reviews-for-google' ); ?></label> 1171 <input type="number" class="small-text" min="4" max="32" id="softrefo_load_more_button_padding_y" name="load_more_button_padding_y" value="<?php echo esc_attr( (string) $settings['load_more_button_padding_y'] ); ?>" /> 1172 <span class="description"><?php echo esc_html__( 'px', 'softlinkster-reviews-for-google' ); ?></span> 1173 </p> 1174 <p> 1175 <label for="softrefo_load_more_button_padding_x"><?php echo esc_html__( 'Padding (left / right)', 'softlinkster-reviews-for-google' ); ?></label> 1176 <input type="number" class="small-text" min="8" max="64" id="softrefo_load_more_button_padding_x" name="load_more_button_padding_x" value="<?php echo esc_attr( (string) $settings['load_more_button_padding_x'] ); ?>" /> 1177 <span class="description"><?php echo esc_html__( 'px', 'softlinkster-reviews-for-google' ); ?></span> 1178 </p> 1179 <p> 1180 <?php $this->renderCheckboxField( 'load_more_button_uppercase', __( 'Uppercase text', 'softlinkster-reviews-for-google' ), (bool) $settings['load_more_button_uppercase'] ); ?> 1181 </p> 1182 </div> 1183 <p class="description"><?php echo esc_html__( 'Used when the button look is set to "Use the button settings below".', 'softlinkster-reviews-for-google' ); ?></p> 1184 </td> 1185 </tr> 1097 1186 <tr data-softrefo-layout-targets="all"> 1098 1187 <th scope="row"><label for="softrefo_border_radius"><?php echo esc_html__( 'Card border radius', 'softlinkster-reviews-for-google' ); ?></label></th> … … 1544 1633 1545 1634 <?php if ( '' !== $business_profile_state['error'] ) : ?> 1546 <div class="softrefo-admin__callout softrefo-admin__callout--<?php echo $business_profile_state['is_connected'] ? 'info' : 'warning'; ?>"> 1635 <?php 1636 // Only call it rate limiting when Google actually returned HTTP 429. 1637 $softrefo_is_rate_limited = $business_profile_state['is_connected'] 1638 && false !== strpos( (string) $business_profile_state['error'], 'status 429' ); 1639 ?> 1640 <div class="softrefo-admin__callout softrefo-admin__callout--<?php echo $softrefo_is_rate_limited ? 'info' : 'warning'; ?>"> 1547 1641 <strong> 1548 1642 <?php 1549 echo esc_html( 1550 $business_profile_state['is_connected'] 1551 ? __( 'Connected, but Google is temporarily rate-limiting account lookup', 'softlinkster-reviews-for-google' ) 1552 : __( 'Connection note', 'softlinkster-reviews-for-google' ) 1553 ); 1643 if ( $softrefo_is_rate_limited ) { 1644 echo esc_html__( 'Connected, but Google is temporarily rate-limiting account lookup', 'softlinkster-reviews-for-google' ); 1645 } elseif ( $business_profile_state['is_connected'] ) { 1646 echo esc_html__( 'Connected, but Google rejected the request', 'softlinkster-reviews-for-google' ); 1647 } else { 1648 echo esc_html__( 'Connection note', 'softlinkster-reviews-for-google' ); 1649 } 1554 1650 ?> 1555 1651 </strong> 1556 <p> 1557 <?php 1558 echo esc_html( 1559 $business_profile_state['is_connected'] 1560 ? __( 'Your Google Business Profile connection is active. Google has temporarily limited the account list request; please wait a few minutes and refresh once. Do not reconnect.', 'softlinkster-reviews-for-google' ) 1561 : $business_profile_state['error'] 1562 ); 1563 ?> 1564 </p> 1652 <p><?php echo esc_html( (string) $business_profile_state['error'] ); ?></p> 1653 <?php if ( $softrefo_is_rate_limited ) : ?> 1654 <p><?php echo esc_html__( 'Wait a few minutes and refresh once. If this never clears, the Google Cloud project may not have Business Profile API access approved yet (quota 0).', 'softlinkster-reviews-for-google' ); ?></p> 1655 <?php endif; ?> 1565 1656 </div> 1566 1657 <?php endif; ?> … … 2146 2237 'enabled' => $this->readCheckboxInput( 'enabled' ), 2147 2238 'auto_sync_enabled' => $this->readCheckboxInput( 'auto_sync_enabled' ), 2148 'default_limit' => $this->readBoundedIntInput( 'default_limit', 1, 50, (int) $defaults['default_limit'] ),2239 'default_limit' => $this->readBoundedIntInput( 'default_limit', 1, Plugin::getMaxReviewLimit( 1 === $this->readCheckboxInput( 'load_more' ) ), (int) $defaults['default_limit'] ), 2149 2240 'default_min_rating' => $this->readBoundedFloatInput( 'default_min_rating', 0.0, 5.0, (float) $defaults['default_min_rating'] ), 2150 2241 'default_sort' => $this->readAllowedInput( 'default_sort', array( 'newest', 'oldest', 'rating_desc', 'rating_asc' ), (string) $defaults['default_sort'] ), … … 2212 2303 'panel_background_transparent' => $this->readCheckboxInput( 'panel_background_transparent' ), 2213 2304 'custom_css_class' => Plugin::sanitizeCssClassListSetting( $this->readTextInput( 'custom_css_class', (string) $defaults['custom_css_class'] ) ), 2305 'load_more' => $this->readCheckboxInput( 'load_more' ), 2306 'per_page' => $this->readBoundedIntInput( 'per_page', 1, 50, (int) $defaults['per_page'] ), 2307 'per_page_mobile' => $this->readBoundedIntInput( 'per_page_mobile', 1, 50, (int) $defaults['per_page_mobile'] ), 2308 'load_more_text' => $this->readTextInput( 'load_more_text', (string) $defaults['load_more_text'] ), 2309 'load_more_align' => $this->readAllowedInput( 'load_more_align', array( 'left', 'center', 'right', 'full' ), (string) $defaults['load_more_align'] ), 2310 'load_more_button_style' => $this->readAllowedInput( 'load_more_button_style', array( 'custom', 'theme' ), (string) $defaults['load_more_button_style'] ), 2311 'load_more_button_bg' => $this->readColorInput( 'load_more_button_bg', (string) $defaults['load_more_button_bg'] ), 2312 'load_more_button_text_color' => $this->readColorInput( 'load_more_button_text_color', (string) $defaults['load_more_button_text_color'] ), 2313 'load_more_button_border_color' => $this->readColorInput( 'load_more_button_border_color', (string) $defaults['load_more_button_border_color'] ), 2314 'load_more_button_hover_bg' => $this->readColorInput( 'load_more_button_hover_bg', (string) $defaults['load_more_button_hover_bg'] ), 2315 'load_more_button_hover_text_color' => $this->readColorInput( 'load_more_button_hover_text_color', (string) $defaults['load_more_button_hover_text_color'] ), 2316 'load_more_button_radius' => $this->readBoundedIntInput( 'load_more_button_radius', 0, 99, (int) $defaults['load_more_button_radius'] ), 2317 'load_more_button_font_size' => $this->readBoundedIntInput( 'load_more_button_font_size', 12, 24, (int) $defaults['load_more_button_font_size'] ), 2318 'load_more_button_font_weight' => $this->readBoundedIntInput( 'load_more_button_font_weight', 100, 900, (int) $defaults['load_more_button_font_weight'] ), 2319 'load_more_button_uppercase' => $this->readCheckboxInput( 'load_more_button_uppercase' ), 2320 'load_more_button_padding_y' => $this->readBoundedIntInput( 'load_more_button_padding_y', 4, 32, (int) $defaults['load_more_button_padding_y'] ), 2321 'load_more_button_padding_x' => $this->readBoundedIntInput( 'load_more_button_padding_x', 8, 64, (int) $defaults['load_more_button_padding_x'] ), 2322 'load_more_button_class' => Plugin::sanitizeCssClassListSetting( $this->readTextInput( 'load_more_button_class', (string) $defaults['load_more_button_class'] ) ), 2214 2323 ); 2215 2324 } … … 2364 2473 private function buildPreviewDocument( string $preview_html ): string { 2365 2474 $preview_styles = 'body{margin:0;padding:24px;background:#edf3f8;font-family:system-ui,-apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif;color:#102134}.softrefo-admin-preview-shell{max-width:1100px;margin:0 auto}.softrefo-admin-preview__empty{background:#fff;border:1px dashed #c8d5e1;border-radius:18px;padding:28px;text-align:center;color:#5e7083}'; 2366 $preview_script = '(function(){var sendHeight=function(){if(window.parent){window.parent.postMessage({type:"softrefoPreviewHeight",height:document.documentElement.scrollHeight},"*");}};window.addEventListener("load",sendHeight);window.addEventListener("resize",sendHeight);document.addEventListener("click",function(event){var toggle=event.target&&event.target.closest?event.target.closest("[data-softrefo-review-toggle] "):null;if(toggle){window.setTimeout(sendHeight,40);window.setTimeout(sendHeight,180);}});window.setTimeout(sendHeight,120);window.setTimeout(sendHeight,600);Array.prototype.forEach.call(document.images||[],function(img){if(!img.complete){img.addEventListener("load",sendHeight);img.addEventListener("error",sendHeight);}});}());';2475 $preview_script = '(function(){var sendHeight=function(){if(window.parent){window.parent.postMessage({type:"softrefoPreviewHeight",height:document.documentElement.scrollHeight},"*");}};window.addEventListener("load",sendHeight);window.addEventListener("resize",sendHeight);document.addEventListener("click",function(event){var toggle=event.target&&event.target.closest?event.target.closest("[data-softrefo-review-toggle],[data-softrefo-load-more]"):null;if(toggle){window.setTimeout(sendHeight,40);window.setTimeout(sendHeight,180);}});window.setTimeout(sendHeight,120);window.setTimeout(sendHeight,600);Array.prototype.forEach.call(document.images||[],function(img){if(!img.complete){img.addEventListener("load",sendHeight);img.addEventListener("error",sendHeight);}});}());'; 2367 2476 2368 2477 wp_add_inline_style( Plugin::FRONTEND_STYLE_HANDLE, $preview_styles ); -
softlinkster-reviews-for-google/trunk/includes/Api/BusinessProfileClient.php
r3715051 r3810562 515 515 516 516 if ( is_array( $payload ) && isset( $payload['error'] ) && is_array( $payload['error'] ) && isset( $payload['error']['message'] ) && is_string( $payload['error']['message'] ) ) { 517 // Google API style: {"error":{"code":400,"message":"...","status":"INVALID_ARGUMENT"}}. 517 518 $message = sanitize_text_field( $payload['error']['message'] ); 519 520 if ( isset( $payload['error']['status'] ) && is_string( $payload['error']['status'] ) && '' !== $payload['error']['status'] ) { 521 $message .= ' (' . sanitize_text_field( $payload['error']['status'] ) . ')'; 522 } 523 } elseif ( is_array( $payload ) && isset( $payload['error'] ) && is_string( $payload['error'] ) ) { 524 // OAuth token endpoint style: {"error":"invalid_grant","error_description":"..."}. 525 $message = sanitize_text_field( $payload['error'] ); 526 527 if ( isset( $payload['error_description'] ) && is_string( $payload['error_description'] ) && '' !== $payload['error_description'] ) { 528 $message .= ': ' . sanitize_text_field( $payload['error_description'] ); 529 } 530 531 if ( 'invalid_grant' === $payload['error'] ) { 532 $message .= ' ' . __( 'The saved Google connection is no longer valid. Disconnect Google Business Profile and connect again.', 'softlinkster-reviews-for-google' ); 533 } 534 } elseif ( '' !== trim( $body ) ) { 535 // Non-JSON body (e.g. an HTML error page): show a short excerpt. 536 $message = wp_html_excerpt( trim( wp_strip_all_tags( $body ) ), 200, '...' ); 518 537 } 519 538 -
softlinkster-reviews-for-google/trunk/includes/Core/Plugin.php
r3715051 r3810562 148 148 public function syncReviews(): void { 149 149 $repository = new ReviewRepository(); 150 $repository->pruneExpiredReviews();151 150 152 151 if ( ! self::isConfigured() ) { … … 187 186 } 188 187 188 // Only remove expired cache entries after every target synced successfully. 189 // A Google/OAuth outage must not make the site lose its last usable reviews. 189 190 $repository->pruneExpiredReviews(); 190 191 … … 324 325 'card_padding' => 24, 325 326 'custom_css_class' => '', 327 'load_more' => 0, 328 'per_page' => 9, 329 'per_page_mobile' => 4, 330 'load_more_text' => 'Load more reviews', 331 'load_more_align' => 'center', 332 'load_more_button_style' => 'custom', 333 'load_more_button_bg' => '#ffffff', 334 'load_more_button_text_color' => '#1f2937', 335 'load_more_button_border_color' => '#e5e7eb', 336 'load_more_button_hover_bg' => '#fef3c7', 337 'load_more_button_hover_text_color' => '#1f2937', 338 'load_more_button_radius' => 99, 339 'load_more_button_font_size' => 15, 340 'load_more_button_font_weight' => 700, 341 'load_more_button_uppercase' => 0, 342 'load_more_button_padding_y' => 12, 343 'load_more_button_padding_x' => 24, 344 'load_more_button_class' => '', 326 345 ); 327 346 } … … 399 418 'card_padding', 400 419 'custom_css_class', 420 'load_more', 421 'per_page', 422 'per_page_mobile', 423 'load_more_text', 424 'load_more_align', 425 'load_more_button_style', 426 'load_more_button_bg', 427 'load_more_button_text_color', 428 'load_more_button_border_color', 429 'load_more_button_hover_bg', 430 'load_more_button_hover_text_color', 431 'load_more_button_radius', 432 'load_more_button_font_size', 433 'load_more_button_font_weight', 434 'load_more_button_uppercase', 435 'load_more_button_padding_y', 436 'load_more_button_padding_x', 437 'load_more_button_class', 401 438 ); 402 439 } … … 435 472 'enabled' => (int) self::getSetting( 'enabled', $defaults['enabled'] ), 436 473 'auto_sync_enabled' => (int) self::getSetting( 'auto_sync_enabled', $defaults['auto_sync_enabled'] ), 437 'default_limit' => max( 1, min( 50, (int) self::getSetting( 'default_limit', $defaults['default_limit'] ) ) ),474 'default_limit' => max( 1, min( self::getMaxReviewLimit( (bool) self::getSetting( 'load_more', $defaults['load_more'] ) ), (int) self::getSetting( 'default_limit', $defaults['default_limit'] ) ) ), 438 475 'default_min_rating' => max( 0.0, min( 5.0, (float) self::getSetting( 'default_min_rating', $defaults['default_min_rating'] ) ) ), 439 476 'default_sort' => self::normalizeSortSetting( (string) self::getSetting( 'default_sort', $defaults['default_sort'] ) ), … … 499 536 'card_padding' => max( 12, min( 40, (int) self::getSetting( 'card_padding', $defaults['card_padding'] ) ) ), 500 537 'custom_css_class' => self::sanitizeCssClassListSetting( (string) self::getSetting( 'custom_css_class', $defaults['custom_css_class'] ) ), 501 ); 538 ) + self::sanitizeLoadMoreSettings( self::getStoredLoadMoreSettings() ); 539 } 540 541 /** 542 * Read the plugin-wide load more options. 543 * 544 * @return array<string, mixed> 545 */ 546 private static function getStoredLoadMoreSettings(): array { 547 $defaults = self::getDefaultSettings(); 548 $stored = array(); 549 550 foreach ( self::getLoadMoreSettingKeys() as $key ) { 551 $stored[ $key ] = self::getSetting( $key, $defaults[ $key ] ); 552 } 553 554 return $stored; 502 555 } 503 556 … … 954 1007 ); 955 1008 1009 if ( ! empty( $settings['load_more'] ) ) { 1010 $load_more = self::sanitizeLoadMoreSettings( $settings ); 1011 $variables += array( 1012 '--softrefo-more-bg' => (string) $load_more['load_more_button_bg'], 1013 '--softrefo-more-text' => (string) $load_more['load_more_button_text_color'], 1014 '--softrefo-more-border' => (string) $load_more['load_more_button_border_color'], 1015 '--softrefo-more-hover-bg' => (string) $load_more['load_more_button_hover_bg'], 1016 '--softrefo-more-hover-text' => (string) $load_more['load_more_button_hover_text_color'], 1017 '--softrefo-more-radius' => (int) $load_more['load_more_button_radius'] . 'px', 1018 '--softrefo-more-size' => (int) $load_more['load_more_button_font_size'] . 'px', 1019 '--softrefo-more-weight' => (string) (int) $load_more['load_more_button_font_weight'], 1020 '--softrefo-more-transform' => ! empty( $load_more['load_more_button_uppercase'] ) ? 'uppercase' : 'none', 1021 '--softrefo-more-pad-y' => (int) $load_more['load_more_button_padding_y'] . 'px', 1022 '--softrefo-more-pad-x' => (int) $load_more['load_more_button_padding_x'] . 'px', 1023 ); 1024 } 1025 956 1026 $parts = array(); 957 1027 … … 1450 1520 return array( 1451 1521 'location' => $location, 1452 'default_limit' => max( 1, min( 50, (int) ( $settings['default_limit'] ?? $defaults['default_limit'] ) ) ),1522 'default_limit' => max( 1, min( self::getMaxReviewLimit( ! empty( $settings['load_more'] ) ), (int) ( $settings['default_limit'] ?? $defaults['default_limit'] ) ) ), 1453 1523 'default_min_rating' => max( 0.0, min( 5.0, (float) ( $settings['default_min_rating'] ?? $defaults['default_min_rating'] ) ) ), 1454 1524 'default_sort' => self::normalizeSortSetting( (string) ( $settings['default_sort'] ?? $defaults['default_sort'] ) ), … … 1514 1584 'card_padding' => max( 12, min( 40, (int) ( $settings['card_padding'] ?? $defaults['card_padding'] ) ) ), 1515 1585 'custom_css_class' => self::sanitizeCssClassListSetting( (string) ( $settings['custom_css_class'] ?? $defaults['custom_css_class'] ) ), 1586 ) + self::sanitizeLoadMoreSettings( $settings ); 1587 } 1588 1589 /** 1590 * Keys used by the load more button. 1591 * 1592 * @return array<int, string> 1593 */ 1594 public static function getLoadMoreSettingKeys(): array { 1595 return array( 1596 'load_more', 1597 'per_page', 1598 'per_page_mobile', 1599 'load_more_text', 1600 'load_more_align', 1601 'load_more_button_style', 1602 'load_more_button_bg', 1603 'load_more_button_text_color', 1604 'load_more_button_border_color', 1605 'load_more_button_hover_bg', 1606 'load_more_button_hover_text_color', 1607 'load_more_button_radius', 1608 'load_more_button_font_size', 1609 'load_more_button_font_weight', 1610 'load_more_button_uppercase', 1611 'load_more_button_padding_y', 1612 'load_more_button_padding_x', 1613 'load_more_button_class', 1614 ); 1615 } 1616 1617 /** 1618 * Highest review count a view may request. Load more pages through a longer list. 1619 * 1620 * @param bool $load_more Whether the load more button is enabled. 1621 */ 1622 public static function getMaxReviewLimit( bool $load_more ): int { 1623 return $load_more ? 200 : 50; 1624 } 1625 1626 /** 1627 * Sanitize the load more button settings. 1628 * 1629 * @param array<string, mixed> $settings Raw settings; missing keys fall back to defaults. 1630 * @return array<string, mixed> 1631 */ 1632 public static function sanitizeLoadMoreSettings( array $settings ): array { 1633 $defaults = self::getDefaultSettings(); 1634 $value = static function ( string $key ) use ( $settings, $defaults ) { 1635 return $settings[ $key ] ?? $defaults[ $key ]; 1636 }; 1637 $text = sanitize_text_field( (string) $value( 'load_more_text' ) ); 1638 1639 return array( 1640 'load_more' => ! empty( $value( 'load_more' ) ) ? 1 : 0, 1641 'per_page' => max( 1, min( 50, (int) $value( 'per_page' ) ) ), 1642 'per_page_mobile' => max( 1, min( 50, (int) $value( 'per_page_mobile' ) ) ), 1643 'load_more_text' => '' !== $text ? $text : (string) $defaults['load_more_text'], 1644 'load_more_align' => in_array( (string) $value( 'load_more_align' ), array( 'left', 'center', 'right', 'full' ), true ) ? (string) $value( 'load_more_align' ) : (string) $defaults['load_more_align'], 1645 'load_more_button_style' => in_array( (string) $value( 'load_more_button_style' ), array( 'custom', 'theme' ), true ) ? (string) $value( 'load_more_button_style' ) : (string) $defaults['load_more_button_style'], 1646 'load_more_button_bg' => self::sanitizeHexColorSetting( (string) $value( 'load_more_button_bg' ), (string) $defaults['load_more_button_bg'] ), 1647 'load_more_button_text_color' => self::sanitizeHexColorSetting( (string) $value( 'load_more_button_text_color' ), (string) $defaults['load_more_button_text_color'] ), 1648 'load_more_button_border_color' => self::sanitizeHexColorSetting( (string) $value( 'load_more_button_border_color' ), (string) $defaults['load_more_button_border_color'] ), 1649 'load_more_button_hover_bg' => self::sanitizeHexColorSetting( (string) $value( 'load_more_button_hover_bg' ), (string) $defaults['load_more_button_hover_bg'] ), 1650 'load_more_button_hover_text_color' => self::sanitizeHexColorSetting( (string) $value( 'load_more_button_hover_text_color' ), (string) $defaults['load_more_button_hover_text_color'] ), 1651 'load_more_button_radius' => max( 0, min( 99, (int) $value( 'load_more_button_radius' ) ) ), 1652 'load_more_button_font_size' => max( 12, min( 24, (int) $value( 'load_more_button_font_size' ) ) ), 1653 'load_more_button_font_weight' => self::normalizeFontWeightSetting( (int) $value( 'load_more_button_font_weight' ) ), 1654 'load_more_button_uppercase' => ! empty( $value( 'load_more_button_uppercase' ) ) ? 1 : 0, 1655 'load_more_button_padding_y' => max( 4, min( 32, (int) $value( 'load_more_button_padding_y' ) ) ), 1656 'load_more_button_padding_x' => max( 8, min( 64, (int) $value( 'load_more_button_padding_x' ) ) ), 1657 'load_more_button_class' => self::sanitizeCssClassListSetting( (string) $value( 'load_more_button_class' ) ), 1516 1658 ); 1517 1659 } -
softlinkster-reviews-for-google/trunk/includes/Database/ReviewRepository.php
r3666897 r3810562 157 157 158 158 $args = wp_parse_args( $args, $defaults ); 159 $limit = max( 1, min( 50, (int) $args['limit'] ) );159 $limit = max( 1, min( 200, (int) $args['limit'] ) ); 160 160 $min_rating = max( 0.0, min( 5.0, (float) $args['min_rating'] ) ); 161 161 $source = sanitize_key( (string) $args['source'] ); -
softlinkster-reviews-for-google/trunk/includes/Frontend/Shortcode.php
r3679755 r3810562 86 86 87 87 $normalized_args = array( 88 'limit' => max( 1, min( 50, (int) $shortcode_args['limit'] ) ),88 'limit' => max( 1, min( Plugin::getMaxReviewLimit( self::isLoadMoreActive( $settings ) ), (int) $shortcode_args['limit'] ) ), 89 89 'min_rating' => max( 0.0, min( 5.0, (float) $shortcode_args['min_rating'] ) ), 90 90 'sort' => $this->normalizeSort( (string) $shortcode_args['sort'] ), … … 112 112 && ( 113 113 'carousel' === (string) $settings['layout'] 114 || self::isLoadMoreActive( $settings ) 114 115 || 'expand' === (string) $settings['review_text_display'] 115 116 || 'google_maps' === (string) $settings['review_text_display'] … … 192 193 $settings['custom_css_class'] = $this->getCssClassAttributeValue( $atts, array( 'custom_css_class', 'wrapper_class', 'css_class' ), (string) $settings['custom_css_class'] ); 193 194 195 // Load more defaults come from the saved view; these shortcode attributes override them per page. 196 $settings['load_more'] = $this->getBooleanAttributeValue( $atts, array( 'load_more' ), (int) ( $settings['load_more'] ?? 0 ) ); 197 $settings['per_page'] = $this->getIntAttributeValue( $atts, array( 'per_page' ), 1, 50, (int) ( $settings['per_page'] ?? 9 ) ); 198 $settings['per_page_mobile'] = $this->getIntAttributeValue( $atts, array( 'per_page_mobile' ), 1, 50, (int) ( $settings['per_page_mobile'] ?? 4 ) ); 199 $settings['load_more_text'] = $this->getTextAttributeValue( $atts, array( 'load_more_text' ), (string) ( $settings['load_more_text'] ?? '' ) ); 200 $settings['load_more_align'] = $this->getAllowedAttributeValue( $atts, array( 'load_more_align' ), array( 'left', 'center', 'right', 'full' ), (string) ( $settings['load_more_align'] ?? 'center' ) ); 201 $settings['load_more_button_style'] = $this->getAllowedAttributeValue( $atts, array( 'load_more_button_style' ), array( 'custom', 'theme' ), (string) ( $settings['load_more_button_style'] ?? 'custom' ) ); 202 $settings['load_more_button_class'] = $this->getCssClassAttributeValue( $atts, array( 'load_more_button_class' ), (string) ( $settings['load_more_button_class'] ?? '' ) ); 203 194 204 return $settings; 205 } 206 207 /** 208 * Load more only applies to the static layouts; carousel and marquee ignore it. 209 * 210 * @param array<string, mixed> $settings Presentation settings. 211 */ 212 private static function isLoadMoreActive( array $settings ): bool { 213 return ! empty( $settings['load_more'] ) && in_array( (string) ( $settings['layout'] ?? '' ), array( 'stacked', 'grid', 'compact' ), true ); 195 214 } 196 215 … … 203 222 public function renderPreview( array $settings, string $place_id = '' ): string { 204 223 $preview_args = array( 205 'limit' => max( 1, min( 50, (int) $settings['default_limit'] ) ),224 'limit' => max( 1, min( Plugin::getMaxReviewLimit( self::isLoadMoreActive( $settings ) ), (int) $settings['default_limit'] ) ), 206 225 'min_rating' => max( 0.0, min( 5.0, (float) $settings['default_min_rating'] ) ), 207 226 'sort' => $this->normalizeSort( (string) $settings['default_sort'] ), -
softlinkster-reviews-for-google/trunk/readme.txt
r3715051 r3810562 5 5 Tested up to: 7.1 6 6 Requires PHP: 7.4 7 Stable tag: 0.2. 97 Stable tag: 0.2.13 8 8 License: GPL-2.0-or-later 9 9 License URI: https://www.gnu.org/licenses/gpl-2.0.html … … 86 86 * `place_id` - render a specific place ID 87 87 * `layout` - one of `stacked`, `grid`, `compact`, `carousel`, or `marquee` 88 * `load_more` - `1` or `0` to turn the "Load more" button on or off (stacked, grid and compact layouts only) 89 * `per_page` - reviews shown at first and added per click when `load_more` is on 90 * `per_page_mobile` - the same count on screens up to 640px wide 91 * `load_more_text` - button label 92 * `load_more_align` - `left`, `center`, `right` or `full` 93 * `load_more_button_style` - `custom` (use the view's button settings) or `theme` (use your theme's button style) 94 * `load_more_button_class` - extra CSS classes for the button, such as your theme's button class 95 96 All load more options, including the button colours, corner radius, text size, weight, padding and uppercase, are also in `Google Reviews > Views > Edit View > Layout & Styling`. Shortcode attributes override the saved view for one page. With load more on, `limit` can go up to `200`. 88 97 89 98 Example: 90 99 91 100 `[softlinkster_google_reviews view="homepage-slider" limit="6" min_rating="4" sort="rating_desc"]` 101 102 Grid with a load more button: 103 104 `[softlinkster_google_reviews view="testimonials" layout="grid" grid_columns="3" limit="200" load_more="1" per_page="9" per_page_mobile="4"]` 92 105 93 106 == Installation == … … 207 220 == Changelog == 208 221 222 = 0.2.13 = 223 * Fixed cards in the grid, stacked and compact layouts running into the card below when "Equal card height" is on and the theme does not set border-box sizing (also visible in the admin preview). 224 225 = 0.2.12 = 226 * Added a "Load more" button for stacked, grid and compact layouts, with its own settings in each saved view: reviews per step (desktop and phone), button text, position, colours, hover colours, corner radius, text size and weight, padding, uppercase, extra CSS classes, or your theme's button style. 227 * Allow up to 200 reviews when the load more button is enabled. 228 * Fixed the marquee layout drawing its looping copy on top of the original cards when there were more reviews than visible cards, which hid reviews and made cards overlap. 229 * Fixed carousel cards overlapping in narrow columns. 230 * Cards per row now follow the width of the reviews block instead of the screen, so page-builder columns and sidebars stay readable. 231 * Reviews block now fills its parent inside page-builder flex columns. 232 233 = 0.2.10 = 234 * Show the real Google OAuth and API error details in the admin. 235 * Preserve the last usable review cache when a sync fails. 236 * Avoid requiring the optional PHP mbstring extension for error formatting. 237 209 238 = 0.2.9 = 210 239 * Fixed Business Profile review requests to include the required account resource path. -
softlinkster-reviews-for-google/trunk/softlinkster-reviews-for-google.php
r3715051 r3810562 4 4 * Plugin URI: https://mrkhuran.com/contact 5 5 * Description: Show Google reviews in WordPress with reusable shortcodes, live preview, and Google Places or Business Profile sync. 6 * Version: 0.2. 96 * Version: 0.2.13 7 7 * Requires at least: 6.2 8 8 * Requires PHP: 7.4 … … 40 40 41 41 if ( ! defined( 'SOFTLINKSTER_GOOGLE_REVIEWS_PLUGIN_VERSION' ) ) { 42 define( 'SOFTLINKSTER_GOOGLE_REVIEWS_PLUGIN_VERSION', '0.2. 9' );42 define( 'SOFTLINKSTER_GOOGLE_REVIEWS_PLUGIN_VERSION', '0.2.13' ); 43 43 } 44 44 -
softlinkster-reviews-for-google/trunk/templates/reviews/default.php
r3679755 r3810562 28 28 if ( $softlinkster_google_reviews_is_marquee ) { 29 29 $softlinkster_google_reviews_track_class .= ' softrefo-reviews__list--marquee-track'; 30 } 31 32 $softlinkster_google_reviews_total = count( $softrefo_reviews ); 33 $softlinkster_google_reviews_per_page = max( 1, (int) ( $softrefo_settings['per_page'] ?? 9 ) ); 34 $softlinkster_google_reviews_per_page_mobile = max( 1, (int) ( $softrefo_settings['per_page_mobile'] ?? $softlinkster_google_reviews_per_page ) ); 35 $softlinkster_google_reviews_load_more = ! $softlinkster_google_reviews_has_motion 36 && ! empty( $softrefo_settings['load_more'] ) 37 && $softlinkster_google_reviews_total > min( $softlinkster_google_reviews_per_page, $softlinkster_google_reviews_per_page_mobile ); 38 $softlinkster_google_reviews_load_more_text = trim( (string) ( $softrefo_settings['load_more_text'] ?? '' ) ); 39 40 if ( '' === $softlinkster_google_reviews_load_more_text ) { 41 $softlinkster_google_reviews_load_more_text = __( 'Load more reviews', 'softlinkster-reviews-for-google' ); 42 } 43 44 $softlinkster_google_reviews_load_more_align = in_array( (string) ( $softrefo_settings['load_more_align'] ?? 'center' ), array( 'left', 'center', 'right', 'full' ), true ) ? (string) $softrefo_settings['load_more_align'] : 'center'; 45 $softlinkster_google_reviews_button_classes = 'softrefo-reviews__load-more-button'; 46 47 // "theme" leaves the look to the site's own button styles (plus any extra class); "custom" uses the view's button settings. 48 $softlinkster_google_reviews_button_classes .= 'theme' === (string) ( $softrefo_settings['load_more_button_style'] ?? 'custom' ) ? ' softrefo-reviews__load-more-button--theme' : ' softrefo-reviews__load-more-button--custom'; 49 50 if ( ! empty( $softrefo_settings['load_more_button_class'] ) ) { 51 $softlinkster_google_reviews_button_classes .= ' ' . (string) $softrefo_settings['load_more_button_class']; 30 52 } 31 53 … … 196 218 }; 197 219 198 $softlinkster_google_reviews_render_card = static function ( array $softlinkster_google_reviews_item ) use ( $softrefo_settings, $softlinkster_google_reviews_text_mode, $softlinkster_google_reviews_card_style, $softlinkster_google_reviews_build_initials, $softlinkster_google_reviews_render_author, $softlinkster_google_reviews_render_source_link, $softlinkster_google_reviews_render_rating, $softlinkster_google_reviews_render_content ): string {220 $softlinkster_google_reviews_render_card = static function ( array $softlinkster_google_reviews_item, bool $softlinkster_google_reviews_is_deferred = false ) use ( $softrefo_settings, $softlinkster_google_reviews_text_mode, $softlinkster_google_reviews_card_style, $softlinkster_google_reviews_build_initials, $softlinkster_google_reviews_render_author, $softlinkster_google_reviews_render_source_link, $softlinkster_google_reviews_render_rating, $softlinkster_google_reviews_render_content ): string { 199 221 $softlinkster_google_reviews_review_text = (string) $softlinkster_google_reviews_item['review_text']; 200 222 201 223 ob_start(); 202 224 ?> 203 <article class="softrefo-review<?php echo 'editorial' === $softlinkster_google_reviews_card_style ? ' softrefo-review--editorial' : ''; ?>" >225 <article class="softrefo-review<?php echo 'editorial' === $softlinkster_google_reviews_card_style ? ' softrefo-review--editorial' : ''; ?>"<?php echo $softlinkster_google_reviews_is_deferred ? ' data-softrefo-deferred' : ''; ?>> 204 226 <?php if ( 'editorial' === $softlinkster_google_reviews_card_style ) : ?> 205 227 <?php if ( (bool) $softrefo_settings['show_rating'] || (bool) $softrefo_settings['show_relative_time'] ) : ?> … … 307 329 ?> 308 330 <div 309 class="<?php echo esc_attr( trim( ( isset( $softrefo_wrapper_classes ) ? (string) $softrefo_wrapper_classes : 'softrefo-reviews' ) . ' softrefo-reviews--layout-' . $softlinkster_google_reviews_layout . ' softrefo-reviews--card-' . $softlinkster_google_reviews_card_style . ( $softlinkster_google_reviews_is_marquee && 'right' === (string) $softrefo_settings['marquee_direction'] ? ' softrefo-reviews--marquee-reverse' : '' ) . ( $softlinkster_google_reviews_is_marquee && (bool) $softrefo_settings['marquee_pause_on_hover'] ? ' softrefo-reviews--marquee-pause' : '' ) . ( $softlinkster_google_reviews_has_motion && (bool) $softrefo_settings['motion_edge_fade'] ? ' softrefo-reviews--motion-fade' : '' ) . ( (bool) $softrefo_settings['equal_card_height'] ? ' softrefo-reviews--equal-height' : '' ) . ( (bool) $softrefo_settings['panel_background_transparent'] ? ' softrefo-reviews--panel-transparent' : '' ) . ( empty( $softrefo_settings['underline_links'] ) ? ' softrefo-reviews--links-plain' : '' ) . ( 'truncate' === $softlinkster_google_reviews_text_mode ? ' softrefo-reviews--text-truncate' : '' ) . ( 'expand' === $softlinkster_google_reviews_text_mode ? ' softrefo-reviews--text-expand' : '' ) ) ); ?>"331 class="<?php echo esc_attr( trim( ( isset( $softrefo_wrapper_classes ) ? (string) $softrefo_wrapper_classes : 'softrefo-reviews' ) . ' softrefo-reviews--layout-' . $softlinkster_google_reviews_layout . ' softrefo-reviews--card-' . $softlinkster_google_reviews_card_style . ( $softlinkster_google_reviews_is_marquee && 'right' === (string) $softrefo_settings['marquee_direction'] ? ' softrefo-reviews--marquee-reverse' : '' ) . ( $softlinkster_google_reviews_is_marquee && (bool) $softrefo_settings['marquee_pause_on_hover'] ? ' softrefo-reviews--marquee-pause' : '' ) . ( $softlinkster_google_reviews_has_motion && (bool) $softrefo_settings['motion_edge_fade'] ? ' softrefo-reviews--motion-fade' : '' ) . ( (bool) $softrefo_settings['equal_card_height'] ? ' softrefo-reviews--equal-height' : '' ) . ( (bool) $softrefo_settings['panel_background_transparent'] ? ' softrefo-reviews--panel-transparent' : '' ) . ( empty( $softrefo_settings['underline_links'] ) ? ' softrefo-reviews--links-plain' : '' ) . ( 'truncate' === $softlinkster_google_reviews_text_mode ? ' softrefo-reviews--text-truncate' : '' ) . ( 'expand' === $softlinkster_google_reviews_text_mode ? ' softrefo-reviews--text-expand' : '' ) . ( $softlinkster_google_reviews_load_more ? ' softrefo-reviews--load-more' : '' ) . ( 'grid' === $softlinkster_google_reviews_layout ? ' softrefo-reviews--grid-cols-' . max( 1, min( 3, (int) ( $softrefo_settings['grid_columns'] ?? 2 ) ) ) : '' ) ) ); ?>" 310 332 data-source="google" 311 333 data-layout="<?php echo esc_attr( $softlinkster_google_reviews_layout ); ?>" … … 317 339 data-carousel-loop="<?php echo esc_attr( (string) (int) $softrefo_settings['carousel_loop'] ); ?>" 318 340 data-carousel-pause-on-hover="<?php echo esc_attr( (string) (int) $softrefo_settings['carousel_pause_on_hover'] ); ?>" 341 <?php if ( $softlinkster_google_reviews_load_more ) : ?> 342 data-per-page="<?php echo esc_attr( (string) $softlinkster_google_reviews_per_page ); ?>" 343 data-per-page-mobile="<?php echo esc_attr( (string) $softlinkster_google_reviews_per_page_mobile ); ?>" 344 <?php endif; ?> 319 345 style="<?php echo esc_attr( $softrefo_wrapper_style ); ?>" 320 346 > … … 366 392 <div class="<?php echo esc_attr( $softlinkster_google_reviews_is_carousel ? 'softrefo-reviews__motion-stage' : '' ); ?>"> 367 393 <div class="<?php echo esc_attr( $softlinkster_google_reviews_track_class ); ?>"> 368 <?php foreach ( $softrefo_reviews as$softlinkster_google_reviews_item ) : ?>369 <?php echo $softlinkster_google_reviews_render_card( $softlinkster_google_reviews_item ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Review cards are escaped inside the shared template renderer. ?>394 <?php foreach ( array_values( $softrefo_reviews ) as $softlinkster_google_reviews_index => $softlinkster_google_reviews_item ) : ?> 395 <?php echo $softlinkster_google_reviews_render_card( $softlinkster_google_reviews_item, $softlinkster_google_reviews_load_more && $softlinkster_google_reviews_index >= $softlinkster_google_reviews_per_page ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Review cards are escaped inside the shared template renderer. ?> 370 396 <?php endforeach; ?> 371 397 </div> 398 </div> 399 <?php endif; ?> 400 401 <?php if ( $softlinkster_google_reviews_load_more ) : ?> 402 <div class="softrefo-reviews__load-more softrefo-reviews__load-more--<?php echo esc_attr( $softlinkster_google_reviews_load_more_align ); ?>"> 403 <button type="button" class="<?php echo esc_attr( $softlinkster_google_reviews_button_classes ); ?>" data-softrefo-load-more<?php echo $softlinkster_google_reviews_total <= $softlinkster_google_reviews_per_page ? ' hidden' : ''; ?>> 404 <?php echo esc_html( $softlinkster_google_reviews_load_more_text ); ?> 405 </button> 406 <?php /* translators: 1: number of reviews shown, 2: total number of reviews. */ ?> 407 <p class="softrefo-screen-reader-text" aria-live="polite" data-softrefo-load-more-status data-softrefo-status-template="<?php echo esc_attr__( 'Showing %1$s of %2$s reviews', 'softlinkster-reviews-for-google' ); ?>"></p> 372 408 </div> 373 409 <?php endif; ?>
Note:
See TracChangeset
for help on using the changeset viewer.