Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/bp-templates/bp-nouveau/buddypress-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -685,6 +685,7 @@ public function localize_scripts() {
'rest_nonce' => wp_create_nonce( 'wp_rest' ),
'member_label' => __( 'member', 'buddyboss' ),
'members_label' => __( 'members', 'buddyboss' ),
'loadingMore' => esc_html__( 'Loading...', 'buddyboss' ),
);

if ( bp_is_active( 'friends' ) ) {
Expand Down
42 changes: 31 additions & 11 deletions src/bp-templates/bp-nouveau/buddypress/groups/groups-loop.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,6 @@

bp_nouveau_before_loop();

if ( bp_get_current_group_directory_type() ) {
?>
<div class="bp-feedback info">
<span class="bp-icon" aria-hidden="true"></span>
<p class="current-group-type"><?php bp_current_group_directory_type_message(); ?></p>
</div>
<?php
}

$cover_class = ! bb_platform_group_element_enable( 'cover-images' ) ? 'bb-cover-disabled' : 'bb-cover-enabled';
$meta_privacy = ! bb_platform_group_element_enable( 'group-privacy' ) ? 'meta-privacy-hidden' : '';
$meta_group_type = ! bb_platform_group_element_enable( 'group-type' ) ? 'meta-group-type-hidden' : '';
Expand All @@ -33,7 +24,18 @@

if ( bp_has_groups( bp_ajax_querystring( 'groups' ) ) ) {

bp_nouveau_pagination( 'top' );
$bb_current_page = isset( $_POST['page'] ) ? absint( $_POST['page'] ) : 0; // phpcs:ignore WordPress.Security.NonceVerification.Missing
if ( empty( $bb_current_page ) || 1 === $bb_current_page ) :

if ( bp_get_current_group_directory_type() ) {
?>
<div class="bp-feedback info">
<span class="bp-icon" aria-hidden="true"></span>
<p class="current-group-type"><?php bp_current_group_directory_type_message(); ?></p>
</div>
<?php
}

?>

<ul id="groups-list" class="
Expand All @@ -43,6 +45,8 @@
?>
groups-dir-list">

<?php endif; ?>

<?php
while ( bp_groups() ) :
bp_the_group();
Expand Down Expand Up @@ -132,6 +136,21 @@
</li>

<?php endwhile; ?>

<?php
// Load more button when more pages exist.
global $groups_template;
$groups_pag_num = max( 1, (int) $groups_template->pag_num );
$groups_total_pages = ceil( (int) $groups_template->total_group_count / $groups_pag_num );
if ( (int) $groups_template->pag_page < $groups_total_pages ) :
$next_page_url = add_query_arg( $groups_template->pag_arg, (int) $groups_template->pag_page + 1, '' );
?>
<li class="load-more">
<a class="button outline" href="<?php echo esc_url( $next_page_url ); ?>"><?php esc_html_e( 'Load More', 'buddyboss' ); ?></a>
</li>
<?php endif; ?>

<?php if ( empty( $bb_current_page ) || 1 === $bb_current_page ) : ?>
</ul>

<!-- Leave Group confirmation popup -->
Expand Down Expand Up @@ -160,8 +179,9 @@
</transition>
</div> <!-- .bb-leave-group-popup -->

<?php endif; ?>

<?php
bp_nouveau_pagination( 'bottom' );
} else {
bp_nouveau_user_feedback( 'groups-loop-none' );
}
Expand Down
41 changes: 32 additions & 9 deletions src/bp-templates/bp-nouveau/buddypress/members/members-loop.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,22 @@
$enabled_joined_date = ! function_exists( 'bb_enabled_member_directory_element' ) || bb_enabled_member_directory_element( 'joined-date' );
?>

<?php if ( bp_get_current_member_type() ) : ?>
<div class="bp-feedback info">
<span class="bp-icon" aria-hidden="true"></span>
<p><?php bp_current_member_type_message(); ?></p>
</div>
<?php endif; ?>

<?php if ( bp_has_members( bp_ajax_querystring( 'members' ) ) ) : ?>

<?php
$bb_current_page = isset( $_POST['page'] ) ? absint( $_POST['page'] ) : 0; // phpcs:ignore WordPress.Security.NonceVerification.Missing
if ( empty( $bb_current_page ) || 1 === $bb_current_page ) :
?>

<?php if ( bp_get_current_member_type() ) : ?>
<div class="bp-feedback info">
<span class="bp-icon" aria-hidden="true"></span>
<p><?php bp_current_member_type_message(); ?></p>
</div>
<?php endif; ?>

<ul id="members-list" class="<?php bp_nouveau_loop_classes(); ?>">
<?php endif; ?>

<?php
while ( bp_members() ) :
Expand Down Expand Up @@ -251,15 +257,31 @@

<?php endwhile; ?>

<?php
// Load more button when more pages exist.
global $members_template;
$members_pag_num = max( 1, (int) $members_template->pag_num );
$members_total_pages = ceil( (int) $members_template->total_member_count / $members_pag_num );
if ( (int) $members_template->pag_page < $members_total_pages ) :
$next_page_url = add_query_arg( $members_template->pag_arg, (int) $members_template->pag_page + 1, '' );
?>
<li class="load-more">
<a class="button outline" href="<?php echo esc_url( $next_page_url ); ?>"><?php esc_html_e( 'Load More', 'buddyboss' ); ?></a>
</li>
<?php endif; ?>

<?php if ( empty( $bb_current_page ) || 1 === $bb_current_page ) : ?>
</ul>
<?php endif; ?>

<?php
bp_nouveau_pagination( 'bottom' );
<?php
else :
bp_nouveau_user_feedback( 'members-loop-none' );
endif;

bp_nouveau_after_loop();

if ( empty( $bb_current_page ) || 1 === $bb_current_page ) :
?>

<!-- Remove Connection confirmation popup -->
Expand Down Expand Up @@ -294,3 +316,4 @@
</div>
</transition>
</div> <!-- .bb-remove-connection -->
<?php endif; ?>
37 changes: 37 additions & 0 deletions src/bp-templates/bp-nouveau/common-styles/_bp_groups_loop.scss
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,43 @@
margin-left: 0;
}

