From 7f77979b0ab0dd2e08efa122964dd40077ff47b4 Mon Sep 17 00:00:00 2001
From: matt <matt@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Tue, 11 Mar 2008 07:23:07 +0000
Subject: [PATCH] Visual and English tweaks throughout.

git-svn-id: http://svn.automattic.com/wordpress/trunk@7230 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/admin-header.php       |  2 +-
 wp-admin/css/colors-classic.css |  8 ++++++--
 wp-admin/css/colors-fresh.css   |  2 +-
 wp-admin/css/theme-editor.css   |  2 +-
 wp-admin/edit-comments.php      | 13 +++++++++++--
 wp-admin/edit-form-advanced.php | 18 ++++++++++++------
 wp-admin/edit-link-form.php     |  7 ++++---
 wp-admin/edit-page-form.php     | 15 ++++++++++-----
 wp-admin/edit-tag-form.php      |  6 ++++--
 wp-admin/options-permalink.php  | 13 +++++++++----
 wp-admin/themes.php             |  2 +-
 wp-admin/wp-admin.css           |  8 ++++----
 12 files changed, 64 insertions(+), 32 deletions(-)

diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index 9c626e5ba..9a8f2fd55 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -61,7 +61,7 @@ do_action('admin_head');
 <div id="wpwrap">
 <div id="wpcontent">
 <div id="wphead">
-<h1><?php bloginfo('name'); ?><span id="viewsite"><a href="<?php echo get_option('home') . '/'; ?>"><?php _e('Visit Site') ?></a></span></h1>
+<h1><?php bloginfo('name'); ?><span id="viewsite"><a href="<?php echo trailingslashit( get_option('home') ); ?>" target="_blank"><?php _e('Visit Site') ?></a></span></h1>
 </div>
 <div id="user_info"><p><?php printf(__('Howdy, <a href="%1$s">%2$s</a>!'), 'profile.php', $user_identity) ?> | <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a> | <?php _e('<a href="http://codex.wordpress.org/">Help</a>') ?> | <?php _e('<a href="http://wordpress.org/support/">Forums</a>') ?></p></div>
 
diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css
index 8aaec8bd9..f78b8d1f9 100644
--- a/wp-admin/css/colors-classic.css
+++ b/wp-admin/css/colors-classic.css
@@ -11,7 +11,7 @@ body > #upload-menu {
 	border-bottom-style: #fff;
 }
 
-div#current-widgets, #postcustom table, #your-profile fieldset, a.page-numbers, #rightnow, div.dashboard-widget, .widefat {
+div#current-widgets, #postcustomstuff table, #your-profile fieldset, a.page-numbers, #rightnow, div.dashboard-widget, .widefat {
 	border-color: #ccc;
 }
 
@@ -192,6 +192,10 @@ ul.widget-control-list .sorthelper {
 	border-color: #a3a3a3;
 }
 
+.tablenav .button-secondary {
+	border-color: #5396c5;
+}
+
 .submit input:hover, .button:hover {
 	border-color: #535353;
 }
@@ -264,7 +268,7 @@ ul.widget-control-list .sorthelper {
 }
 
 .widefat thead, .thead {
-	background-color: #07273e;
+	background-color: #464646;
 	color: #d7d7d7;
 }
 
diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css
index df55da994..8fbaec1af 100644
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
@@ -11,7 +11,7 @@ body > #upload-menu {
 	border-bottom-style: #fff;
 }
 
-div#current-widgets, #postcustom table, #your-profile fieldset, a.page-numbers, #rightnow, div.dashboard-widget, .widefat {
+div#current-widgets, #postcustomstuff table, #your-profile fieldset, a.page-numbers, #rightnow, div.dashboard-widget, .widefat {
 	border-color: #ccc;
 }
 
diff --git a/wp-admin/css/theme-editor.css b/wp-admin/css/theme-editor.css
index 1d5289453..eaaa946fd 100644
--- a/wp-admin/css/theme-editor.css
+++ b/wp-admin/css/theme-editor.css
@@ -14,7 +14,7 @@
 	margin-top:-3.4em;
 }
 
