Add some help for the widgets screen, make css class .description usable everywhere, fixes #5859

git-svn-id: http://svn.automattic.com/wordpress/trunk@11133 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-admin/css/colors-classic.css

@@ -135,7 +135,7 @@ textarea.disabled {
 	text-shadow: #fff 0 1px 0;
 }
 
-.setting-description,
+.description,
 .form-wrap p {
 	color: #666;
 }
@@ -1606,4 +1606,4 @@ div.widgets-holder-wrap {
 
 .sidebar-name:hover {
 	color: #d54e21;
-}
+}

wp-admin/css/colors-fresh.css

@@ -119,7 +119,8 @@ textarea.disabled {
 	text-shadow: #fff 0 1px 0;
 }
 
-.setting-description, .form-wrap p {
+.description,
+.form-wrap p {
 	color: #666;
 }
 

wp-admin/css/widgets.css

@@ -173,3 +173,12 @@ div#sidebar-info {
 	line-height: 3em;
 	vertical-align: middle;
 }
+
+#wp_inactive_widgets .sidebar-name {
+	margin: 0;
+	padding: 2px 0;
+}
+
+#wp_inactive_widgets p.description {
+	margin: 0 0 15px;
+}

wp-admin/includes/template.php

@@ -3458,6 +3458,12 @@ function screen_meta($screen) {
 				$_wp_contextual_help[$screen] = $help;
 			}
 			break;
+		case 'widgets':
+			if ( !isset($_wp_contextual_help['widgets']) ) {
+				$help = widgets_help();
+				$_wp_contextual_help['widgets'] = $help;
+			}
+			break;
 	}
 ?>
 <div id="screen-meta">
@@ -3562,6 +3568,14 @@ function plugins_search_help() {
 ';
 }
 
