<!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][3724] trunk/bp-themes/bp-default: Change blog comment CSS to mimic the Activity Stream.</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>3724</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-01-16 22:50:24 +0000 (Sun, 16 Jan 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>Change blog comment CSS to mimic the Activity Stream. Fixes #2988, props modemlooper</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="#trunkbpthemesbpdefaultcommentsphp">trunk/bp-themes/bp-default/comments.php</a></li>
<li><a href="#trunkbpthemesbpdefaultfunctionsphp">trunk/bp-themes/bp-default/functions.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 (3723 => 3724)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default.css        2011-01-16 20:09:56 UTC (rev 3723)
+++ trunk/bp-themes/bp-default/_inc/css/default.css        2011-01-16 22:50:24 UTC (rev 3724)
</span><span class="lines">@@ -1494,6 +1494,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .activity-list .activity-header a:first-child,
</span><ins>+.commentlist .depth-1 &gt; .comment-content .comment-meta a:first-child,
</ins><span class="cx"> span.highlight {
</span><span class="cx">         background: #ebf7ff;
</span><span class="cx">         border-bottom: 1px solid #a1dcfa;
</span><span class="lines">@@ -1516,7 +1517,8 @@
</span><span class="cx">         outline: none;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.activity-list .activity-content span.time-since {
</del><ins>+.activity-list .activity-content span.time-since,
+.comment-content .comment-meta span.time-since {
</ins><span class="cx">         color: #bbb;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -1669,7 +1671,8 @@
</span><span class="cx">         padding: 10px 0 0;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-div.activity-comments ul li p:last-child {
</del><ins>+div.activity-comments ul li p:last-child,
+.commentlist .comment-content a:first-child {
</ins><span class="cx">         margin-bottom: 10px;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -2052,8 +2055,7 @@
</span><span class="cx">         border-top: 1px solid #eee;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-div.post div.author-box,
-div.comment-avatar-box {
</del><ins>+div.post div.author-box {
</ins><span class="cx">         background: #f0f0f0;
</span><span class="cx">         padding: 10px;
</span><span class="cx">         float: left;
</span><span class="lines">@@ -2077,20 +2079,18 @@
</span><span class="cx">         text-decoration: none;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-div.post div.author-box img,
-div.comment-avatar-box img {
</del><ins>+div.post div.author-box img {
</ins><span class="cx">         float: none;
</span><span class="cx">         border: 4px solid #fff;
</span><span class="cx">         margin: 0;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-div.post div.post-content,
-div.comment-content {
</del><ins>+div.post div.post-content {
</ins><span class="cx">         margin-left: 105px;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-div.post p.date, div.post p.postmetadata,
-div.comment-meta, div.comment-options {
</del><ins>+div.post p.date,
+div.post p.postmetadata {
</ins><span class="cx">         color: #888;
</span><span class="cx">         font-size: 12px;
</span><span class="cx">         font-family: Georgia, times, serif;
</span><span class="lines">@@ -2188,49 +2188,198 @@
</span><span class="cx">         margin-top: 30px;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#comments h3,
-#trackbacks h3,
-#respond h3 {
-        font-size: 20px;
-        margin: 5px 0 25px 0;
-        font-weight: normal;
-        color: #555;
</del><ins>+.commentlist .bypostauthor {
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-#comments span.title,
-#trackbacks span.title {
-        color: #aaa;
</del><ins>+#comments ol.commentlist {
+        border-bottom: 1px solid #e4e4e4;
+        margin-bottom: 30px;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-.commentlist .bypostauthor {
</del><ins>+ol.commentlist div.comment-avatar-box {
+        float: left;
+        margin: 10px 10px 10px 0;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-ol.commentlist li {
-        margin: 0 0 30px 0;
</del><ins>+ul.children div.comment-avatar-box {
+        float: left;
+        margin: 0px 10px 10px 0;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-ol.commentlist ul.children {
-        margin-left: 105px;
</del><ins>+div.comment-avatar-box img {
+        border: 2px solid #eee;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-div.comment-meta {
-        border-top: none;
-        padding-top: 0;
</del><ins>+div.comment-content {
+        border-top: 1px solid #e4e4e4;
+        padding-left: 75px;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-div.comment-meta h5 {
-        font-weight: normal;
</del><ins>+.commentlist .children .comment {
+        margin-bottom: 5px;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><ins>+div.comment-meta,
+div.comment-options {
+        color: #888;
+        font-size: 11px;
+        margin: 10px 0;
+        padding: 0 0 3px;
+}
+
</ins><span class="cx"> div.comment-meta em {
</span><ins>+        font-style: normal;
+}
+
+div.comment-meta span.comment-highlight a {
+        background: #EBF7FF;
+        border-bottom: 1px solid #a1dcfa;
+        border-radius: 4px;
+        border-right: 1px solid #a1dcfa;
+        color: #059AE7;
+        margin-right: 3px;
+        padding: 3px 8px;
+        text-decoration: none;
+        -moz-border-radius: 4px;
+        -webkit-border-radius: 4px;
+}
+
+div.comment-meta .comment-highlight a:hover,
+.commentlist .depth-1 &gt; .comment-content .comment-meta a:first-child:hover {
+        background: #059AE7;
+        border-color: #059AE7;
+        color: #fff;
+}
+
+#reply-title small {
</ins><span class="cx">         float: right;
</span><ins>+        font-size: 11px;
+        font-weight: normal;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-div.comment-options {
-        border-bottom: none;
</del><ins>+#reply-title small a,
+div.comment-options a.comment-reply-link {
+        background: #FFF9DB;
+        border-bottom: 1px solid #FFE8C4;
+        border-radius: 4px;
+        border-right: 1px solid #FFE8C4;
+        color: #ffa200;
+        margin-right: 10px;
+        padding: 3px 8px;
+        text-decoration: none;
+        -moz-border-radius: 4px;
+        -webkit-border-radius: 4px;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#reply-title small a {
+        margin-right: 0;
+}
</ins><span class="cx"> 
</span><ins>+#reply-title small a:hover,
+div.comment-options a.comment-reply-link:hover {
+        background: #f7740a;
+        border-color: #f7740a;
+        color: #fff;
+}
+
+ul.children {
+        background: #f5f5f5;
+        margin-bottom: 20px;
+        margin-left: 75px;
+        padding: 1px 10px;
+        -moz-border-radius: 4px;
+        -webkit-border-radius: 4px;
+}
+
+ul.children ul {
+        margin-left: 20px;
+        margin-bottom: 0;
+        padding: 5px 0 0 0;
+}
+
+ul.children img.avatar {
+        border-style: none;
+        height: 25px;
+        margin: 0;
+        width: 25px;
+}
+
+ul.children div.comment-content {
+        border-top: none;
+        padding-left: 35px;
+}
+
+ul.children div.comment-meta {
+        font-size: 11px;
+        margin-top: 0;
+}
+
+ul.children div.comment-options {
+        margin-bottom: 5px;
+        margin-top: 0;
+}
+
+ul.children li {
+        border-top: 2px solid #fffeff;
+        padding-top: 10px;
+}
+
+ul.children li:first-child {
+        border-top: none;
+}
+
+ul.children ul li:first-child {
+        border-top: 2px solid #fffeff;
+}
+
+ul.children div.comment-options a.comment-reply-link {
+        background: transparent;
+        border-style: none;
+        color: #1fb3dd;
+        margin-right: 0;
+        padding: 3px 8px;
+        text-decoration: underline;
+}
+
+ul.children div.comment-options a.comment-reply-link:hover {
+        background: transparent;
+        border-style: none;
+        color: #1fb3dd;
+}
+
+#respond {
+        background-color: #fafafa;
+        border: 1px solid #e5e5e5;
+        border-radius: 4px;
+        margin-bottom: 20px;
+        padding: 10px;
+        -moz-border-radius: 4px;
+        -webkit-border-radius: 4px;
+}
+
+ol.commentlist #respond {
+        margin-left: 75px;
+}
+
+ul.children #respond {
+        margin-bottom: 10px;
+        margin-left: 35px;
+        margin-right: 20px;
+}
+
+h3#reply .comments-header {
+        font-size: 14px;
+}
+
+#respond div.comment-avatar-box {
+        margin-top: 0;
+}
+
+#respond div.comment-content {
+        border-style: none;
+}
+
+
</ins><span class="cx"> /* &gt; Footer
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/comments.php (3723 => 3724)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/comments.php        2011-01-16 20:09:56 UTC (rev 3723)
+++ trunk/bp-themes/bp-default/comments.php        2011-01-16 22:50:24 UTC (rev 3724)
</span><span class="lines">@@ -54,25 +54,7 @@
</span><span class="cx"> &lt;?php endif; ?&gt;
</span><span class="cx"> 
</span><span class="cx"> &lt;?php if ( comments_open() ) : ?&gt;
</span><del>-        &lt;div id=&quot;respond&quot;&gt;
-
-                &lt;div class=&quot;comment-avatar-box&quot;&gt;
-                        &lt;div class=&quot;avb&quot;&gt;
-                                &lt;?php if ( bp_loggedin_user_id() ) : ?&gt;
-                                        &lt;a href=&quot;&lt;?php echo bp_loggedin_user_domain() ?&gt;&quot;&gt;
-                                                &lt;?php echo get_avatar( bp_loggedin_user_id(), 50 ) ?&gt;
-                                        &lt;/a&gt;
-                                &lt;?php else : ?&gt;
-                                        &lt;?php echo get_avatar( 0, 50 ) ?&gt;
-                                &lt;?php endif; ?&gt;
-                        &lt;/div&gt;
-                &lt;/div&gt;
-
-                &lt;div class=&quot;comment-content standard-form&quot;&gt;
-                        &lt;?php comment_form() ?&gt;
-                &lt;/div&gt;&lt;!-- .comment-content --&gt;
-
-        &lt;/div&gt;&lt;!-- #respond --&gt;
</del><ins>+        &lt;?php comment_form() ?&gt;
</ins><span class="cx"> &lt;?php endif; ?&gt;
</span><span class="cx"> 
</span><span class="cx"> &lt;?php if ( !empty( $num_trackbacks ) ) : ?&gt;
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/functions.php (3723 => 3724)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/functions.php        2011-01-16 20:09:56 UTC (rev 3723)
+++ trunk/bp-themes/bp-default/functions.php        2011-01-16 22:50:24 UTC (rev 3724)
</span><span class="lines">@@ -85,16 +85,16 @@
</span><span class="cx">                 define( 'HEADER_TEXTCOLOR', 'FFFFFF' );
</span><span class="cx">                 // No CSS. The %s is a placeholder for the theme template directory URI.
</span><span class="cx">                 define( 'HEADER_IMAGE', '%s/_inc/images/default_header.jpg' );
</span><del>-        
</del><ins>+
</ins><span class="cx">                 // The height and width of your custom header. You can hook into the theme's own filters to change these values.
</span><span class="cx">                 // Add a filter to bp_dtheme_header_image_width and bp_dtheme_header_image_height to change these values.
</span><span class="cx">                 define( 'HEADER_IMAGE_WIDTH', apply_filters( 'bp_dtheme_header_image_width', 1250 ) );
</span><span class="cx">                 define( 'HEADER_IMAGE_HEIGHT', apply_filters( 'bp_dtheme_header_image_height', 125 ) );
</span><del>-        
</del><ins>+
</ins><span class="cx">                 // We'll be using post thumbnails for custom header images on posts and pages. We want them to be 1250 pixels wide by 125 pixels tall.
</span><span class="cx">                 // Larger images will be auto-cropped to fit, smaller ones will be ignored.
</span><span class="cx">                 set_post_thumbnail_size( HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT, true );
</span><del>-        
</del><ins>+
</ins><span class="cx">                 // Add a way for the custom header to be styled in the admin panel that controls custom headers.
</span><span class="cx">                 add_custom_image_header( 'bp_dtheme_header_style', 'bp_dtheme_admin_header_style' );
</span><span class="cx">         }
</span><span class="lines">@@ -381,41 +381,54 @@
</span><span class="cx">  * @since 1.2
</span><span class="cx">  */
</span><span class="cx"> function bp_dtheme_blog_comments( $comment, $args, $depth ) {
</span><del>-        $GLOBALS['comment'] = $comment; ?&gt;
</del><ins>+        $GLOBALS['comment'] = $comment;
</ins><span class="cx"> 
</span><del>-        &lt;?php if ( 'pingback' == $comment-&gt;comment_type ) return false; ?&gt;
</del><ins>+        if ( 'pingback' == $comment-&gt;comment_type )
+                return false;
</ins><span class="cx"> 
</span><del>-        &lt;li &lt;?php comment_class(); ?&gt; id=&quot;comment-&lt;?php comment_ID(); ?&gt;&quot;&gt;
</del><ins>+        if ( 1 == $depth )
+                $avatar_size = 50;
+        else
+                $avatar_size = 20;
+        ?&gt;
+        &lt;li &lt;?php comment_class() ?&gt; id=&quot;comment-&lt;?php comment_ID() ?&gt;&quot;&gt;
</ins><span class="cx">                 &lt;div class=&quot;comment-avatar-box&quot;&gt;
</span><span class="cx">                         &lt;div class=&quot;avb&quot;&gt;
</span><span class="cx">                                 &lt;a href=&quot;&lt;?php echo get_comment_author_url() ?&gt;&quot; rel=&quot;nofollow&quot;&gt;
</span><span class="cx">                                         &lt;?php if ( $comment-&gt;user_id ) : ?&gt;
</span><del>-                                                &lt;?php echo bp_core_fetch_avatar( array( 'item_id' =&gt; $comment-&gt;user_id, 'width' =&gt; 50, 'height' =&gt; 50, 'email' =&gt; $comment-&gt;comment_author_email ) ); ?&gt;
</del><ins>+                                                &lt;?php echo bp_core_fetch_avatar( array( 'item_id' =&gt; $comment-&gt;user_id, 'width' =&gt; $avatar_size, 'height' =&gt; $avatar_size, 'email' =&gt; $comment-&gt;comment_author_email ) ) ?&gt;
</ins><span class="cx">                                         &lt;?php else : ?&gt;
</span><del>-                                                &lt;?php echo get_avatar( $comment, 50 ) ?&gt;
</del><ins>+                                                &lt;?php echo get_avatar( $comment, $avatar_size ) ?&gt;
</ins><span class="cx">                                         &lt;?php endif; ?&gt;
</span><span class="cx">                                 &lt;/a&gt;
</span><span class="cx">                         &lt;/div&gt;
</span><span class="cx">                 &lt;/div&gt;
</span><span class="cx"> 
</span><span class="cx">                 &lt;div class=&quot;comment-content&quot;&gt;
</span><ins>+                        &lt;div class=&quot;comment-meta&quot;&gt;
+                                &lt;a href=&quot;&lt;?php echo get_comment_author_url() ?&gt;&quot; rel=&quot;nofollow&quot;&gt;&lt;?php echo get_comment_author() ?&gt;&lt;/a&gt; &lt;?php echo _n( 'said:', 'replied:', $depth, 'buddypress' ) ?&gt;&lt;/a&gt;
+                                &lt;span class=&quot;time-since&quot;&gt;&amp;nbsp; &lt;?php comment_date() ?&gt;&lt;/span&gt;
</ins><span class="cx"> 
</span><del>-                        &lt;div class=&quot;comment-meta&quot;&gt;
-                                &lt;?php printf( __( '%s said:', 'buddypress' ), '&lt;a href=&quot;' . get_comment_author_url() . '&quot; rel=&quot;nofollow&quot;&gt;' . get_comment_author() . '&lt;/a&gt;' ) ?&gt;
-                                &lt;em&gt;&lt;?php _e( 'On', 'buddypress' ) ?&gt; &lt;a href=&quot;#comment-&lt;?php comment_ID() ?&gt;&quot; title=&quot;&quot;&gt;&lt;?php comment_date() ?&gt;&lt;/a&gt;&lt;/em&gt;
</del><ins>+                                &lt;?php if ( 1 == $depth ) : ?&gt;
+                                        &amp;middot; &lt;a href=&quot;#comment-&lt;?php comment_ID() ?&gt;&quot;&gt;&lt;?php _e( 'View', 'buddypress' ) ?&gt;&lt;/a&gt;
+                                &lt;?php else: ?&gt;
+                                        &amp;middot; &lt;?php echo comment_reply_link( array( 'depth' =&gt; $depth, 'max_depth' =&gt; $args['max_depth'], 'reply_text' =&gt; __( 'Reply', 'buddypress' ) ) ) ?&gt;
+                                &lt;?php endif; ?&gt;
+
+                                &lt;?php edit_comment_link( __( 'Edit', 'buddypress' ), '&amp;middot; ', '' ) ?&gt;
</ins><span class="cx">                         &lt;/div&gt;
</span><span class="cx"> 
</span><span class="cx">                         &lt;?php if ( $comment-&gt;comment_approved == '0' ) : ?&gt;
</span><del>-                                 &lt;em class=&quot;moderate&quot;&gt;&lt;?php _e( 'Your comment is awaiting moderation.', 'buddypress' ); ?&gt;&lt;/em&gt;&lt;br /&gt;
</del><ins>+                                 &lt;em class=&quot;moderate&quot;&gt;&lt;?php _e( 'Your comment is awaiting moderation.', 'buddypress' ) ?&gt;&lt;/em&gt;&lt;br /&gt;
</ins><span class="cx">                         &lt;?php endif; ?&gt;
</span><span class="cx"> 
</span><span class="cx">                         &lt;?php comment_text() ?&gt;
</span><span class="cx"> 
</span><del>-                        &lt;div class=&quot;comment-options&quot;&gt;
-                                &lt;?php echo comment_reply_link( array( 'depth' =&gt; $depth, 'max_depth' =&gt; $args['max_depth'] ) ) ?&gt;
-                                &lt;?php edit_comment_link( __( 'Edit', 'buddypress' ), '', '' ); ?&gt;
-                        &lt;/div&gt;
-
</del><ins>+                        &lt;?php if ( 1 == $depth ) : ?&gt;
+                                &lt;div class=&quot;comment-options&quot;&gt;
+                                        &lt;?php echo comment_reply_link( array( 'depth' =&gt; $depth, 'max_depth' =&gt; $args['max_depth'] ) ) ?&gt;
+                                &lt;/div&gt;
+                        &lt;?php endif; ?&gt;
</ins><span class="cx">                 &lt;/div&gt;
</span><span class="cx"> &lt;?php
</span><span class="cx"> }
</span><span class="lines">@@ -549,22 +562,61 @@
</span><span class="cx">         );
</span><span class="cx"> 
</span><span class="cx">         $new_labels = array(
</span><del>-                'cancel_reply_link'    =&gt; '&lt;p id=&quot;cancel-comment-reply&quot;&gt;' . __( 'Cancel reply', 'buddypress' ) . '&lt;/p&gt;',
</del><span class="cx">                 'comment_field'        =&gt; '&lt;p class=&quot;form-textarea&quot;&gt;&lt;label for=&quot;comment&quot;&gt;' . __( 'Comment', 'buddypress' ) . '&lt;/label&gt;&lt;textarea name=&quot;comment&quot; id=&quot;comment&quot; cols=&quot;60&quot; rows=&quot;10&quot; aria-required=&quot;true&quot;&gt;&lt;/textarea&gt;&lt;/p&gt;',
</span><span class="cx">                 'comment_notes_after'  =&gt; '',
</span><span class="cx">                 'comment_notes_before' =&gt; '',
</span><span class="cx">                 'fields'               =&gt; apply_filters( 'comment_form_default_fields', $fields ),
</span><span class="cx">                 'logged_in_as'         =&gt; '&lt;p class=&quot;log-in-out&quot;&gt;' . sprintf( __( 'Logged in as &lt;a href=&quot;%1$s&quot;&gt;%2$s&lt;/a&gt;. &lt;a href=&quot;%3$s&quot;&gt;Log out?&lt;/a&gt;', 'buddypress' ), bp_loggedin_user_domain(), $user_identity, wp_logout_url( get_permalink() ) ) . '&lt;/p&gt;',
</span><del>-                'must_log_in'          =&gt; '&lt;p class=&quot;alert&quot;&gt;' . sprintf( __( 'You must be &lt;a href=&quot;%1$s&quot;&gt;logged in&lt;/a&gt; to post a comment.', 'buddypress' ), wp_login_url( get_permalink() ) )        . '&lt;/p&gt;',
-                'title_reply'          =&gt; '&lt;h3 id=&quot;reply&quot; class=&quot;comments-header&quot;&gt;' . __( 'Leave a reply', 'buddypress' ) . '&lt;/h3&gt;',
-                'title_reply_to'       =&gt; '&lt;h3 id=&quot;reply&quot; class=&quot;comments-header&quot;&gt;' . __( 'Leave a reply to %s', 'buddypress' ) . '&lt;/h3&gt;'
</del><ins>+                'must_log_in'          =&gt; '&lt;p class=&quot;alert&quot;&gt;' . sprintf( __( 'You must be &lt;a href=&quot;%1$s&quot;&gt;logged in&lt;/a&gt; to post a comment.', 'buddypress' ), wp_login_url( get_permalink() ) )        . '&lt;/p&gt;'
</ins><span class="cx">         );
</span><span class="cx"> 
</span><span class="cx">         return apply_filters( 'bp_dtheme_comment_form', array_merge( $default_labels, $new_labels ) );
</span><span class="cx"> }
</span><span class="cx"> add_filter( 'comment_form_defaults', 'bp_dtheme_comment_form', 10 );
</span><span class="cx"> 
</span><ins>+/**
+ * Adds the user's avatar before the comment form box.
+ *
+ * The 'comment_form_top' action is used to insert our HTML within &lt;div id=&quot;reply&quot;&gt;
+ * so that the nested comments comment-reply javascript moves the entirety of the comment reply area.
+ *
+ * @see comment_form()
+ * @since 1.3
+ */
+function bp_dtheme_before_comment_form() {
+?&gt;
+        &lt;div class=&quot;comment-avatar-box&quot;&gt;
+                &lt;div class=&quot;avb&quot;&gt;
+                        &lt;?php if ( bp_loggedin_user_id() ) : ?&gt;
+                                &lt;a href=&quot;&lt;?php echo bp_loggedin_user_domain() ?&gt;&quot;&gt;
+                                        &lt;?php echo get_avatar( bp_loggedin_user_id(), 50 ) ?&gt;
+                                &lt;/a&gt;
+                        &lt;?php else : ?&gt;
+                                &lt;?php echo get_avatar( 0, 50 ) ?&gt;
+                        &lt;?php endif; ?&gt;
+                &lt;/div&gt;
+        &lt;/div&gt;
</ins><span class="cx"> 
</span><ins>+        &lt;div class=&quot;comment-content standard-form&quot;&gt;
+&lt;?php
+}
+add_action( 'comment_form_top', 'bp_dtheme_before_comment_form' );
+
+/**
+ * Closes tags opened in bp_dtheme_before_comment_form().
+ *
+ * @see bp_dtheme_before_comment_form()
+ * @see comment_form()
+ * @since 1.3
+ */
+function bp_dtheme_after_comment_form() {
+?&gt;
+        &lt;/div&gt;&lt;!-- .comment-content standard-form --&gt;
+&lt;?php
+}
+add_action( 'comment_form', 'bp_dtheme_after_comment_form' );
+
+
</ins><span class="cx"> // Everything beyond this point is deprecated as of BuddyPress 1.3. This will be removed in a future version.
</span><span class="cx"> 
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>

</body>
</html>