-#templateside h3, #postcustom p.submit {
+#templateside h3, #postcustomstuff p.submit {
 	margin: 0;
 }
 
diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index 1ad5e0a00..b5dc2143f 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -108,6 +108,9 @@ foreach ( $stati as $status => $label ) {
 
 	$status_links[] = "<li><a href=\"edit-comments.php?comment_status=$status\"$class>" . $label . '</a>';
 }
+
+$status_links = apply_filters( 'comment_status_links', $status_links );
+
 echo implode(' | </li>', $status_links) . '</li>';
 unset($status_links);
 ?>
@@ -214,10 +217,16 @@ if ($comments) {
 
 <div id="ajax-response"></div>
 <?php
-} else {
+} elseif ( 'moderated' == $_GET['comment_status'] ) {
 ?>
 <p>
-<strong><?php _e('No results found.') ?></strong>
+<?php _e('No comments awaiting moderation&hellip; yet.') ?>
+</p>
+<?php
+} else  {
+?>
+<p>
+<?php _e('No results found.') ?>
 </p>
 <?php
 }
diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 1dec59964..751297d17 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -263,13 +263,16 @@ if (current_user_can('upload_files') && false) {
 
 <div id="postexcerpt" class="postbox <?php echo postbox_classes('postexcerpt', 'post'); ?>">
 <h3><?php _e('Excerpt') ?></h3>
-<div class="inside"><textarea rows="1" cols="40" name="excerpt" tabindex="6" id="excerpt"><?php echo $post->post_excerpt ?></textarea></div>
+<div class="inside"><textarea rows="1" cols="40" name="excerpt" tabindex="6" id="excerpt"><?php echo $post->post_excerpt ?></textarea>
+<p><?php _e('Excerpts are optional hand-crafted summaries of your content. You can <a href="http://codex.wordpress.org/Template_Tags/the_excerpt" target="_blank">use them in your template</a>'); ?></p>
+</div>
 </div>
 
 <div id="trackbacksdiv" class="postbox <?php echo postbox_classes('trackbacksdiv', 'post'); ?>">
 <h3><?php _e('Trackbacks') ?></h3>
 <div class="inside">
-<?php _e('Send trackbacks to:'); ?> <?php echo $form_trackback; ?> (<?php _e('Separate multiple URLs with spaces'); ?>)
+<p><?php _e('Send trackbacks to:'); ?> <?php echo $form_trackback; ?><br /> (<?php _e('Separate multiple URLs with spaces'); ?>)</p>
+<p><?php _e('Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. If you link other WordPress blogs they&#8217;ll be notified automatically using <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">pingbacks</a>, no other action necessary.'); ?></p>
 <?php
 if ( ! empty($pings) )
 	echo $pings;
@@ -293,6 +296,7 @@ list_meta($metadata);
 ?>
 <div id="ajax-response"></div>
 </div>
+<p><?php _e('Custom fields can be used to add extra metadata to a post that you can <a href="http://codex.wordpress.org/Using_Custom_Fields" target="_blank">use in your theme</a>.'); ?></p>
 </div>
 </div>
 
@@ -302,17 +306,19 @@ list_meta($metadata);
 <h3><?php _e('Comments &amp; Pings') ?></h3>
 <div class="inside">
 <input name="advanced_view" type="hidden" value="1" />
-<label for="comment_status" class="selectit">
+<p><label for="comment_status" class="selectit">
 <input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> />
-<?php _e('Allow Comments') ?></label>
-<label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php _e('Allow Pings') ?></label>
+<?php _e('Allow Comments') ?></label></p>
+<p><label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php _e('Allow Pings') ?></label></p>
+<p><?php _e('These settings apply to this post only. &#8220;Pings&#8221; are <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">trackbacks and pingbacks</a>.'); ?></p>
 </div>
 </div>
 
 <div id="passworddiv" class="postbox <?php echo postbox_classes('passworddiv', 'post'); ?>">
 <h3><?php _e('Password Protect This Post') ?></h3>
 <div class="inside">
-<input name="post_password" type="text" size="13" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" />
+<p><input name="post_password" type="text" size="25" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" /></p>
+<p><?php _e('Setting a password will require people who visit your blog to enter the above password to view this post and its comments.'); ?></p>
 </div>
 </div>
 
diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php
index 568b2f4a3..df0e794bd 100644
--- a/wp-admin/edit-link-form.php
+++ b/wp-admin/edit-link-form.php
@@ -146,6 +146,7 @@ if ( ( 'edit' == $action) && current_user_can('manage_links') )
 <label for="link_target_none" class="selectit">
 <input id="link_target_none" type="radio" name="link_target" value="" <?php echo(($link->link_target == '') ? 'checked="checked"' : ''); ?> />
 <?php _e('none') ?></label>
+<p><?php _e('Choose the frame your link targets. Essentially this means if you choose <code>_blank</code> your link will open in a new window.'); ?></p>
 </div>
 </div>
 
@@ -158,9 +159,8 @@ if ( ( 'edit' == $action) && current_user_can('manage_links') )
 		<td style="width: 80%;"><input type="text" name="link_rel" id="link_rel" size="50" value="<?php echo $link->link_rel; ?>" /></td>
 	</tr>
 	<tr>
-		<th scope="row"><?php _e('<a href="http://gmpg.org/xfn/">XFN</a> Creator:') ?></th>
-		<td>
-			<table cellpadding="3" cellspacing="5">
+		<td colspan="2">
+			<table cellpadding="3" cellspacing="5" class="form-table">
 				<tr>
 					<th scope="row"> <?php _e('identity') ?> </th>
 					<td>
@@ -259,6 +259,7 @@ if ( ( 'edit' == $action) && current_user_can('manage_links') )
 		</td>
 	</tr>
 </table>
+<p><?php _e('If the link is to a person, you can specify your relationship with them using the above form. If you would like to learn more about the idea check out <a href="http://gmpg.org/xfn/">XFN</a>.'); ?></p>
 </div>
 </div>
 
diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php
index afeeea55a..0b7b958db 100644
--- a/wp-admin/edit-page-form.php
+++ b/wp-admin/edit-page-form.php
@@ -200,17 +200,19 @@ list_meta($metadata);
 <h3><?php _e('Comments &amp; Pings') ?></h3>
 <div class="inside">
 <input name="advanced_view" type="hidden" value="1" />
-<label for="comment_status" class="selectit">
+<p><label for="comment_status" class="selectit">
 <input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> />
-<?php _e('Allow Comments') ?></label>
-<label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php _e('Allow Pings') ?></label>
+<?php _e('Allow Comments') ?></label></p>
+<p><label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php _e('Allow Pings') ?></label></p>
+<p><?php _e('These settings apply to this post only. &#8220;Pings&#8221; are <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">trackbacks and pingbacks</a>.'); ?></p>
 </div>
 </div>
 
 <div id="pagepassworddiv" class="postbox <?php echo postbox_classes('pagepassworddiv', 'page'); ?>">
 <h3><?php _e('Password Protect This Page') ?></h3>
 <div class="inside">
-<input name="post_password" type="text" size="13" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" />
+<p><input name="post_password" type="text" size="25" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" /></p>
+<p><?php _e('Setting a password will require people who visit your blog to enter the above password to view this post and its comments.'); ?></p>
 </div>
 </div>
 
@@ -228,6 +230,7 @@ list_meta($metadata);
 <option value='0'><?php _e('Main Page (no parent)'); ?></option>
 <?php parent_dropdown($post->post_parent); ?>
 </select>
+<p><?php _e('You can arrange your pages in hierarchies, for example you could have an &#8220;About&#8221; page that has &#8220;Life Story&#8221; and &#8220;My Dog&#8221; pages under it. There are no limits to how deeply nested you can make pages.'); ?></p>
 </div>
 </div>
 
@@ -239,6 +242,7 @@ list_meta($metadata);
 <option value='default'><?php _e('Default Template'); ?></option>
 <?php page_template_dropdown($post->page_template); ?>
 </select>
+<p><?php _e('Some themes have custom templates you can use for certain pages that might have additional features or custom layouts. If so, you&#8217;ll see them above.'); ?></p>
 </div>
 </div>
 <?php } ?>