// Load more button for infinite scroll.
.load-more {
background: none;
border: none;
font-size: 110%;
margin: $marg-med 0;
padding: 0;
text-align: center;
width: 100%;
flex-basis: 100%;
max-width: 100%;

a {
color: $dark-grey;
display: block;
padding: $pad-sml 0;

&:focus,
&:hover {
color: $black;
}

&.loading:after {
content: "";
display: inline-block;
height: 16px;
width: 16px;
border: 2px solid $light-grey;
border-top-color: $dark-grey;
border-radius: 50%;
animation: spin 3s infinite linear;
margin-left: 8px;
vertical-align: middle;
}
}
}

} // close .groups-list

// User account group loop
Expand Down
4 changes: 3 additions & 1 deletion src/bp-templates/bp-nouveau/common-styles/_bp_media.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1340,7 +1340,9 @@ ul.bb-albums-list {

#buddypress .activity-list li.load-more,
#buddypress .bb-photo-list li.load-more,
#buddypress .bb-video-list li.load-more {
#buddypress .bb-video-list li.load-more,
#buddypress .members-list li.load-more,
#buddypress .groups-list li.load-more {
margin: 20px auto 10px;
text-align: center;
-ms-flex-preferred-size: 100%;
Expand Down
37 changes: 37 additions & 0 deletions src/bp-templates/bp-nouveau/common-styles/_bp_members_loop.scss
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,43 @@

}

// Load more button for infinite scroll.
.load-more {
background: none;
border: none;
font-size: 110%;
margin: $marg-med 0;
padding: 0;
text-align: center;
width: 100%;
flex-basis: 100%;
max-width: 100%;

a {
color: $dark-grey;
display: block;
padding: $pad-sml 0;

&:focus,
&:hover {
color: $black;
}

&.loading:after {
content: "";
display: inline-block;
height: 16px;
width: 16px;
border: 2px solid $light-grey;
border-top-color: $dark-grey;
border-radius: 50%;
animation: spin 3s infinite linear;
margin-left: 8px;
vertical-align: middle;
}
}
}

} // close .members-list

