More screen icons and fixes, includes patch by johnconners, fixes #8380

git-svn-id: http://svn.automattic.com/wordpress/trunk@9912 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2008-11-26 23:35:23 +00:00
parent 5410af6e2a
commit f0b7562b48
13 changed files with 161 additions and 86 deletions

View File

@ -102,7 +102,6 @@ textarea.disabled {
}
li.widget-list-control-item h4.widget-title a:hover,
#footer a,
#upload-menu li a.upload-tab-link,
li.widget-list-control-item h4.widget-title a,
#dragHelper li.widget-list-control-item h4.widget-title a,
@ -207,6 +206,9 @@ ul#widget-list li.widget-list-item h4.widget-title {
border-right-color: #99d;
}
#media-upload {
background: #fff;
}
#media-upload .slidetoggle {
border-top-color: #dfdfdf;
}
@ -250,7 +252,12 @@ ul#widget-list li.widget-list-item h4.widget-title {
color: #d54e21;
}
.howto, .nonessential, #edit-slug-box, .form-input-tip, .rss-widget span.rss-date, .subsubsub {
.howto,
.nonessential,
#edit-slug-box,
.form-input-tip,
.rss-widget span.rss-date,
.subsubsub {
color: #999;
}
@ -297,31 +304,42 @@ td.help {
.button,
.submit input {
border-color: #DCDCDC;
border-color: #bbb;
color: #464646;
}
.button:hover,
.submit input:hover {
color: #000;
border-color: #666;
}
.button,
.submit input,
.button-secondary {
background: #f2f2f2 url(../images/white-grad.png) repeat-x scroll left top;
}
.button-secondary,
.submit .button-secondary {
border-color: #CFE1EF;
color: #464646;
.button:active,
.submit input:active,
.button-secondary:active {
background: #eee url(../images/white-grad-active.png) repeat-x scroll left top;
}
.button-primary,
.submit .button-primary,
#login form .submit input {
border-color: #21759B;
border-color: #298cba;
font-weight: bold;
color: #FFF;
background: #21759B url(../images/button-grad.png) repeat-x scroll left top;
}
.button-primary:active,
#login form .submit input:active {
background: #21759b url(../images/button-grad-active.png) repeat-x scroll left top !important;
}
.button[disabled],
.button:disabled,
.button-primary[disabled],
@ -331,21 +349,16 @@ td.help {
a.button.disabled {
background: #ddd;
color: #888;
}
.button:hover,
.submit input:hover,
#postcustomstuff .submit input:hover {
border-color: #535353;
text-shadow: rgba(255,255,255,0.6) 0 1px 0;
border-color: #ccc;
}
a:active,
a:focus {
color: #d54e21 !important;
color: #d54e21;
}
a:hover,
.button:hover,
#wphead #viewsite a:hover,
#adminmenu a:hover,
#adminmenu ul.wp-submenu a:hover,
@ -365,13 +378,10 @@ div.dashboard-widget-submit input:hover,
border-color: #dfdfdf;
}
.button-secondary:hover,
.button-primary:hover,
#login form .submit input:hover {
border-color: #328ab2;
}
.button-primary:hover, #login form .submit input:hover {
color: #EAF2FA;
border-color: #13455b !important;
color: #EAF2FA !important;
}
#side-info-column #category-tabs .ui-tabs-selected a {
@ -388,7 +398,7 @@ div.dashboard-widget-submit input:hover,
color: #ccc;
}
.submitbox .submitdelete {
.submitbox .submitdelete, a.delete {
color: #f00;
border-bottom-color: #f00;
}
@ -489,7 +499,8 @@ body.press-this .ui-tabs-selected a:hover {
color: #d54e21;
}
#adminmenu li a #awaiting-mod, #adminmenu li a span.update-plugins {
#adminmenu li a #awaiting-mod,
#adminmenu li a span.update-plugins {
background-image: url(../images/comment-stalk-fresh.gif);
}
@ -509,7 +520,7 @@ body.press-this .ui-tabs-selected a:hover {
}
div#media-upload-header {
background-color: #f1f1f1;
background-color: #f9f9f9;
border-bottom-color: #dfdfdf;
}
@ -550,7 +561,9 @@ li.widget-list-control-item h4,
background-color: #fffbcc;
}
#edit-slug-box strong, .tablenav .displaying-num {
#edit-slug-box strong,
.tablenav .displaying-num,
#submitted-on {
color: #777;
}
@ -738,20 +751,19 @@ body.login {
color: #999;
}
#user_info a:hover {
color: #fff;
text-decoration: underline !important;
}
#user_info a:active {
color: #ccc !important;
}
#user_info a, #user_info a:visited {
#user_info a:link, #user_info a:visited, #footer a:link, #footer a:visited {
color: #ccc;
text-decoration: none;
}
#user_info a:hover, #footer a:hover {
color: #fff;
text-decoration: underline !important;
}
#user_info a:active, #footer a:active {
color: #ccc !important;
}
div#media-upload-error,
.file-error,
@ -811,12 +823,6 @@ abbr.required,
}
/* Containers */
.wp_themeSkin table, #wp_editbtns {
/*
background: #cee1ef;
*/
}
.wp_themeSkin iframe {
background: #fff;
}
@ -961,12 +967,6 @@ abbr.required,
border-top-left-radius: 4px;
}
.wp-admin .clearlooks2 .mceFocus .mceTop .mceCenter {
background: #444444;
border-bottom: 1px solid #999;
border-top: 1px solid #999;
}
.wp-admin .clearlooks2 .mceFocus .mceTop .mceRight {
background: #444444;
border-right: 1px solid #999;
@ -1010,7 +1010,7 @@ abbr.required,
}
.wp-admin .clearlooks2 .mceFocus .mceTop span {
color: #fff;
color: #e5e5e5;
}
/* end TinyMCE */
@ -1082,7 +1082,8 @@ abbr.required,
text-shadow: rgba(0,0,0,0.4) 0px -1px 0px;
}
#adminmenu li.wp-has-current-submenu .wp-submenu, #adminmenu li.wp-has-current-submenu ul li a {
#adminmenu li.wp-has-current-submenu .wp-submenu,
#adminmenu li.wp-has-current-submenu ul li a {
border-color: #aaa !important;
}
@ -1132,11 +1133,11 @@ abbr.required,
/* menu icons */
#adminmenu #menu-dashboard div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -61px -34px;
background: transparent url("../images/menu.png") no-repeat scroll -61px -33px;
}
#adminmenu #menu-dashboard:hover div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -61px -2px;
background: transparent url("../images/menu.png") no-repeat scroll -61px -1px;
}
#adminmenu #menu-posts div.wp-menu-image {
@ -1180,11 +1181,11 @@ abbr.required,
}
#adminmenu #menu-appearance div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -1px -32px;
background: transparent url("../images/menu.png") no-repeat scroll -1px -33px;
}
#adminmenu #menu-appearance:hover div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -1px 0;
background: transparent url("../images/menu.png") no-repeat scroll -1px -1px;
}
#adminmenu #menu-plugins div.wp-menu-image {
@ -1241,8 +1242,8 @@ table.diff .diff-addedline ins {
/* edit image */
#sidemenu a {
background-color: #f1f1f1;
border-color: #f1f1f1;
background-color: #f9f9f9;
border-color: #f9f9f9;
border-bottom-color: #dfdfdf;
}
@ -1288,7 +1289,8 @@ table.diff .diff-addedline ins {
}
/* Install Plugins */
.star-average, .star.star-rating {
.star-average,
.star.star-rating {
background-color: #fc0;
}
@ -1304,7 +1306,8 @@ div.star.select:hover {
background-color: #cee1ef;
}
#plugin-information pre, #plugin-information code {
#plugin-information pre,
#plugin-information code {
background-color: #ededff;
}
@ -1405,6 +1408,7 @@ div.star.select:hover {
form p.submit a.cancel {
border-color: red;
color: red;
text-shadow: none;
}
form p.submit a.cancel:hover {
@ -1481,12 +1485,15 @@ form p.submit a.cancel:hover {
}
#favorite-actions a {
color: #eee;
color: #ddd;
text-shadow: rgba(0,0,0,0.2) 0 -1px 0;
}
#favorite-inside a:hover {
#favorite-actions a:hover {
color: #fff;
}
#favorite-inside a:hover {
text-decoration: underline;
}
@ -1520,3 +1527,53 @@ form p.submit a.cancel:hover {
background-color: transparent;
text-shadow: rgba(255,255,255,0.7) 0 1px 0;
}
#icon-edit,
#icon-post {
background: transparent url(../images/icons32.png) no-repeat -552px -5px;
}
#icon-index {
background: transparent url(../images/icons32.png) no-repeat -137px -5px;
}
#icon-upload {
background: transparent url(../images/icons32.png) no-repeat -251px -5px;
}
#icon-link-manager,
#icon-link,
#icon-link-category {
background: transparent url(../images/icons32.png) no-repeat -190px -5px;
}
#icon-edit-pages,
#icon-page {
background: transparent url(../images/icons32.png) no-repeat -312px -5px;
}
#icon-edit-comments {
background: transparent url(../images/icons32.png) no-repeat -72px -5px;
}
#icon-themes {
background: transparent url(../images/icons32.png) no-repeat -11px -5px;
}
#icon-plugins {
background: transparent url(../images/icons32.png) no-repeat -370px -5px;
}
#icon-users,
#icon-user-edit {
background: transparent url(../images/icons32.png) no-repeat -600px -5px;
}
#icon-import,
#icon-admin {
background: transparent url(../images/icons32.png) no-repeat -432px -5px;
}
#icon-options-general {
background: transparent url(../images/icons32.png) no-repeat -492px -5px;
}

