diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css index 8d1b8d5c5f..27d6e24505 100644 --- a/wp-admin/css/colors-classic.css +++ b/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; -} \ No newline at end of file +} diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index d211d7d60b..16f7ea184f 100644 --- a/wp-admin/css/colors-fresh.css +++ b/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; } diff --git a/wp-admin/css/widgets.css b/wp-admin/css/widgets.css index 7be92c0f9e..0e8519f3bf 100644 --- a/wp-admin/css/widgets.css +++ b/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; +} diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index ae329557ad..c860967fb7 100644 --- a/wp-admin/includes/template.php +++ b/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; } ?>
@@ -3562,6 +3568,14 @@ function plugins_search_help() { '; } +function widgets_help() { + return ' +

' . __('Widgets can be added or arranged by dragging. If you hover your mouse over the title bar of a widget you’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.') . '

+

' . __('To show or hide the settings for a widget, click on the arrow that appears on the right of the widget title.') . '

+

' . __('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.') . '

+'; +} + function screen_layout($screen) { global $screen_layout_columns; diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php index dc5cc5c75a..23515d07f7 100644 --- a/wp-admin/options-general.php +++ b/wp-admin/options-general.php @@ -65,7 +65,7 @@ include('./admin-header.php'); - + @@ -74,12 +74,12 @@ include('./admin-header.php'); " /> -to be different from the directory you installed WordPress.'); ?> +to be different from the directory you installed WordPress.'); ?> - + @@ -129,8 +129,8 @@ foreach ( $offset_range as $offset ) { %2$s'), $current_offset_name, date_i18n($time_format)); ?> -
- +
+ %1$s'), date_i18n($timezone_format)); ?> -
- +
+
diff --git a/wp-admin/options-misc.php b/wp-admin/options-misc.php index 061587bf88..b43b91bc0e 100644 --- a/wp-admin/options-misc.php +++ b/wp-admin/options-misc.php @@ -28,14 +28,14 @@ include('admin-header.php'); -wp-content/uploads'); ?> +wp-content/uploads'); ?> - + diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php index e66606038a..934caf2688 100644 --- a/wp-admin/options-reading.php +++ b/wp-admin/options-reading.php @@ -72,7 +72,7 @@ include('admin-header.php'); -recommended)') ?> +recommended)') ?> diff --git a/wp-admin/rtl.css b/wp-admin/rtl.css index 53c35b464c..f8c9eaceda 100644 --- a/wp-admin/rtl.css +++ b/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 diff --git a/wp-admin/themes.php b/wp-admin/themes.php index 34213018a2..0d9f167a73 100644 --- a/wp-admin/themes.php +++ b/wp-admin/themes.php @@ -121,7 +121,7 @@ function theme_update_available( $theme ) {

title, $ct->version, $ct->author) ; ?>

-

description; ?>

+

description; ?>

parent_theme) { ?>

%2$s. The stylesheet files are located in %3$s. %4$s uses templates from %5$s. Changes made to the templates will affect both themes.'), $ct->title, $ct->template_dir, $ct->stylesheet_dir, $ct->title, $ct->parent_theme); ?>

diff --git a/wp-admin/widgets.php b/wp-admin/widgets.php index 00ff9ada0e..1d8cebf2e3 100644 --- a/wp-admin/widgets.php +++ b/wp-admin/widgets.php @@ -344,6 +344,7 @@ require_once( 'admin-header.php' ); ?>

+


diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css index a90280db1e..946fc8d6f5 100644 --- a/wp-admin/wp-admin.css +++ b/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;