Changeset 4577 for trunk/bp-themes/bp-default/functions.php

Timestamp:

06/30/2011 08:33:09 PM (15 years ago)

Author:

djpaul

Message:

First pass at tidying up comment styling. See #3242. Big props Dennissmolek & hnla

File:

• trunk/bp-themes/bp-default/functions.php (modified) (2 diffs)

trunk/bp-themes/bp-default/functions.php

@@ -422 +422 @@
         $avatar_size = 20;
     ?>
+
     <li <?php comment_class() ?> id="comment-<?php comment_ID() ?>">
         <div class="comment-avatar-box">
@@ -442 +443 @@
 
                     <?php if ( 1 == $depth ) : ?>
-                        &middot; <a href="#comment-<?php comment_ID() ?>"><?php _e( 'View', 'buddypress' ) ?></a>
+                        <a href="#comment-<?php comment_ID() ?>"><?php _e( 'View', 'buddypress' ) ?></a>
                     <?php elseif ( comments_open() ) : ?>
-                        &middot; <?php comment_reply_link( array( 'depth' => $depth, 'max_depth' => $args['max_depth'], 'reply_text' => __( 'Reply', 'buddypress' ) ) ) ?>
+                        <?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 edit_comment_link( __( 'Edit', 'buddypress' ) ); ?>
                 </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>
+
         </div>
+
 <?php
 }