Changeset 7976

Timestamp:

05/21/08 23:24:23 (4 months ago)

Author:

ryan

Message:

Add wp_default_styles(), convert wp_admin_css(). Props mdawaffe. see #7011

Files:

• trunk/wp-admin/admin-header.php (modified) (1 diff)
• trunk/wp-includes/class.wp-scripts.php (modified) (1 diff)
• trunk/wp-includes/class.wp-styles.php (modified) (3 diffs)
• trunk/wp-includes/general-template.php (modified) (2 diffs)
• trunk/wp-includes/script-loader.php (modified) (3 diffs)

trunk/wp-admin/admin-header.php

@@ -30 +30 @@
-<title><?php bloginfo('name') ?> &rsaquo; <?php echo wp_specialchars( strip_tags( $title ) ); ?> &#8212; WordPress</title>
-<?php
+
-wp_admin_css( 'css/global' );
-wp_admin_css();
-wp_admin_css( 'css/colors' );
+wp_admin_css( 'css/ie' );
+
-?>
-<!--[if gte IE 6]>
-<?php wp_admin_css( 'css/ie' );
-?>
-<![endif]-->
-<script type="text/javascript">
-//<![CDATA[

trunk/wp-includes/class.wp-scripts.php

@@ -56 +56 @@
-
-        $src = add_query_arg('ver', $ver, $src);
-
+, $handle
-
-        $this->print_scripts_l10n( $handle );

trunk/wp-includes/class.wp-styles.php

@@ -4 +4 @@
-    var $base_url;
-    var $default_version;
+    var $text_direction = 'ltr';
-
-    function __construct() {
@@ -22 +23 @@
-            $media = 'all';
-
-
-
-
+
+
+
+
+
+
-        }
-
-
-
+
+
+
+
+
+
-
-
+
+
+
+
-
-        // Could do something with $this->registered[$handle]->extra here to print out extra CSS rules
@@ -47 +58 @@
-        return $r;
-    }
+
+    function _css_href( $src, $ver, $handle ) {
+        if ( !preg_match('|^https?://|', $src) ) {
+            $src = $this->base_url . $src;
+        }
+
+        $src = add_query_arg('ver', $ver, $src);
+        $src = apply_filters( 'style_loader_src', $src, $handle );
+        return clean_url( $src );
+    }
+
-}

trunk/wp-includes/general-template.php

@@ -1132 +1132 @@
-        $_file = "./$file.css";
-    } else {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    }
-    $_file = add_query_arg( 'version', get_bloginfo( 'version' ),  $_file );
@@ -1152 +1140 @@
-
-function wp_admin_css( $file = 'wp-admin' ) {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

trunk/wp-includes/script-loader.php

@@ -7 +7 @@
-require( ABSPATH . WPINC . '/functions.wp-styles.php' );
-
-
+&
-    $scripts->base_url = get_option( 'siteurl' );
-    $scripts->default_version = get_bloginfo( 'version' );
@@ -204 +204 @@
-}
-
+function wp_default_styles( &$styles ) {
+    $styles->base_url = get_option( 'siteurl' );
+    $styles->default_version = get_bloginfo( 'version' );
+    $styles->text_direction = 'rtl' == get_bloginfo( 'text_direction' ) ? 'rtl' : 'ltr';
+
+    $rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets' );
+
+    $styles->add( 'wp-admin', '/wp-admin/wp-admin.css' );
+    $styles->add_data( 'wp-admin', 'rtl', '/wp-admin/rtl.css' );
+
+    $styles->add( 'ie', '/wp-admin/css/ie.css' );
+    $styles->add_data( 'ie', 'conditional', 'gte IE 6' );
+
+    $styles->add( 'colors', true ); // Register "meta" stylesheet for admin colors
+
+    $styles->add( 'global', '/wp-admin/css/global.css' );
+    $styles->add( 'media', '/wp-admin/css/media.css' );
+    $styles->add( 'widgets', '/wp-admin/css/widgets.css' );
+    $styles->add( 'dashboard', '/wp-admin/css/dashboard.css' );
+    $styles->add( 'install', '/wp-admin/css/install.css' );
+    $styles->add( 'theme-editor', '/wp-admin/css/theme-editor.css' );
+    $styles->add( 'press-this', '/wp-admin/css/press-this.css' );
+    $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css' );
+    $styles->add( 'login', '/wp-admin/css/login.css' );
+
+    foreach ( $rtl_styles as $rtl_style )
+        $styles->add_data( $rtl_style, 'rtl', true );
+}
+
-function wp_prototype_before_jquery( $js_array ) {
-    if ( false === $jquery = array_search( 'jquery', $js_array ) )
@@ -233 +262 @@
-}
-
+function wp_style_loader_src( $src, $handle ) {
+    if ( defined('WP_INSTALLING') )
+        return preg_replace( '#^wp-admin/#', './', $src );
+
+    if ( 'colors' == $handle || 'colors-rtl' == $handle ) {
+        global $_wp_admin_css_colors;
+        $color = get_user_option('admin_color');
+        if ( empty($color) || !isset($_wp_admin_css_colors[$color]) )
+            $color = 'fresh';
+        $color = $_wp_admin_css_colors[$color];
+        $parsed = parse_url( $src );
+        $url = $color->url;
+        if ( isset($parsed['query']) && $parsed['query'] ) {
+            wp_parse_str( $parsed['query'], $qv );
+            $url = add_query_arg( $qv, $url );
+        }
+        return $url;
+    }
+
+    return $src;
+}
+
-add_action( 'wp_default_scripts', 'wp_default_scripts' );
-add_filter( 'wp_print_scripts', 'wp_just_in_time_script_localization' );
-add_filter( 'print_scripts_array', 'wp_prototype_before_jquery' );
+
+add_action( 'wp_default_styles', 'wp_default_styles' );
+add_filter( 'style_loader_src', 'wp_style_loader_src', 10, 2 );