Ticket #5509: 5509-2.patch

src/bp-templates/bp-legacy/buddypress/groups/single/invites-loop.php

@@ +1 @@
+
 <div class="left-menu">
 
         <div id="invite-list">
@@ -11 +12 @@
         </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' ) ) : ?>
 
+                <h3 class="invite-list-heading"><?php _e('Your current invitations','buddypress'); ?></h3>
+
                 <div id="pag-top" class="pagination">
 
                         <div class="pag-count" id="group-invite-count-top">
@@ -74 +77 @@
 
                 </div>
 
-        <?php else : ?>
-                <div id="message" class="info">
-                        <p><?php _e( 'Select people to invite from your friends list.', 'buddypress' ); ?></p>
+        <?php else: ?>
+
+                <div id="message">
+                        <p class="info"><?php _e('Select members from your friends list to invite to this group.', '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>

src/bp-templates/bp-legacy/buddypress/groups/single/send-invites.php

@@ +1 @@
+<h2 class="manage-invites-heading"><?php _e( 'Manage your member invites for this group', 'buddypress' ); ?></h2>
+
 <?php do_action( 'bp_before_group_send_invites_content' ); ?>
 
-<?php if ( bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
 
+<?php 
+        /* You may have friends but they may all be members of this group, invite list would then return false. 
+                                Check user has friends and check that 'bp_get_new_group_invite_friend_list' is true else skip to
+                                the end and either say all your friends are group members or that you have no friends yet to invite. */
+
+        if ( bp_get_total_friend_count( bp_loggedin_user_id() ) && bp_get_new_group_invite_friend_list() ) : ?>
+
         <?php /* 'send-invite-form' is important for AJAX support */ ?>
         <form action="<?php bp_group_send_invite_form_action(); ?>" method="post" id="send-invite-form" class="standard-form" role="main">
 
@@ -16 +24 @@
 
         </form><!-- #send-invite-form -->
 
+<?php elseif( !bp_get_new_group_invite_friend_list() ): ?>
+
+        <div id="message-block">
+                <p class="notice"><?php _e('Your friends are currently all members of this group.', 'buddypress'); ?></p>
+                <p class="message-body"><?php _e('When you have any new friends you will be able to return to this screen to invite them to join this group.', 'buddypress'); ?></p>
+        </div>
+
+<?php else: ?>
+
+        <div id="message-block">
+                <p class="notice"><?php _e('You currently have no friends to invite.', 'buddypress'); ?></p>
+                <p class="message-body"><?php _e('When you have built up a friends list you will be able to invite them to this group.', 'buddypress'); ?></p>
+        </div>
+
 <?php endif; ?>
 
+
 <?php do_action( 'bp_after_group_send_invites_content' ); ?>

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

@@ -514 +514 @@
         clear: both;
         display: block;
 }
+#buddypress div#message-block,
 #buddypress div#message p,
 #sitewide-notice p {
         font-size: 90%;
         display: block;
         padding: 10px 15px;
 }
+#buddypress div#message-block {
+        margin: 20px 0;
+        padding: .5em;
+}
 #buddypress div#message.error p {
         background-color: #fdc;
         border: 1px solid #a00;
@@ -1374 +1379 @@
         overflow: auto;
         list-style: none;
 }
-
-
+#buddypress .manage-invites-heading,
+#buddypress .invite-list-heading {
+        clear: none;    
+        margin: 20px 0;
+}
+#buddypress .manage-invites-heading {
+        font-size: 120%;
+}
+#buddypress .invite-list-heading {
+        font-size: 100%;
+}
 /*--------------------------------------------------------------
 3.9 - Private Messaging Threads
 --------------------------------------------------------------*/