<!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] [2201] trunk/bp-themes/bp-default: Fixing missing 'In Reply To
' information on profile activity stream</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2201</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-12-18 10:59:56 +0000 (Fri, 18 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixing missing 'In Reply To' information on profile activity stream</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpdefault_inccssdefaultcss">trunk/bp-themes/bp-default/_inc/css/default.css</a></li>
<li><a href="#trunkbpthemesbpdefaultactivityactivityloopphp">trunk/bp-themes/bp-default/activity/activity-loop.php</a></li>
<li><a href="#trunkbpthemesbpdefaultactivityindexphp">trunk/bp-themes/bp-default/activity/index.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpthemesbpdefault_inccssdefaultcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/default.css (2200 => 2201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default.css 2009-12-18 10:49:55 UTC (rev 2200)
+++ trunk/bp-themes/bp-default/_inc/css/default.css 2009-12-18 10:59:56 UTC (rev 2201)
</span><span class="lines">@@ -986,6 +986,7 @@
</span><span class="cx"> font-size: 11px;
</span><span class="cx"> color: #888;
</span><span class="cx"> margin-left: 70px;
</span><ins>+ margin-bottom: 15px;
</ins><span class="cx"> padding-left: 25px;
</span><span class="cx"> background: url( ../images/replyto_arrow.gif ) 7px 0 no-repeat;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultactivityactivityloopphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/activity/activity-loop.php (2200 => 2201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/activity/activity-loop.php 2009-12-18 10:49:55 UTC (rev 2200)
+++ trunk/bp-themes/bp-default/activity/activity-loop.php 2009-12-18 10:59:56 UTC (rev 2201)
</span><span class="lines">@@ -26,32 +26,30 @@
</span><span class="cx"> </div>
</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"> <?php if ( bp_activity_can_comment() ) : ?>
</span><ins>+ <div class="activity-comments">
+ <?php bp_activity_comments() ?>
</ins><span class="cx">
</span><del>- <?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 else : ?>
- <div class="activity-comments">
- <?php bp_activity_comments() ?>
-
- <?php if ( is_user_logged_in() ) : ?>
- <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">
- <div class="ac-textarea">
- <textarea id="ac-input-<?php bp_activity_id() ?>" class="ac-input" name="ac-input-<?php bp_activity_id() ?>"></textarea>
- </div>
- <input type="submit" name="ac-form-submit" value="<?php _e( 'Post', 'buddypress' ) ?> &rarr;" /> &nbsp; <?php _e( 'or press esc to cancel.', 'buddypress' ) ?>
</del><ins>+ <?php if ( is_user_logged_in() ) : ?>
+ <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">
+ <div class="ac-textarea">
+ <textarea id="ac-input-<?php bp_activity_id() ?>" class="ac-input" name="ac-input-<?php bp_activity_id() ?>"></textarea>
</ins><span class="cx"> </div>
</span><del>- <?php wp_nonce_field( 'new_activity_comment', '_wpnonce_new_activity_comment' ) ?>
- </form>
- <?php endif; ?>
- </div>
- <?php endif; ?>
-
- <?php endif;?>
</del><ins>+ <input type="submit" name="ac-form-submit" value="<?php _e( 'Post', 'buddypress' ) ?> &rarr;" /> &nbsp; <?php _e( 'or press esc to cancel.', 'buddypress' ) ?>
+ </div>
+ <?php wp_nonce_field( 'new_activity_comment', '_wpnonce_new_activity_comment' ) ?>
+ </form>
+ <?php endif; ?>
+ </div>
+ <?php endif; ?>
</ins><span class="cx"> </li>
</span><span class="cx">
</span><span class="cx"> <?php endwhile; ?>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultactivityindexphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/activity/index.php (2200 => 2201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/activity/index.php 2009-12-18 10:49:55 UTC (rev 2200)
+++ trunk/bp-themes/bp-default/activity/index.php 2009-12-18 10:59:56 UTC (rev 2201)
</span><span class="lines">@@ -22,8 +22,8 @@
</span><span class="cx"> <li class="selected" id="activity-all"><a href="<?php bp_root_domain() ?>"><?php printf( __( 'All Members (%s)', 'buddypress' ), bp_get_total_site_member_count() ) ?></a></li>
</span><span class="cx">
</span><span class="cx"> <?php if ( is_user_logged_in() ) : ?>
</span><del>- <li id="activity-friends"><a href="<?php echo bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/my-friends/' ?>"><?php printf( __( 'My Friends (%s)', 'buddypress' ), friends_get_total_friend_count( bp_loggedin_user_id() ) ) ?></a></li>
- <li id="activity-groups"><a href="<?php echo bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/my-groups/' ?>"><?php printf( __( 'My Groups (%s)', 'buddypress' ), groups_total_groups_for_user( bp_loggedin_user_id() ) ) ?></a></li>
</del><ins>+ <li id="activity-friends"><a href="<?php echo bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/my-friends/' ?>"><?php printf( __( 'My Friends (%s)', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ) ?></a></li>
+ <li id="activity-groups"><a href="<?php echo bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/my-groups/' ?>"><?php printf( __( 'My Groups (%s)', 'buddypress' ), bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_activity_types' ) ?>
</span></span></pre>
</div>
</div>
</body>
</html>