Ticket #8183: 8183.2.patch

src/bp-templates/bp-nouveau/buddypress/members/members-loop.php

@@ -3 +3 @@
  * BuddyPress - Members Loop
  *
  * @since 3.0.0
- * @version 3.0.0
+ * @version 6.0.0
  */
 
 bp_nouveau_before_loop(); ?>
@@ -38 +38 @@
                                                 <?php if ( bp_nouveau_member_has_meta() ) : ?>
                                                         <p class="item-meta last-activity">
                                                                 <?php bp_nouveau_member_meta(); ?>
-                                                        </p><!-- #item-meta -->
+                                                        </p><!-- .item-meta -->
                                                 <?php endif; ?>
 
+                                                <?php if ( bp_nouveau_member_has_extra_content() ) : ?>
+                                                        <div class="item-extra-content">
+                                                                <?php bp_nouveau_member_extra_content() ; ?>
+                                                        </div><!-- .item-extra-content -->
+                                                <?php endif ; ?>
+
                                                 <?php
                                                 bp_nouveau_members_loop_buttons(
                                                         array(
@@ -48 +54 @@
                                                                 'button_element' => 'button',
                                                         )
                                                 );
-?>
-
+                                                ?>
                                         </div>
 
                                         <?php if ( bp_get_member_latest_update() && ! bp_nouveau_loop_is_grid() ) : ?>
-                                        <div class="user-update">
-                                                <p class="update"> <?php bp_member_latest_update(); ?></p>
-                                        </div>
-                                                <?php endif; ?>
+                                                <div class="user-update">
+                                                        <p class="update"> <?php bp_member_latest_update(); ?></p>
+                                                </div>
+                                        <?php endif; ?>
 
                                 </div><!-- // .item -->
-
-
-
                         </div>
                 </li>
 

src/bp-templates/bp-nouveau/common-styles/_bp_members_loop.scss

@@ -1 +1 @@
 // BP Members loop.
-// @version 3.0.0
+// @since 3.0.0
+// @version 6.0.0
 
 .buddypress-wrap {
 
@@ -11 +12 @@
                                 margin-bottom: $marg-sml;
                         }
 
+                        .item-extra-content {
+                                clear: both;
+
+                                @include font-size(14);
+                        }
+
                         .user-update {
                                 border: 1px solid $light-grey;
 

src/bp-templates/bp-nouveau/css/buddypress-rtl.css

@@ -1874 +1874 @@
         margin-bottom: 10px;
 }
 
+.buddypress-wrap .members-list li .item-extra-content {
+        clear: both;
+        font-size: 14px;
+}
+
 .buddypress-wrap .members-list li .user-update {
         border: 1px solid #eaeaea;
         border-radius: 10px;

src/bp-templates/bp-nouveau/css/buddypress.css

@@ -1874 +1874 @@
         margin-bottom: 10px;
 }
 
+.buddypress-wrap .members-list li .item-extra-content {
+        clear: both;
+        font-size: 14px;
+}
+
 .buddypress-wrap .members-list li .user-update {
         border: 1px solid #eaeaea;
         border-radius: 10px;

src/bp-templates/bp-nouveau/includes/members/functions.php

@@ -3 +3 @@
  * Members functions
  *
  * @since 3.0.0
- * @version 3.1.0
+ * @version 6.0.0
  */
 
 // Exit if accessed directly.
@@ -159 +159 @@
  * and in the members loop.
  *
  * @since 3.0.0
+ * @since 6.0.0 Replace wrongly positionned `bp_directory_members_item`
+ *              with `bp_directory_members_item_meta`
  *
  * @return string|false HTML Output if hooked. False otherwise.
  */
@@ -167 +169 @@
 
         if ( ! empty( $GLOBALS['members_template'] ) ) {
                 /**
-                 * Fires inside the display of a directory member item.
+                 * Fires inside the display of metas in the directory member item.
                  *
-                 * @since 1.1.0
+                 * @since 6.0.0
                  */
-                do_action( 'bp_directory_members_item' );
+                do_action( 'bp_directory_members_item_meta' );
 
         // It's the user's header
         } else {

src/bp-templates/bp-nouveau/includes/members/template-tags.php

@@ -588 +588 @@
                 return $member->template_meta;
         }
 
+/**
+ * Check if some extra content needs to be displayed into the members directory.
+ *
+ * @since 6.0.0
+ *
+ * @return bool True if some extra content needs to be displayed into the members directory.
+ *              False otherwise.
+ */
+function bp_nouveau_member_has_extra_content() {
+        /**
+         * Filter here to display the extra content not only into the Members directory.
+         *
+         * @since 6.0.0
+         *
+         * @param bool $value True if on the Members directory page.
+         *                    False otherwise.
+         */
+        $members_directory_only = (bool) apply_filters( 'bp_nouveau_member_extra_content_in_members_directory', bp_is_members_directory() );
+
+        // Check if some extra content needs to be included into the item of the loop.
+        $has_action = (bool) has_action( 'bp_directory_members_item' );
+
+        return $members_directory_only && $has_action;
+}
+
+/**
+ * Displays extra content for each item of a members loop.
+ *
+ * @since 6.0.0
+ */
+function bp_nouveau_member_extra_content() {
+        /**
+         * Fires inside the display of a members loop member item.
+         *
+         * @since 1.1.0
+         */
+        do_action( 'bp_directory_members_item' );
+}
+
 /**
  * Load the appropriate content for the single member pages
  *