Changeset 12059

Timestamp:

05/05/2018 06:32:09 AM (8 years ago)

Author:

imath

Message:

BP Nouveau: avoid empty links in the Group Invites UI

See #7794

Location:

trunk/src/bp-templates/bp-nouveau

Files:

• buddypress/common/js-templates/invites/index.php (modified) (1 diff)
• includes/groups/functions.php (modified) (1 diff)
• js/buddypress-group-invites.js (modified) (2 diffs)

trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/invites/index.php

@@ -89 +89 @@
 
 <script type="text/html" id="tmpl-bp-invites-selection">
-        <a href="#" title="{{data.name}}">
-                <img src="{{data.avatar}}" class="avatar" alt="{{data.name}}" />
+        <a href="#uninvite-user-{{data.id}}" title="{{data.name}}">
+                <img src="{{data.avatar}}" class="avatar" title="{{data.name}}"/>
         </a>
 </script>

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

@@ -113 +113 @@
         // Init the Group invites nav
         $invites_nav = array(
-                'members' => array( 'id' => 'members', 'caption' => __( 'All Members', 'buddypress' ), 'order' => 5 ),
-                'invited' => array( 'id' => 'invited', 'caption' => __( 'Pending Invites', 'buddypress' ), 'order' => 90, 'hide' => (int) ! $show_pending ),
-                'invites' => array( 'id' => 'invites', 'caption' => __( 'Send Invites', 'buddypress' ), 'order' => 100, 'hide' => 1 ),
+                'members' => array(
+                        'id'      => 'members',
+                        'caption' => __( 'All Members', 'buddypress' ),
+                        'order'   => 5,
+                ),
+                'invited' => array(
+                        'id'      => 'invited',
+                        'caption' => __( 'Pending Invites', 'buddypress' ),
+                        'order'   => 90,
+                        'hide'    => (int) ! $show_pending,
+                ),
+                'invites' => array(
+                        'id'      => 'invites',
+                        'caption' => __( 'Send Invites', 'buddypress' ),
+                        'order'   => 100,
+                        'hide'    => 1,
+                        'href'    => '#send-invites-editor',
+                ),
         );
 
         if ( bp_is_active( 'friends' ) ) {
-                $invites_nav['friends'] = array( 'id' => 'friends', 'caption' => __( 'My Friends', 'buddypress' ), 'order' => 0 );
+                $invites_nav['friends'] = array(
+                        'id'      => 'friends',
+                        'caption' => __( 'My Friends', 'buddypress' ),
+                        'order'   => 0,
+                );
 
                 if ( true === bp_nouveau_groups_disallow_all_members_invites() ) {

trunk/src/bp-templates/bp-nouveau/js/buddypress-group-invites.js

@@ -73 +73 @@
                                         id     : item.id,
                                         name   : item.caption,
-                                        href   : '#',
+                                        href   : item.href || '#members-list',
                                         active : activeView,
                                         hide   : _.isUndefined( item.hide ) ? 0 : item.hide
@@ -807 +807 @@
                 initialize: function() {
                         this.model.on( 'change:selected', this.removeView, this );
+                        this.el.id = 'uninvite-user-' + this.model.get( 'id' );
                 },