Changeset 5426

Timestamp:

12/01/2011 04:34:49 PM (13 years ago)

Author:

djpaul

Message:

Activity admin iteration. See #3660.

• Pluralise the name of top-level Activity menu to match other menus' titles.
• Update contextual help for Activity index screen, and fix deprecated function use.
• Move index/edit screen generation into separate functions; restructure bp_activity_admin().
• Change the In Response To column to only show speech bubble when item is a root activity, rather than for any node that contains children. This changes the single activity filter screen to match BP-Default's activity permalink screen.

File:

• trunk/bp-activity/bp-activity-admin.php (modified) (7 diffs)

trunk/bp-activity/bp-activity-admin.php

@@ -29 +29 @@
     global $bp;
 
-    if ( !bp_current_user_can( 'bp_moderate' ) )
+    if ( ! bp_current_user_can( 'bp_moderate' ) )
         return;
 
     // Add our screen
-    $hook = add_menu_page( __( 'Activity', 'buddypress' ), __( 'Activity', 'buddypress' ), 'manage_options', 'bp-activity', 'bp_activity_admin' );
+    $hook = add_menu_page( __( 'BuddyPress Activities', 'buddypress' ), __( 'Activities', 'buddypress' ), 'manage_options', 'bp-activity', 'bp_activity_admin' );
 
     // Hook into early actions to load custom CSS and our init handler.
@@ -142 +142 @@
     global $bp_activity_list_table;
 
-    // per_page screen option
-    add_screen_option( 'per_page', array( 'label' => _x( 'Activities', 'Activity items per page (screen options)', 'buddypress' )) );
-
-    // Help panel - text
-    add_contextual_help( get_current_screen(), '<p>' . __( 'You can manage activities made on your site similar to the way you manage comments and other content. This screen is customizable in the same ways as other management screens, and you can act on activities using the on-hover action links or the Bulk Actions.', 'buddypress' ) . '</p>' .
-        '<p>' . __( 'There are many different types of activities. Some are generated by BuddyPress automatically, and others are entered directly by a user in the form of status update. To help manage the different activity types, use the filter dropdown box to switch between them.', 'buddypress' ) . '</p>' .
-        '<p>' . __( 'In the Activity column, above each activity it says &#8220;Submitted on,&#8221; followed by the date and time the activity item was generated on your site. Clicking on the date/time link will take you to that activity on your live site. Hovering over any activity gives you options to reply, edit, spam mark, or delete that activity.', 'buddypress' ) . '</p>' .
-        '<p>' . __( "In the In Response To Column, if the activity was in reply to another activity, it shows that activity's author's picture and name, and a link to that activity on your live site. If there is a small bubble, the number in it shows how many other activities are related to this one; these are usually comments. Clicking the bubble will filter the activity screen to show only related activity items.", 'buddypress' ) . '</p>'
-    );
+    // Create the Activity screen list table
+    $bp_activity_list_table = new BP_Activity_List_Table();
+
+    // Edit screen
+    if ( 'edit' == $bp_activity_list_table->current_action() && !empty( $_GET['aid'] ) ) {
+        // @todo Contextual help for the edit screen
+
+    // Index screen
+    } else {
+        // per_page screen option
+        add_screen_option( 'per_page', array( 'label' => _x( 'Activities', 'Activity items per page (screen options)', 'buddypress' )) );
+
+        // Help panel - overview text
+        get_current_screen()->add_help_tab( array(
+            'id'      => 'bp-activity-overview',
+            'title'   => __( 'Overview', 'buddypress' ),
+            'content' =>
+                '<p>' . __( 'You can manage activities made on your site similar to the way you manage comments and other content. This screen is customizable in the same ways as other management screens, and you can act on activities using the on-hover action links or the Bulk Actions.', 'buddypress' ) . '</p>' .
+                '<p>' . __( 'There are many different types of activities. Some are generated automatically by BuddyPress and other plugins, and some are entered directly by a user in the form of status update. To help manage the different activity types, use the filter dropdown box to switch between them.', 'buddypress' ) . '</p>'
+        ) );
+
+    // Help panel - moderation text
+        get_current_screen()->add_help_tab( array(
+            'id'        => 'bp-activity-moderating',
+            'title'     => __( 'Moderating Activities', 'buddypress' ),
+            'content'   =>
+                '<ul>' .
+                    '<li>' . __( 'In the <strong>Activity</strong> column, above each activity it says &#8220;Submitted on,&#8221; followed by the date and time the activity item was generated on your site. Clicking on the date/time link will take you to that activity on your live site. Hovering over any activity gives you options to reply, edit, spam mark, or delete that activity.', 'buddypress' ) . '</li>' .
+                    '<li>' . __( "In the <strong>In Response To</strong> column, if the activity was in reply to another activity, it shows that activity's author's picture and name, and a link to that activity on your live site. If there is a small bubble, the number in it shows how many other activities are related to this one; these are usually comments. Clicking the bubble will filter the activity screen to show only related activity items.", 'buddypress' ) . '</li>' .
+                '</ul>'
+        ) );
+
+        // Enqueue CSS and JavaScript
+        $dev = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? 'dev.' : '';
+        wp_enqueue_script( 'bp_activity_admin_js', BP_PLUGIN_URL . "bp-activity/admin/js/admin.{$dev}js", array( 'jquery', 'wp-ajax-response' ), '20111120' );
+        wp_enqueue_style( 'bp_activity_admin_css', BP_PLUGIN_URL . "bp-activity/admin/css/admin.{$dev}css", array(), '20111126' );
+    }
 
     // Help panel - sidebar links
@@ -157 +185 @@
         '<p>' . __( '<a href="http://buddypress.org/support/">Support Forums</a>', 'buddypress' ) . '</p>'
     );