View File

@ -252,7 +252,12 @@ ul#widget-list li.widget-list-item h4.widget-title {
color: #d54e21;
}
.howto, .nonessential, #edit-slug-box, .form-input-tip, .rss-widget span.rss-date, .subsubsub {
.howto,
.nonessential,
#edit-slug-box,
.form-input-tip,
.rss-widget span.rss-date,
.subsubsub {
color: #999;
}
@ -330,7 +335,8 @@ td.help {
background: #21759B url(../images/button-grad.png) repeat-x scroll left top;
}
.button-primary:active, #login form .submit input:active {
.button-primary:active,
#login form .submit input:active {
background: #21759b url(../images/button-grad-active.png) repeat-x scroll left top !important;
}
@ -372,7 +378,8 @@ div.dashboard-widget-submit input:hover,
border-color: #dfdfdf;
}
.button-primary:hover, #login form .submit input:hover {
.button-primary:hover,
#login form .submit input:hover {
border-color: #13455b !important;
color: #EAF2FA !important;
}
@ -492,7 +499,8 @@ body.press-this .ui-tabs-selected a:hover {
color: #d54e21;
}
#adminmenu li a #awaiting-mod, #adminmenu li a span.update-plugins {
#adminmenu li a #awaiting-mod,
#adminmenu li a span.update-plugins {
background-image: url(../images/comment-stalk-fresh.gif);
}
@ -553,7 +561,9 @@ li.widget-list-control-item h4,
background-color: #fffbcc;
}
#edit-slug-box strong, .tablenav .displaying-num, #submitted-on {
#edit-slug-box strong,
.tablenav .displaying-num,
#submitted-on {
color: #777;
}
@ -813,12 +823,6 @@ abbr.required,
}
/* Containers */
.wp_themeSkin table, #wp_editbtns {
/*
background: #cee1ef;
*/
}
.wp_themeSkin iframe {
background: #fff;
}
@ -1078,7 +1082,8 @@ abbr.required,
text-shadow: rgba(0,0,0,0.4) 0px -1px 0px;
}
#adminmenu li.wp-has-current-submenu .wp-submenu, #adminmenu li.wp-has-current-submenu ul li a {
#adminmenu li.wp-has-current-submenu .wp-submenu,
#adminmenu li.wp-has-current-submenu ul li a {
border-color: #aaa !important;
}
@ -1284,7 +1289,8 @@ table.diff .diff-addedline ins {
}
/* Install Plugins */
.star-average, .star.star-rating {
.star-average,
.star.star-rating {
background-color: #fc0;
}
@ -1300,7 +1306,8 @@ div.star.select:hover {
background-color: #cee1ef;
}
#plugin-information pre, #plugin-information code {
#plugin-information pre,
#plugin-information code {
background-color: #ededff;
}
@ -1535,7 +1542,8 @@ form p.submit a.cancel:hover {
}
#icon-link-manager,
#icon-link {
#icon-link,
#icon-link-category {
background: transparent url(../images/icons32.png) no-repeat -190px -5px;
}
@ -1556,7 +1564,7 @@ form p.submit a.cancel:hover {
background: transparent url(../images/icons32.png) no-repeat -370px -5px;
}
#icon-users
#icon-users,
#icon-user-edit {
background: transparent url(../images/icons32.png) no-repeat -600px -5px;
}

