<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[13030] trunk/wp-includes/comment-template.php: Change comment_form()
markup to match twentyten.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13030">13030</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-08 20:54:29 +0000 (Mon, 08 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Change comment_form() markup to match twentyten. Props beaulebens. see <a href="http://trac.wordpress.org/ticket/10910">#10910</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescommenttemplatephp">trunk/wp-includes/comment-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescommenttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment-template.php (13029 => 13030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment-template.php 2010-02-08 20:28:13 UTC (rev 13029)
+++ trunk/wp-includes/comment-template.php 2010-02-08 20:54:29 UTC (rev 13030)
</span><span class="lines">@@ -1465,19 +1465,34 @@
</span><span class="cx">
</span><span class="cx"> $req = get_option( 'require_name_email' );
</span><span class="cx"> $aria_req = ( $req ? " aria-required='true'" : '' );
</span><del>- $req_str = ( $req ? __( ' (required)' ) : '' );
- $defaults = array( 'fields' => apply_filters( 'comment_form_default_fields', array( 'author' => '<p><input type="text" name="author" id="author" value="' . esc_attr( $commenter['comment_author'] ) . '" size="22" tabindex="1"' . $aria_req . ' /> <label for="author"><small>' . __( 'Name' ) . $req_str . '</small></label></p>',
- 'email' => '<p><input type="text" name="email" id="email" value="' . esc_attr( $commenter['comment_author_email'] ) . '" size="22" tabindex="2"' . $aria_req . ' /> <label for="email"><small>' . __( 'Mail (will not be published)' ) . $req_str . '</small></label></p>',
- 'url' => '<p><input type="text" name="url" id="url" value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="22" tabindex="3" /> <label for="url"><small>' . __( 'Website' ) . '</small></label></p>' ) ),
- 'comment_field' => '<p><textarea name="comment" id="comment" cols="58" rows="10" tabindex="4"></textarea></p>',
</del><ins>+ $defaults = array( 'fields' => apply_filters( 'comment_form_default_fields', array( 'author' => '<div id="form-section-author" class="form-section">
+ <div class="form-label"><label for="author">' . __( 'Name', 'twentyten' ) . '</label> ' . ( $req ? '<span class="required">*</span>' : '' ) . '</div>
+ <div class="form-input"><input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" tabindex="1"' . $aria_req . ' /></div>
+ </div><!-- #form-section-author .form-section -->',
+ 'email' => '<div id="form-section-email" class="form-section">
+ <div class="form-label"><label for="email">' . __( 'Email', 'twentyten' ) . '</label> ' . ( $req ? '<span class="required">*</span>' : '' ) . '</div>
+ <div class="form-input"><input id="email" name="email" type="text" value="' . esc_attr( $commenter['comment_author_email'] ) . '" size="30" tabindex="2"' . $aria_req . ' /></div>
+ </div><!-- #form-section-email .form-section -->',
+ 'url' => '<div id="form-section-url" class="form-section">
+ <div class="form-label"><label for="url">' . __( 'Website', 'twentyten' ) . '</label></div>
+ <div class="form-input"><input id="url" name="url" type="text" value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" tabindex="3" /></div>
+ </div><!-- #form-section-url .form-section -->' ) ),
+ 'comment_field' => '<div id="form-section-comment" class="form-section">
+ <div class="form-label"><label for="comment">' . __( 'Comment', 'twentyten' ) . '</label></div>
+ <div class="form-textarea"><textarea id="comment" name="comment" cols="45" rows="8" tabindex="4" aria-required="true"></textarea></div>
+ </div><!-- #form-section-comment .form-section -->',
</ins><span class="cx"> 'must_log_in' => '<p>' . sprintf( __( 'You must be <a href="%s">logged in</a> to post a comment.' ), wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>',
</span><del>- 'logged_in_as' => '<p>' . sprintf( __( 'Logged in as <a href="%s">%s</a>. <a href="%s" title="Log out of this account">Log out &raquo;</a></p>' ), admin_url( 'profile.php' ), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ),
</del><ins>+ 'logged_in_as' => '<p>' . sprintf( __( 'Logged in as <a href="%s">%s</a>. <a href="%s" title="Log out of this account">Log out?</a></p>' ), admin_url( 'profile.php' ), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ),
+ 'comment_notes_before' => '<p id="comment-notes">' . __( 'Your email is <em>never</em> published nor shared.' ) . ( $req ? __( ' Required fields are marked <span class="required">*</span>' ) : '' ) . '</p>',
+ 'comment_notes_after' => '<div id="form-allowed-tags" class="form-section">
+ <p><span>' . __( 'You may use these <abbr title="HyperText Markup Language">HTML</abbr> tags and attributes:' ) . '</span> <code>' . allowed_tags() . '</code></p>
+ </div>',
</ins><span class="cx"> 'id_form' => 'commentform',
</span><span class="cx"> 'id_submit' => 'submit',
</span><span class="cx"> 'title_reply' => __( 'Leave a Reply' ),
</span><span class="cx"> 'title_reply_to' => __( 'Leave a Reply to %s'),
</span><del>- 'cancel_reply_link' => '',
- 'label_submit' => __( 'Submit Comment' ),
</del><ins>+ 'cancel_reply_link' => __( 'Cancel reply' ),
+ 'label_submit' => __( 'Post Comment' ),
</ins><span class="cx"> );
</span><span class="cx"> $args = wp_parse_args( $args, apply_filters( 'comment_form_defaults', $defaults ) );
</span><span class="cx">
</span><span class="lines">@@ -1485,10 +1500,7 @@
</span><span class="cx"> <?php if ( comments_open() ) : ?>
</span><span class="cx"> <?php do_action( 'comment_form_before' ); ?>
</span><span class="cx"> <div id="respond">
</span><del>- <h3><?php comment_form_title( $args['title_reply'], $args['title_reply_to'] ); ?></h3>
- <div class="cancel-comment-reply">
- <small><?php cancel_comment_reply_link( $args['cancel_comment_reply_link'] ); ?></small>
- </div>
</del><ins>+ <h3 id="reply-title"><?php comment_form_title( $args['title_reply'], $args['title_reply_to'] ); ?> <small><?php cancel_comment_reply_link( $args['cancel_reply_link'] ); ?></small></h3>
</ins><span class="cx"> <?php if ( get_option( 'comment_registration' ) && !is_user_logged_in() ) : ?>
</span><span class="cx"> <?php echo $args['must_log_in']; ?>
</span><span class="cx"> <?php do_action( 'comment_form_must_log_in_after' ); ?>
</span><span class="lines">@@ -1499,6 +1511,7 @@
</span><span class="cx"> <?php echo apply_filters( 'comment_form_logged_in', $args['logged_in_as'], $commenter, $user_identity ); ?>
</span><span class="cx"> <?php do_action( 'comment_form_logged_in_after', $commenter, $user_identity ); ?>
</span><span class="cx"> <?php else : ?>
</span><ins>+ <?php echo $args['comment_notes_before']; ?>
</ins><span class="cx"> <?php
</span><span class="cx"> do_action( 'comment_form_before_fields' );
</span><span class="cx"> foreach ( (array) $args['fields'] as $name => $field ) {
</span><span class="lines">@@ -1508,10 +1521,11 @@
</span><span class="cx"> ?>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php echo apply_filters( 'comment_form_field_comment', $args['comment_field'] ); ?>
</span><del>- <p>
</del><ins>+ <?php echo $args['comment_notes_after']; ?>
+ <div class="form-submit">
</ins><span class="cx"> <input name="submit" type="submit" id="<?php echo esc_attr( $args['id_submit'] ); ?>" tabindex="<?php echo ( count( $args['fields'] ) + 2 ); ?>" value="<?php echo esc_attr( $args['label_submit'] ); ?>" />
</span><span class="cx"> <?php comment_id_fields(); ?>
</span><del>- </p>
</del><ins>+ </div>
</ins><span class="cx"> <?php do_action( 'comment_form', $post_id ); ?>
</span><span class="cx"> </form>
</span><span class="cx"> <?php endif; ?>
</span></span></pre>
</div>
</div>
</body>
</html>