// Members group specific list
Expand Down
83 changes: 81 additions & 2 deletions src/bp-templates/bp-nouveau/css/buddypress-rtl.css
Original file line number Diff line number Diff line change
Expand Up @@ -10317,6 +10317,41 @@ form.ac-form .activity-attached-gif-container .gif-image-remove:hover .bb-icon-t
margin-right: 0;
}

.buddypress-wrap .groups-list .load-more {
background: none;
border: none;
font-size: 110%;
margin: 15px 0;
padding: 0;
text-align: center;
width: 100%;
flex-basis: 100%;
max-width: 100%;
}

.buddypress-wrap .groups-list .load-more a {
color: #555;
display: block;
padding: 0.7em 0;
}

.buddypress-wrap .groups-list .load-more a:focus, .buddypress-wrap .groups-list .load-more a:hover {
color: #333;
}

.buddypress-wrap .groups-list .load-more a.loading:after {
content: "";
display: inline-block;
height: 16px;
width: 16px;
border: 2px solid #eaeaea;
border-top-color: #555;
border-radius: 50%;
animation: spin 3s infinite linear;
margin-right: 8px;
vertical-align: middle;
}

.buddypress-wrap .mygroups .groups-list.grid .wrap {
min-height: 450px;
padding-bottom: 0;
Expand Down Expand Up @@ -10576,6 +10611,46 @@ form.ac-form .activity-attached-gif-container .gif-image-remove:hover .bb-icon-t
display: block;
}

.buddypress-wrap .members-list .load-more,
.buddypress-wrap .friends-mutual-list .load-more {
background: none;
border: none;
font-size: 110%;
margin: 15px 0;
padding: 0;
text-align: center;
width: 100%;
flex-basis: 100%;
max-width: 100%;
}

.buddypress-wrap .members-list .load-more a,
.buddypress-wrap .friends-mutual-list .load-more a {
color: #555;
display: block;
padding: 0.7em 0;
}

.buddypress-wrap .members-list .load-more a:focus, .buddypress-wrap .members-list .load-more a:hover,
.buddypress-wrap .friends-mutual-list .load-more a:focus,
.buddypress-wrap .friends-mutual-list .load-more a:hover {
color: #333;
}

.buddypress-wrap .members-list .load-more a.loading:after,
.buddypress-wrap .friends-mutual-list .load-more a.loading:after {
content: "";
display: inline-block;
height: 16px;
width: 16px;
border: 2px solid #eaeaea;
border-top-color: #555;
border-radius: 50%;
animation: spin 3s infinite linear;
margin-right: 8px;
vertical-align: middle;
}

@media screen and (min-width: 46.8em) {
.buddypress-wrap .members-group-list li .joined {
clear: right;
Expand Down Expand Up @@ -23300,7 +23375,9 @@ ul.bb-albums-list .load-more {

#buddypress .activity-list li.load-more,
#buddypress .bb-photo-list li.load-more,
#buddypress .bb-video-list li.load-more {
#buddypress .bb-video-list li.load-more,
#buddypress .members-list li.load-more,
#buddypress .groups-list li.load-more {
margin: 20px auto 10px;
text-align: center;
-ms-flex-preferred-size: 100%;
Expand All @@ -23311,7 +23388,9 @@ ul.bb-albums-list .load-more {

#buddypress .activity-list li.load-more > a,
#buddypress .bb-photo-list li.load-more > a,
#buddypress .bb-video-list li.load-more > a {
#buddypress .bb-video-list li.load-more > a,
#buddypress .members-list li.load-more > a,
#buddypress .groups-list li.load-more > a {
max-width: 33%;
pointer-events: auto;
}
Expand Down
4 changes: 2 additions & 2 deletions src/bp-templates/bp-nouveau/css/buddypress-rtl.min.css

Large diffs are not rendered by default.

Loading
Loading