Changeset 2290

Timestamp:

01/11/2010 11:53:11 AM (17 years ago)

Author:

apeatling

Message:

Keeping mention screen notifications theme based.

Location:

trunk

Files:

• bp-activity.php (modified) (2 diffs)
• bp-activity/bp-activity-notifications.php (modified) (1 diff)
• bp-groups.php (modified) (8 diffs)
• bp-themes/bp-default/_inc/global.js (modified) (1 diff)
• bp-xprofile.php (modified) (1 diff)

trunk/bp-activity.php

@@ -63 +63 @@
         $bp->activity->table_name_meta = $wpdb->base_prefix . 'bp_activity_meta';
         $bp->activity->slug = BP_ACTIVITY_SLUG;
+        $bp->activity->format_notification_function = 'bp_activity_format_notifications';
 
         /* Register this in the active components array */
@@ -341 +342 @@
 add_action( 'wp', 'bp_activity_action_friends_feed', 3 );
 
+
 /********************************************************************************
  * Business Functions

trunk/bp-activity/bp-activity-notifications.php

@@ -15 +15 @@
                 if ( !$receiver_user_id = bp_core_get_userid($username) )
                         continue;
-
-                // Add a screen notification of an @message
-                bp_core_add_notification( $activity_id, $receiver_user_id, $bp->activity->id, 'new_at_mention', $poster_user_id );
 
                 // Now email the user with the contents of the message (if they have enabled email notifications)

trunk/bp-groups.php

@@ -305 +305 @@
         global $bp;
 
-        bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'member_promoted_to_mod' );
-        bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'member_promoted_to_admin' );
+        if ( isset($_GET['n']) ) {
+                // Delete group request notifications for the user
+                bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'membership_request_accepted' );
+                bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'membership_request_rejected' );
+                bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'member_promoted_to_mod' );
+                bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'member_promoted_to_admin' );
+        }
 
         do_action( 'groups_screen_my_groups' );
@@ -367 +372 @@
 
         if ( $bp->is_single_item ) {
-                if ( isset($_GET['new']) ) {
+                if ( isset($_GET['n']) ) {
                         // Delete group request notifications for the user
                         bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'membership_request_accepted' );
@@ -1447 +1452 @@
 
                         if ( (int)$total_items > 1 ) {
-                                return apply_filters( 'bp_groups_multiple_new_membership_requests_notification', '<a href="' . $group_link . '/admin/membership-requests/" title="' . __( 'Group Membership Requests', 'buddypress' ) . '">' . sprintf( __('%d new membership requests for the group "%s"', 'buddypress' ), (int)$total_items, $group->name ) . '</a>', $group_link, $total_items, $group->name );
+                                return apply_filters( 'bp_groups_multiple_new_membership_requests_notification', '<a href="' . $group_link . '/admin/membership-requests/?n=1" title="' . __( 'Group Membership Requests', 'buddypress' ) . '">' . sprintf( __('%d new membership requests for the group "%s"', 'buddypress' ), (int)$total_items, $group->name ) . '</a>', $group_link, $total_items, $group->name );
                         } else {
                                 $user_fullname = bp_core_get_user_displayname( $requesting_user_id );
-                                return apply_filters( 'bp_groups_single_new_membership_request_notification', '<a href="' . $group_link . '/admin/membership-requests/" title="' . $user_fullname .' requests group membership">' . sprintf( __('%s requests membership for the group "%s"', 'buddypress' ), $user_fullname, $group->name ) . '</a>', $group_link, $user_fullname, $group->name );
+                                return apply_filters( 'bp_groups_single_new_membership_request_notification', '<a href="' . $group_link . '/admin/membership-requests/?n=1" title="' . $user_fullname .' requests group membership">' . sprintf( __('%s requests membership for the group "%s"', 'buddypress' ), $user_fullname, $group->name ) . '</a>', $group_link, $user_fullname, $group->name );
                         }
                 break;
@@ -1458 +1463 @@
 
                         $group = new BP_Groups_Group( $group_id, false, false );
-                        $group_link = bp_get_group_permalink( $group )  . '/?new';
+                        $group_link = bp_get_group_permalink( $group );
 
                         if ( (int)$total_items > 1 ) {
-                                return apply_filters( 'bp_groups_multiple_membership_request_accepted_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('%d accepted group membership requests', 'buddypress' ), (int)$total_items, $group->name ) . '</a>', $total_items, $group_name );
+                                return apply_filters( 'bp_groups_multiple_membership_request_accepted_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/?n=1" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('%d accepted group membership requests', 'buddypress' ), (int)$total_items, $group->name ) . '</a>', $total_items, $group_name );
                         } else {
-                                return apply_filters( 'bp_groups_single_membership_request_accepted_notification', '<a href="' . $group_link . '">' . sprintf( __('Membership for group "%s" accepted'), $group->name ) . '</a>', $group_link, $group->name );
+                                return apply_filters( 'bp_groups_single_membership_request_accepted_notification', '<a href="' . $group_link . '/?n=1">' . sprintf( __('Membership for group "%s" accepted'), $group->name ) . '</a>', $group_link, $group->name );
                         }
                 break;
@@ -1471 +1476 @@
 
                         $group = new BP_Groups_Group( $group_id, false, false );
-                        $group_link = bp_get_group_permalink( $group )  . '/?new';
+                        $group_link = bp_get_group_permalink( $group );
 
                         if ( (int)$total_items > 1 ) {
-                                return apply_filters( 'bp_groups_multiple_membership_request_rejected_notification', '<a href="' . site_url() . '/' . BP_MEMBERS_SLUG . '/' . $bp->groups->slug . '" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('%d rejected group membership requests', 'buddypress' ), (int)$total_items, $group->name ) . '</a>', $total_items, $group->name );
+                                return apply_filters( 'bp_groups_multiple_membership_request_rejected_notification', '<a href="' . site_url() . '/' . BP_MEMBERS_SLUG . '/' . $bp->groups->slug . '/?n=1" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('%d rejected group membership requests', 'buddypress' ), (int)$total_items, $group->name ) . '</a>', $total_items, $group->name );
                         } else {
-                                return apply_filters( 'bp_groups_single_membership_request_rejected_notification', '<a href="' . $group_link . '">' . sprintf( __('Membership for group "%s" rejected'), $group->name ) . '</a>', $group_link, $group->name );
+                                return apply_filters( 'bp_groups_single_membership_request_rejected_notification', '<a href="' . $group_link . '/?n=1">' . sprintf( __('Membership for group "%s" rejected'), $group->name ) . '</a>', $group_link, $group->name );
                         }
 
@@ -1485 +1490 @@
 
                         $group = new BP_Groups_Group( $group_id, false, false );
-                        $group_link = bp_get_group_permalink( $group )  . '/?new';
+                        $group_link = bp_get_group_permalink( $group );
 
                         if ( (int)$total_items > 1 ) {
-                                return apply_filters( 'bp_groups_multiple_member_promoted_to_admin_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('You were promoted to an admin in %d groups', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
+                                return apply_filters( 'bp_groups_multiple_member_promoted_to_admin_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/?n=1" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('You were promoted to an admin in %d groups', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
                         } else {
-                                return apply_filters( 'bp_groups_single_member_promoted_to_admin_notification', '<a href="' . $group_link . '">' . sprintf( __('You were promoted to an admin in the group %s'), $group->name ) . '</a>', $group_link, $group->name );
+                                return apply_filters( 'bp_groups_single_member_promoted_to_admin_notification', '<a href="' . $group_link . '/?n=1">' . sprintf( __('You were promoted to an admin in the group %s'), $group->name ) . '</a>', $group_link, $group->name );
                         }
                 break;
@@ -1498 +1503 @@
 
                         $group = new BP_Groups_Group( $group_id, false, false );
-                        $group_link = bp_get_group_permalink( $group )  . '/?new';
+                        $group_link = bp_get_group_permalink( $group );
 
                         if ( (int)$total_items > 1 ) {
-                                return apply_filters( 'bp_groups_multiple_member_promoted_to_mod_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('You were promoted to a mod in %d groups', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
+                                return apply_filters( 'bp_groups_multiple_member_promoted_to_mod_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/?n=1" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('You were promoted to a mod in %d groups', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
                         } else {
-                                return apply_filters( 'bp_groups_single_member_promoted_to_mod_notification', '<a href="' . $group_link . '">' . sprintf( __('You were promoted to a mod in the group %s'), $group->name ) . '</a>', $group_link, $group->name );
+                                return apply_filters( 'bp_groups_single_member_promoted_to_mod_notification', '<a href="' . $group_link . '/?n=1">' . sprintf( __('You were promoted to a mod in the group %s'), $group->name ) . '</a>', $group_link, $group->name );
                         }
                 break;
@@ -1514 +1519 @@
 
                         if ( (int)$total_items > 1 ) {
-                                return apply_filters( 'bp_groups_multiple_group_invite_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/invites" title="' . __( 'Group Invites', 'buddypress' ) . '">' . sprintf( __('You have %d new group invitations', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
+                                return apply_filters( 'bp_groups_multiple_group_invite_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/invites/?n=1" title="' . __( 'Group Invites', 'buddypress' ) . '">' . sprintf( __('You have %d new group invitations', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
                         } else {
-                                return apply_filters( 'bp_groups_single_group_invite_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/invites" title="' . __( 'Group Invites', 'buddypress' ) . '">' . sprintf( __('You have an invitation to the group: %s', 'buddypress' ), $group->name ) . '</a>', $group->name );
+                                return apply_filters( 'bp_groups_single_group_invite_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/invites/?n=1" title="' . __( 'Group Invites', 'buddypress' ) . '">' . sprintf( __('You have an invitation to the group: %s', 'buddypress' ), $group->name ) . '</a>', $group->name );
                         }
                 break;

trunk/bp-themes/bp-default/_inc/global.js

@@ -97 +97 @@
 
         /* List tabs event delegation */
