Changeset 12570

Timestamp:

03/15/2020 06:15:19 AM (6 years ago)

Author:

imath

Message:

BP Nouveau: improve bp_directory_members_item hook positioning

In 3.0.0, we wrongly positioned this hook into the Members loop's item meta. We are repositioning it at a more consistent place considering BP Legacy, which is outside of the p.item-meta tag.

Fixes #8183

Location:

trunk/src/bp-templates/bp-nouveau

Files:

• buddypress/members/members-loop.php (modified) (3 diffs)
• common-styles/_bp_members_loop.scss (modified) (2 diffs)
• css/buddypress-rtl.css (modified) (1 diff)
• css/buddypress.css (modified) (1 diff)
• includes/members/functions.php (modified) (3 diffs)
• includes/members/template-tags.php (modified) (1 diff)

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

@@ -4 +4 @@
  *
  * @since 3.0.0
- * @version 3.0.0
+ * @version 6.0.0
  */
 
@@ -39 +39 @@
                                                         <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
@@ -49 +55 @@
                                                         )
                                                 );
-?>
-
+                                                ?>
                                         </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>

trunk/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 {
@@ -10 +11 @@
                         .member-name {
                                 margin-bottom: $marg-sml;
+                        }
+
+                        .item-extra-content {
+                                clear: both;
+
+                                @include font-size(14);
                         }
 

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

@@ -1873 +1873 @@
 .buddypress-wrap .members-list li .member-name {
         margin-bottom: 10px;
+}
+
+.buddypress-wrap .members-list li .item-extra-content {
+        clear: both;
+        font-size: 14px;
 }
 

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

@@ -1873 +1873 @@
 .buddypress-wrap .members-list li .member-name {
         margin-bottom: 10px;
+}
+
+.buddypress-wrap .members-list li .item-extra-content {
+        clear: both;
+        font-size: 14px;
 }
 

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

@@ -4 +4 @@
  *
  * @since 3.0.0
- * @version 3.1.0
+ * @version 6.0.0
  */
 
@@ -160 +160 @@
  *
  * @since 3.0.0
+ * @since 6.0.0 Replace wrongly positioned `bp_directory_members_item`
+ *              with `bp_directory_members_item_meta`
  *
  * @return string|false HTML Output if hooked. False otherwise.
@@ -168 +170 @@
         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

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

@@ -590 +590 @@
 
 /**
+ * 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
  *