<!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 ? &quot; aria-required='true'&quot; : '' );
</span><del>-        $req_str  = ( $req ? __( ' (required)' ) : '' );
-        $defaults = array( 'fields' =&gt; apply_filters( 'comment_form_default_fields', array( 'author' =&gt; '&lt;p&gt;&lt;input type=&quot;text&quot; name=&quot;author&quot; id=&quot;author&quot; value=&quot;' . esc_attr( $commenter['comment_author'] ) . '&quot; size=&quot;22&quot; tabindex=&quot;1&quot;' . $aria_req . ' /&gt; &lt;label for=&quot;author&quot;&gt;&lt;small&gt;' . __( 'Name' ) . $req_str . '&lt;/small&gt;&lt;/label&gt;&lt;/p&gt;',
-                                                                                                                                                                            'email'  =&gt; '&lt;p&gt;&lt;input type=&quot;text&quot; name=&quot;email&quot; id=&quot;email&quot; value=&quot;' . esc_attr( $commenter['comment_author_email'] ) . '&quot; size=&quot;22&quot; tabindex=&quot;2&quot;' . $aria_req . ' /&gt; &lt;label for=&quot;email&quot;&gt;&lt;small&gt;' . __( 'Mail (will not be published)' ) . $req_str . '&lt;/small&gt;&lt;/label&gt;&lt;/p&gt;',
-                                                                                                                                                                            'url'    =&gt; '&lt;p&gt;&lt;input type=&quot;text&quot; name=&quot;url&quot; id=&quot;url&quot; value=&quot;' . esc_attr( $commenter['comment_author_url'] ) . '&quot; size=&quot;22&quot; tabindex=&quot;3&quot; /&gt; &lt;label for=&quot;url&quot;&gt;&lt;small&gt;' . __( 'Website' ) . '&lt;/small&gt;&lt;/label&gt;&lt;/p&gt;' ) ),
-                                                'comment_field' =&gt; '&lt;p&gt;&lt;textarea name=&quot;comment&quot; id=&quot;comment&quot; cols=&quot;58&quot; rows=&quot;10&quot; tabindex=&quot;4&quot;&gt;&lt;/textarea&gt;&lt;/p&gt;',
</del><ins>+        $defaults = array( 'fields' =&gt; apply_filters( 'comment_form_default_fields', array( 'author' =&gt; '&lt;div id=&quot;form-section-author&quot; class=&quot;form-section&quot;&gt;
+                                                                                                                                                                                                                &lt;div class=&quot;form-label&quot;&gt;&lt;label for=&quot;author&quot;&gt;' . __( 'Name', 'twentyten' ) . '&lt;/label&gt; ' . ( $req ? '&lt;span class=&quot;required&quot;&gt;*&lt;/span&gt;' : '' ) . '&lt;/div&gt;
+                                                                                                                                                                                                                &lt;div class=&quot;form-input&quot;&gt;&lt;input id=&quot;author&quot; name=&quot;author&quot; type=&quot;text&quot; value=&quot;' . esc_attr( $commenter['comment_author'] ) . '&quot; size=&quot;30&quot; tabindex=&quot;1&quot;' . $aria_req . ' /&gt;&lt;/div&gt;
+                                                                                                                                                                                                        &lt;/div&gt;&lt;!-- #form-section-author .form-section --&gt;',
+                                                                                                                                                                                        'email' =&gt; '&lt;div id=&quot;form-section-email&quot; class=&quot;form-section&quot;&gt;
+                                                                                                                                                                                                                        &lt;div class=&quot;form-label&quot;&gt;&lt;label for=&quot;email&quot;&gt;' . __( 'Email', 'twentyten' ) . '&lt;/label&gt; ' . ( $req ? '&lt;span class=&quot;required&quot;&gt;*&lt;/span&gt;' : '' ) . '&lt;/div&gt;
+                                                                                                                                                                                                                        &lt;div class=&quot;form-input&quot;&gt;&lt;input id=&quot;email&quot; name=&quot;email&quot; type=&quot;text&quot; value=&quot;' . esc_attr(  $commenter['comment_author_email'] ) . '&quot; size=&quot;30&quot; tabindex=&quot;2&quot;' . $aria_req . ' /&gt;&lt;/div&gt;
+                                                                                                                                                                                                                &lt;/div&gt;&lt;!-- #form-section-email .form-section --&gt;', 
+                                                                                                                                                                                        'url' =&gt; '&lt;div id=&quot;form-section-url&quot; class=&quot;form-section&quot;&gt;
+                                                                                                                                                                                                                        &lt;div class=&quot;form-label&quot;&gt;&lt;label for=&quot;url&quot;&gt;' . __( 'Website', 'twentyten' ) . '&lt;/label&gt;&lt;/div&gt;
+                                                                                                                                                                                                                        &lt;div class=&quot;form-input&quot;&gt;&lt;input id=&quot;url&quot; name=&quot;url&quot; type=&quot;text&quot; value=&quot;' . esc_attr( $commenter['comment_author_url'] ) . '&quot; size=&quot;30&quot; tabindex=&quot;3&quot; /&gt;&lt;/div&gt;
+                                                                                                                                                                                                                &lt;/div&gt;&lt;!-- #form-section-url .form-section --&gt;' ) ),
+                                                'comment_field' =&gt; '&lt;div id=&quot;form-section-comment&quot; class=&quot;form-section&quot;&gt;
+                                                                                                &lt;div class=&quot;form-label&quot;&gt;&lt;label for=&quot;comment&quot;&gt;' . __( 'Comment', 'twentyten' ) . '&lt;/label&gt;&lt;/div&gt;
+                                                                                                &lt;div class=&quot;form-textarea&quot;&gt;&lt;textarea id=&quot;comment&quot; name=&quot;comment&quot; cols=&quot;45&quot; rows=&quot;8&quot; tabindex=&quot;4&quot; aria-required=&quot;true&quot;&gt;&lt;/textarea&gt;&lt;/div&gt;
+                                                                                        &lt;/div&gt;&lt;!-- #form-section-comment .form-section --&gt;',
</ins><span class="cx">                                                 'must_log_in' =&gt; '&lt;p&gt;' .  sprintf( __( 'You must be &lt;a href=&quot;%s&quot;&gt;logged in&lt;/a&gt; to post a comment.' ), wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '&lt;/p&gt;',
</span><del>-                                                'logged_in_as' =&gt; '&lt;p&gt;' . sprintf( __( 'Logged in as &lt;a href=&quot;%s&quot;&gt;%s&lt;/a&gt;. &lt;a href=&quot;%s&quot; title=&quot;Log out of this account&quot;&gt;Log out &amp;raquo;&lt;/a&gt;&lt;/p&gt;' ), admin_url( 'profile.php' ), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ),
</del><ins>+                                                'logged_in_as' =&gt; '&lt;p&gt;' . sprintf( __( 'Logged in as &lt;a href=&quot;%s&quot;&gt;%s&lt;/a&gt;. &lt;a href=&quot;%s&quot; title=&quot;Log out of this account&quot;&gt;Log out?&lt;/a&gt;&lt;/p&gt;' ), admin_url( 'profile.php' ), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ),
+                                                'comment_notes_before' =&gt; '&lt;p id=&quot;comment-notes&quot;&gt;' . __( 'Your email is &lt;em&gt;never&lt;/em&gt; published nor shared.' ) . ( $req ? __( ' Required fields are marked &lt;span class=&quot;required&quot;&gt;*&lt;/span&gt;' ) : '' ) . '&lt;/p&gt;', 
+                                                'comment_notes_after' =&gt; '&lt;div id=&quot;form-allowed-tags&quot; class=&quot;form-section&quot;&gt;
+                                                                                                        &lt;p&gt;&lt;span&gt;' . __( 'You may use these &lt;abbr title=&quot;HyperText Markup Language&quot;&gt;HTML&lt;/abbr&gt; tags and attributes:' ) . '&lt;/span&gt; &lt;code&gt;' . allowed_tags() . '&lt;/code&gt;&lt;/p&gt;
+                                                                                                &lt;/div&gt;',
</ins><span class="cx">                                                 'id_form' =&gt; 'commentform',
</span><span class="cx">                                                 'id_submit' =&gt; 'submit',
</span><span class="cx">                                                 'title_reply' =&gt; __( 'Leave a Reply' ),
</span><span class="cx">                                                 'title_reply_to' =&gt; __( 'Leave a Reply to %s'),
</span><del>-                                                'cancel_reply_link' =&gt; '',
-                                                'label_submit' =&gt; __( 'Submit Comment' ),
</del><ins>+                                                'cancel_reply_link' =&gt; __( 'Cancel reply' ),
+                                                'label_submit' =&gt; __( '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">                 &lt;?php if ( comments_open() ) : ?&gt;
</span><span class="cx">                         &lt;?php do_action( 'comment_form_before' ); ?&gt;
</span><span class="cx">                         &lt;div id=&quot;respond&quot;&gt;
</span><del>-                                &lt;h3&gt;&lt;?php comment_form_title( $args['title_reply'], $args['title_reply_to'] ); ?&gt;&lt;/h3&gt;
-                                &lt;div class=&quot;cancel-comment-reply&quot;&gt;
-                                        &lt;small&gt;&lt;?php cancel_comment_reply_link( $args['cancel_comment_reply_link'] ); ?&gt;&lt;/small&gt;
-                                &lt;/div&gt;
</del><ins>+                                &lt;h3 id=&quot;reply-title&quot;&gt;&lt;?php comment_form_title( $args['title_reply'], $args['title_reply_to'] ); ?&gt; &lt;small&gt;&lt;?php cancel_comment_reply_link( $args['cancel_reply_link'] ); ?&gt;&lt;/small&gt;&lt;/h3&gt;
</ins><span class="cx">                                 &lt;?php if ( get_option( 'comment_registration' ) &amp;&amp; !is_user_logged_in() ) : ?&gt;
</span><span class="cx">                                         &lt;?php echo $args['must_log_in']; ?&gt;
</span><span class="cx">                                         &lt;?php do_action( 'comment_form_must_log_in_after' ); ?&gt;
</span><span class="lines">@@ -1499,6 +1511,7 @@
</span><span class="cx">                                                         &lt;?php echo apply_filters( 'comment_form_logged_in', $args['logged_in_as'], $commenter, $user_identity ); ?&gt;
</span><span class="cx">                                                         &lt;?php do_action( 'comment_form_logged_in_after', $commenter, $user_identity ); ?&gt;
</span><span class="cx">                                                 &lt;?php else : ?&gt;
</span><ins>+                                                        &lt;?php echo $args['comment_notes_before']; ?&gt;
</ins><span class="cx">                                                         &lt;?php
</span><span class="cx">                                                         do_action( 'comment_form_before_fields' );
</span><span class="cx">                                                         foreach ( (array) $args['fields'] as $name =&gt; $field ) {
</span><span class="lines">@@ -1508,10 +1521,11 @@
</span><span class="cx">                                                         ?&gt;
</span><span class="cx">                                                 &lt;?php endif; ?&gt;
</span><span class="cx">                                                 &lt;?php echo apply_filters( 'comment_form_field_comment', $args['comment_field'] ); ?&gt;
</span><del>-                                                &lt;p&gt;
</del><ins>+                                                &lt;?php echo $args['comment_notes_after']; ?&gt;
+                                                &lt;div class=&quot;form-submit&quot;&gt;
</ins><span class="cx">                                                         &lt;input name=&quot;submit&quot; type=&quot;submit&quot; id=&quot;&lt;?php echo esc_attr( $args['id_submit'] ); ?&gt;&quot; tabindex=&quot;&lt;?php echo ( count( $args['fields'] ) + 2 ); ?&gt;&quot; value=&quot;&lt;?php echo esc_attr( $args['label_submit'] ); ?&gt;&quot; /&gt;
</span><span class="cx">                                                         &lt;?php comment_id_fields(); ?&gt;
</span><del>-                                                &lt;/p&gt;
</del><ins>+                                                &lt;/div&gt;
</ins><span class="cx">                                                 &lt;?php do_action( 'comment_form', $post_id ); ?&gt;
</span><span class="cx">                                         &lt;/form&gt;
</span><span class="cx">                                 &lt;?php endif; ?&gt;
</span></span></pre>
</div>
</div>

</body>
</html>