<!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>[25087] trunk/src/wp-content/themes/twentyfourteen: Twenty Fourteen: Use HTML5 comment markup, props obenland.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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><a href="http://core.trac.wordpress.org/changeset/25087">25087</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2013-08-22 17:00:36 +0000 (Thu, 22 Aug 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Fourteen: Use HTML5 comment markup, props obenland. Fixes <a href="http://core.trac.wordpress.org/ticket/25045">#25045</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfourteencommentsphp">trunk/src/wp-content/themes/twentyfourteen/comments.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenfunctionsphp">trunk/src/wp-content/themes/twentyfourteen/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteeninctemplatetagsphp">trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenstylecss">trunk/src/wp-content/themes/twentyfourteen/style.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentyfourteencommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/comments.php (25086 => 25087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/comments.php 2013-08-22 15:57:31 UTC (rev 25086)
+++ trunk/src/wp-content/themes/twentyfourteen/comments.php 2013-08-22 17:00:36 UTC (rev 25087)
</span><span class="lines">@@ -40,9 +40,6 @@
</span><span class="cx"> wp_list_comments( array(
</span><span class="cx"> 'style' => 'ol',
</span><span class="cx"> 'short_ping' => true,
</span><del>-
- // TODO: Remove callback and update styles.
- 'callback'=>'twentyfourteen_comment',
</del><span class="cx"> ) );
</span><span class="cx"> ?>
</span><span class="cx"> </ol><!-- .comment-list -->
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/functions.php (25086 => 25087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/functions.php 2013-08-22 15:57:31 UTC (rev 25086)
+++ trunk/src/wp-content/themes/twentyfourteen/functions.php 2013-08-22 17:00:36 UTC (rev 25087)
</span><span class="lines">@@ -68,11 +68,19 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> /*
</span><ins>+ * Switches default core markup for search form, comment form, and comments
+ * to output valid HTML5.
+ */
+ add_theme_support( 'html5', array(
+ 'search-form', 'comment-form', 'comment-list',
+ ) );
+
+ /*
</ins><span class="cx"> * Enable support for Post Formats.
</span><span class="cx"> * See http://codex.wordpress.org/Post_Formats
</span><span class="cx"> */
</span><span class="cx"> add_theme_support( 'post-formats', array(
</span><del>- 'aside', 'image', 'video', 'quote', 'link', 'gallery'
</del><ins>+ 'aside', 'image', 'video', 'quote', 'link', 'gallery',
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> /*
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteeninctemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php (25086 => 25087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php 2013-08-22 15:57:31 UTC (rev 25086)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php 2013-08-22 17:00:36 UTC (rev 25087)
</span><span class="lines">@@ -84,59 +84,6 @@
</span><span class="cx"> }
</span><span class="cx"> endif;
</span><span class="cx">
</span><del>-if ( ! function_exists( 'twentyfourteen_comment' ) ) :
-/**
- * Template for comments and pingbacks.
- *
- * Used as a callback by wp_list_comments() for displaying the comments.
- *
- */
-function twentyfourteen_comment( $comment, $args, $depth ) {
- $GLOBALS['comment'] = $comment;
- switch ( $comment->comment_type ) :
- case 'pingback' :
- case 'trackback' :
- ?>
- <li class="post pingback">
- <p><?php _e( 'Pingback:', 'twentyfourteen' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( 'Edit', 'twentyfourteen' ), ' ' ); ?></p>
- <?php
- break;
- default :
- ?>
- <li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
- <article id="comment-<?php comment_ID(); ?>" class="comment">
- <footer>
- <div class="comment-author vcard">
- <span class="comment-author-avatar"><?php echo get_avatar( $comment, 32 ); ?></span>
- <?php printf( __( '%s', 'twentyfourteen' ), sprintf( '<cite class="fn">%s</cite> says:', get_comment_author_link() ) ); ?>
- </div><!-- .comment-author .vcard -->
- </footer>
-
- <div class="comment-content">
- <?php comment_text(); ?>
- <?php if ( $comment->comment_approved == '0' ) : ?>
- <p><em><?php _e( 'Your comment is awaiting moderation.', 'twentyfourteen' ); ?></em></p>
- <?php endif; ?>
- </div>
-
- <div class="comment-meta commentmetadata">
- <a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>"><time pubdate datetime="<?php comment_time( 'c' ); ?>">
- <?php
- /* translators: 1: date, 2: time */
- printf( __( '%1$s at %2$s', 'twentyfourteen' ), get_comment_date(), get_comment_time() ); ?>
- </time></a>
- <?php comment_reply_link( array_merge( $args, array( 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
- <?php edit_comment_link( __( 'Edit', 'twentyfourteen' ), ' ' );
- ?>
- </div><!-- .comment-meta .commentmetadata -->
- </article><!-- #comment-## -->
-
- <?php
- break;
- endswitch;
-}
-endif; // ends check for twentyfourteen_comment()
-
</del><span class="cx"> if ( ! function_exists( 'twentyfourteen_posted_on' ) ) :
</span><span class="cx"> /**
</span><span class="cx"> * Prints HTML with meta information for the current post-date/time and author.
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenstylecss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/style.css (25086 => 25087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/style.css 2013-08-22 15:57:31 UTC (rev 25086)
+++ trunk/src/wp-content/themes/twentyfourteen/style.css 2013-08-22 17:00:36 UTC (rev 25087)
</span><span class="lines">@@ -1850,33 +1850,32 @@
</span><span class="cx"> margin: 0 0 48px 0;
</span><span class="cx"> margin: 0 0 4.8rem 0;
</span><span class="cx"> }
</span><del>-.comment-meta,
</del><ins>+.comment-metadata,
</ins><span class="cx"> .comment-author {
</span><span class="cx"> font-size: 14px;
</span><span class="cx"> font-size: 1.4rem;
</span><span class="cx"> line-height: 1.7142857142;
</span><span class="cx"> }
</span><del>-.comment-author cite {
</del><ins>+.comment-author .fn {
</ins><span class="cx"> font-weight: 900;
</span><span class="cx"> text-transform: uppercase;
</span><span class="cx"> }
</span><span class="cx"> .comment-author a {
</span><span class="cx"> color: #2b2b2b;
</span><span class="cx"> }
</span><del>-.comment-meta a,
-.comment-list li.trackback a,
-.comment-list li.pingback a {
</del><ins>+.comment-metadata a,
+.comment-list .trackback a,
+.comment-list .pingback a {
</ins><span class="cx"> color: #767676;
</span><span class="cx"> }
</span><span class="cx"> .comment-author a:hover,
</span><del>-.comment-meta a:hover,
</del><ins>+.comment-metadata a:hover,
</ins><span class="cx"> .comment-list .trackback a:hover,
</span><span class="cx"> .comment-list .pingback a:hover {
</span><span class="cx"> color: #24890d;
</span><span class="cx"> text-decoration: none;
</span><span class="cx"> }
</span><del>-.comment-edit-link:before,
-.comment-reply-link:before {
</del><ins>+.comment-edit-link:before {
</ins><span class="cx"> color: rgba(0, 0, 0, 0.2);
</span><span class="cx"> content: '\007c\0020';
</span><span class="cx"> }
</span><span class="lines">@@ -1896,14 +1895,13 @@
</span><span class="cx"> background: none;
</span><span class="cx"> min-height: 48px;
</span><span class="cx"> min-height: 4.8rem;
</span><del>- position: relative;
</del><span class="cx"> }
</span><span class="cx"> .comment-author {
</span><span class="cx"> padding-left: 36px;
</span><span class="cx"> padding-left: 3.6rem;
</span><span class="cx"> position: relative;
</span><span class="cx"> }
</span><del>-.comment-author .comment-author-avatar {
</del><ins>+.comment-author .avatar {
</ins><span class="cx"> border: 1px solid rgba(0, 0, 0, 0.1);
</span><span class="cx"> padding: 2px;
</span><span class="cx"> padding: 0.2rem;
</span><span class="lines">@@ -1916,10 +1914,10 @@
</span><span class="cx"> height: 22px;
</span><span class="cx"> height: 2.2rem;
</span><span class="cx"> }
</span><del>-.bypostauthor .comment-author .comment-author-avatar {
</del><ins>+.bypostauthor .avatar {
</ins><span class="cx"> background-color: #24890d;
</span><span class="cx"> }
</span><del>-.comment-author cite {
</del><ins>+.comment-author .fn {
</ins><span class="cx"> font-style: normal;
</span><span class="cx"> }
</span><span class="cx"> .comment-author .avatar {
</span><span class="lines">@@ -1933,7 +1931,7 @@
</span><span class="cx"> height: 22px;
</span><span class="cx"> height: 2.2rem;
</span><span class="cx"> }
</span><del>-.comment-meta,
</del><ins>+.comment-metadata,
</ins><span class="cx"> .comment-content {
</span><span class="cx"> padding-left: 36px;
</span><span class="cx"> padding-left: 3.6rem;
</span><span class="lines">@@ -2412,7 +2410,7 @@
</span><span class="cx"> .content-area .entry-date a:before,
</span><span class="cx"> .content-area .byline a:before,
</span><span class="cx"> .content-area .comments-link a:before,
</span><del>- .content-area .edit-link a:before,
</del><ins>+ .entry-meta .edit-link a:before,
</ins><span class="cx"> .attachment .entry-date:before,
</span><span class="cx"> .content-area .full-size-link a:before,
</span><span class="cx"> .content-area .parent-post-link a:before {
</span><span class="lines">@@ -2475,7 +2473,7 @@
</span><span class="cx"> margin: -1px 2px 0 0;
</span><span class="cx"> margin: -0.1rem 0.2rem 0 0;
</span><span class="cx"> }
</span><del>- .content-area .edit-link a:before {
</del><ins>+ .entry-meta .edit-link a:before {
</ins><span class="cx"> content: '\F411';
</span><span class="cx"> margin: -1px 2px 0 0;
</span><span class="cx"> margin: -0.1rem 0.2rem 0 0;
</span><span class="lines">@@ -2486,7 +2484,7 @@
</span><span class="cx"> .content-area .parent-post-link a:before {
</span><span class="cx"> content: '\F301';
</span><span class="cx"> }
</span><del>- .page .content-area .edit-link a:before {
</del><ins>+ .page .entry-meta .edit-link a:before {
</ins><span class="cx"> margin: 5px 2px 0 0;
</span><span class="cx"> margin: 0.5rem 0.2rem 0 0;
</span><span class="cx"> }
</span><span class="lines">@@ -2605,25 +2603,21 @@
</span><span class="cx"> margin-top: 0;
</span><span class="cx"> }
</span><span class="cx"> .comments-area article,
</span><del>- .comment-list li.trackback,
- .comment-list li.pingback {
</del><ins>+ .comment-list .trackback,
+ .comment-list .pingback {
</ins><span class="cx"> margin-bottom: 36px;
</span><span class="cx"> margin-bottom: 3.6rem;
</span><span class="cx"> padding-top: 36px;
</span><span class="cx"> padding-top: 3.6rem;
</span><span class="cx"> }
</span><del>- .comment-author {
- padding-left: 60px;
- padding-left: 6.0rem;
- }
- .comment-author .comment-author-avatar,
</del><span class="cx"> .comment-author .avatar {
</span><span class="cx"> width: 32px;
</span><span class="cx"> width: 3.2rem;
</span><span class="cx"> height: 32px;
</span><span class="cx"> height: 3.2rem;
</span><span class="cx"> }
</span><del>- .comment-meta,
</del><ins>+ .comment-author,
+ .comment-metadata,
</ins><span class="cx"> .comment-content {
</span><span class="cx"> padding-left: 60px;
</span><span class="cx"> padding-left: 6.0rem;
</span><span class="lines">@@ -2632,8 +2626,8 @@
</span><span class="cx"> .no-comments,
</span><span class="cx"> .comment-respond,
</span><span class="cx"> .comments-area article,
</span><del>- .comment-list li.trackback,
- .comment-list li.pingback,
</del><ins>+ .comment-list .trackback,
+ .comment-list .pingback,
</ins><span class="cx"> .post-navigation [rel="prev"],
</span><span class="cx"> .post-navigation [rel="next"] {
</span><span class="cx"> padding-right: 9.12778904%;
</span><span class="lines">@@ -2652,8 +2646,8 @@
</span><span class="cx"> .full-width .comments-title,
</span><span class="cx"> .full-width .comment-respond,
</span><span class="cx"> .full-width .comments-area article,
</span><del>- .full-width .comment-list li.trackback,
- .full-width .comment-list li.pingback {
</del><ins>+ .full-width .comment-list .trackback,
+ .full-width .comment-list .pingback {
</ins><span class="cx"> padding-right: 6.04307432%;
</span><span class="cx"> padding-left: 6.04307432%;
</span><span class="cx"> }
</span><span class="lines">@@ -2728,8 +2722,8 @@
</span><span class="cx"> .no-comments,
</span><span class="cx"> .comment-respond,
</span><span class="cx"> .comments-area article,
</span><del>- .comment-list li.trackback,
- .comment-list li.pingback,
</del><ins>+ .comment-list .trackback,
+ .comment-list .pingback,
</ins><span class="cx"> .post-navigation [rel="prev"],
</span><span class="cx"> .post-navigation [rel="next"] {
</span><span class="cx"> padding-right: 12.39493534%;
</span><span class="lines">@@ -2752,8 +2746,8 @@
</span><span class="cx"> .full-width .comments-title,
</span><span class="cx"> .full-width .comment-respond,
</span><span class="cx"> .full-width .comments-area article,
</span><del>- .full-width .comment-list li.trackback,
- .full-width .comment-list li.pingback {
</del><ins>+ .full-width .comment-list .trackback,
+ .full-width .comment-list .pingback {
</ins><span class="cx"> padding-right: 11.30926724%;
</span><span class="cx"> padding-left: 11.30926724%;
</span><span class="cx"> }
</span><span class="lines">@@ -2923,8 +2917,8 @@
</span><span class="cx"> .no-comments,
</span><span class="cx"> .comment-respond,
</span><span class="cx"> .comments-area article,
</span><del>- .comment-list li.trackback,
- .comment-list li.pingback,
</del><ins>+ .comment-list .trackback,
+ .comment-list .pingback,
</ins><span class="cx"> .post-navigation [rel="prev"],
</span><span class="cx"> .post-navigation [rel="next"] {
</span><span class="cx"> padding-right: 9.87001616%;
</span><span class="lines">@@ -2943,8 +2937,8 @@
</span><span class="cx"> .full-width .comments-title,
</span><span class="cx"> .full-width .comment-respond,
</span><span class="cx"> .full-width .comments-area article,
</span><del>- .full-width .comment-list li.trackback,
- .full-width .comment-list li.pingback {
</del><ins>+ .full-width .comment-list .trackback,
+ .full-width .comment-list .pingback {
</ins><span class="cx"> padding-right: 5.882236%;
</span><span class="cx"> padding-left: 5.882236%;
</span><span class="cx"> }
</span><span class="lines">@@ -2997,8 +2991,8 @@
</span><span class="cx"> .no-comments,
</span><span class="cx"> .comment-respond,
</span><span class="cx"> .comments-area article,
</span><del>- .comment-list li.trackback,
- .comment-list li.pingback,
</del><ins>+ .comment-list .trackback,
+ .comment-list .pingback,
</ins><span class="cx"> .post-navigation [rel="prev"],
</span><span class="cx"> .post-navigation [rel="next"] {
</span><span class="cx"> padding-right: 12.44146986%;
</span><span class="lines">@@ -3035,8 +3029,8 @@
</span><span class="cx"> .full-width .comments-title,
</span><span class="cx"> .full-width .comment-respond,
</span><span class="cx"> .full-width .comments-area article,
</span><del>- .full-width .comment-list li.trackback,
- .full-width .comment-list li.pingback {
</del><ins>+ .full-width .comment-list .trackback,
+ .full-width .comment-list .pingback {
</ins><span class="cx"> padding-right: 11.21868265%;
</span><span class="cx"> padding-left: 11.21868265%;
</span><span class="cx"> }
</span><span class="lines">@@ -3075,8 +3069,8 @@
</span><span class="cx"> .full-width .comments-title,
</span><span class="cx"> .full-width .comment-respond,
</span><span class="cx"> .full-width .comments-area article,
</span><del>- .full-width .comment-list li.trackback,
- .full-width .comment-list li.pingback {
</del><ins>+ .full-width .comment-list .trackback,
+ .full-width .comment-list .pingback {
</ins><span class="cx"> padding-right: 0;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>