Changeset 9663

Timestamp:

03/31/2020 11:17:28 PM (5 years ago)

Author:

coffee2code

Message:

Support Forums: Output search form and button for creating topic/review next to each other above topics table.

Props valentinbora, bcworkz, melchoyce, coffee2code.
See #4659.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc

Files:

• class-directory-compat.php (modified) (2 diffs)
• class-hooks.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-directory-compat.php

@@ -313 +313 @@
             add_action( 'wporg_compat_before_single_view', array( $this, 'do_view_header' ) );
             add_action( 'wporg_compat_before_single_view', array( $this, 'do_subscription_link' ), 11 );
-            add_action( 'wporg_compat_before_single_view', array( $this, 'do_search_form' ), 11 );
 
             // Add output filters and actions.
@@ -793 +792 @@
 
     /**
-     * Display a project-specific search form in compat views.
-     */
-    function do_search_form() {
-        get_search_form();
-    }
-
-    /**
      * Term subscriptions use `get_term_link` for the redirect. This needs to be
      * filtered to redirect to the appropriate theme/plugin support view.

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php

@@ -607 +607 @@
             bbp_is_single_view() && in_array( bbp_get_view_id(), array( 'plugin', 'reviews', 'theme' ) )
         ) {
+            $btn = null;
             $is_reviews = 'reviews' === bbp_get_view_id();
+
             if ( bbp_current_user_can_access_create_topic_form() ) {
-                printf(
-                    '<a class="button create-topic" href="#new-topic-0">%s</a>',
+                $btn = sprintf(
+                    '<a class="button button-secondary create-topic" href="#new-topic-0">%s</a>',
                     $is_reviews ? __( 'Create Review', 'wporg-forums' ) : __( 'Create Topic', 'wporg-forums' )
                 );
             } elseif ( ! bbp_is_forum_closed() && ! is_user_logged_in() ) {
-                printf(
-                    '<a class="button create-topic login" href="%s">%s</a>',
+                $btn = sprintf(
+                    '<a class="button button-secondary create-topic login" href="%s">%s</a>',
                     wp_login_url(),
                     $is_reviews ? __( 'Log in to Create a Review', 'wporg-forums' ) : __( 'Log in to Create a Topic', 'wporg-forums' )
                 );
+            }
+
+            if ( $btn ) {
+                $searchform = get_search_form( [ 'echo' => false ] );
+
+                echo '<div class="bbp-create-topic-wrapper">';
+                if ( $searchform ) {
+                    printf(
+                        /* translators: 1: markup for forums search field which is primary action, 2: markup for button to create topic */
+                        __( '%1$s or %2$s', 'wporg-forums' ),
+                        $searchform,
+                        $btn
+                    );
+                } else {
+                    echo $btn;
+                }
+                echo "</div>\n";
             }