Changeset 23696

Timestamp:

03/14/2013 04:36:14 PM (12 years ago)

Author:

lancewillett

Message:

Twenty Thirteen: remove custom comment callback in favor of core comment_form() defaults. Props obenland, closes #22005. See #20088.

Location:

trunk/wp-content/themes/twentythirteen

Files:

• comments.php (modified) (1 diff)
• functions.php (modified) (1 diff)
• rtl.css (modified) (1 diff)
• style.css (modified) (8 diffs)

trunk/wp-content/themes/twentythirteen/comments.php

@@ -31 +31 @@
 
         <ol class="comment-list">
-            <?php wp_list_comments( array( 'callback' => 'twentythirteen_comment', 'style' => 'ol' ) ); ?>
+            <?php
+                wp_list_comments( array(
+                    'style'       => 'ol',
+                    'format'      => 'html5',
+                    'short_ping'  => true,
+                    'avatar_size' => 74,
+                ) );
+            ?>
         </ol><!-- .comment-list -->
 

trunk/wp-content/themes/twentythirteen/functions.php

@@ -352 +352 @@
 endif;
 
-if ( ! function_exists( 'twentythirteen_comment' ) ) :
-/**
- * Template for comments and pingbacks.
- *
- * To override this walker in a child theme without modifying the comments
- * template simply create your own twentythirteen_comment(), and that function
- * will be used instead.
- *
- * Used as a callback by wp_list_comments() for displaying the comments.
- *
- * @since Twenty Thirteen 1.0
- *
- * @param object $comment Comment to display.
- * @param array $args Optional args.
- * @param int $depth Depth of comment.
- * @return void
- */
-
-function twentythirteen_comment( $comment, $args, $depth ) {
-    $GLOBALS['comment'] = $comment;
-    switch ( $comment->comment_type ) :
-        case 'pingback' :
-        case 'trackback' :
-        // Display trackbacks differently than normal comments.
-    ?>
-    <li id="comment-<?php comment_ID(); ?>" <?php comment_class(); ?>>
-        <p><?php _e( 'Pingback:', 'twentythirteen' ); ?> <?php comment_author_link(); ?> <?php edit_comment_link( __( 'Edit', 'twentythirteen' ), '<span class="ping-meta"><span class="edit-link">', '</span></span>' ); ?></p>
-    <?php
-            break;
-        default :
-        // Proceed with normal comments.
-    ?>
-    <li id="li-comment-<?php comment_ID(); ?>">
-        <article id="comment-<?php comment_ID(); ?>" <?php comment_class(); ?>>
-            <div class="comment-author vcard">
-                <?php echo get_avatar( $comment, 74 ); ?>
-                <cite class="fn"><?php comment_author_link(); ?></cite>
-            </div><!-- .comment-author -->
-
-            <header class="comment-meta">
-                <?php
-                    printf( '<a href="%1$s"><time datetime="%2$s">%3$s</time></a>',
-                        esc_url( get_comment_link( $comment->comment_ID ) ),
-                        get_comment_time( 'c' ),
-                        sprintf( _x( '%1$s at %2$s', '1: date, 2: time', 'twentythirteen' ), get_comment_date(), get_comment_time() )
-                    );
-                    edit_comment_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' );
-                ?>
-            </header><!-- .comment-meta -->
-
-            <?php if ( '0' == $comment->comment_approved ) : ?>
-                <p class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'twentythirteen' ); ?></p>
-            <?php endif; ?>
-
-            <div class="comment-content">
-                <?php comment_text(); ?>
-            </div><!-- .comment-content -->
-
-            <div class="reply">
-                <?php comment_reply_link( array_merge( $args, array( 'reply_text' => __( 'Reply', 'twentythirteen' ), 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
-            </div><!-- .reply -->
-        </article><!-- #comment-## -->
-    <?php
-        break;
-    endswitch; // End comment_type check.
-}
-endif;
-
 if ( ! function_exists( 'twentythirteen_entry_meta' ) ) :
 /**

trunk/wp-content/themes/twentythirteen/rtl.css

@@ -592 +592 @@
 
 .comment-author {
-    float: right;
     margin-left: 50px;
     margin-right: auto;
+    left: auto;
+    right: 0;
 }
 

trunk/wp-content/themes/twentythirteen/style.css

@@ -511 +511 @@
 .nav-links:after,
 .gallery:after,
-.comment:after {
+.comment-body:after {
     clear: both;
 }
@@ -531 +531 @@
 .gallery:before,
 .gallery:after,
-.comment:before,
-.comment:after {
+.comment-body:before,
+.comment-body:after {
     content: "";
     display: table;
@@ -2259 +2259 @@
 }
 
-.comment {
+.comment-body {
     padding: 24px 0;
+    position: relative;
 }
 
 .comment-author {
-    float: left;
-    margin-right: 50px;
     max-width: 74px;
+    position: absolute;
+    left: 0;
 }
 
@@ -2275 +2276 @@
 
 .comment-author .fn,
+.comment-author .url,
 .comment-reply-link {
     color: #ed331c;
@@ -2281 +2283 @@
 }
 
+.says {
+    display: none;
+}
+
 .no-avatars .comment-author {
-    float: none;
     margin: 0 0 5px;
     max-width: 100%;
+    position: relative;
 }
 
@@ -2330 +2336 @@
 .comment-awaiting-moderation {
     color: #a2a2a2;
+    margin: 20px 0 0;
 }
 
@@ -2350 +2357 @@
 }
 
-.comment + #respond {
-    margin-bottom: 30px;
+.comment #respond {
+    margin-bottom: 20px;
     padding: 20px;
 }
@@ -3118 +3125 @@
     /* Comments */
     .comment-author {
-        float: none;
         margin: 0 0 5px;
         max-width: 100%;
+        position: relative;
     }