Changeset 12149

Timestamp:

05/30/2018 04:59:34 PM (7 years ago)

Author:

imath

Message:

BP Nouveau Activity comment form: allow inputs to be added to the form

In BP Legacy, the hook bp_activity_entry_comments is fired inside the activity comment form, letting plugin developers inject custom inputs into this form. The same hook is also available in BP Nouveau but was misplaced out of the comment form.

To adapt to one of this Nouveau principle: try to avoid adding hooks directly into templates using existing template tags or specific wrappers and preserve the same level of customization plugin developers need, we will use the bp_nouveau_submit_button() template tag to wrap and fire this hook into its output.

Props sbrajesh

Fixes #7839 (Branch 3.0)

Location:

branches/3.0/src/bp-templates/bp-nouveau

Files:

• buddypress/activity/comment-form.php (modified) (1 diff)
• includes/activity/template-tags.php (modified) (1 diff)
• includes/functions.php (modified) (1 diff)
• includes/template-tags.php (modified) (1 diff)

branches/3.0/src/bp-templates/bp-nouveau/buddypress/activity/comment-form.php

@@ -21 +21 @@
             <textarea id="ac-input-<?php bp_activity_id(); ?>" class="ac-input bp-suggestions" name="ac_input_<?php bp_activity_id(); ?>"></textarea>
         </div>
+        <input type="hidden" name="comment_form_id" value="<?php bp_activity_id(); ?>" />
+
         <?php
+        bp_nouveau_submit_button( 'activity-new-comment' );
         printf(
-            '<input type="submit" name="ac_form_submit" value="%s" /> &nbsp; <button type="button" class="ac-reply-cancel">%s</button>',
-            esc_attr( _x( 'Post', 'button', 'buddypress' ) ),
+            '&nbsp; <button type="button" class="ac-reply-cancel">%s</button>',
             esc_html( _x( 'Cancel', 'button', 'buddypress' ) )
         );
         ?>
-        <input type="hidden" name="comment_form_id" value="<?php bp_activity_id(); ?>" />
     </div>
 
-    <?php wp_nonce_field( 'new_activity_comment', '_wpnonce_new_activity_comment' ); ?>
-
 </form>

branches/3.0/src/bp-templates/bp-nouveau/includes/activity/template-tags.php

@@ -696 +696 @@
 function bp_nouveau_activity_comment_form() {
     bp_get_template_part( 'activity/comment-form' );
-
-    /**
-     * Fires after the activity entry comment form.
-     *
-     * @since 1.5.0
-     */
-    do_action( 'bp_activity_entry_comments' );
 }
 

branches/3.0/src/bp-templates/bp-nouveau/includes/functions.php

@@ -1322 +1322 @@
             ),
         ),
+        'activity-new-comment' => array(
+            'after'     => 'bp_activity_entry_comments',
+            'nonce'     => 'new_activity_comment',
+            'nonce_key' => '_wpnonce_new_activity_comment',
+            'wrapper'   => false,
+            'attributes' => array(
+                'name'  => 'ac_form_submit',
+                'value' => _x( 'Post', 'button', 'buddypress' ),
+            ),
+        ),
     ) );
 

branches/3.0/src/bp-templates/bp-nouveau/includes/template-tags.php

@@ -2420 +2420 @@
     }
 
-    // Output the submit button.
-    printf(
-        '<div class="submit">
-            <input type="submit" %s/>
-        </div>',
+    $submit_input = sprintf( '<input type="submit" %s/>',
         bp_get_form_field_attributes( 'submit', $submit_data['attributes'] )  // Safe.
     );
 
-    wp_nonce_field( $submit_data['nonce'] );
+    // Output the submit button.
+    if ( isset( $submit_data['wrapper'] ) && false === $submit_data['wrapper'] ) {
+        echo $submit_input;
+
+    // Output the submit button into a wrapper.
+    } else {
+        printf( '<div class="submit">%s</div>', $submit_input );
+    }
+
+    if ( empty( $submit_data['nonce_key'] ) ) {
+        wp_nonce_field( $submit_data['nonce'] );
+    } else {
+        wp_nonce_field( $submit_data['nonce'], $submit_data['nonce_key'] );
+    }
 
     if ( ! empty( $submit_data['after'] ) ) {