-
-    $dev = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? 'dev.' : '';
-
-    // Enqueue CSS and JavaScript
-    wp_enqueue_script( 'bp_activity_admin_js', BP_PLUGIN_URL . "bp-activity/admin/js/admin.{$dev}js", array( 'jquery', 'wp-ajax-response' ), '20111120' );
-    wp_enqueue_style( 'bp_activity_admin_css', BP_PLUGIN_URL . "bp-activity/admin/css/admin.{$dev}css", array(), '20111126' );
-
-    // Create the Activity screen list table
-    $bp_activity_list_table = new BP_Activity_List_Table();
 
     // Handle spam/un-spam/delete of activities
@@ -287 +306 @@
  *
  * @global BP_Activity_List_Table $bp_activity_list_table Activity screen list table
+ * @since 1.6
+ */
+function bp_activity_admin() {
+    global $bp_activity_list_table;
+
+    // Display the single activity edit screen
+    if ( 'edit' == $bp_activity_list_table->current_action() && !empty( $_GET['aid'] ) )
+        bp_activity_admin_edit();
+
+    // Otherwise, display the Activity index screen
+    else
+        bp_activity_admin_index();
+}
+
+/**
+ * Display the single activity edit screen
+ *
+ * @global BP_Activity_List_Table $bp_activity_list_table Activity screen list table
+ * @since 1.6
+ */
+function bp_activity_admin_edit() {
+    global $bp_activity_list_table;
+}
+
+/**
+ * Display the Activity admin index screen, which contains a list of all the activities.
+ *
+ * @global BP_Activity_List_Table $bp_activity_list_table Activity screen list table
  * @global string $plugin_page
  * @since 1.6
  */
-function bp_activity_admin() {
+function bp_activity_admin_index() {
     global $bp_activity_list_table, $plugin_page;
 
@@ -314 +361 @@
             $messages[] = sprintf( _n( '%s activity restored from the spam.', '%s activities restored from the spam.', $unspammed, 'buddypress' ), number_format_i18n( $unspammed ) );
 
-    // Handle the edit screen
-    } elseif ( 'edit' == $bp_activity_list_table->current_action() && !empty( $_GET['aid'] ) ) {
-        echo '@TODO: Activity Edit screen.';
-        return;
     }
 
@@ -328 +371 @@
         <h2>
             <?php if ( !empty( $_REQUEST['aid'] ) ) : ?>
-                <?php printf( __( 'Activity (ID #%s)', 'buddypress' ), number_format_i18n( (int) $_REQUEST['aid'] ) ); ?>
+                <?php printf( __( 'Activities related to ID #%s', 'buddypress' ), number_format_i18n( (int) $_REQUEST['aid'] ) ); ?>
             <?php else : ?>
-                <?php _e( 'Activity', 'buddypress' ); ?>
+                <?php _e( 'Activities', 'buddypress' ); ?>
             <?php endif; ?>
 
@@ -811 +854 @@
      */
     function column_response( $item ) {
-        // Get activity permalink
-        $activity_link = bp_activity_get_permalink( $item['id'], (object) $item );
-
-        // Get the root activity ID; this may be not be the same as $item['id'] for nested items (e.g. activity_comments)
-        if ( empty( $item['item_id'] ) || ! in_array( $item['type'], apply_filters( 'bp_activity_admin_root_activity_types', array( 'activity_comment' ), $item ) ) )
-            $is_root_activity  = true;
-        else
-            $is_root_activity  = false;
-
-        $root_activity_id  = $is_root_activity ? $item['id'] : $item['item_id'];
-        $root_activity_url = network_admin_url( 'admin.php?page=bp-activity&amp;aid=' . $root_activity_id );
-
-        // Get comment count
-        if ( $is_root_activity )
-            $comment_count = !empty( $item['children'] ) ? bp_activity_recurse_comment_count( (object) $item ) : 0;
-        else
-            $comment_count = count( BP_Activity_Activity::get_child_comments( $item['id'] ) );
-
-        if ( ! $is_root_activity ) {
-            // Display link to the replied-to activity's author's profile
+        // Is $item is a root activity?
+        if ( empty( $item['item_id'] ) ) {
+            $comment_count     = !empty( $item['children'] ) ? bp_activity_recurse_comment_count( (object) $item ) : 0;
+            $root_activity_url = network_admin_url( 'admin.php?page=bp-activity&amp;aid=' . $item['id'] );
+
+            // If the activity has comments, display a link to the activity's permalink, with its comment count in a speech bubble
+            if ( $comment_count ) {
+                $title_attr = sprintf( _n( '%s related activity', '%s related activities', $comment_count, 'buddypress' ), number_format_i18n( $comment_count ) );
+                printf( '<a href="%1$s" title="%2$s" class="post-com-count"><span class="comment-count">%3$s</span></a>', esc_attr( $root_activity_url ), esc_attr( $title_attr ), number_format_i18n( $comment_count ) );
+            }
+
+        // For non-root activities, display a link to the replied-to activity's author's profile
+        } else {
             echo '<strong>' . get_avatar( $this->get_activity_user_id( $item['item_id'] ), '32' ) . ' ' . bp_core_get_userlink( $this->get_activity_user_id( $item['item_id'] ) ) . '</strong><br />';
-        }
-
-        // If the activity has comments, display a link to the root activity's permalink, with its comment count in a speech bubble
-        if ( $comment_count ) {
-            $title_attr = sprintf( _n( '%s related activity', '%s related activities', $comment_count, 'buddypress' ), number_format_i18n( $comment_count ) );
-            printf( '<a href="%1$s" title="%2$s" class="post-com-count"><span class="comment-count">%3$s</span></a>', $root_activity_url, esc_attr( $title_attr ), number_format_i18n( $comment_count ) );
         }