-        j('div.activity-type-tabs').click( function(event) {
+        j('div.activity-type-tabs li a').click( function(event) {
                 var target = j(event.target).parent();
 

trunk/bp-xprofile.php

@@ -719 +719 @@
         global $bp;
 
-        if ( 'new_at_mention' == $action ) {
-                $user_fullname = bp_core_get_user_displayname( $secondary_item_id );
-
-                if ( (int)$total_items > 1 ) {
-                        return apply_filters( 'bp_xprofile_multiple_at_mentions_notification', '<a href="' . bp_core_get_user_domain( $secondary_item_id ) . 'activity/" title="' . __( 'View User', 'buddypress' ) . '">' . sprintf( __( '%s mentioned you in %d updates', 'buddypress' ), $user_fullname, (int)$total_items ) . '</a>', $total_items );
-                } else {
-                        return apply_filters( 'bp_xprofile_single_at_mention_notification', '<a href="' . bp_activity_get_permalink( $item_id ) . '" title="' . __( 'View Thread', 'buddypress' ) . '">' . sprintf( __( '%s mentioned you in an update', 'buddypress' ), $user_fullname ) . '</a>', $user_fullname );
-                }
-        }
-
         if ( 'new_wire_post' == $action ) {
                 if ( (int)$total_items > 1 ) {