+function widgets_help() {
+	return '
+	<p>' .	__('Widgets can be added or arranged by dragging. If you hover your mouse over the title bar of a widget you&rsquo;ll notice the 4 arrow cursor appears to let you know it is movable. Click on it, hold down the mouse button and start dragging the widget to a new location. As you drag the module, notice the dotted gray box that also moves. This box indicates where the widget will be placed when you release the mouse button.') . '</p>
+	<p>' . __('To show or hide the settings for a widget, click on the arrow that appears on the right of the widget title.') . '</p>
+	<p>' . __('The Inactive Widgets area stores all widgets that are configured but not curently used on the web site. After changing themes if the new theme has less sidebars than the old theme, all widgets that were in these sidebars will be transfered to Inactive Widgets.') . '</p>
+';
+}
+
 function screen_layout($screen) {
 	global $screen_layout_columns;
 

wp-admin/options-general.php

@@ -65,7 +65,7 @@ include('./admin-header.php');
 <tr valign="top">
 <th scope="row"><label for="blogdescription"><?php _e('Tagline') ?></label></th>
 <td><input name="blogdescription" type="text" id="blogdescription"  value="<?php form_option('blogdescription'); ?>" class="regular-text" />
-<span class="setting-description"><?php _e('In a few words, explain what this blog is about.') ?></span></td>
+<span class="description"><?php _e('In a few words, explain what this blog is about.') ?></span></td>
 </tr>
 <tr valign="top">
 <th scope="row"><label for="siteurl"><?php _e('WordPress address (URL)') ?></label></th>
@@ -74,12 +74,12 @@ include('./admin-header.php');
 <tr valign="top">
 <th scope="row"><label for="home"><?php _e('Blog address (URL)') ?></label></th>
 <td><input name="home" type="text" id="home" value="<?php form_option('home'); ?>" class="regular-text code<?php if ( defined( 'WP_HOME' ) ) : ?> disabled" disabled="disabled"<?php else: ?>"<?php endif; ?> />
-<span class="setting-description"><?php _e('Enter the address here if you want your blog homepage <a href="http://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">to be different from the directory</a> you installed WordPress.'); ?></span></td>
+<span class="description"><?php _e('Enter the address here if you want your blog homepage <a href="http://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">to be different from the directory</a> you installed WordPress.'); ?></span></td>
 </tr>
 <tr valign="top">
 <th scope="row"><label for="admin_email"><?php _e('E-mail address') ?> </label></th>
 <td><input name="admin_email" type="text" id="admin_email" value="<?php form_option('admin_email'); ?>" class="regular-text" />
-<span class="setting-description"><?php _e('This address is used for admin purposes, like new user notification.') ?></span></td>
+<span class="description"><?php _e('This address is used for admin purposes, like new user notification.') ?></span></td>
 </tr>
 <tr valign="top">
 <th scope="row"><?php _e('Membership') ?></th>
@@ -129,8 +129,8 @@ foreach ( $offset_range as $offset ) {
 <?php if ($current_offset) : ?>
 	<span id="local-time"><?php printf(__('UTC %1$s is <code>%2$s</code>'), $current_offset_name, date_i18n($time_format)); ?></span>
 <?php endif; ?>
-<br/>
-<span class="setting-description"><?php _e('Unfortunately, you have to manually update this for Daylight Savings Time. Lame, we know, but will be fixed in the future.'); ?></span>
+<br />
+<span class="description"><?php _e('Unfortunately, you have to manually update this for Daylight Savings Time. Lame, we know, but will be fixed in the future.'); ?></span>
 </td>
 <?php
 else: // looks like we can do nice timezone selection!
@@ -153,8 +153,8 @@ if (empty($tzstring)) { // set the Etc zone if no timezone string exists
 <?php if (get_option('timezone_string')) : ?>
 	<span id="local-time"><?php printf(__('Local time is <code>%1$s</code>'), date_i18n($timezone_format)); ?></span>
 <?php endif; ?>
-<br/>
-<span class="setting-description"><?php _e('Choose a city in the same timezone as you.'); ?></span>
+<br />
+<span class="description"><?php _e('Choose a city in the same timezone as you.'); ?></span>
 <br />
 <span>
 <?php if (get_option('timezone_string')) : ?>

wp-admin/options-misc.php

@@ -28,14 +28,14 @@ include('admin-header.php');
 <tr valign="top">
 <th scope="row"><label for="upload_path"><?php _e('Store uploads in this folder'); ?></label></th>
 <td><input name="upload_path" type="text" id="upload_path" value="<?php echo attr(str_replace(ABSPATH, '', get_option('upload_path'))); ?>" class="regular-text code" />
-<span class="setting-description"><?php _e('Default is <code>wp-content/uploads</code>'); ?></span>
+<span class="description"><?php _e('Default is <code>wp-content/uploads</code>'); ?></span>
 </td>
 </tr>
 
 <tr valign="top">
 <th scope="row"><label for="upload_url_path"><?php _e('Full URL path to files'); ?></label></th>
 <td><input name="upload_url_path" type="text" id="upload_url_path" value="<?php echo attr( get_option('upload_url_path')); ?>" class="regular-text code" />
-<span class="setting-description"><?php _e('Configuring this is optional. By default, it should be blank.'); ?></span>
+<span class="description"><?php _e('Configuring this is optional. By default, it should be blank.'); ?></span>
 </td>
 </tr>
 

wp-admin/options-reading.php

@@ -72,7 +72,7 @@ include('admin-header.php');
 <tr valign="top">
 <th scope="row"><label for="blog_charset"><?php _e('Encoding for pages and feeds') ?></label></th>
 <td><input name="blog_charset" type="text" id="blog_charset" value="<?php form_option('blog_charset'); ?>" class="regular-text" />
-<span class="setting-description"><?php _e('The character encoding you write your blog in (UTF-8 is <a href="http://developer.apple.com/documentation/macos8/TextIntlSvcs/TextEncodingConversionManager/TEC1.5/TEC.b0.html">recommended</a>)') ?></span></td>
+<span class="description"><?php _e('The character encoding you write your blog in (UTF-8 is <a href="http://developer.apple.com/documentation/macos8/TextIntlSvcs/TextEncodingConversionManager/TEC1.5/TEC.b0.html">recommended</a>)') ?></span></td>
 </tr>
 <?php do_settings_fields('reading', 'default'); ?>
 </table>

wp-admin/rtl.css

@@ -242,7 +242,7 @@ td.available-theme {
 #poststuff h2 {
 	clear: right;
 }
-.setting-description, .form-wrap p {
+.description, .form-wrap p {
 	font-family: Tahoma, Arial;
 }
 /* 1500 - 1800

wp-admin/themes.php

@@ -121,7 +121,7 @@ function theme_update_available( $theme ) {
 <h4><?php
 	/* translators: 1: theme title, 2: theme version, 3: theme author */
 	printf(__('%1$s %2$s by %3$s'), $ct->title, $ct->version, $ct->author) ; ?></h4>
-<p class="description"><?php echo $ct->description; ?></p>
+<p class="theme-description"><?php echo $ct->description; ?></p>
 <?php if ($ct->parent_theme) { ?>
 	<p><?php printf(__('The template files are located in <code>%2$s</code>.  The stylesheet files are located in <code>%3$s</code>.  <strong>%4$s</strong> uses templates from <strong>%5$s</strong>.  Changes made to the templates will affect both themes.'), $ct->title, $ct->template_dir, $ct->stylesheet_dir, $ct->title, $ct->parent_theme); ?></p>
 <?php } else { ?>

wp-admin/widgets.php

@@ -344,6 +344,7 @@ require_once( 'admin-header.php' ); ?>
 	<div id="wp_inactive_widgets" class="widgets-holder-wrap">
 		<h3 class="sidebar-name"><?php _e('Inactive Widgets'); ?>
 		<span><img src="images/loading-publish.gif" class="ajax-feedback" title="" alt="" /></span></h3>
+		<p class="description"><?php _e('Drag widgets here to remove them from the web site but keep their settings.'); ?></p>
 		<?php wp_list_widget_controls('wp_inactive_widgets'); ?>
 		<br class="clear" />
 	</div>

wp-admin/wp-admin.css

@@ -135,7 +135,7 @@ table#availablethemes td.bottom {
 	margin: 0;
 }
 
-#current-theme .description {
+#current-theme .theme-description {
 	margin-top: 5px;
 }
 
@@ -1368,11 +1368,14 @@ table.form-table td .updated {
 	width: 95%;
 }
 
+p.description,
 .form-wrap p {
 	margin: 2px 0 5px;
+	font-size: 11px;
 }
 
-.setting-description, .form-wrap p {
+.description,
+.form-wrap p {
 	font-style: italic;
 	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
 }
@@ -2955,10 +2958,7 @@ abbr.required {
 }
 
 #favorite-actions .slide-down {
-/*	background-image: url(images/fav-top.png);
-	background-repeat: repeat-x;
-	background-position: 0 top;
-*/	-moz-border-radius: 12px 12px 0 0;
+	-moz-border-radius: 12px 12px 0 0;
 	-webkit-border-bottom-right-radius: 0;
 	-webkit-border-bottom-left-radius: 0;
 	-khtml-border-bottom-right-radius: 0;