<!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>[20605] trunk/wp-admin: Add line breaks before most form field descriptions (the italicized gray text on General Settings and other screens).</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, #logmsg > ol { margin-left: 0; 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/20605">20605</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-04-26 00:58:16 +0000 (Thu, 26 Apr 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add line breaks before most form field descriptions (the italicized gray text on General Settings and other screens). props johnbillion, helenyhou, fixes <a href="http://core.trac.wordpress.org/ticket/17390">#17390</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminedittagformphp">trunk/wp-admin/edit-tag-form.php</a></li>
<li><a href="#trunkwpadminexportphp">trunk/wp-admin/export.php</a></li>
<li><a href="#trunkwpadminoptionsgeneralphp">trunk/wp-admin/options-general.php</a></li>
<li><a href="#trunkwpadminoptionsmediaphp">trunk/wp-admin/options-media.php</a></li>
<li><a href="#trunkwpadminoptionsreadingphp">trunk/wp-admin/options-reading.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminedittagformphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tag-form.php (20604 => 20605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tag-form.php 2012-04-25 22:28:43 UTC (rev 20604)
+++ trunk/wp-admin/edit-tag-form.php 2012-04-26 00:58:16 UTC (rev 20605)
</span><span class="lines">@@ -52,16 +52,16 @@
</span><span class="cx"> <tr class="form-field">
</span><span class="cx"> <th scope="row" valign="top"><label for="parent"><?php _ex('Parent', 'Taxonomy Parent'); ?></label></th>
</span><span class="cx"> <td>
</span><del>- <?php wp_dropdown_categories(array('hide_empty' => 0, 'hide_if_empty' => false, 'name' => 'parent', 'orderby' => 'name', 'taxonomy' => $taxonomy, 'selected' => $tag->parent, 'exclude_tree' => $tag->term_id, 'hierarchical' => true, 'show_option_none' => __('None'))); ?><br />
</del><ins>+ <?php wp_dropdown_categories(array('hide_empty' => 0, 'hide_if_empty' => false, 'name' => 'parent', 'orderby' => 'name', 'taxonomy' => $taxonomy, 'selected' => $tag->parent, 'exclude_tree' => $tag->term_id, 'hierarchical' => true, 'show_option_none' => __('None'))); ?>
</ins><span class="cx"> <?php if ( 'category' == $taxonomy ) : ?>
</span><del>- <span class="description"><?php _e('Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.'); ?></span>
</del><ins>+ <p class="description"><?php _e('Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.'); ?></p>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <?php endif; // is_taxonomy_hierarchical() ?>
</span><span class="cx"> <tr class="form-field">
</span><span class="cx"> <th scope="row" valign="top"><label for="description"><?php _ex('Description', 'Taxonomy Description'); ?></label></th>
</span><del>- <td><textarea name="description" id="description" rows="5" cols="50" style="width: 97%;"><?php echo $tag->description; // textarea_escaped ?></textarea><br />
</del><ins>+ <td><textarea name="description" id="description" rows="5" cols="50" class="large-text"><?php echo $tag->description; // textarea_escaped ?></textarea><br />
</ins><span class="cx"> <span class="description"><?php _e('The description is not prominent by default, however some themes may show it.'); ?></span></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkwpadminexportphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/export.php (20604 => 20605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/export.php 2012-04-25 22:28:43 UTC (rev 20604)
+++ trunk/wp-admin/export.php 2012-04-26 00:58:16 UTC (rev 20605)
</span><span class="lines">@@ -130,8 +130,8 @@
</span><span class="cx"> <h3><?php _e( 'Choose what to export' ); ?></h3>
</span><span class="cx"> <form action="" method="get" id="export-filters">
</span><span class="cx"> <input type="hidden" name="download" value="true" />
</span><del>-<p><label><input type="radio" name="content" value="all" checked="checked" /> <?php _e( 'All content' ); ?></label>
-<span class="description"><?php _e( 'This will contain all of your posts, pages, comments, custom fields, terms, navigation menus and custom posts.' ); ?></span></p>
</del><ins>+<p><label><input type="radio" name="content" value="all" checked="checked" /> <?php _e( 'All content' ); ?></label></p>
+<p class="description"><?php _e( 'This will contain all of your posts, pages, comments, custom fields, terms, navigation menus and custom posts.' ); ?></p>
</ins><span class="cx">
</span><span class="cx"> <p><label><input type="radio" name="content" value="posts" /> <?php _e( 'Posts' ); ?></label></p>
</span><span class="cx"> <ul id="post-filters" class="export-filters">
</span></span></pre></div>
<a id="trunkwpadminoptionsgeneralphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-general.php (20604 => 20605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-general.php 2012-04-25 22:28:43 UTC (rev 20604)
+++ trunk/wp-admin/options-general.php 2012-04-26 00:58:16 UTC (rev 20605)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><label for="blogdescription"><?php _e('Tagline') ?></label></th>
</span><span class="cx"> <td><input name="blogdescription" type="text" id="blogdescription" value="<?php form_option('blogdescription'); ?>" class="regular-text" />
</span><del>-<span class="description"><?php _e('In a few words, explain what this site is about.') ?></span></td>
</del><ins>+<p class="description"><?php _e('In a few words, explain what this site is about.') ?></p></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <?php if ( !is_multisite() ) { ?>
</span><span class="cx"> <tr valign="top">
</span><span class="lines">@@ -109,12 +109,12 @@
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><label for="home"><?php _e('Site Address (URL)') ?></label></th>
</span><span class="cx"> <td><input name="home" type="text" id="home" value="<?php form_option('home'); ?>"<?php disabled( defined( 'WP_HOME' ) ); ?> class="regular-text code<?php if ( defined( 'WP_HOME' ) ) echo ' disabled' ?>" />
</span><del>-<span class="description"><?php _e('Enter the address here if you want your site homepage <a href="http://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">to be different from the directory</a> you installed WordPress.'); ?></span></td>
</del><ins>+<p class="description"><?php _e('Enter the address here if you want your site homepage <a href="http://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">to be different from the directory</a> you installed WordPress.'); ?></p></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><label for="admin_email"><?php _e('E-mail Address') ?> </label></th>
</span><span class="cx"> <td><input name="admin_email" type="text" id="admin_email" value="<?php form_option('admin_email'); ?>" class="regular-text ltr" />
</span><del>-<span class="description"><?php _e('This address is used for admin purposes, like new user notification.') ?></span></td>
</del><ins>+<p class="description"><?php _e('This address is used for admin purposes, like new user notification.') ?></p></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><?php _e('Membership') ?></th>
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><label for="new_admin_email"><?php _e('E-mail Address') ?> </label></th>
</span><span class="cx"> <td><input name="new_admin_email" type="text" id="new_admin_email" value="<?php form_option('admin_email'); ?>" class="regular-text ltr" />
</span><del>-<span class="description"><?php _e('This address is used for admin purposes. If you change this we will send you an e-mail at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>') ?></span>
</del><ins>+<p class="description"><?php _e('This address is used for admin purposes. If you change this we will send you an e-mail at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>') ?></p>
</ins><span class="cx"> <?php
</span><span class="cx"> $new_admin_email = get_option( 'new_admin_email' );
</span><span class="cx"> if ( $new_admin_email && $new_admin_email != get_option('admin_email') ) : ?>
</span><span class="lines">@@ -177,8 +177,7 @@
</span><span class="cx"> <?php if ( get_option('timezone_string') || !empty($current_offset) ) : ?>
</span><span class="cx"> <span id="local-time"><?php printf(__('Local time is <code>%1$s</code>'), date_i18n($timezone_format)); ?></span>
</span><span class="cx"> <?php endif; ?>
</span><del>-<br />
-<span class="description"><?php _e('Choose a city in the same timezone as you.'); ?></span>
</del><ins>+<p class="description"><?php _e('Choose a city in the same timezone as you.'); ?></p>
</ins><span class="cx"> <?php if ($check_zone_info && $tzstring) : ?>
</span><span class="cx"> <br />
</span><span class="cx"> <span>
</span></span></pre></div>
<a id="trunkwpadminoptionsmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-media.php (20604 => 20605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-media.php 2012-04-25 22:28:43 UTC (rev 20604)
+++ trunk/wp-admin/options-media.php 2012-04-26 00:58:16 UTC (rev 20605)
</span><span class="lines">@@ -109,7 +109,9 @@
</span><span class="cx"> <input name="embed_size_w" type="number" step="1" min="0" id="embed_size_w" value="<?php form_option('embed_size_w'); ?>" class="small-text" />
</span><span class="cx"> <label for="embed_size_h"><?php _e('Height'); ?></label>
</span><span class="cx"> <input name="embed_size_h" type="number" step="1" min="0" id="embed_size_h" value="<?php form_option('embed_size_h'); ?>" class="small-text" />
</span><del>-<?php if ( !empty($content_width) ) echo '<br />' . __("If the width value is left blank, embeds will default to the max width of your theme."); ?>
</del><ins>+<?php if ( ! empty( $content_width ) )
+ echo '<p class="description">' . __( 'If the width value is left blank, embeds will default to the max width of your theme.' ) . '</p>';
+?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span><span class="lines">@@ -122,14 +124,14 @@
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><label for="upload_path"><?php _e('Store uploads in this folder'); ?></label></th>
</span><span class="cx"> <td><input name="upload_path" type="text" id="upload_path" value="<?php echo esc_attr(get_option('upload_path')); ?>" class="regular-text code" />
</span><del>-<span class="description"><?php _e('Default is <code>wp-content/uploads</code>'); ?></span>
</del><ins>+<p class="description"><?php _e('Default is <code>wp-content/uploads</code>'); ?></p>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><label for="upload_url_path"><?php _e('Full URL path to files'); ?></label></th>
</span><span class="cx"> <td><input name="upload_url_path" type="text" id="upload_url_path" value="<?php echo esc_attr( get_option('upload_url_path')); ?>" class="regular-text code" />
</span><del>-<span class="description"><?php _e('Configuring this is optional. By default, it should be blank.'); ?></span>
</del><ins>+<p class="description"><?php _e('Configuring this is optional. By default, it should be blank.'); ?></p>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminoptionsreadingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-reading.php (20604 => 20605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-reading.php 2012-04-25 22:28:43 UTC (rev 20604)
+++ trunk/wp-admin/options-reading.php 2012-04-26 00:58:16 UTC (rev 20605)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><label for="blog_charset"><?php _e( 'Encoding for pages and feeds' ); ?></label></th>
</span><span class="cx"> <td><input name="blog_charset" type="text" id="blog_charset" value="<?php form_option( 'blog_charset' ); ?>" class="regular-text" />
</span><del>-<span class="description"><?php _e( 'The <a href="http://codex.wordpress.org/Glossary#Character_set">character encoding</a> of your site (UTF-8 is recommended, if you are adventurous there are some <a href="http://en.wikipedia.org/wiki/Character_set">other encodings</a>)' ); ?></span></td>
</del><ins>+<p class="description"><?php _e( 'The <a href="http://codex.wordpress.org/Glossary#Character_set">character encoding</a> of your site (UTF-8 is recommended, if you are adventurous there are some <a href="http://en.wikipedia.org/wiki/Character_set">other encodings</a>)' ); ?></p></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <?php do_settings_fields( 'reading', 'default' ); ?>
</span><span class="cx"> </table>
</span></span></pre>
</div>
</div>
</body>
</html>