@@ -246,7 +250,8 @@ list_meta($metadata);
 <div id="pageorderdiv" class="postbox <?php echo postbox_classes('pageorderdiv', 'page'); ?>">
 <h3><?php _e('Page Order') ?></h3>
 <div class="inside">
-<input name="menu_order" type="text" size="4" id="menu_order" value="<?php echo $post->menu_order ?>" />
+<p><input name="menu_order" type="text" size="4" id="menu_order" value="<?php echo $post->menu_order ?>" /></p>
+<p><?php _e('Pages are usually ordered alphabetically, but you can put a number above to change the order pages appear in. (We know this is a little janky, it&#8217;ll be better in future releases.)'); ?></p>
 </div>
 </div>
 
diff --git a/wp-admin/edit-tag-form.php b/wp-admin/edit-tag-form.php
index 6c81dce22..c3a6665f9 100644
--- a/wp-admin/edit-tag-form.php
+++ b/wp-admin/edit-tag-form.php
@@ -26,11 +26,13 @@ if ( ! empty($tag_ID) ) {
 	<table class="form-table">
 		<tr class="form-field form-required">
 			<th scope="row" valign="top"><label for="name"><?php _e('Tag name') ?></label></th>
-			<td><input name="name" id="name" type="text" value="<?php echo attribute_escape($tag->name); ?>" size="40" /></td>
+			<td><input name="name" id="name" type="text" value="<?php echo attribute_escape($tag->name); ?>" size="40" />
+            <p><?php _e('The name is how the tag appears on your site.'); ?></p></td>
 		</tr>
 		<tr class="form-field">
 			<th scope="row" valign="top"><label for="slug"><?php _e('Tag slug') ?></label></th>
-			<td><input name="slug" id="slug" type="text" value="<?php echo attribute_escape($tag->slug); ?>" size="40" /></td>
+			<td><input name="slug" id="slug" type="text" value="<?php echo attribute_escape($tag->slug); ?>" size="40" />
+            <p><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p></td>
 		</tr>
 	</table>
 <p class="submit"><input type="submit" class="button" name="submit" value="<?php echo $submit_text ?>" /></p>
diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index dd2c8a2ba..6997890d3 100644
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -123,6 +123,7 @@ if ( ! got_mod_rewrite() )
 $structures = array(
 	'',
 	$prefix . '/%year%/%monthnum%/%day%/%postname%/',
+	$prefix . '/%year%/%monthnum%/%postname%/',
 	$prefix . '/archives/%post_id%'
 	);
 ?>
@@ -133,11 +134,15 @@ $structures = array(
 		<td><code><?php echo get_option('home'); ?>/?p=123</code></td>
 	</tr>
 	<tr>
-		<th><label><input name="selection" type="radio" value="<?php echo $structures[1]; ?>" class="tog" <?php checked($structures[1], $permalink_structure); ?> /> <?php _e('Date and name based'); ?></label></th>
+		<th><label><input name="selection" type="radio" value="<?php echo $structures[1]; ?>" class="tog" <?php checked($structures[1], $permalink_structure); ?> /> <?php _e('Day and name'); ?></label></th>
 		<td><code><?php echo get_option('home') . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/sample-post/'; ?></code></td>
 	</tr>
 	<tr>
-		<th><label><input name="selection" type="radio" value="<?php echo $structures[2]; ?>" class="tog" <?php checked($structures[2], $permalink_structure); ?> /> <?php _e('Numeric'); ?></label></th>
+		<th><label><input name="selection" type="radio" value="<?php echo $structures[2]; ?>" class="tog" <?php checked($structures[2], $permalink_structure); ?> /> <?php _e('Month and name'); ?></label></th>
+		<td><code><?php echo get_option('home') . $prefix . '/' . date('Y') . '/' . date('m') . '/' . '/sample-post/'; ?></code></td>
+	</tr>
+	<tr>
+		<th><label><input name="selection" type="radio" value="<?php echo $structures[3]; ?>" class="tog" <?php checked($structures[3], $permalink_structure); ?> /> <?php _e('Numeric'); ?></label></th>
 		<td><code><?php echo get_option('home') . $prefix  ; ?>/archives/123</code></td>
 	</tr>
 	<tr>
@@ -158,9 +163,9 @@ $structures = array(
 
 <h3><?php _e('Optional'); ?></h3>
 <?php if ($is_apache) : ?>
-	<p><?php _e('If you like, you may enter custom bases for your category and tag <abbr title="Universal Resource Locator">URL</abbr>s here. For example, using <code>/topics/</code> as your category base would make your category links like <code>http://example.org/topics/uncategorized/</code>. If you leave these blank the defaults will be used.') ?></p>
+	<p><?php _e('If you like, you may enter custom structures for your category and tag <abbr title="Universal Resource Locator">URL</abbr>s here. For example, using <code>/topics/</code> as your category base would make your category links like <code>http://example.org/topics/uncategorized/</code>. If you leave these blank the defaults will be used.') ?></p>
 <?php else : ?>
-	<p><?php _e('If you like, you may enter custom bases for your category and tag <abbr title="Universal Resource Locator">URL</abbr>s here. For example, using <code>/topics/</code> as your category base would make your category links like <code>http://example.org/index.php/topics/uncategorized/</code>. If you leave these blank the defaults will be used.') ?></p>
+	<p><?php _e('If you like, you may enter custom structures for your category and tag <abbr title="Universal Resource Locator">URL</abbr>s here. For example, using <code>/topics/</code> as your category base would make your category links like <code>http://example.org/index.php/topics/uncategorized/</code>. If you leave these blank the defaults will be used.') ?></p>
 <?php endif; ?>
 
 <table class="form-table">
diff --git a/wp-admin/themes.php b/wp-admin/themes.php
index 45a2a916d..0981b77e7 100644
--- a/wp-admin/themes.php
+++ b/wp-admin/themes.php
@@ -19,7 +19,7 @@ require_once('admin-header.php');
 <?php if ( ! validate_current_theme() ) : ?>
 <div id="message1" class="updated fade"><p><?php _e('The active theme is broken.  Reverting to the default theme.'); ?></p></div>
 <?php elseif ( isset($_GET['activated']) ) : ?>
-<div id="message2" class="updated fade"><p><?php printf(__('New theme activated. <a href="%s">View site</a>'), get_bloginfo('url') . '/'); ?></p></div>
+<div id="message2" class="updated fade"><p><?php printf(__('New theme activated. <a href="%s" target="_blank">Visit site</a>'), get_bloginfo('url') . '/'); ?></p></div>
 <?php endif; ?>
 
 <?php
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index e44fc6488..1355a0f00 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -323,22 +323,22 @@ textarea.all-options, input.all-options {
 	top: .35em;
 }
 
-#postcustom .updatemeta, #postcustom .deletemeta {
+#postcustomstuff .updatemeta, #postcustomstuff .deletemeta {
 	margin: auto;
 }
 
-#postcustom table {
+#postcustomstuff table {
 	margin: 0;
 	width: 100%;
 	border-width: 1px;
 	border-style: solid;
 }
 
-#postcustom table input, #postcustom table textarea {
+#postcustomstuff table input, #postcustomstuff table textarea {
 	width: 95%;
 }
 
-#postcustom table #addmetasub {
+#postcustomstuff table #addmetasub {
 	width: auto;
 }