View File

@ -39,6 +39,7 @@ _fill_empty_category($category);
?>
<div class="wrap">
<?php screen_icon(); ?>
<h2><?php _e('Edit Category'); ?></h2>
<div id="ajax-response"></div>
<form name="editcat" id="editcat" method="post" action="categories.php" class="validate">

View File

@ -18,6 +18,7 @@ $form_extra = "' />\n<input type='hidden' name='comment_ID' value='" . $comment-
<form name="post" action="comment.php" method="post" id="post">
<?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?>
<div class="wrap">
<?php screen_icon(); ?>
<h2><?php _e('Edit Comment'); ?></h2>
<div id="poststuff" class="metabox-holder">

View File

@ -16,14 +16,14 @@ if ( ! empty($cat_ID) ) {
/**
* @var string
*/
$heading = '<h2>' . __('Edit Category') . '</h2>';
$heading = '<h2>' . __('Edit Link Category') . '</h2>';
$submit_text = __('Edit Category');
$form = '<form name="editcat" id="editcat" method="post" action="link-category.php" class="validate">';
$action = 'editedcat';
$nonce_action = 'update-link-category_' . $cat_ID;
do_action('edit_link_category_form_pre', $category);
} else {
$heading = '<h2>' . __('Add Category') . '</h2>';
$heading = '<h2>' . __('Add Link Category') . '</h2>';
$submit_text = __('Add Category');
$form = '<form name="addcat" id="addcat" class="add:the-list: validate" method="post" action="link-category.php">';
$action = 'addcat';
@ -53,6 +53,7 @@ _fill_empty_link_category($category);
?>
<div class="wrap">
<?php screen_icon(); ?>
<?php echo $heading ?>
<div id="ajax-response"></div>
<?php echo $form ?>

View File

@ -15,6 +15,7 @@ if ( empty($tag_ID) ) { ?>
do_action('edit_tag_form_pre', $tag); ?>
<div class="wrap">
<?php screen_icon(); ?>
<h2><?php _e('Edit Tag'); ?></h2>
<div id="ajax-response"></div>
<form name="edittag" id="edittag" method="post" action="edit-tags.php" class="validate">

View File

@ -703,6 +703,7 @@ jQuery(function($){
</script>
<form action="<?php echo $form_post ?>" method="post">
<div class="wrap">
<?php screen_icon(); ?>
<h2><?php _e('Connection Information') ?></h2>
<p><?php _e('To perform the requested action, connection information is required.') ?></p>
<table class="form-table">

View File

@ -547,6 +547,7 @@ function upload_plugin() {
check_admin_referer('plugin-upload');
echo '<div class="wrap">';
screen_icon();
echo '<h2>', sprintf( __('Installing Plugin from file: %s'), basename($filename) ), '</h2>';
//Handle a newly uploaded file, Else assume it was
@ -583,6 +584,7 @@ function install_plugin() {
wp_die($api);
echo '<div class="wrap">';
screen_icon();
echo '<h2>', sprintf( __('Installing Plugin: %s'), $api->name . ' ' . $api->version ), '</h2>';
do_plugin_install($api->download_link, $api);

View File

@ -3327,14 +3327,15 @@ function add_contextual_help($screen, $help) {
$_wp_contextual_help[$screen] = $help;
}
function screen_icon() {
function screen_icon($name = '') {
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);
if ( empty($name) ) {
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);
?>
<div id="icon-<?php echo $name; ?>" class="icon32"><br /></div>

View File

@ -27,7 +27,7 @@ switch ($step) {
?>
<div class="wrap">
<?php screen_icon(); ?>
<h2><?php _e('Import your blogroll from another system') ?> </h2>
<form enctype="multipart/form-data" action="link-import.php" method="post" name="blogroll">
<?php wp_nonce_field('import-bookmarks') ?>

View File

@ -82,7 +82,7 @@ case 'edit' :
?>
<div class="wrap">
<?php screen_icon(); ?>
<h2><?php _e( 'Edit Media' ); ?></h2>
<form method="post" action="<?php echo clean_url( remove_query_arg( 'message' ) ); ?>" class="media-upload-form" id="media-single-form">

View File

@ -87,6 +87,7 @@ default:
include('admin-header.php'); ?>
<div class="wrap">
<?php screen_icon(); ?>
<h2><?php _e('All Settings'); ?></h2>
<form name="form" action="options.php" method="post" id="all-options">
<?php wp_nonce_field('options-options') ?>

View File

@ -135,6 +135,7 @@ case 'delete':
<?php echo $referer; ?>
<div class="wrap">
<?php screen_icon(); ?>
<h2><?php _e('Delete Users'); ?></h2>
<p><?php _e('You have specified these users for deletion:'); ?></p>
<ul>