Skip to content

Commit 0198c04

Browse files
ryanborenryanboren
committed
wp_admin_css() improvements. Props mdawaffe. see WordPress#7011
git-svn-id: https://develop.svn.wordpress.org/trunk@7979 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 36f755b commit 0198c04

16 files changed

Lines changed: 35 additions & 48 deletions

‎wp-admin/includes/media.php‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,12 @@ function wp_iframe($content_func /* ... */) {
126126
<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
127127
<title><?php bloginfo('name') ?> &rsaquo; <?php _e('Uploads'); ?> &#8212; <?php _e('WordPress'); ?></title>
128128
<?php
129-
wp_admin_css( 'css/global' );
129+
wp_admin_css( 'global' );
130130
wp_admin_css();
131-
wp_admin_css( 'css/colors' );
131+
wp_admin_css( 'colors' );
132+
if ( 0 === strpos( $content_func, 'media' ) )
133+
wp_admin_css( 'media' );
134+
132135
?>
133136
<script type="text/javascript">
134137
//<![CDATA[
@@ -137,6 +140,7 @@ function addLoadEvent(func) {if ( typeof wpOnload!='function'){wpOnload=func;}el
137140
</script>
138141
<?php
139142
do_action('admin_print_scripts');
143+
do_action('admin_print_styles');
140144
do_action('admin_head');
141145
if ( is_string($content_func) )
142146
do_action( "admin_head_{$content_func}" );
@@ -182,10 +186,6 @@ function media_buttons() {
182186
add_action( 'admin_print_scripts-page-new.php', 'add_thickbox' );
183187
add_action( 'admin_print_scripts-page.php', 'add_thickbox' );
184188

185-
function media_admin_css() {
186-
wp_admin_css('css/media');
187-
}
188-
189189
add_action('media_upload_media', 'media_upload_handler');
190190

191191
function media_upload_form_handler() {
@@ -1205,12 +1205,9 @@ function type_form_file() {
12051205
add_action('media_upload_audio', 'media_upload_audio');
12061206
add_action('media_upload_video', 'media_upload_video');
12071207
add_action('media_upload_file', 'media_upload_file');
1208-
add_action('admin_head_media_upload_type_form', 'media_admin_css');
12091208

12101209
add_filter('media_upload_gallery', 'media_upload_gallery');
1211-
add_action('admin_head_media_upload_gallery_form', 'media_admin_css');
12121210

12131211
add_filter('media_upload_library', 'media_upload_library');
1214-
add_action('admin_head_media_upload_library_form', 'media_admin_css');
12151212

12161213
?>

‎wp-admin/includes/widgets.php‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -285,11 +285,3 @@ function wp_widget_control_ob_filter( $string ) {
285285
$string = str_replace( '&nbsp;', ' ', $string );
286286
return trim( wp_specialchars( strip_tags( $string ) ) );
287287
}
288-
289-
function widget_css() {
290-
wp_admin_css( 'css/widgets' );
291-
}
292-
293-
add_action( 'admin_head', 'widget_css' );
294-
295-
?>

‎wp-admin/index.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,8 @@ function index_js() {
2626
}
2727
add_action( 'admin_head', 'index_js' );
2828

29-
function index_css() {
30-
wp_admin_css( 'css/dashboard' );
31-
}
32-
add_action( 'admin_head', 'index_css' );
33-
3429
wp_enqueue_script( 'jquery' );
30+
wp_admin_css( 'dashboard' );
3531

3632
$title = __('Dashboard');
3733
$parent_file = 'index.php';

‎wp-admin/install.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ function display_header(){
1616
<head>
1717
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
1818
<title><?php _e('WordPress &rsaquo; Installation'); ?></title>
19-
<?php wp_admin_css( 'css/install' ); ?>
19+
<?php wp_admin_css( 'install', true ); ?>
2020
</head>
2121
<body>
2222
<h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1>

‎wp-admin/media.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@
6060
add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
6161

6262
wp_enqueue_script( 'wp-ajax-response' );
63-
add_action('admin_head', 'media_admin_css');
63+
wp_admin_css( 'media' );
64+
6465

6566
require( 'admin-header.php' );
6667

‎wp-admin/plugin-editor.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66

77
wp_reset_vars(array('action', 'redirect', 'profile', 'error', 'warning', 'a', 'file'));
88

9-
add_action( 'admin_head', 'theme_editor_css' );
10-
function theme_editor_css(){
11-
wp_admin_css( 'css/theme-editor' );
12-
}
9+
wp_admin_css( 'theme-editor' );
1310

1411
$plugins = get_plugins();
1512
$plugin_files = array_keys($plugins);

‎wp-admin/press-this.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,11 +195,13 @@ function press_this_js_init() { ?>
195195
<?php
196196
wp_enqueue_script('jquery-ui-tabs');
197197
add_thickbox();
198+
wp_admin_css('press-this');
199+
wp_admin_css( 'colors' );
198200
wp_enqueue_script('post');
201+
199202
do_action('admin_print_scripts');
203+
do_action('admin_print_styles');
200204
do_action('admin_head');
201-
wp_admin_css('css/press-this');
202-
wp_admin_css( 'css/colors' );
203205
?>
204206
<script type="text/javascript">
205207

‎wp-admin/sidebar.php‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@
1414
<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=UTF-8" />
1515
<title><?php _e('WordPress &#8250; Posted'); ?></title>
1616
<?php
17-
wp_admin_css( 'css/global' );
18-
wp_admin_css();
17+
wp_admin_css( 'global', true );
18+
wp_admin_css( 'wp-admin', true );
19+
wp_admin_css( 'colors', true );
1920
?>
2021
</head>
2122
<body>
@@ -32,8 +33,9 @@
3233
<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('blog_charset'); ?>" />
3334
<title><?php _e('WordPress &#8250; Sidebar'); ?></title>
3435
<?php
35-
wp_admin_css( 'css/global' );
36-
wp_admin_css();
36+
wp_admin_css( 'global', true );
37+
wp_admin_css( 'wp-admin', true );
38+
wp_admin_css( 'colors', true );
3739
?>
3840
<style type="text/css" media="screen">
3941
form {

‎wp-admin/theme-editor.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66

77
wp_reset_vars(array('action', 'redirect', 'profile', 'error', 'warning', 'a', 'file', 'theme'));
88

9-
add_action( 'admin_head', 'theme_editor_css' );
10-
function theme_editor_css(){
11-
wp_admin_css( 'css/theme-editor' );
12-
}
9+
wp_admin_css( 'theme-editor' );
1310

1411
$themes = get_themes();
1512

‎wp-admin/update.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require_once('admin.php');
44

55
if ( !current_user_can('edit_plugins') )
6-
wp_die('<p>'.__('You do not have sufficient permissions to update plugins for this blog.').'</p>');
6+
wp_die('<p>'.__('You do not have sufficient permissions to update plugins for this blog.').'</p>');
77

88
function request_filesystem_credentials($form_post, $type = '', $error = false) {
99
$req_cred = apply_filters('request_filesystem_credentials', '', $form_post, $type, $error);
@@ -151,8 +151,8 @@ function do_plugin_upgrade($plugin) {
151151
<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
152152
<title><?php bloginfo('name') ?> &rsaquo; <?php _e('Plugin Reactivation'); ?> &#8212; <?php _e('WordPress'); ?></title>
153153
<?php
154-
wp_admin_css( 'css/global' );
155-
wp_admin_css( 'css/colors' );
154+
wp_admin_css( 'global', true );
155+
wp_admin_css( 'colors', true );
156156
?>
157157
</head>
158158
<body>

0 commit comments

Comments
 (0)