<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][8063] trunk: Introduce pagination for Send Invites page in single groups</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/8063">8063</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-03-06 14:50:45 +0000 (Thu, 06 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce pagination for Send Invites page in single groups
For better support for up-to-date pagination, the AJAX for group invitations
now refreshes the entire invitation section, rather than simply adding single
items to/removing single items from the DOM. This change requires a new
template, groups/single/invite-loop.php, which is the item loaded by the AJAX
request. Backward compatibility with bp-default-style themes is maintained in
the JS.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5423">#5423</a>
Props dcavins</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupstemplatephp">trunk/bp-groups/bp-groups-template.php</a></li>
<li><a href="#trunkbptemplatesbplegacybuddypressgroupssinglesendinvitesphp">trunk/bp-templates/bp-legacy/buddypress/groups/single/send-invites.php</a></li>
<li><a href="#trunkbptemplatesbplegacybuddypressfunctionsphp">trunk/bp-templates/bp-legacy/buddypress-functions.php</a></li>
<li><a href="#trunkbptemplatesbplegacycssbuddypresscss">trunk/bp-templates/bp-legacy/css/buddypress.css</a></li>
<li><a href="#trunkbptemplatesbplegacyjsbuddypressjs">trunk/bp-templates/bp-legacy/js/buddypress.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkbptemplatesbplegacybuddypressgroupssingleinvitesloopphp">trunk/bp-templates/bp-legacy/buddypress/groups/single/invites-loop.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-template.php (8062 => 8063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-template.php 2014-03-06 14:50:40 UTC (rev 8062)
+++ trunk/bp-groups/bp-groups-template.php 2014-03-06 14:50:45 UTC (rev 8063)
</span><span class="lines">@@ -3318,6 +3318,52 @@
</span><span class="cx"> return wp_nonce_url( site_url( bp_get_groups_slug() . '/' . $invites_template->invite->group_id . '/invites/remove/' . $invites_template->invite->user->id ), 'groups_invite_uninvite_user' );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Output pagination links for group invitations.
+ *
+ * @since BuddyPress (2.0.0)
+ */
+function bp_group_invite_pagination_links() {
+ echo bp_get_group_invite_pagination_links();
+}
+ /**
+ * Get pagination links for group invitations.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @return string
+ */
+ function bp_get_group_invite_pagination_links() {
+ global $invites_template;
+ return apply_filters( 'bp_get_group_invite_pagination_links', $invites_template->pag_links );
+ }
+
+/**
+ * Output pagination count text for group invitations.
+ *
+ * @since BuddyPress (2.0.0)
+ */
+function bp_group_invite_pagination_count() {
+ echo bp_get_group_invite_pagination_count();
+}
+ /**
+ * Get pagination count text for group invitations.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @return string
+ */
+ function bp_get_group_invite_pagination_count() {
+ global $invites_template;
+
+ $start_num = intval( ( $invites_template->pag_page - 1 ) * $invites_template->pag_num ) + 1;
+ $from_num = bp_core_number_format( $start_num );
+ $to_num = bp_core_number_format( ( $start_num + ( $invites_template->pag_num - 1 ) > $invites_template->total_invite_count ) ? $invites_template->total_invite_count : $start_num + ( $invites_template->pag_num - 1 ) );
+ $total = bp_core_number_format( $invites_template->total_invite_count );
+
+ return apply_filters( 'bp_get_groups_pagination_count', sprintf( _n( 'Viewing invitation %1$s to %2$s (of %3$s invitation)', 'Viewing invitation %1$s to %2$s (of %3$s invitations)', $total, 'buddypress' ), $from_num, $to_num, $total ), $from_num, $to_num, $total );
+ }
+
</ins><span class="cx"> /***
</span><span class="cx"> * Groups RSS Feed Template Tags
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkbptemplatesbplegacybuddypressgroupssingleinvitesloopphp"></a>
<div class="addfile"><h4>Added: trunk/bp-templates/bp-legacy/buddypress/groups/single/invites-loop.php (0 => 8063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/buddypress/groups/single/invites-loop.php (rev 0)
+++ trunk/bp-templates/bp-legacy/buddypress/groups/single/invites-loop.php 2014-03-06 14:50:45 UTC (rev 8063)
</span><span class="lines">@@ -0,0 +1,93 @@
</span><ins>+<div class="left-menu">
+
+ <div id="invite-list">
+
+ <ul>
+ <?php bp_new_group_invite_friend_list(); ?>
+ </ul>
+
+ <?php wp_nonce_field( 'groups_invite_uninvite_user', '_wpnonce_invite_uninvite_user' ); ?>
+
+ </div>
+
+</div><!-- .left-menu -->
+
+<div class="main-column">
+
+ <?php do_action( 'bp_before_group_send_invites_list' ); ?>
+
+ <?php if ( bp_group_has_invites( bp_ajax_querystring( 'invite' ) . '&per_page=10' ) ) : ?>
+
+ <div id="pag-top" class="pagination">
+
+ <div class="pag-count" id="group-invite-count-top">
+
+ <?php bp_group_invite_pagination_count(); ?>
+
+ </div>
+
+ <div class="pagination-links" id="group-invite-pag-top">
+
+ <?php bp_group_invite_pagination_links(); ?>
+
+ </div>
+
+ </div>
+
+ <?php /* The ID 'friend-list' is important for AJAX support. */ ?>
+ <ul id="friend-list" class="item-list">
+
+ <?php while ( bp_group_invites() ) : bp_group_the_invite(); ?>
+
+ <li id="<?php bp_group_invite_item_id(); ?>">
+ <?php bp_group_invite_user_avatar(); ?>
+
+ <h4><?php bp_group_invite_user_link(); ?></h4>
+ <span class="activity"><?php bp_group_invite_user_last_active(); ?></span>
+
+ <?php do_action( 'bp_group_send_invites_item' ); ?>
+
+ <div class="action">
+ <a class="button remove" href="<?php bp_group_invite_user_remove_invite_url(); ?>" id="<?php bp_group_invite_item_id(); ?>"><?php _e( 'Remove Invite', 'buddypress' ); ?></a>
+
+ <?php do_action( 'bp_group_send_invites_item_action' ); ?>
+ </div>
+ </li>
+
+ <?php endwhile; ?>
+
+ </ul><!-- #friend-list -->
+
+ <div id="pag-bottom" class="pagination">
+
+ <div class="pag-count" id="group-invite-count-bottom">
+
+ <?php bp_group_invite_pagination_count(); ?>
+
+ </div>
+
+ <div class="pagination-links" id="group-invite-pag-bottom">
+
+ <?php bp_group_invite_pagination_links(); ?>
+
+ </div>
+
+ </div>
+
+ <?php else : ?>
+ <div id="message" class="info">
+ <p><?php _e( 'Select people to invite from your friends list.', 'buddypress' ); ?></p>
+ </div>
+ <?php endif; ?>
+
+<?php do_action( 'bp_after_group_send_invites_list' ); ?>
+
+</div><!-- .main-column -->
+
+<div class="clear"></div>
+
+<div class="submit">
+ <input type="submit" name="submit" id="submit" value="<?php esc_attr_e( 'Send Invites', 'buddypress' ); ?>" />
+</div>
+
+<?php wp_nonce_field( 'groups_send_invites', '_wpnonce_send_invites' ); ?>
</ins></span></pre></div>
<a id="trunkbptemplatesbplegacybuddypressgroupssinglesendinvitesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-templates/bp-legacy/buddypress/groups/single/send-invites.php (8062 => 8063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/buddypress/groups/single/send-invites.php 2014-03-06 14:50:40 UTC (rev 8062)
+++ trunk/bp-templates/bp-legacy/buddypress/groups/single/send-invites.php 2014-03-06 14:50:45 UTC (rev 8063)
</span><span class="lines">@@ -2,77 +2,20 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
</span><span class="cx">
</span><ins>+ <?php /* 'send-invite-form' is important for AJAX support */ ?>
</ins><span class="cx"> <form action="<?php bp_group_send_invite_form_action(); ?>" method="post" id="send-invite-form" class="standard-form" role="main">
</span><span class="cx">
</span><del>- <div class="left-menu">
</del><ins>+ <div class="invite">
</ins><span class="cx">
</span><del>- <div id="invite-list">
- <ul>
- <?php bp_new_group_invite_friend_list(); ?>
- </ul>
</del><ins>+ <?php bp_get_template_part( 'groups/single/invites-loop' ); ?>
</ins><span class="cx">
</span><del>- <?php wp_nonce_field( 'groups_invite_uninvite_user', '_wpnonce_invite_uninvite_user' ); ?>
- </div>
-
- </div><!-- .left-menu -->
-
- <div class="main-column">
-
- <div id="message" class="info">
- <p><?php _e('Select people to invite from your friends list.', 'buddypress' ); ?></p>
- </div>
-
- <?php do_action( 'bp_before_group_send_invites_list' ); ?>
-
- <?php /* The ID 'friend-list' is important for AJAX support. */ ?>
- <ul id="friend-list" class="item-list">
- <?php if ( bp_group_has_invites() ) : ?>
-
- <?php while ( bp_group_invites() ) : bp_group_the_invite(); ?>
-
- <li id="<?php bp_group_invite_item_id(); ?>">
- <?php bp_group_invite_user_avatar(); ?>
-
- <h4><?php bp_group_invite_user_link(); ?></h4>
- <span class="activity"><?php bp_group_invite_user_last_active(); ?></span>
-
- <?php do_action( 'bp_group_send_invites_item' ); ?>
-
- <div class="action">
- <a class="button remove" href="<?php bp_group_invite_user_remove_invite_url(); ?>" id="<?php bp_group_invite_item_id(); ?>"><?php _e( 'Remove Invite', 'buddypress' ); ?></a>
-
- <?php do_action( 'bp_group_send_invites_item_action' ); ?>
- </div>
- </li>
-
- <?php endwhile; ?>
-
- <?php endif; ?>
- </ul><!-- #friend-list -->
-
- <?php do_action( 'bp_after_group_send_invites_list' ); ?>
-
- </div><!-- .main-column -->
-
- <div class="clear"></div>
-
- <div class="submit">
- <input type="submit" name="submit" id="submit" value="<?php esc_attr_e( 'Send Invites', 'buddypress' ); ?>" />
</del><span class="cx"> </div>
</span><span class="cx">
</span><del>- <?php wp_nonce_field( 'groups_send_invites', '_wpnonce_send_invites' ); ?>
-
</del><span class="cx"> <?php /* This is important, don't forget it */ ?>
</span><span class="cx"> <input type="hidden" name="group_id" id="group_id" value="<?php bp_group_id(); ?>" />
</span><span class="cx">
</span><span class="cx"> </form><!-- #send-invite-form -->
</span><span class="cx">
</span><del>-<?php else : ?>
-
- <div id="message" class="info" role="main">
- <p><?php _e( 'Once you have built up friend connections you will be able to invite others to your group.', 'buddypress' ); ?></p>
- </div>
-
</del><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_after_group_send_invites_content' ); ?>
</span></span></pre></div>
<a id="trunkbptemplatesbplegacybuddypressfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-templates/bp-legacy/buddypress-functions.php (8062 => 8063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/buddypress-functions.php 2014-03-06 14:50:40 UTC (rev 8062)
+++ trunk/bp-templates/bp-legacy/buddypress-functions.php 2014-03-06 14:50:45 UTC (rev 8063)
</span><span class="lines">@@ -139,6 +139,7 @@
</span><span class="cx"> 'groups_filter' => 'bp_legacy_theme_object_template_loader',
</span><span class="cx"> 'members_filter' => 'bp_legacy_theme_object_template_loader',
</span><span class="cx"> 'messages_filter' => 'bp_legacy_theme_messages_template_loader',
</span><ins>+ 'invite_filter' => 'bp_legacy_theme_invite_template_loader',
</ins><span class="cx">
</span><span class="cx"> // Friends
</span><span class="cx"> 'accept_friendship' => 'bp_legacy_theme_ajax_accept_friendship',
</span><span class="lines">@@ -601,6 +602,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Load group invitations loop to handle pagination requests sent via AJAX.
+ *
+ * @since BuddyPress (2.0.0)
+ */
+function bp_legacy_theme_invite_template_loader() {
+ bp_get_template_part( 'groups/single/invites-loop' );
+ exit();
+}
+
+/**
</ins><span class="cx"> * Load the activity loop template when activity is requested via AJAX,
</span><span class="cx"> *
</span><span class="cx"> * @return string JSON object containing 'contents' (output of the template loop
</span></span></pre></div>
<a id="trunkbptemplatesbplegacycssbuddypresscss"></a>
<div class="modfile"><h4>Modified: trunk/bp-templates/bp-legacy/css/buddypress.css (8062 => 8063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/css/buddypress.css 2014-03-06 14:50:40 UTC (rev 8062)
+++ trunk/bp-templates/bp-legacy/css/buddypress.css 2014-03-06 14:50:45 UTC (rev 8063)
</span><span class="lines">@@ -764,6 +764,7 @@
</span><span class="cx">
</span><span class="cx"> #buddypress form.standard-form .main-column ul#friend-list {
</span><span class="cx"> clear:none;
</span><ins>+ float: left;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #buddypress form.standard-form .main-column ul#friend-list h4 {
</span></span></pre></div>
<a id="trunkbptemplatesbplegacyjsbuddypressjs"></a>
<div class="modfile"><h4>Modified: trunk/bp-templates/bp-legacy/js/buddypress.js (8062 => 8063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/js/buddypress.js 2014-03-06 14:50:40 UTC (rev 8062)
+++ trunk/bp-templates/bp-legacy/js/buddypress.js 2014-03-06 14:50:45 UTC (rev 8063)
</span><span class="lines">@@ -901,17 +901,30 @@
</span><span class="cx"> /** Invite Friends Interface ****************************************/
</span><span class="cx">
</span><span class="cx"> /* Select a user from the list of friends and add them to the invite list */
</span><del>- jq("#invite-list input").on( 'click', function() {
</del><ins>+ jq("#send-invite-form").on( 'click', '#invite-list input', function() {
+ // invites-loop template contains a div with the .invite class
+ // We use the existence of this div to check for old- vs new-
+ // style templates.
+ var invites_new_template = jq( "#send-invite-form > .invite" ).length;
+
</ins><span class="cx"> jq('.ajax-loader').toggle();
</span><span class="cx">
</span><ins>+ // Dim the form until the response arrives
+ if ( invites_new_template ) {
+ jq( this ).parents( 'ul' ).find( 'input' ).prop( 'disabled', true );
+ }
+
</ins><span class="cx"> var friend_id = jq(this).val();
</span><span class="cx">
</span><del>- if ( jq(this).prop('checked') == true )
</del><ins>+ if ( jq(this).prop('checked') == true ) {
</ins><span class="cx"> var friend_action = 'invite';
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> var friend_action = 'uninvite';
</span><ins>+ }
</ins><span class="cx">
</span><del>- jq('.item-list-tabs li.selected').addClass('loading');
</del><ins>+ if ( ! invites_new_template ) {
+ jq( '.item-list-tabs li.selected' ).addClass( 'loading' );
+ }
</ins><span class="cx">
</span><span class="cx"> jq.post( ajaxurl, {
</span><span class="cx"> action: 'groups_invite_user',
</span><span class="lines">@@ -923,23 +936,37 @@
</span><span class="cx"> },
</span><span class="cx"> function(response)
</span><span class="cx"> {
</span><del>- if ( jq("#message") )
</del><ins>+ if ( jq("#message") ) {
</ins><span class="cx"> jq("#message").hide();
</span><ins>+ }
</ins><span class="cx">
</span><del>- jq('.ajax-loader').toggle();
</del><ins>+ if ( invites_new_template ) {
+ // With new-style templates, we refresh the
+ // entire list
+ bp_filter_request( 'invite', 'bp-invite-filter', 'bp-invite-scope', 'div.invite', false, 1, '', '', '' );
+ } else {
+ // Old-style templates manipulate only the
+ // single invitation element
+ jq('.ajax-loader').toggle();
</ins><span class="cx">
</span><del>- if ( friend_action == 'invite' ) {
- jq('#friend-list').append(response);
- } else if ( friend_action == 'uninvite' ) {
- jq('#friend-list li#uid-' + friend_id).remove();
</del><ins>+ if ( friend_action == 'invite' ) {
+ jq('#friend-list').append(response);
+ } else if ( friend_action == 'uninvite' ) {
+ jq('#friend-list li#uid-' + friend_id).remove();
+ }
+
+ jq('.item-list-tabs li.selected').removeClass('loading');
</ins><span class="cx"> }
</span><del>-
- jq('.item-list-tabs li.selected').removeClass('loading');
</del><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> /* Remove a user from the list of users to invite to a group */
</span><del>- jq("#friend-list").on('click', 'li a.remove', function() {
</del><ins>+ jq("#send-invite-form").on('click', 'a.remove', function() {
+ // invites-loop template contains a div with the .invite class
+ // We use the existence of this div to check for old- vs new-
+ // style templates.
+ var invites_new_template = jq("#send-invite-form > .invite").length;
+
</ins><span class="cx"> jq('.ajax-loader').toggle();
</span><span class="cx">
</span><span class="cx"> var friend_id = jq(this).attr('id');
</span><span class="lines">@@ -956,9 +983,17 @@
</span><span class="cx"> },
</span><span class="cx"> function(response)
</span><span class="cx"> {
</span><del>- jq('.ajax-loader').toggle();
- jq('#friend-list #uid-' + friend_id).remove();
- jq('#invite-list #f-' + friend_id).prop('checked', false);
</del><ins>+ if ( invites_new_template ) {
+ // With new-style templates, we refresh the
+ // entire list
+ bp_filter_request( 'invite', 'bp-invite-filter', 'bp-invite-scope', 'div.invite', false, 1, '', '', '' );
+ } else {
+ // Old-style templates manipulate only the
+ // single invitation element
+ jq('.ajax-loader').toggle();
+ jq('#friend-list #uid-' + friend_id).remove();
+ jq('#invite-list #f-' + friend_id).prop('checked', false);
+ }
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>