Changeset 13845

Timestamp:

06/21/2024 02:16:30 AM (21 months ago)

Author:

dufresnesteven

Message:

Plugin-Directory: Update commercial/community plugin link location to match theme directory.

See: ​https://github.com/WordPress/wordpress.org/issues/333

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/widgets

Files:

• class-categorization.php (modified) (4 diffs)
• class-ratings.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/widgets/class-categorization.php

@@ -35 +35 @@
             $title       = __( 'Commercial plugin', 'wporg-plugins' );
             $url         = get_post_meta( $post->ID, 'external_support_url', true );
-            $link_text   = __( 'Support', 'wporg-plugins' );
+            $link_text   = __( 'View support', 'wporg-plugins' );
             $description = __( 'This plugin is free but offers additional paid commercial upgrades or support.', 'wporg-plugins' );
         }
@@ -42 +42 @@
             $title       = __( 'Community plugin', 'wporg-plugins' );
             $url         = get_post_meta( $post->ID, 'external_repository_url', true );
-            $link_text   = __( 'Contribute', 'wporg-plugins' );
+            $link_text   = __( 'Contribute to this plugin', 'wporg-plugins' );
             $description = __( 'This plugin is developed and supported by a community.', 'wporg-plugins' );
         }
@@ -55 +55 @@
             <div class="widget-head">
                 <h2><?php echo esc_html( apply_filters( 'widget_title', $title, $instance, $this->id_base ) ); ?></h2>
-
+            </div>
+    
+            <p><?php echo esc_html( $description ); ?>
                 <?php
                 // Always show URL if there is one, but also output the markup if on the advanced view tab
@@ -62 +64 @@
                 // URL from being shown.)
                 if ( $url || ( get_query_var( 'plugin_advanced' ) && current_user_can( 'plugin_admin_edit', $post ) ) ) {
-                    printf( '<a href="%1$s" rel="nofollow">%2$s</a>', esc_url( $url ), esc_html( $link_text ) );
+                    printf( '<a class="external-link" href="%1$s" rel="nofollow">%2$s</a>', esc_url( $url ), esc_html( $link_text ) );
                 }
                 ?>
-            </div>
-    
-            <p><?php echo esc_html( $description ); ?></p>
+            </p>
         </div>
         <?php

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/widgets/class-ratings.php

@@ -39 +39 @@
         }
 
+        var_dump($ratings);
+
         $num_ratings = array_sum( $ratings );
 
@@ -46 +48 @@
         if ( $rating ) :
         ?>
-            <a class="reviews-link" href="<?php echo esc_url( 'https://wordpress.org/support/plugin/' . $post->post_name . '/reviews/' ); ?>"><?php _ex( 'See all', 'reviews', 'wporg-plugins' ); ?></a>
-
             <div class="rating">
                 <?php echo Template::dashicons_stars( $rating ); ?>
@@ -77 +77 @@
         <?php endif; // $rating ?>
 
-        <?php if ( is_user_logged_in() ) : ?>
-            <div class="user-rating">
-                <a href="<?php echo esc_url( 'https://wordpress.org/support/plugin/' . $post->post_name . '/reviews/#new-post' ); ?>"><?php _e( 'Add my review', 'wporg-plugins' ); ?></a>
-            </div>
-        <?php else: ?>
-            <div class="user-rating">
-                <a href="<?php echo esc_url( wp_login_url( 'https://wordpress.org/support/plugin/' . get_post()->post_name . '/reviews/#new-post' ) ); ?>" rel="nofollow" title="<?php esc_attr_e( 'Log in to WordPress.org', 'wporg-plugins' ); ?>"><?php _e( 'Log in to submit a review.', 'wporg-plugins' ); ?></a>
-            </div>
         <?php
-        endif;
+
+            $action_link_url = is_user_logged_in() ? esc_url( 'https://wordpress.org/support/plugin/' . $post->post_name . '/reviews/#new-post' ) : esc_url( wp_login_url( 'https://wordpress.org/support/plugin/' . get_post()->post_name . '/reviews/#new-post' ) );
+            $action_link_url_text =  is_user_logged_in() ? __( 'Add my review', 'wporg-plugins' ) : __( 'Log in to review.', 'wporg-plugins' );
+
+            $see_all_link_url = esc_url( 'https://wordpress.org/support/plugin/' . $post->post_name . '/reviews/' );
+            $see_all_link_text = __( 'See all<span class="screen-reader-text"> reviews</span>', 'reviews', 'wporg-plugins' );
+
+            $block_markup = <<<EOT
+                <!-- wp:group {"style":{"spacing":{"margin":{"top":"var:preset|spacing|10"},"blockGap":"var:preset|spacing|10"}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
+                    <div class="wp-block-group" style="margin-top:var(--wp--preset--spacing--10)">
+                    <a href="$action_link_url">$action_link_url_text</a>
+                    <a href="$see_all_link_url">$see_all_link_text</a>
+                </div>
+                <!-- /wp:group -->
+            EOT;
+
+            echo do_blocks( $block_markup );
+        ?>
+
+        <?php
 
         echo $args['after_widget'];