diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php index 19edd9eed7..06a60e4b01 100644 --- a/wp-admin/admin-header.php +++ b/wp-admin/admin-header.php @@ -112,7 +112,7 @@ if ( function_exists('mb_strlen') ) { do_action('admin_notices'); screen_meta($hook_suffix); -unset($hook_suffix); +//unset($hook_suffix); if ( $parent_file == 'options-general.php' ) { require(ABSPATH . 'wp-admin/options-head.php'); diff --git a/wp-admin/categories.php b/wp-admin/categories.php index 8a4275d274..2deb866fba 100644 --- a/wp-admin/categories.php +++ b/wp-admin/categories.php @@ -130,6 +130,7 @@ $messages[5] = __('Category not updated.'); ?>
+

+

+

diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php index 7ceb5c16a4..6483504c00 100644 --- a/wp-admin/edit-link-categories.php +++ b/wp-admin/edit-link-categories.php @@ -60,6 +60,7 @@ $messages[5] = __('Category not updated.'); $messages[6] = __('Categories deleted.'); ?>
+

diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php index d62aae3d1e..a9745bb8c3 100644 --- a/wp-admin/edit-link-form.php +++ b/wp-admin/edit-link-form.php @@ -341,6 +341,7 @@ require_once ('admin-header.php');
+

diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php index ef21bbbebc..3dbe078d66 100644 --- a/wp-admin/edit-page-form.php +++ b/wp-admin/edit-page-form.php @@ -391,6 +391,7 @@ require_once('admin-header.php'); ?>
+

diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php index 7c97f4841b..e11a9b152a 100644 --- a/wp-admin/edit-pages.php +++ b/wp-admin/edit-pages.php @@ -99,6 +99,7 @@ if ( is_singular() ) { require_once('admin-header.php'); ?>
+

diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php index 7e87a0a51b..30314b44df 100644 --- a/wp-admin/edit-tags.php +++ b/wp-admin/edit-tags.php @@ -129,6 +129,7 @@ $messages[5] = __('Tag not updated.'); $messages[6] = __('Tags deleted.'); ?>
+

diff --git a/wp-admin/edit.php b/wp-admin/edit.php index 2c69943088..a7f444cb4c 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -91,6 +91,7 @@ else $mode = attribute_escape($_GET['mode']); ?>
+

+

diff --git a/wp-admin/images/icons32.png b/wp-admin/images/icons32.png new file mode 100644 index 0000000000..6677d1ce07 Binary files /dev/null and b/wp-admin/images/icons32.png differ diff --git a/wp-admin/import.php b/wp-admin/import.php index 2b2691bd15..a2f37c328d 100644 --- a/wp-admin/import.php +++ b/wp-admin/import.php @@ -13,6 +13,7 @@ require_once ('admin-header.php'); ?>
+

diff --git a/wp-admin/import/blogger.php b/wp-admin/import/blogger.php index 59627e8ddd..894ad7e88c 100644 --- a/wp-admin/import/blogger.php +++ b/wp-admin/import/blogger.php @@ -54,7 +54,10 @@ class Blogger_Import { $auth = __('Authorize'); echo " -

$title

$welcome

$prereqs

$stepone

+
+ ".screen_icon()." +

$title

+

$welcome

$prereqs

$stepone

@@ -68,7 +71,9 @@ class Blogger_Import { } function uh_oh($title, $message, $info) { - echo "

$title

$message

$info
"; + echo "
"; + screen_icon(); + echo "

$title

$message

$info
"; } function auth() { diff --git a/wp-admin/import/blogware.php b/wp-admin/import/blogware.php index 2f96262ea6..1adcc1d5d3 100644 --- a/wp-admin/import/blogware.php +++ b/wp-admin/import/blogware.php @@ -21,6 +21,7 @@ class BW_Import { function header() { echo '
'; + screen_icon(); echo '

'.__('Import Blogware').'

'; } diff --git a/wp-admin/import/btt.php b/wp-admin/import/btt.php index 450d4cdb01..c528c2251c 100644 --- a/wp-admin/import/btt.php +++ b/wp-admin/import/btt.php @@ -18,6 +18,7 @@ class BunnyTags_Import { function header() { echo '
'; + screen_icon(); echo '

'.__('Import Bunny’s Technorati Tags').'

'; echo '

'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'

'; } diff --git a/wp-admin/import/dotclear.php b/wp-admin/import/dotclear.php index 808a4f3dd3..500d0d9a59 100644 --- a/wp-admin/import/dotclear.php +++ b/wp-admin/import/dotclear.php @@ -198,6 +198,7 @@ class Dotclear_Import { function header() { echo '
'; + screen_icon(); echo '

'.__('Import DotClear').'

'; echo '

'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'

'; } diff --git a/wp-admin/import/greymatter.php b/wp-admin/import/greymatter.php index d39e307da7..8651a691cd 100644 --- a/wp-admin/import/greymatter.php +++ b/wp-admin/import/greymatter.php @@ -20,6 +20,7 @@ class GM_Import { function header() { echo '
'; + screen_icon(); echo '

'.__('Import GreyMatter').'

'; } diff --git a/wp-admin/import/jkw.php b/wp-admin/import/jkw.php index 265936a6f3..ba479528b9 100644 --- a/wp-admin/import/jkw.php +++ b/wp-admin/import/jkw.php @@ -17,6 +17,7 @@ class JeromesKeyword_Import { function header() { echo '
'; + screen_icon(); echo '

'.__('Import Jerome’s Keywords').'

'; echo '

'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'

'; } diff --git a/wp-admin/import/livejournal.php b/wp-admin/import/livejournal.php index c70fbd21a1..6b352e88f7 100644 --- a/wp-admin/import/livejournal.php +++ b/wp-admin/import/livejournal.php @@ -19,6 +19,7 @@ class LJ_Import { function header() { echo '
'; + screen_icon(); echo '

'.__('Import LiveJournal').'

'; } diff --git a/wp-admin/import/mt.php b/wp-admin/import/mt.php index 903f778021..bb6868cddc 100644 --- a/wp-admin/import/mt.php +++ b/wp-admin/import/mt.php @@ -24,6 +24,7 @@ class MT_Import { function header() { echo '
'; + screen_icon(); echo '

'.__('Import Movable Type or TypePad').'

'; } @@ -191,6 +192,7 @@ class MT_Import { function mt_authors_form() { ?>
+

italics. For each of these names, you can either pick an author in your WordPress installation from the menu, or enter a name for the author in the textbox.'); ?>

diff --git a/wp-admin/import/rss.php b/wp-admin/import/rss.php index 11fc2efe56..d672b064c9 100644 --- a/wp-admin/import/rss.php +++ b/wp-admin/import/rss.php @@ -22,6 +22,7 @@ class RSS_Import { function header() { echo '
'; + screen_icon(); echo '

'.__('Import RSS').'

'; } diff --git a/wp-admin/import/stp.php b/wp-admin/import/stp.php index 4a5b61f47c..54c501f817 100644 --- a/wp-admin/import/stp.php +++ b/wp-admin/import/stp.php @@ -16,6 +16,7 @@ class STP_Import { function header() { echo '
'; + screen_icon(); echo '

'.__('Import Simple Tagging').'

'; echo '

'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'

'; } diff --git a/wp-admin/import/textpattern.php b/wp-admin/import/textpattern.php index 1362bd27a6..413f0331ef 100644 --- a/wp-admin/import/textpattern.php +++ b/wp-admin/import/textpattern.php @@ -52,6 +52,7 @@ class Textpattern_Import { function header() { echo '
'; + screen_icon(); echo '

'.__('Import Textpattern').'

'; echo '

'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'

'; } diff --git a/wp-admin/import/utw.php b/wp-admin/import/utw.php index 2b65756526..7478fe46f1 100644 --- a/wp-admin/import/utw.php +++ b/wp-admin/import/utw.php @@ -17,6 +17,7 @@ class UTW_Import { function header() { echo '
'; + screen_icon(); echo '

'.__('Import Ultimate Tag Warrior').'

'; echo '

'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'

'; } diff --git a/wp-admin/import/wordpress.php b/wp-admin/import/wordpress.php index 4a2424bc5c..fe14491a67 100644 --- a/wp-admin/import/wordpress.php +++ b/wp-admin/import/wordpress.php @@ -34,6 +34,7 @@ class WP_Import { function header() { echo '
'; + screen_icon(); echo '

'.__('Import WordPress').'

'; } @@ -197,6 +198,7 @@ class WP_Import { function wp_authors_form() { ?> +

admins entries.'); ?>

allow_fetch_attachments() ) { ?> +

diff --git a/wp-admin/import/wp-cat2tag.php b/wp-admin/import/wp-cat2tag.php index fdfa5a7757..90098ee2f0 100644 --- a/wp-admin/import/wp-cat2tag.php +++ b/wp-admin/import/wp-cat2tag.php @@ -64,6 +64,7 @@ class WP_Categories_to_Tags { echo '
'; if ( $cat_num > 0 ) { + screen_icon(); echo '

' . sprintf( __ngettext( 'Convert Category to Tag.', 'Convert Categories (%d) to Tags.', $cat_num ), $cat_num ) . '

'; echo '
'; echo '

' . __('Hey there. Here you can selectively convert existing categories to tags. To get started, check the categories you wish to be converted, then click the Convert button.') . '

'; @@ -139,6 +140,7 @@ function check_all_rows() { echo '
'; if ( $tags_num > 0 ) { + screen_icon(); echo '

' . sprintf( __ngettext( 'Convert Tag to Category.', 'Convert Tags (%d) to Categories.', $tags_num ), $tags_num ) . '

'; echo '
'; echo '

' . __('Here you can selectively converts existing tags to categories. To get started, check the tags you wish to be converted, then click the Convert button.') . '

'; diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index b176ba69cf..98212b91d6 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -3327,4 +3327,18 @@ function add_contextual_help($screen, $help) { $_wp_contextual_help[$screen] = $help; } +function screen_icon() { + global $parent_file, $hook_suffix; + + if ( isset($parent_file) && !empty($parent_file) ) + $name = substr($parent_file, 0, -4); + else + $name = str_replace(array('.php', '-new', '-add'), '', $hook_suffix); + + unset($hook_suffix); +?> +

+ diff --git a/wp-admin/index.php b/wp-admin/index.php index b4921ce533..e3e1d5772a 100644 --- a/wp-admin/index.php +++ b/wp-admin/index.php @@ -29,6 +29,7 @@ $today = current_time('mysql', 1); ?>
+

diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php index f6b8c54bd7..ce3dcaeff5 100644 --- a/wp-admin/link-manager.php +++ b/wp-admin/link-manager.php @@ -70,6 +70,7 @@ switch ($order_by) { } ?>
+

+

diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php index 14605b1a70..7edeea4a41 100644 --- a/wp-admin/options-discussion.php +++ b/wp-admin/options-discussion.php @@ -16,6 +16,7 @@ include('admin-header.php'); ?>
+

diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php index 12b6d1909b..1f03e29f97 100644 --- a/wp-admin/options-general.php +++ b/wp-admin/options-general.php @@ -49,6 +49,7 @@ include('./admin-header.php'); ?>
+

diff --git a/wp-admin/options-media.php b/wp-admin/options-media.php index efdd7d8119..f2e898ed4a 100644 --- a/wp-admin/options-media.php +++ b/wp-admin/options-media.php @@ -17,6 +17,7 @@ include('admin-header.php'); ?>
+

diff --git a/wp-admin/options-misc.php b/wp-admin/options-misc.php index b436361cb1..15d61fcc6e 100644 --- a/wp-admin/options-misc.php +++ b/wp-admin/options-misc.php @@ -17,6 +17,7 @@ include('admin-header.php'); ?>
+

diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php index 6ef09db736..7d8f5fe85a 100644 --- a/wp-admin/options-permalink.php +++ b/wp-admin/options-permalink.php @@ -123,6 +123,7 @@ else
+

diff --git a/wp-admin/options-privacy.php b/wp-admin/options-privacy.php index 950cd6b6c3..f4ac853f8a 100644 --- a/wp-admin/options-privacy.php +++ b/wp-admin/options-privacy.php @@ -16,6 +16,7 @@ include('./admin-header.php'); ?>
+

diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php index 7bb8af0c26..f4b497bc3e 100644 --- a/wp-admin/options-reading.php +++ b/wp-admin/options-reading.php @@ -16,6 +16,7 @@ include('admin-header.php'); ?>
+

diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php index fa0705bcb1..63fda90e6c 100644 --- a/wp-admin/options-writing.php +++ b/wp-admin/options-writing.php @@ -16,6 +16,7 @@ include('admin-header.php'); ?>
+

diff --git a/wp-admin/plugin-editor.php b/wp-admin/plugin-editor.php index b43f52e388..221396b7fa 100644 --- a/wp-admin/plugin-editor.php +++ b/wp-admin/plugin-editor.php @@ -96,7 +96,8 @@ default:
-

+ +

diff --git a/wp-admin/plugin-install.php b/wp-admin/plugin-install.php index 43f1e8ca9d..e71c2ce917 100644 --- a/wp-admin/plugin-install.php +++ b/wp-admin/plugin-install.php @@ -52,6 +52,7 @@ do_action('install_plugins_pre_' . $tab); //Used to override the general interfa include('admin-header.php'); ?>
+

    diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php index 81304bac6e..3c7edb4c77 100644 --- a/wp-admin/plugins.php +++ b/wp-admin/plugins.php @@ -201,6 +201,7 @@ if ( !empty($invalid) )
    +

    diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php index c28b72354a..887eb4c06b 100644 --- a/wp-admin/theme-editor.php +++ b/wp-admin/theme-editor.php @@ -99,6 +99,7 @@ $description = get_file_description($file); $desc_header = ( $description != $file_show ) ? "$description (%s)" : "%s"; ?>
    +

    diff --git a/wp-admin/themes.php b/wp-admin/themes.php index f1949cf956..3adba24420 100644 --- a/wp-admin/themes.php +++ b/wp-admin/themes.php @@ -100,6 +100,7 @@ function theme_update_available( $theme ) { ?>
    +

    diff --git a/wp-admin/turbo.php b/wp-admin/turbo.php index f48fa4df81..1f4885178c 100644 --- a/wp-admin/turbo.php +++ b/wp-admin/turbo.php @@ -17,6 +17,7 @@ require_once('admin-header.php'); if ( ! $is_opera ) { ?>
    +

    diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php index 9c20c92d78..37c964cbb4 100644 --- a/wp-admin/update-core.php +++ b/wp-admin/update-core.php @@ -88,10 +88,11 @@ function dismissed_updates() { */ function core_upgrade_preamble() { $updates = get_core_updates(); - - echo '
    '; - echo '

    ' . __('Upgrade WordPress') . '

    '; - +?> +
    + +

    +response) || 'latest' == $updates[0]->response ) { echo '

    '; _e('You have the latest version of WordPress. You do not need to upgrade'); @@ -146,9 +147,11 @@ function do_core_upgrade() { request_filesystem_credentials($url, '', true); //Failed to connect, Error and request again return; } - - echo '
    '; - echo '

    ' . __('Upgrade WordPress') . '

    '; +?> +
    + +

    +errors->get_error_code() ) { foreach ( $wp_filesystem->errors->get_error_messages() as $message ) show_message($message); diff --git a/wp-admin/upload.php b/wp-admin/upload.php index 5d312b8799..21db415238 100644 --- a/wp-admin/upload.php +++ b/wp-admin/upload.php @@ -163,6 +163,7 @@ if ( isset($_GET['message']) && (int) $_GET['message'] ) {
    +

    -

    + +

    diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php index 5fc5f60326..343c54604b 100644 --- a/wp-admin/user-new.php +++ b/wp-admin/user-new.php @@ -42,6 +42,7 @@ require_once ('admin-header.php'); ?>
    +

    diff --git a/wp-admin/users.php b/wp-admin/users.php index 612668bcdd..e711a87e22 100644 --- a/wp-admin/users.php +++ b/wp-admin/users.php @@ -237,6 +237,7 @@ if ( ! empty($messages) ) { } ?>
    +

    diff --git a/wp-admin/widgets.php b/wp-admin/widgets.php index 641f16cf66..7f4685a384 100644 --- a/wp-admin/widgets.php +++ b/wp-admin/widgets.php @@ -233,6 +233,7 @@ require_once( 'admin-header.php' ); ?>
    +

    diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css index 8b2ce2f277..e58bf5c680 100644 --- a/wp-admin/wp-admin.css +++ b/wp-admin/wp-admin.css @@ -1214,6 +1214,7 @@ strong .post-com-count { margin-top: 0.5em; width: 100%; margin-bottom: -8px; + clear: both; } .form-table td, @@ -3111,3 +3112,9 @@ table.fixed { text-shadow: rgba(255,255,255,0.8) 0 1px 0; } +.icon32 { + float: left; + height: 36px; + margin: 8px 6px 0 0; + width: 36px; +}