<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][5623] trunk/bp-activity: Add 'history' meta box to admin edit activity screen.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/5623">5623</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2012-01-07 19:48:58 +0000 (Sat, 07 Jan 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add 'history' meta box to admin edit activity screen. See <a href="http://buddypress.trac.wordpress.org/ticket/3660">#3660</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivityadmincssadmincss">trunk/bp-activity/admin/css/admin.css</a></li>
<li><a href="#trunkbpactivityadmincssadmindevcss">trunk/bp-activity/admin/css/admin.dev.css</a></li>
<li><a href="#trunkbpactivitybpactivityadminphp">trunk/bp-activity/bp-activity-admin.php</a></li>
<li><a href="#trunkbpactivitybpactivityakismetphp">trunk/bp-activity/bp-activity-akismet.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivityadmincssadmincss"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/admin/css/admin.css (5622 => 5623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/admin/css/admin.css 2012-01-07 17:23:24 UTC (rev 5622)
+++ trunk/bp-activity/admin/css/admin.css 2012-01-07 19:48:58 UTC (rev 5623)
</span><span class="lines">@@ -1 +1 @@
</span><del>-.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-activ
ities-primaryid{margin-bottom:1em;}
</del><span class="cx">\ No newline at end of file
</span><ins>+.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;}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpactivityadmincssadmindevcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/admin/css/admin.dev.css (5622 => 5623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/admin/css/admin.dev.css 2012-01-07 17:23:24 UTC (rev 5622)
+++ trunk/bp-activity/admin/css/admin.dev.css 2012-01-07 19:48:58 UTC (rev 5623)
</span><span class="lines">@@ -5,6 +5,16 @@
</span><span class="cx"> color: #AAA;
</span><span class="cx"> font-style: italic;
</span><span class="cx"> }
</span><ins>+.akismet-history {
+ margin: 13px;
+}
+.akismet-history div {
+ margin-bottom: 13px;
+}
+.akismet-history span {
+ color: #999;
+}
+
</ins><span class="cx"> #wp-bp-activities-wrap {
</span><span class="cx"> padding: 5px 0;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpactivitybpactivityadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-admin.php (5622 => 5623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-admin.php 2012-01-07 17:23:24 UTC (rev 5622)
+++ trunk/bp-activity/bp-activity-admin.php 2012-01-07 19:48:58 UTC (rev 5623)
</span><span class="lines">@@ -1100,7 +1100,7 @@
</span><span class="cx"> * @since 1.6
</span><span class="cx"> */
</span><span class="cx"> function get_views() {
</span><del>- $redirect_to = remove_query_arg( array( 'activity_status', 'aid', 'deleted', 'spammed', 'unspammed', ), $_SERVER['REQUEST_URI'] );
</del><ins>+ $redirect_to = remove_query_arg( array( 'activity_status', 'aid', 'deleted', 'error', 'spammed', 'unspammed', 'updated', ), $_SERVER['REQUEST_URI'] );
</ins><span class="cx"> ?>
</span><span class="cx"> <ul class="subsubsub">
</span><span class="cx"> <li class="all"><a href="<?php echo esc_attr( esc_url( $redirect_to ) ); ?>" class="<?php if ( 'spam' != $this->view ) echo 'current'; ?>"><?php _e( 'All', 'buddypress' ); ?></a> |</li>
</span></span></pre></div>
<a id="trunkbpactivitybpactivityakismetphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-akismet.php (5622 => 5623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-akismet.php 2012-01-07 17:23:24 UTC (rev 5622)
+++ trunk/bp-activity/bp-activity-akismet.php 2012-01-07 19:48:58 UTC (rev 5623)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx">
</span><span class="cx"> // Hook into the Activity wp-admin screen
</span><span class="cx"> add_action( 'bp_activity_admin_comment_row_actions', array( $this, 'comment_row_action' ), 10, 2 );
</span><ins>+ add_action( 'bp_activity_admin_load', array( $this, 'add_history_metabox' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -96,19 +97,18 @@
</span><span class="cx"> foreach ( $actions as $k => $item ) {
</span><span class="cx"> $b[ $k ] = $item;
</span><span class="cx"> if ( $k == 'edit' )
</span><del>- $b['history'] = '<a href="' . network_admin_url( 'admin.php?page=bp-activity&amp;action=edit&aid=' . $activity['id'] ) . '#history"> '. __( 'History', 'buddypress' ) . '</a>';
</del><ins>+ $b['history'] = '<a href="' . network_admin_url( 'admin.php?page=bp-activity&amp;action=edit&aid=' . $activity['id'] ) . '#bp_activity_history"> '. __( 'History', 'buddypress' ) . '</a>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $actions = $b;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $desc )
</span><del>- 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>';
</del><ins>+ 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>';
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_akismet_comment_row_action', $actions );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> /**
</span><span class="cx"> * Adds a nonce to the member profile status form, and to the reply form of each activity stream item.
</span><span class="cx"> * This is used by Akismet to help detect spam activity.
</span><span class="lines">@@ -484,6 +484,40 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * 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>';
+ }
+
+ /**
</ins><span class="cx"> * Update an activity item's Akismet history
</span><span class="cx"> *
</span><span class="cx"> * @param int $activity_id Activity item ID
</span></span></pre>
</div>
</div>
</body>
</html>