<!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>[13180] trunk: Comment form output tweaks.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13180">13180</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-17 19:28:03 +0000 (Wed, 17 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Comment form output tweaks. Props beaulebens. see <a href="http://trac.wordpress.org/ticket/10910">#10910</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytenstylecss">trunk/wp-content/themes/twentyten/style.css</a></li>
<li><a href="#trunkwpincludescommenttemplatephp">trunk/wp-includes/comment-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytenstylecss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/style.css (13179 => 13180)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/style.css 2010-02-17 19:05:39 UTC (rev 13179)
+++ trunk/wp-content/themes/twentyten/style.css 2010-02-17 19:28:03 UTC (rev 13180)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> h3#reply-title,
</span><span class="cx"> #access .menu,
</span><span class="cx"> #cancel-comment-reply-link,
</span><del>-#form-allowed-tags,
</del><ins>+.form-allowed-tags,
</ins><span class="cx"> #site-info,
</span><span class="cx"> #site-title,
</span><span class="cx"> #wp-calendar,
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> .entry-meta,
</span><span class="cx"> .entry-title,
</span><span class="cx"> .entry-utility,
</span><del>-.form-label,
</del><ins>+#respond label,
</ins><span class="cx"> .navigation,
</span><span class="cx"> .page-title,
</span><span class="cx"> .pingback p,
</span><span class="lines">@@ -972,6 +972,12 @@
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> position: relative;
</span><span class="cx"> }
</span><ins>+#respond p {
+ margin: 0;
+}
+#respond .comment-notes {
+ margin-bottom: 1em;
+}
</ins><span class="cx"> .children #respond {
</span><span class="cx"> margin: 0 48px 0 0;
</span><span class="cx"> }
</span><span class="lines">@@ -993,33 +999,42 @@
</span><span class="cx"> color:#FF4B33;
</span><span class="cx"> font-weight:bold;
</span><span class="cx"> }
</span><del>-.form-section label {
</del><ins>+#respond label {
</ins><span class="cx"> color: #888;
</span><span class="cx"> font-size: 12px;
</span><span class="cx"> }
</span><del>-.form-section input {
</del><ins>+#respond input {
</ins><span class="cx"> margin:0 0 9px 0;
</span><span class="cx"> width:98%;
</span><span class="cx"> }
</span><del>-.form-section textarea {
</del><ins>+#respond textarea {
</ins><span class="cx"> width:99%;
</span><span class="cx"> }
</span><del>-#form-allowed-tags {
- color:#888;
</del><ins>+#respond dt,
+#respond dd {
+ color: #888;
</ins><span class="cx"> font-size: 12px;
</span><span class="cx"> line-height: 18px;
</span><span class="cx"> }
</span><del>-#form-allowed-tags p {
- margin:0;
</del><ins>+#respond dd code {
+ font-size: 11px;
</ins><span class="cx"> }
</span><del>-#form-allowed-tags span {
</del><ins>+#respond .form-submit {
+ margin: 0 0 24px;
</ins><span class="cx"> }
</span><del>-#form-allowed-tags code {
- font-size: 11px;
</del><ins>+#respond .form-submit input {
+ width: auto;
</ins><span class="cx"> }
</span><del>-.form-submit {
- margin: 12px 0 24px 0;
</del><ins>+#respond dl {
+ margin: 0 0 10px;
</ins><span class="cx"> }
</span><ins>+#respond dt {
+ display: inline;
+ font-weight: normal;
+}
+#respond dd {
+ display: inline;
+}
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludescommenttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment-template.php (13179 => 13180)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment-template.php 2010-02-17 19:05:39 UTC (rev 13179)
+++ trunk/wp-includes/comment-template.php 2010-02-17 19:28:03 UTC (rev 13180)
</span><span class="lines">@@ -1466,32 +1466,32 @@
</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>- $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 -->',
- '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>',
- '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>',
</del><ins>+ $defaults = array( 'fields' => apply_filters( 'comment_form_default_fields', array( 'author' => '<p class="comment-form-author">' .
+ '<label for="author">' . __( 'Name' ) . '</label> ' .
+ ( $req ? '<span class="required">*</span>' : '' ) .
+ '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" tabindex="1"' . $aria_req . ' />' .
+ '</p><!-- #form-section-author .form-section -->',
+ 'email' => '<p class="comment-form-email">' .
+ '<label for="email">' . __( 'Email' ) . '</label> ' .
+ ( $req ? '<span class="required">*</span>' : '' ) .
+ '<input id="email" name="email" type="text" value="' . esc_attr( $commenter['comment_author_email'] ) . '" size="30" tabindex="2"' . $aria_req . ' />' .
+ '</p><!-- #form-section-email .form-section -->',
+ 'url' => '<p class="comment-form-url">' .
+ '<label for="url">' . __( 'Website' ) . '</label>' .
+ '<input id="url" name="url" type="text" value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" tabindex="3" />' .
+ '</p><!-- #form-section-url .form-section -->' ) ),
+ 'comment_field' => '<p class="comment-form-comment">' .
+ '<label for="comment">' . __( 'Comment' ) . '</label>' .
+ '<textarea id="comment" name="comment" cols="45" rows="8" tabindex="4" aria-required="true"></textarea>' .
+ '</p><!-- #form-section-comment .form-section -->',
+ 'must_log_in' => '<p class="must-log-in">' . 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>',
+ 'logged_in_as' => '<p class="logged-in-as">' . 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 class="comment-notes">' . __( 'Your email is <em>never</em> published nor shared.' ) . ( $req ? __( ' Required fields are marked <span class="required">*</span>' ) : '' ) . '</p>',
+ 'comment_notes_after' => '<dl class="form-allowed-tags"><dt>' . __( 'You may use these <abbr title="HyperText Markup Language">HTML</abbr> tags and attributes:' ) . '</dt> <dd><code>' . allowed_tags() . '</code></dd></dl>',
</ins><span class="cx"> 'id_form' => 'commentform',
</span><span class="cx"> 'id_submit' => 'submit',
</span><span class="cx"> 'title_reply' => __( 'Leave a Reply' ),
</span><del>- 'title_reply_to' => __( 'Leave a Reply to %s'),
</del><ins>+ 'title_reply_to' => __( 'Leave a Reply to %s' ),
</ins><span class="cx"> 'cancel_reply_link' => __( 'Cancel reply' ),
</span><span class="cx"> 'label_submit' => __( 'Post Comment' ),
</span><span class="cx"> );
</span><span class="lines">@@ -1523,10 +1523,10 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php echo apply_filters( 'comment_form_field_comment', $args['comment_field'] ); ?>
</span><span class="cx"> <?php echo $args['comment_notes_after']; ?>
</span><del>- <div class="form-submit">
</del><ins>+ <p 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>- </div>
</del><ins>+ </p>
</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>