<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [2139] trunk/bp-themes/bp-sn-parent:
Parent theme support for in-reply-to feature.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2139</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-11-26 15:08:05 +0000 (Thu, 26 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Parent theme support for in-reply-to feature.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpsnparent_incajaxphp">trunk/bp-themes/bp-sn-parent/_inc/ajax.php</a></li>
<li><a href="#trunkbpthemesbpsnparentactivityjustmephp">trunk/bp-themes/bp-sn-parent/activity/just-me.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpthemesbpsnparent_incajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-sn-parent/_inc/ajax.php (2138 => 2139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-sn-parent/_inc/ajax.php 2009-11-26 15:06:59 UTC (rev 2138)
+++ trunk/bp-themes/bp-sn-parent/_inc/ajax.php 2009-11-26 15:08:05 UTC (rev 2139)
</span><span class="lines">@@ -441,7 +441,7 @@
</span><span class="cx"> $activity_content = sprintf( __('%s posted an update:', 'buddypress'), $from_user_link ) . ' <span class="time-since">%s</span></p><p>
</span><span class="cx"> ';
</span><span class="cx"> $primary_link = bp_core_get_userlink( $wire_post->user_id, false, true );
</span><del>- $activity_content .= '<blockquote>' . $_POST['content'] . '</blockquote>';
</del><ins>+ $activity_content .= '<div class="activity-inner">' . $_POST['content'] . '</div>';
</ins><span class="cx">
</span><span class="cx"> /* Now write the values */
</span><span class="cx"> $activity_id = xprofile_record_activity( array(
</span><span class="lines">@@ -458,7 +458,7 @@
</span><span class="cx"> /* Record this in activity streams */
</span><span class="cx"> $activity_content = sprintf( __( '%s posted an update in the group %s:', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' ) . ' <span class="time-since">%s</span>
</span><span class="cx"> ';
</span><del>- $activity_content .= '<blockquote>' . $_POST['content'] . '</blockquote>';
</del><ins>+ $activity_content .= '<div class="activity-inner">' . $_POST['content'] . '</div>';
</ins><span class="cx">
</span><span class="cx"> $activity_id = groups_record_activity( array(
</span><span class="cx"> 'content' => apply_filters( 'groups_activity_new_wire_post', $activity_content ),
</span><span class="lines">@@ -509,7 +509,7 @@
</span><span class="cx">
</span><span class="cx"> /* Insert the activity comment */
</span><span class="cx"> $comment_id = bp_activity_add( array(
</span><del>- 'content' => apply_filters( 'bp_activity_comment_content', $comment_header . $_POST['content'] ),
</del><ins>+ 'content' => apply_filters( 'bp_activity_comment_content', $comment_header . '<div class="activity-inner">' . $_POST['content'] . '</div>' ),
</ins><span class="cx"> 'primary_link' => '',
</span><span class="cx"> 'component_name' => $bp->activity->id,
</span><span class="cx"> 'component_action' => 'activity_comment',
</span></span></pre></div>
<a id="trunkbpthemesbpsnparentactivityjustmephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-sn-parent/activity/just-me.php (2138 => 2139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-sn-parent/activity/just-me.php 2009-11-26 15:06:59 UTC (rev 2138)
+++ trunk/bp-themes/bp-sn-parent/activity/just-me.php 2009-11-26 15:08:05 UTC (rev 2139)
</span><span class="lines">@@ -68,24 +68,30 @@
</span><span class="cx"> <?php bp_activity_content() ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( is_user_logged_in() && 'activity_comment' != bp_get_activity_action_name() ) : ?>
</span><del>- <div class="activity-meta">
- <a href="#acomment-<?php bp_activity_id() ?>" class="acomment-reply" id="acomment-comment-<?php bp_activity_id() ?>"><?php _e( 'Comment', 'buddypress' ) ?> (<?php bp_activity_comment_count() ?>)</a>
- </div>
</del><ins>+ <div class="activity-meta">
+ <a href="#acomment-<?php bp_activity_id() ?>" class="acomment-reply" id="acomment-comment-<?php bp_activity_id() ?>"><?php _e( 'Comment', 'buddypress' ) ?> (<?php bp_activity_comment_count() ?>)</a>
+ </div>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> </div>
</span><span class="cx">
</span><ins>+ <?php if ( 'activity_comment' == bp_get_activity_action_name() ) : ?>
+ <div class="activity-inreplyto">
+ <strong><?php _e( 'In reply to', 'buddypress' ) ?></strong> - <?php bp_activity_parent_content() ?>
+ </div>
+ <?php endif; ?>
+
</ins><span class="cx"> <div class="activity-comments">
</span><span class="cx"> <?php bp_activity_comments() ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( is_user_logged_in() ) : ?>
</span><del>- <form action="" method="post" name="activity-comment-form" id="ac-form-<?php bp_activity_id() ?>" class="ac-form">
- <div class="ac-reply-avatar"><?php bp_loggedin_user_avatar( 'width=25&height=25' ) ?></div>
- <div class="ac-reply-content">
- <textarea id="ac-input-<?php bp_activity_id() ?>" class="ac-input" name="ac-input-<?php bp_activity_id() ?>"></textarea>
- <input type="submit" name="ac-form-submit" value="<?php _e( 'Post', 'buddypress' ) ?> &rarr;" />
- </div>
- <?php wp_nonce_field( 'new_activity_comment', '_wpnonce_new_activity_comment' ) ?>
- </form>
</del><ins>+ <form action="" method="post" name="activity-comment-form" id="ac-form-<?php bp_activity_id() ?>" class="ac-form">
+ <div class="ac-reply-avatar"><?php bp_loggedin_user_avatar( 'width=25&height=25' ) ?></div>
+ <div class="ac-reply-content">
+ <textarea id="ac-input-<?php bp_activity_id() ?>" class="ac-input" name="ac-input-<?php bp_activity_id() ?>"></textarea>
+ <input type="submit" name="ac-form-submit" value="<?php _e( 'Post', 'buddypress' ) ?> &rarr;" />
+ </div>
+ <?php wp_nonce_field( 'new_activity_comment', '_wpnonce_new_activity_comment' ) ?>
+ </form>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> </div>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>