Ticket #3242: 3242-should-be-final.patch

_inc/css/default.css

@@ -1289 +1289 @@
         margin: 0 5px -8px 0 !important;
 }
 .activity-list .activity-header a:first-child,
-.commentlist .depth-1 > .comment-content .comment-meta a:first-child,
+.comment-author,
 span.highlight {
         background: #ebf7ff;
         border-bottom: 1px solid #a1dcfa;
@@ -1949 +1949 @@
         padding-left: 75px;
 }
 .commentlist .children .comment {
+        /* Is this needed? */
         margin-bottom: 5px;
 }
-div.comment-meta,
-div.comment-options {
+.comment-entry {
+        float: left;
+}
+ul.children .comment-entry {
+        margin-bottom: 10px;
+}
+div.comment-meta {
         color: #888;
+        float: left; 
         font-size: 11px;
         margin: 15px 0;
+        width: 100%;
 }
+div.comment-meta p {
+        float: left;
+        margin-bottom: 0;
+}
+div.comment-meta p.comment-reply {
+        float: right;
+}
 div.comment-meta em {
         font-style: normal;
 }
@@ -1973 +1988 @@
         -webkit-border-radius: 4px;
 }
 div.comment-meta .comment-highlight a:hover,
-.commentlist .depth-1 > .comment-content .comment-meta a:first-child:hover {
+.comment-author:hover {
         background: #059AE7;
         border-color: #059AE7;
         color: #fff;
@@ -1987 +2002 @@
         font-weight: normal;
 }
 #reply-title small a,
-div.comment-options a.comment-reply-link {
+p.comment-reply a.comment-reply-link {
         background: #FFF9DB;
         border-bottom: 1px solid #FFE8C4;
         border-radius: 4px;
@@ -2003 +2018 @@
         margin-right: 0;
 }
 #reply-title small a:hover,
-div.comment-options a.comment-reply-link:hover {
+p.comment-reply a.comment-reply-link:hover {
         background: #f7740a;
         border-color: #f7740a;
         color: #fff;

functions.php

@@ -434 +434 @@
                 <div class="comment-content">
                         <div class="comment-meta">
                                 <p>
-                                        <a href="<?php echo get_comment_author_url() ?>" rel="nofollow"><?php echo get_comment_author() ?></a> <?php echo _n( 'said:', 'replied:', $depth, 'buddypress' ) ?>
+                                        <a href="<?php echo get_comment_author_url();?>"class="<?php if ( 1 != $depth ) : echo "children-"; endif;?>comment-author"  rel="nofollow"><?php echo get_comment_author() ?></a> <?php echo _n( 'said:', 'replied:', $depth, 'buddypress' ) ?>
                                         <span class="time-since">&nbsp; <?php comment_date() ?></span>
-
-                                        <?php if ( 1 == $depth ) : ?>
-                                                &middot; <a href="#comment-<?php comment_ID() ?>"><?php _e( 'View', 'buddypress' ) ?></a>
-                                        <?php elseif ( comments_open() ) : ?>
+                    
+                                        <?php edit_comment_link( __( 'Edit', 'buddypress' ), '&middot; ', '' );
+                    if ( 1 != $depth && comments_open() ) :?>
                                                 &middot; <?php comment_reply_link( array( 'depth' => $depth, 'max_depth' => $args['max_depth'], 'reply_text' => __( 'Reply', 'buddypress' ) ) ) ?>
-                                        <?php endif; ?>
-
-                                        <?php edit_comment_link( __( 'Edit', 'buddypress' ), '&middot; ', '' ); ?>
+                                        <?php endif; ?> 
                                 </p>
+                                <?php if ( 1 == $depth && -1 != $args['max_depth'] && comments_open() ) : ?>
+                                        <p class="comment-reply"><?php comment_reply_link( array( 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ?></p>
+                                <?php endif; ?>
                         </div>
-
-                        <?php if ( $comment->comment_approved == '0' ) : ?>
-                                <em class="moderate"><?php _e( 'Your comment is awaiting moderation.', 'buddypress' ) ?></em><br />
-                        <?php endif; ?>
-
-                        <?php comment_text() ?>
-
-                        <?php if ( 1 == $depth && -1 != $args['max_depth'] && comments_open() ) : ?>
-                                <div class="comment-options">
-                                        <?php comment_reply_link( array( 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ?>
-                                </div>
-                        <?php endif; ?>
+                        <div class="comment-entry">
+                                <?php if ( $comment->comment_approved == '0' ) : ?>
+                                        <em class="moderate"><?php _e( 'Your comment is awaiting moderation.', 'buddypress' ); ?></em>
+                                <?php endif; ?>
+                                <?php comment_text() ?>
+                        </div>&nbsp;
                 </div>
 <?php
 }