diff --git src/bp-templates/bp-nouveau/buddypress/members/members-loop.php src/bp-templates/bp-nouveau/buddypress/members/members-loop.php
index 9cc1f606e..ca18f0cde 100644
|
|
|
3 | 3 | * BuddyPress - Members Loop |
4 | 4 | * |
5 | 5 | * @since 3.0.0 |
6 | | * @version 3.0.0 |
| 6 | * @version 6.0.0 |
7 | 7 | */ |
8 | 8 | |
9 | 9 | bp_nouveau_before_loop(); ?> |
… |
… |
bp_nouveau_before_loop(); ?> |
38 | 38 | <?php if ( bp_nouveau_member_has_meta() ) : ?> |
39 | 39 | <p class="item-meta last-activity"> |
40 | 40 | <?php bp_nouveau_member_meta(); ?> |
41 | | </p><!-- #item-meta --> |
| 41 | </p><!-- .item-meta --> |
42 | 42 | <?php endif; ?> |
43 | 43 | |
| 44 | <?php if ( bp_nouveau_member_has_extra_content() ) : ?> |
| 45 | <div class="item-extra-content"> |
| 46 | <?php bp_nouveau_member_extra_content() ; ?> |
| 47 | </div><!-- .item-extra-content --> |
| 48 | <?php endif ; ?> |
| 49 | |
44 | 50 | <?php |
45 | 51 | bp_nouveau_members_loop_buttons( |
46 | 52 | array( |
… |
… |
bp_nouveau_before_loop(); ?> |
48 | 54 | 'button_element' => 'button', |
49 | 55 | ) |
50 | 56 | ); |
51 | | ?> |
52 | | |
| 57 | ?> |
53 | 58 | </div> |
54 | 59 | |
55 | 60 | <?php if ( bp_get_member_latest_update() && ! bp_nouveau_loop_is_grid() ) : ?> |
56 | | <div class="user-update"> |
57 | | <p class="update"> <?php bp_member_latest_update(); ?></p> |
58 | | </div> |
59 | | <?php endif; ?> |
| 61 | <div class="user-update"> |
| 62 | <p class="update"> <?php bp_member_latest_update(); ?></p> |
| 63 | </div> |
| 64 | <?php endif; ?> |
60 | 65 | |
61 | 66 | </div><!-- // .item --> |
62 | | |
63 | | |
64 | | |
65 | 67 | </div> |
66 | 68 | </li> |
67 | 69 | |
diff --git src/bp-templates/bp-nouveau/common-styles/_bp_members_loop.scss src/bp-templates/bp-nouveau/common-styles/_bp_members_loop.scss
index cf239f052..3e552bbe7 100644
|
|
|
1 | 1 | // BP Members loop. |
2 | | // @version 3.0.0 |
| 2 | // @since 3.0.0 |
| 3 | // @version 6.0.0 |
3 | 4 | |
4 | 5 | .buddypress-wrap { |
5 | 6 | |
… |
… |
|
11 | 12 | margin-bottom: $marg-sml; |
12 | 13 | } |
13 | 14 | |
| 15 | .item-extra-content { |
| 16 | clear: both; |
| 17 | |
| 18 | @include font-size(14); |
| 19 | } |
| 20 | |
14 | 21 | .user-update { |
15 | 22 | border: 1px solid $light-grey; |
16 | 23 | |
diff --git src/bp-templates/bp-nouveau/css/buddypress-rtl.css src/bp-templates/bp-nouveau/css/buddypress-rtl.css
index a9ad15225..3b729ed3b 100644
|
|
form.ac-form .ac-reply-content input { |
1877 | 1877 | margin-bottom: 10px; |
1878 | 1878 | } |
1879 | 1879 | |
| 1880 | .buddypress-wrap .members-list li .item-extra-content { |
| 1881 | clear: both; |
| 1882 | font-size: 14px; |
| 1883 | } |
| 1884 | |
1880 | 1885 | .buddypress-wrap .members-list li .user-update { |
1881 | 1886 | border: 1px solid #eaeaea; |
1882 | 1887 | border-radius: 10px; |
diff --git src/bp-templates/bp-nouveau/css/buddypress.css src/bp-templates/bp-nouveau/css/buddypress.css
index e114e6877..ef1802df1 100644
|
|
form.ac-form .ac-reply-content input { |
1877 | 1877 | margin-bottom: 10px; |
1878 | 1878 | } |
1879 | 1879 | |
| 1880 | .buddypress-wrap .members-list li .item-extra-content { |
| 1881 | clear: both; |
| 1882 | font-size: 14px; |
| 1883 | } |
| 1884 | |
1880 | 1885 | .buddypress-wrap .members-list li .user-update { |
1881 | 1886 | border: 1px solid #eaeaea; |
1882 | 1887 | border-radius: 10px; |
diff --git src/bp-templates/bp-nouveau/includes/members/functions.php src/bp-templates/bp-nouveau/includes/members/functions.php
index 6bbba38dd..bdcbbad62 100644
|
|
|
3 | 3 | * Members functions |
4 | 4 | * |
5 | 5 | * @since 3.0.0 |
6 | | * @version 3.1.0 |
| 6 | * @version 6.0.0 |
7 | 7 | */ |
8 | 8 | |
9 | 9 | // Exit if accessed directly. |
… |
… |
function bp_nouveau_members_catch_button_args( $button = array() ) { |
159 | 159 | * and in the members loop. |
160 | 160 | * |
161 | 161 | * @since 3.0.0 |
| 162 | * @since 6.0.0 Replace wrongly positionned `bp_directory_members_item` |
| 163 | * with `bp_directory_members_item_meta` |
162 | 164 | * |
163 | 165 | * @return string|false HTML Output if hooked. False otherwise. |
164 | 166 | */ |
… |
… |
function bp_nouveau_get_hooked_member_meta() { |
167 | 169 | |
168 | 170 | if ( ! empty( $GLOBALS['members_template'] ) ) { |
169 | 171 | /** |
170 | | * Fires inside the display of a directory member item. |
| 172 | * Fires inside the display of metas in the directory member item. |
171 | 173 | * |
172 | | * @since 1.1.0 |
| 174 | * @since 6.0.0 |
173 | 175 | */ |
174 | | do_action( 'bp_directory_members_item' ); |
| 176 | do_action( 'bp_directory_members_item_meta' ); |
175 | 177 | |
176 | 178 | // It's the user's header |
177 | 179 | } else { |
diff --git src/bp-templates/bp-nouveau/includes/members/template-tags.php src/bp-templates/bp-nouveau/includes/members/template-tags.php
index 82058a60c..eadb299fe 100644
|
|
|
3 | 3 | * Members template tags |
4 | 4 | * |
5 | 5 | * @since 3.0.0 |
6 | | * @version 3.1.0 |
| 6 | * @version 6.0.0 |
7 | 7 | */ |
8 | 8 | |
9 | 9 | // Exit if accessed directly. |
… |
… |
function bp_nouveau_member_meta() { |
595 | 595 | return $member->template_meta; |
596 | 596 | } |
597 | 597 | |
| 598 | /** |
| 599 | * Check if some extra content needs to be displayed into the members directory. |
| 600 | * |
| 601 | * @since 6.0.0 |
| 602 | * |
| 603 | * @return bool True if some extra content needs to be displayed into the members directory. |
| 604 | * False otherwise. |
| 605 | */ |
| 606 | function bp_nouveau_member_has_extra_content() { |
| 607 | /** |
| 608 | * Filter here to display the extra content not only into the Members directory. |
| 609 | * |
| 610 | * @since 6.0.0 |
| 611 | * |
| 612 | * @param bool $value True if on the Members directory page. |
| 613 | * False otherwise. |
| 614 | */ |
| 615 | $members_directory_only = (bool) apply_filters( 'bp_nouveau_member_extra_content_in_members_directory', bp_is_members_directory() ); |
| 616 | |
| 617 | // Check if some extra content needs to be included into the item of the loop. |
| 618 | $has_action = (bool) has_action( 'bp_directory_members_item' ); |
| 619 | |
| 620 | return $members_directory_only && $has_action; |
| 621 | } |
| 622 | |
| 623 | /** |
| 624 | * Displays extra content for each item of a members loop. |
| 625 | * |
| 626 | * @since 6.0.0 |
| 627 | */ |
| 628 | function bp_nouveau_member_extra_content() { |
| 629 | /** |
| 630 | * Fires inside the display of a members loop member item. |
| 631 | * |
| 632 | * @since 1.1.0 |
| 633 | */ |
| 634 | do_action( 'bp_directory_members_item' ); |
| 635 | } |
| 636 | |
598 | 637 | /** |
599 | 638 | * Load the appropriate content for the single member pages |
600 | 639 | * |