Changeset 5623

Timestamp:

01/07/2012 07:48:58 PM (13 years ago)

Author:

djpaul

Message:

Add 'history' meta box to admin edit activity screen. See #3660.

Location:

trunk/bp-activity

Files:

• admin/css/admin.css (modified) (1 diff)
• admin/css/admin.dev.css (modified) (1 diff)
• bp-activity-admin.php (modified) (1 diff)
• bp-activity-akismet.php (modified) (4 diffs)

trunk/bp-activity/admin/css/admin.css

@@ -1 @@
-.akismet-status{float:right;}.akismet-status a{color:#AAA;font-style:italic;}#wp-bp-activities-wrap{padding:5px 0;}#bp-activities{height:120px;}#bp-replyhead{font-size:1em;line-height:1.4em;margin:0;}#bp-replysubmit{margin:0;padding:0 0 3px;text-align:center;}#bp-replysubmit .error{color:red;line-height:21px;text-align:center;vertical-align:center;}#bp-replysubmit img.waiting{float:right;padding:4px 10px 0;vertical-align:top;}#bp-activities-form .column-response img{float:left;margin-right:10px;margin-top:1px;}.activity-errors{list-style-type:disc;margin-left:2em;}#bp_activity_action div.inside,#bp_activity_content div.inside{line-height:0;}#bp_activity_action h3,#bp_activity_content h3{cursor:auto;}#bp_activity_action td.mceIframeContainer,#bp_activity_content td.mceIframeContainer{background-color:white;}#post-body #bp-activities-action_resize,#post-body #bp-activities-content_resize{position:inherit;margin-top:-2px;}#bp_activity_link input{width:99%;}#bp-activities-primaryid{margin-bottom:1em;}
+.akismet-status{float:right;}.akismet-status a{color:#AAA;font-style:italic;}.akismet-history{margin:13px;}.akismet-history div{margin-bottom:13px;}.akismet-history span{color:#999;}#wp-bp-activities-wrap{padding:5px 0;}#bp-activities{height:120px;}#bp-replyhead{font-size:1em;line-height:1.4em;margin:0;}#bp-replysubmit{margin:0;padding:0 0 3px;text-align:center;}#bp-replysubmit .error{color:red;line-height:21px;text-align:center;vertical-align:center;}#bp-replysubmit img.waiting{float:right;padding:4px 10px 0;vertical-align:top;}#bp-activities-form .column-response img{float:left;margin-right:10px;margin-top:1px;}.activity-errors{list-style-type:disc;margin-left:2em;}#bp_activity_action div.inside,#bp_activity_content div.inside{line-height:0;}#bp_activity_action h3,#bp_activity_content h3{cursor:auto;}#bp_activity_action td.mceIframeContainer,#bp_activity_content td.mceIframeContainer{background-color:white;}#post-body #bp-activities-action_resize,#post-body #bp-activities-content_resize{position:inherit;margin-top:-2px;}#bp_activity_link input{width:99%;}#bp-activities-primaryid{margin-bottom:1em;}

trunk/bp-activity/admin/css/admin.dev.css

@@ -6 +6 @@
     font-style: italic;
 }
+.akismet-history {
+    margin: 13px;
+}
+.akismet-history div {
+    margin-bottom: 13px;
+}
+.akismet-history span {
+    color: #999;
+}
+
 #wp-bp-activities-wrap {
     padding: 5px 0;

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

@@ -1101 +1101 @@
      */
     function get_views() {
-        $redirect_to = remove_query_arg( array( 'activity_status', 'aid', 'deleted', 'spammed', 'unspammed', ), $_SERVER['REQUEST_URI'] );
+        $redirect_to = remove_query_arg( array( 'activity_status', 'aid', 'deleted', 'error', 'spammed', 'unspammed', 'updated', ), $_SERVER['REQUEST_URI'] );
     ?>
         <ul class="subsubsub">

trunk/bp-activity/bp-activity-akismet.php

@@ -56 +56 @@
         // Hook into the Activity wp-admin screen
         add_action( 'bp_activity_admin_comment_row_actions', array( $this, 'comment_row_action' ), 10, 2 );
+        add_action( 'bp_activity_admin_load',                array( $this, 'add_history_metabox' ) );
     }
 
@@ -97 +98 @@
                 $b[ $k ] = $item;
                 if ( $k == 'edit' )
-                    $b['history'] = '<a href="' . network_admin_url( 'admin.php?page=bp-activity&amp;action=edit&aid=' . $activity['id'] ) . '#history"> '. __( 'History', 'buddypress' ) . '</a>';
+                    $b['history'] = '<a href="' . network_admin_url( 'admin.php?page=bp-activity&amp;action=edit&aid=' . $activity['id'] ) . '#bp_activity_history"> '. __( 'History', 'buddypress' ) . '</a>';
             }
 
@@ -104 +105 @@
 
         if ( $desc )
-            echo '<span class="akismet-status"><a href="' . network_admin_url( 'admin.php?page=bp-activity&amp;action=edit&aid=' . $activity['id'] ) . '#history">' . htmlspecialchars( $desc ) . '</a></span>';
+            echo '<span class="akismet-status"><a href="' . network_admin_url( 'admin.php?page=bp-activity&amp;action=edit&aid=' . $activity['id'] ) . '#bp_activity_history">' . htmlspecialchars( $desc ) . '</a></span>';
 
         return apply_filters( 'bp_akismet_comment_row_action', $actions );
     }
-
 
     /**
@@ -485 +485 @@
 
     /**
+     * Adds a "History" meta box to the activity edit screen.
+     *
+     * @param string $screen_action The type of screen that has been requested
+     * @since 1.6
+     */
+    function add_history_metabox( $screen_action ) {
+        // Only proceed if we're on the edit screen
+        if ( 'edit' != $screen_action )
+            return;
+
+        // Display meta box with a low priority (low position on screen by default)
+        add_meta_box( 'bp_activity_history',  __( 'Activity History', 'buddypress' ), array( $this, 'history_metabox' ), 'toplevel_page_bp-activity', 'advanced', 'low' );
+    }
+
+    /**
+     * History meta box for the Activity admin edit screen
+     *
+     * @param object $item Activity item
+     * @since 1.6
+     * @todo Update activity meta to allow >1 record with the same key (iterate through $history).
+     * @see http://buddypress.trac.wordpress.org/ticket/3907
+     */
+    function history_metabox( $item ) {
+        $history = BP_Akismet::get_activity_history( $item->id );
+
+        if ( empty( $history ) )
+            return;
+
+        echo '<div class="akismet-history"><div>';
+        printf( '<span>%1$s</span> &mdash; %2$s', bp_core_time_since( $history[2] ), esc_html( $history[1] ) );
+        echo '</div></div>';
+    }
+
+    /**
      * Update an activity item's Akismet history
      *