From 0a9b6980d632ae6dae0c8ebc523fc4b06c039204 Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Fri, 25 Oct 2024 02:39:00 +0000 Subject: [PATCH 01/13] Update theme. --- .../themes/pub/wporg-support-2024/bbpress.php | 3 +- .../pub/wporg-support-2024/functions.php | 47 +++++++++++++++++++ .../pub/wporg-support-2024/package-lock.json | 10 ++-- .../sass/site/_bbpress.scss | 5 +- .../pub/wporg-support-2024/style-rtl.css | 5 +- .../themes/pub/wporg-support-2024/style.css | 5 +- 6 files changed, 60 insertions(+), 15 deletions(-) diff --git a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/bbpress.php b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/bbpress.php index f09ecac155..c3822014cd 100644 --- a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/bbpress.php +++ b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/bbpress.php @@ -4,13 +4,12 @@ * * @package WPBBP */ - +global $wp_query; get_header(); ?>
-
diff --git a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/functions.php b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/functions.php index df6cc5ae45..a0865ef0da 100644 --- a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/functions.php +++ b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/functions.php @@ -1557,3 +1557,50 @@ function bb_is_intl_forum() { * Include the Strings for the supporg/update-php page. */ include_once __DIR__ . '/helphub-update-php-strings.php'; + + +/** + * Update ratings blocks with real rating data. + * + * @param array $data Rating data. + * @param int $post_id Current post. + * + * @return array + */ +function wporg_set_rating_data( $data, $post_id ) { + $post = wporg_support_get_compat_object(); + + if ( class_exists( '\WPORG_Ratings' ) ) { + $rating = \WPORG_Ratings::get_avg_rating( $post->type, $post->post_name ) ?: 0; + $ratings = \WPORG_Ratings::get_rating_counts( $post->type, $post->post_name ) ?: array(); + } + + /** + * Why do we multiply the average rating by 20? + * The themes API does it this way, and the rating plugin was built to fit that. + * Instead of redoing everything, multiplying here keeps things simple and works well. + * + * @see theme-directory/class-themes-api.php for more info. + */ + $adjusted_rating = $rating * 20; + + return array( + 'rating' => $adjusted_rating, + 'ratingsCount' => array_sum( $ratings ), + 'ratings' => $ratings, + 'supportUrl' => esc_url( sprintf( home_url( '/%s/%s/reviews/' ), $post->type, $post->post_name ) ) + ); +} + +add_filter( 'wporg_ratings_data', 'wporg_set_rating_data', 10, 2 ); + +function wporg_render_block_context( $context, $parsed_block, $parent_block ) { + + if ( in_array( $parsed_block['blockName'], [ 'wporg/ratings-stars', 'wporg/ratings-bars' ] ) ) { + $context = array_merge( $context, [ 'postId' => wporg_support_get_compat_object()->ID ] ); + } + + return $context; +} + +add_filter( 'render_block_context', 'wporg_render_block_context', 10, 3 ); \ No newline at end of file diff --git a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/package-lock.json b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/package-lock.json index 5ec2b40621..46e76102d8 100644 --- a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/package-lock.json +++ b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/package-lock.json @@ -8,9 +8,6 @@ "name": "wporg-support", "version": "1.0.0", "license": "GPL-2.0-or-later", - "dependencies": { - "postcss-scss": "~4.0.9" - }, "devDependencies": { "@lodder/grunt-postcss": "~3.1.1", "@wordpress/browserslist-config": "~5.33.0", @@ -2308,6 +2305,7 @@ "version": "3.3.7", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "dev": true, "funding": [ { "type": "github", @@ -2613,7 +2611,8 @@ "node_modules/picocolors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "dev": true }, "node_modules/picomatch": { "version": "2.3.1", @@ -2640,6 +2639,7 @@ "version": "8.4.33", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz", "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==", + "dev": true, "funding": [ { "type": "opencollective", @@ -2695,6 +2695,7 @@ "version": "4.0.9", "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.9.tgz", "integrity": "sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==", + "dev": true, "funding": [ { "type": "opencollective", @@ -3254,6 +3255,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "dev": true, "engines": { "node": ">=0.10.0" } diff --git a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/sass/site/_bbpress.scss b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/sass/site/_bbpress.scss index 18e9fbd1c0..e018f157f2 100644 --- a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/sass/site/_bbpress.scss +++ b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/sass/site/_bbpress.scss @@ -1344,8 +1344,8 @@ div.bbp-breadcrumb { .review-ratings { @extend .clear; - margin-bottom: ms(0); - padding-bottom: 10px; + margin-bottom: var(--wp--preset--spacing--20); + padding-bottom: var(--wp--preset--spacing--20); border-bottom: 1px solid var(--wp--custom--color--border); display: flex; flex-direction: row-reverse; @@ -1354,7 +1354,6 @@ div.bbp-breadcrumb { font-size: ms(-2); margin: 0; min-width: 40%; - border-top: 1px solid var(--wp--custom--color--border); flex-shrink: 0; .reviews-total-count { diff --git a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/style-rtl.css b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/style-rtl.css index 136a46fc83..2769a786ba 100644 --- a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/style-rtl.css +++ b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/style-rtl.css @@ -3557,8 +3557,8 @@ div.bbp-breadcrumb .bbp-breadcrumb-sep { # Plugin / Theme specific support pages --------------------------------------------------------------*/ .bbp-view .review-ratings { - margin-bottom: 1rem; - padding-bottom: 10px; + margin-bottom: var(--wp--preset--spacing--20); + padding-bottom: var(--wp--preset--spacing--20); border-bottom: 1px solid var(--wp--custom--color--border); display: flex; flex-direction: row-reverse; @@ -3567,7 +3567,6 @@ div.bbp-breadcrumb .bbp-breadcrumb-sep { font-size: 0.8rem; margin: 0; min-width: 40%; - border-top: 1px solid var(--wp--custom--color--border); flex-shrink: 0; } .bbp-view .review-ratings .col-3 .reviews-total-count { diff --git a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/style.css b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/style.css index eace4a2868..cdbb92fdc8 100644 --- a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/style.css +++ b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/style.css @@ -3557,8 +3557,8 @@ div.bbp-breadcrumb .bbp-breadcrumb-sep { # Plugin / Theme specific support pages --------------------------------------------------------------*/ .bbp-view .review-ratings { - margin-bottom: 1rem; - padding-bottom: 10px; + margin-bottom: var(--wp--preset--spacing--20); + padding-bottom: var(--wp--preset--spacing--20); border-bottom: 1px solid var(--wp--custom--color--border); display: flex; flex-direction: row-reverse; @@ -3567,7 +3567,6 @@ div.bbp-breadcrumb .bbp-breadcrumb-sep { font-size: 0.8rem; margin: 0; min-width: 40%; - border-top: 1px solid var(--wp--custom--color--border); flex-shrink: 0; } .bbp-view .review-ratings .col-3 .reviews-total-count { From 49662e8e73759a998aa78a09c349ce2e426510d4 Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Fri, 25 Oct 2024 02:44:45 +0000 Subject: [PATCH 02/13] Update support forum plugin. --- .../inc/class-ratings-compat.php | 49 +------------------ 1 file changed, 2 insertions(+), 47 deletions(-) diff --git a/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-ratings-compat.php b/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-ratings-compat.php index 6ae00461f1..5bbda14d80 100644 --- a/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-ratings-compat.php +++ b/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-ratings-compat.php @@ -221,56 +221,11 @@ public function do_view_header() { '' . number_format_i18n( $this->reviews_count ) . '' ); ?>
- ratings_counts[ $rating ] ) ? $this->ratings_counts[ $rating ] : 0; - $ratings_count_total = isset( $this->ratings_counts ) ? array_sum( $this->ratings_counts) : 0; - $stars_title = sprintf( - /* translators: %s: number of stars */ - _n( - 'Click to see reviews that provided a rating of %d star', - 'Click to see reviews that provided a rating of %d stars', - $rating, - 'wporg-forums' - ), - $rating - ); - /* translators: %d: number of stars */ - $stars_text = sprintf( - /* translators: %d: number of stars */ - _n( '%d star', '%d stars', $rating, 'wporg-forums' ), - $rating - ); - $width = 0; - if ( $ratings_count && $ratings_count_total ) { - $width = 100 * ( $ratings_count / $ratings_count_total ); - } - ?> -
- - - - - - - -
- + ' ); ?>
- avg_rating ); - printf( - /* translators: 1: number of stars in rating, 2: total number of stars (5) */ - __( '%1$s out of %2$s stars', 'wporg-forums' ), - round( isset( $this->avg_rating ) ? $this->avg_rating : 0, 1 ), - '5' - ); - ?> + ' ); ?>
Date: Fri, 25 Oct 2024 03:15:01 +0000 Subject: [PATCH 03/13] Remove global. --- .../wp-content/themes/pub/wporg-support-2024/bbpress.php | 1 - 1 file changed, 1 deletion(-) diff --git a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/bbpress.php b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/bbpress.php index c3822014cd..1ca13b1c6d 100644 --- a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/bbpress.php +++ b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/bbpress.php @@ -4,7 +4,6 @@ * * @package WPBBP */ -global $wp_query; get_header(); ?>
From c99043982eb721c03a3bbf1083b6102e3b69250d Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Fri, 25 Oct 2024 03:33:04 +0000 Subject: [PATCH 04/13] Move block to config. --- .../pub/wporg-support-2024/functions.php | 48 +------------ .../wporg-support-2024/inc/block-config.php | 68 +++++++++++++++++++ 2 files changed, 69 insertions(+), 47 deletions(-) create mode 100644 wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/inc/block-config.php diff --git a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/functions.php b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/functions.php index a0865ef0da..7f6722202d 100644 --- a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/functions.php +++ b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/functions.php @@ -9,6 +9,7 @@ * Include locale specific styles. */ require_once get_theme_root( 'wporg-parent-2021' ) . '/wporg-parent-2021/inc/rosetta-styles.php'; +require_once( __DIR__ . '/inc/block-config.php' ); /** * Use the ‘Lead Topic’ uses the single topic part @@ -1557,50 +1558,3 @@ function bb_is_intl_forum() { * Include the Strings for the supporg/update-php page. */ include_once __DIR__ . '/helphub-update-php-strings.php'; - - -/** - * Update ratings blocks with real rating data. - * - * @param array $data Rating data. - * @param int $post_id Current post. - * - * @return array - */ -function wporg_set_rating_data( $data, $post_id ) { - $post = wporg_support_get_compat_object(); - - if ( class_exists( '\WPORG_Ratings' ) ) { - $rating = \WPORG_Ratings::get_avg_rating( $post->type, $post->post_name ) ?: 0; - $ratings = \WPORG_Ratings::get_rating_counts( $post->type, $post->post_name ) ?: array(); - } - - /** - * Why do we multiply the average rating by 20? - * The themes API does it this way, and the rating plugin was built to fit that. - * Instead of redoing everything, multiplying here keeps things simple and works well. - * - * @see theme-directory/class-themes-api.php for more info. - */ - $adjusted_rating = $rating * 20; - - return array( - 'rating' => $adjusted_rating, - 'ratingsCount' => array_sum( $ratings ), - 'ratings' => $ratings, - 'supportUrl' => esc_url( sprintf( home_url( '/%s/%s/reviews/' ), $post->type, $post->post_name ) ) - ); -} - -add_filter( 'wporg_ratings_data', 'wporg_set_rating_data', 10, 2 ); - -function wporg_render_block_context( $context, $parsed_block, $parent_block ) { - - if ( in_array( $parsed_block['blockName'], [ 'wporg/ratings-stars', 'wporg/ratings-bars' ] ) ) { - $context = array_merge( $context, [ 'postId' => wporg_support_get_compat_object()->ID ] ); - } - - return $context; -} - -add_filter( 'render_block_context', 'wporg_render_block_context', 10, 3 ); \ No newline at end of file diff --git a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/inc/block-config.php b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/inc/block-config.php new file mode 100644 index 0000000000..56029dd615 --- /dev/null +++ b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/inc/block-config.php @@ -0,0 +1,68 @@ +type, $post->post_name ) ?: 0; + $ratings = \WPORG_Ratings::get_rating_counts( $post->type, $post->post_name ) ?: array(); + } + + /** + * Why do we multiply the average rating by 20? + * The themes API does it this way, and the rating plugin was built to fit that. + * Instead of redoing everything, multiplying here keeps things simple and works well. + * + * @see theme-directory/class-themes-api.php for more info. + */ + $adjusted_rating = $rating * 20; + + return array( + 'rating' => $adjusted_rating, + 'ratingsCount' => array_sum( $ratings ), + 'ratings' => $ratings, + 'supportUrl' => esc_url( sprintf( home_url( '/%s/%s/reviews/' ), $post->type, $post->post_name ) ) + ); +} + +/** + * Modifies the block context to include a `postId` for specific blocks. + * + * The `wporg/ratings-stars` and `wporg/ratings-bars` require a postId. Due to context, it's unavailable. + * + * @param array $context The current block context. + * @param array $parsed_block The block being rendered. + * @param WP_Block|null $parent_block Optional. The parent block, if any. + * + * @return array The modified block context. + */ +function wporg_render_block_context( $context, $parsed_block, $parent_block ) { + if ( isset( $parsed_block['blockName'] ) && + in_array( $parsed_block['blockName'], [ 'wporg/ratings-stars', 'wporg/ratings-bars' ], true ) ) { + + $compat_object = wporg_support_get_compat_object(); + + if ( $compat_object ) { + $context = array_merge( $context, [ 'postId' => $compat_object->ID ] ); + } + } + + return $context; +} From 1481dcd9c1ab4281d224fbea31f98661ea304895 Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Fri, 25 Oct 2024 03:35:12 +0000 Subject: [PATCH 05/13] Fix indentation. --- .../plugins/support-forums/inc/class-ratings-compat.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-ratings-compat.php b/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-ratings-compat.php index 5bbda14d80..26ea112fff 100644 --- a/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-ratings-compat.php +++ b/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-ratings-compat.php @@ -225,7 +225,7 @@ public function do_view_header() {
- ' ); ?> + ' ); ?>
Date: Fri, 25 Oct 2024 03:37:20 +0000 Subject: [PATCH 06/13] Add the emtpy line. --- .../wp-content/themes/pub/wporg-support-2024/bbpress.php | 1 + 1 file changed, 1 insertion(+) diff --git a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/bbpress.php b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/bbpress.php index 1ca13b1c6d..93e8d0c41b 100644 --- a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/bbpress.php +++ b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/bbpress.php @@ -9,6 +9,7 @@
+
From db3ef98c93f4595b4cfc3d7ec5d76d4ec743fd53 Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Fri, 25 Oct 2024 03:38:01 +0000 Subject: [PATCH 07/13] Spacing. --- .../wp-content/themes/pub/wporg-support-2024/bbpress.php | 1 + 1 file changed, 1 insertion(+) diff --git a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/bbpress.php b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/bbpress.php index 93e8d0c41b..f09ecac155 100644 --- a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/bbpress.php +++ b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/bbpress.php @@ -4,6 +4,7 @@ * * @package WPBBP */ + get_header(); ?>
From e52e1d6188bd3f898351dbdb2971bb45a4d9f4cd Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Thu, 31 Oct 2024 12:18:44 +0900 Subject: [PATCH 08/13] Update to add namespaces and return if ratings are empty. --- .../themes/pub/wporg-support-2024/inc/block-config.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/inc/block-config.php b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/inc/block-config.php index 56029dd615..44dd4f6992 100644 --- a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/inc/block-config.php +++ b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/inc/block-config.php @@ -3,6 +3,8 @@ * Set up configuration for dynamic blocks. */ +namespace WordPressdotorg\Forums\Block_Config; + /** * Actions and filters. */ @@ -20,11 +22,13 @@ function wporg_set_rating_data( $data, $post_id ) { $post = wporg_support_get_compat_object(); - if ( class_exists( '\WPORG_Ratings' ) ) { - $rating = \WPORG_Ratings::get_avg_rating( $post->type, $post->post_name ) ?: 0; - $ratings = \WPORG_Ratings::get_rating_counts( $post->type, $post->post_name ) ?: array(); + if ( ! class_exists( '\WPORG_Ratings' ) ) { + return ''; } + $rating = \WPORG_Ratings::get_avg_rating( $post->type, $post->post_name ) ?: 0; + $ratings = \WPORG_Ratings::get_rating_counts( $post->type, $post->post_name ) ?: array(); + /** * Why do we multiply the average rating by 20? * The themes API does it this way, and the rating plugin was built to fit that. From d533ffc2940bc0483f411e6c873926919197256b Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Thu, 31 Oct 2024 13:21:53 +0900 Subject: [PATCH 09/13] Convert to tabs. --- .../pub/wporg-support-2024/inc/block-config.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/inc/block-config.php b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/inc/block-config.php index 44dd4f6992..9d67bc6135 100644 --- a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/inc/block-config.php +++ b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/inc/block-config.php @@ -58,15 +58,15 @@ function wporg_set_rating_data( $data, $post_id ) { * @return array The modified block context. */ function wporg_render_block_context( $context, $parsed_block, $parent_block ) { - if ( isset( $parsed_block['blockName'] ) && - in_array( $parsed_block['blockName'], [ 'wporg/ratings-stars', 'wporg/ratings-bars' ], true ) ) { + if ( isset( $parsed_block['blockName'] ) && + in_array( $parsed_block['blockName'], [ 'wporg/ratings-stars', 'wporg/ratings-bars' ], true ) ) { - $compat_object = wporg_support_get_compat_object(); + $compat_object = wporg_support_get_compat_object(); - if ( $compat_object ) { - $context = array_merge( $context, [ 'postId' => $compat_object->ID ] ); - } - } + if ( $compat_object ) { + $context = array_merge( $context, [ 'postId' => $compat_object->ID ] ); + } + } - return $context; + return $context; } From 70ed63e2806119bd4c25eef138befb8af929d969 Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Thu, 31 Oct 2024 13:36:18 +0900 Subject: [PATCH 10/13] Attach namespace calls. --- .../themes/pub/wporg-support-2024/inc/block-config.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/inc/block-config.php b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/inc/block-config.php index 9d67bc6135..05eff0a5a7 100644 --- a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/inc/block-config.php +++ b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/inc/block-config.php @@ -8,8 +8,8 @@ /** * Actions and filters. */ -add_filter( 'render_block_context', 'wporg_render_block_context', 10, 3 ); -add_filter( 'wporg_ratings_data', 'wporg_set_rating_data', 10, 2 ); +add_filter( 'render_block_context', __NAMESPACE__ . '\wporg_render_block_context', 10, 3 ); +add_filter( 'wporg_ratings_data', __NAMESPACE__ . '\wporg_set_rating_data', 10, 2 ); /** * Update ratings blocks with real rating data. From 33efd056aa8afe1f5052bf3c688d2bf06c44bc59 Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Thu, 31 Oct 2024 05:17:43 +0000 Subject: [PATCH 11/13] Reorder the stars and bars component css. --- .../sass/site/_bbpress.scss | 37 +++++++-------- .../pub/wporg-support-2024/style-rtl.css | 46 +++++++++---------- .../themes/pub/wporg-support-2024/style.css | 46 +++++++++---------- 3 files changed, 61 insertions(+), 68 deletions(-) diff --git a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/sass/site/_bbpress.scss b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/sass/site/_bbpress.scss index e018f157f2..97ad106965 100644 --- a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/sass/site/_bbpress.scss +++ b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/sass/site/_bbpress.scss @@ -1343,18 +1343,23 @@ div.bbp-breadcrumb { // Review page .review-ratings { - @extend .clear; margin-bottom: var(--wp--preset--spacing--20); padding-bottom: var(--wp--preset--spacing--20); border-bottom: 1px solid var(--wp--custom--color--border); display: flex; - flex-direction: row-reverse; - .col-3 { + > div:first-child { font-size: ms(-2); - margin: 0; - min-width: 40%; + width: 60%; + min-width: 54%; flex-shrink: 0; + } + + > div:last-child { + margin: 0 0 10px 0; + padding-right: 10px; + min-width: 40%; + font-size: ms(-2); .reviews-total-count { font-weight: 700; @@ -1362,20 +1367,7 @@ div.bbp-breadcrumb { padding-top: 5px; } - .counter-bar { - background-color: var(--wp--preset--color--pomegrade-1) !important; - } - } - - .col-5 { - margin: 0 0 10px 0; - padding-right: 10px; - width: 60%; - min-width: 54%; - font-size: ms(-2); - > div:first-child { - @extend h4; margin-top: 0; } @@ -1391,11 +1383,16 @@ div.bbp-breadcrumb { } @media (max-width: 499px) { - flex-direction: column-reverse; + flex-direction: column; - .col-3, .col-5 { + > div:first-child { width: 100%; + margin-bottom: 20px; } } } + + .reviews-submit-link { + margin-top: 10px; + } } diff --git a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/style-rtl.css b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/style-rtl.css index 2769a786ba..3dd6a3ea96 100644 --- a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/style-rtl.css +++ b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/style-rtl.css @@ -918,7 +918,7 @@ h1, h2, h3, h4, -.bbp-view .review-ratings .col-5 > div:first-child, +.bbp-view .review-ratings > div:last-child > div:first-child, h5, h6 { margin: 0 0 var(--wp--style--block-gap); @@ -1980,9 +1980,8 @@ fieldset label { /*-------------------------------------------------------------- # Clearings --------------------------------------------------------------*/ -.clear::before, .bbp-view .review-ratings::before, .bbpress main#main::before, +.clear::before, .bbpress main#main::before, .clear::after, -.bbp-view .review-ratings::after, .bbpress main#main::after, .entry-content::before, .entry-content::after, @@ -1999,7 +1998,7 @@ fieldset label { table-layout: fixed; } -.clear::after, .bbp-view .review-ratings::after, .bbpress main#main::after, +.clear::after, .bbpress main#main::after, .entry-content::after, .comment-content::after, .site-header::after, @@ -3561,47 +3560,46 @@ div.bbp-breadcrumb .bbp-breadcrumb-sep { padding-bottom: var(--wp--preset--spacing--20); border-bottom: 1px solid var(--wp--custom--color--border); display: flex; - flex-direction: row-reverse; } -.bbp-view .review-ratings .col-3 { +.bbp-view .review-ratings > div:first-child { font-size: 0.8rem; - margin: 0; - min-width: 40%; + width: 60%; + min-width: 54%; flex-shrink: 0; } -.bbp-view .review-ratings .col-3 .reviews-total-count { - font-weight: 700; - padding-bottom: 5px; - padding-top: 5px; -} -.bbp-view .review-ratings .col-3 .counter-bar { - background-color: var(--wp--preset--color--pomegrade-1) !important; -} -.bbp-view .review-ratings .col-5 { +.bbp-view .review-ratings > div:last-child { margin: 0 0 10px 0; padding-left: 10px; - width: 60%; - min-width: 54%; + min-width: 40%; font-size: 0.8rem; } -.bbp-view .review-ratings .col-5 > div:first-child { +.bbp-view .review-ratings > div:last-child .reviews-total-count { + font-weight: 700; + padding-bottom: 5px; + padding-top: 5px; +} +.bbp-view .review-ratings > div:last-child > div:first-child { margin-top: 0; } -.bbp-view .review-ratings .col-5 .wporg-ratings { +.bbp-view .review-ratings > div:last-child .wporg-ratings { display: inline-block; margin-left: 1rem; } -.bbp-view .review-ratings .col-5 .reviews-submit-link { +.bbp-view .review-ratings > div:last-child .reviews-submit-link { margin-top: 1rem; } @media (max-width: 499px) { .bbp-view .review-ratings { - flex-direction: column-reverse; + flex-direction: column; } - .bbp-view .review-ratings .col-3, .bbp-view .review-ratings .col-5 { + .bbp-view .review-ratings > div:first-child { width: 100%; + margin-bottom: 20px; } } +.bbp-view .reviews-submit-link { + margin-top: 10px; +} /*-------------------------------------------------------------- # HelpHub Specific diff --git a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/style.css b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/style.css index cdbb92fdc8..a9a047e9e2 100644 --- a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/style.css +++ b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/style.css @@ -918,7 +918,7 @@ h1, h2, h3, h4, -.bbp-view .review-ratings .col-5 > div:first-child, +.bbp-view .review-ratings > div:last-child > div:first-child, h5, h6 { margin: 0 0 var(--wp--style--block-gap); @@ -1980,9 +1980,8 @@ fieldset label { /*-------------------------------------------------------------- # Clearings --------------------------------------------------------------*/ -.clear::before, .bbp-view .review-ratings::before, .bbpress main#main::before, +.clear::before, .bbpress main#main::before, .clear::after, -.bbp-view .review-ratings::after, .bbpress main#main::after, .entry-content::before, .entry-content::after, @@ -1999,7 +1998,7 @@ fieldset label { table-layout: fixed; } -.clear::after, .bbp-view .review-ratings::after, .bbpress main#main::after, +.clear::after, .bbpress main#main::after, .entry-content::after, .comment-content::after, .site-header::after, @@ -3561,47 +3560,46 @@ div.bbp-breadcrumb .bbp-breadcrumb-sep { padding-bottom: var(--wp--preset--spacing--20); border-bottom: 1px solid var(--wp--custom--color--border); display: flex; - flex-direction: row-reverse; } -.bbp-view .review-ratings .col-3 { +.bbp-view .review-ratings > div:first-child { font-size: 0.8rem; - margin: 0; - min-width: 40%; + width: 60%; + min-width: 54%; flex-shrink: 0; } -.bbp-view .review-ratings .col-3 .reviews-total-count { - font-weight: 700; - padding-bottom: 5px; - padding-top: 5px; -} -.bbp-view .review-ratings .col-3 .counter-bar { - background-color: var(--wp--preset--color--pomegrade-1) !important; -} -.bbp-view .review-ratings .col-5 { +.bbp-view .review-ratings > div:last-child { margin: 0 0 10px 0; padding-right: 10px; - width: 60%; - min-width: 54%; + min-width: 40%; font-size: 0.8rem; } -.bbp-view .review-ratings .col-5 > div:first-child { +.bbp-view .review-ratings > div:last-child .reviews-total-count { + font-weight: 700; + padding-bottom: 5px; + padding-top: 5px; +} +.bbp-view .review-ratings > div:last-child > div:first-child { margin-top: 0; } -.bbp-view .review-ratings .col-5 .wporg-ratings { +.bbp-view .review-ratings > div:last-child .wporg-ratings { display: inline-block; margin-right: 1rem; } -.bbp-view .review-ratings .col-5 .reviews-submit-link { +.bbp-view .review-ratings > div:last-child .reviews-submit-link { margin-top: 1rem; } @media (max-width: 499px) { .bbp-view .review-ratings { - flex-direction: column-reverse; + flex-direction: column; } - .bbp-view .review-ratings .col-3, .bbp-view .review-ratings .col-5 { + .bbp-view .review-ratings > div:first-child { width: 100%; + margin-bottom: 20px; } } +.bbp-view .reviews-submit-link { + margin-top: 10px; +} /*-------------------------------------------------------------- # HelpHub Specific From f5f4017af70a9811c21b51f7d714f676c06cc4ca Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Thu, 31 Oct 2024 14:27:45 +0900 Subject: [PATCH 12/13] Reorder controls. --- .../inc/class-ratings-compat.php | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-ratings-compat.php b/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-ratings-compat.php index 26ea112fff..434f27a623 100644 --- a/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-ratings-compat.php +++ b/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-ratings-compat.php @@ -212,18 +212,7 @@ public function do_view_header() { add_filter( 'bbp_get_topic_last_topic_title', array( $this, 'undo_topic_title' ), 10, 1 ); ?>
-
- -
reviews_count, 'wporg-forums' ), - '' . number_format_i18n( $this->reviews_count ) . '' - ); - ?>
- ' ); ?> -
-
+
' ); ?>
@@ -252,6 +241,17 @@ public function do_view_header() { ?>
+
+ +
reviews_count, 'wporg-forums' ), + '' . number_format_i18n( $this->reviews_count ) . '' + ); + ?>
+ ' ); ?> +
Date: Tue, 12 Nov 2024 06:25:38 +0000 Subject: [PATCH 13/13] Return data if we don't have the avalable classes. --- .../themes/pub/wporg-support-2024/inc/block-config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/inc/block-config.php b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/inc/block-config.php index 05eff0a5a7..8ab4c65a59 100644 --- a/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/inc/block-config.php +++ b/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/inc/block-config.php @@ -23,7 +23,7 @@ function wporg_set_rating_data( $data, $post_id ) { $post = wporg_support_get_compat_object(); if ( ! class_exists( '\WPORG_Ratings' ) ) { - return ''; + return $data; } $rating = \WPORG_Ratings::get_avg_rating( $post->type, $post->post_name ) ?: 0;