diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-06-13 17:21:00 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-06-13 17:21:00 +0000 |
| commit | 12de05107e4c8b006bde6ee8916f34eb476d08da (patch) | |
| tree | 123ee54ecd1f3f777373b7df54a4604012d43640 /wp-admin/admin-header.php | |
| parent | e51c7a9ca4bfdb45fa3ec7334bd33871e78c68b1 (diff) | |
| download | wordpress-mu-12de05107e4c8b006bde6ee8916f34eb476d08da.tar.gz wordpress-mu-12de05107e4c8b006bde6ee8916f34eb476d08da.tar.xz wordpress-mu-12de05107e4c8b006bde6ee8916f34eb476d08da.zip | |
WP Merge with revision 8075
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1328 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/admin-header.php')
| -rw-r--r-- | wp-admin/admin-header.php | 76 |
1 files changed, 62 insertions, 14 deletions
diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php index 0185a98..7073e2f 100644 --- a/wp-admin/admin-header.php +++ b/wp-admin/admin-header.php @@ -5,6 +5,7 @@ if ( $editing ) { if ( user_can_richedit() ) wp_enqueue_script( 'wp_tiny_mce' ); } +wp_enqueue_script( 'wp-gears' ); $min_width_pages = array( 'post.php', 'post-new.php', 'page.php', 'page-new.php', 'widgets.php', 'comment.php', 'link.php' ); $the_current_page = preg_replace('|^.*/wp-admin/|i', '', $_SERVER['PHP_SELF']); @@ -28,14 +29,13 @@ get_admin_page_title(); <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" /> <title><?php bloginfo('name') ?> › <?php echo wp_specialchars( strip_tags( $title ) ); ?> — 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[ addLoadEvent = function(func) {if (typeof jQuery != "undefined") jQuery(document).ready(func); else if (typeof wpOnload!='function'){wpOnload=func;} else {var oldonload=wpOnload; wpOnload=function(){oldonload();func();}}}; @@ -44,26 +44,74 @@ addLoadEvent = function(func) {if (typeof jQuery != "undefined") jQuery(document <?php if ( ($parent_file != 'link-manager.php') && ($parent_file != 'options-general.php') && $ie6_no_scrollbar ) : ?> <style type="text/css">* html { overflow-x: hidden; }</style> <?php endif; -if ( isset($page_hook) ) - do_action('admin_print_scripts-' . $page_hook); -else if ( isset($plugin_page) ) - do_action('admin_print_scripts-' . $plugin_page); -do_action('admin_print_scripts'); + +$hook_suffixes = array(); if ( isset($page_hook) ) - do_action('admin_head-' . $page_hook); + $hook_suffixes[] = "-$page_hook"; else if ( isset($plugin_page) ) - do_action('admin_head-' . $plugin_page); -do_action('admin_head'); + $hook_suffixes[] = "-$plugin_page"; +else if ( isset($pagenow) ) + $hook_suffixes[] = "-$pagenow"; + +$hook_suffixes[] = ''; + +foreach ( $hook_suffixes as $hook_suffix ) + do_action("admin_print_styles$hook_suffix"); // do_action( 'admin_print_styles-XXX' ); do_action( 'admin_print_styles' ); +foreach ( $hook_suffixes as $hook_suffix ) + do_action("admin_print_scripts$hook_suffix"); // do_action( 'admin_print_scripts-XXX' ); do_action( 'admin_print_scripts' ); +foreach ( $hook_suffixes as $hook_suffix ) + do_action("admin_head$hook_suffix"); // do_action( 'admin_head-XXX' ); do_action( 'admin_head' ); +unset($hook_suffixes, $hook_suffix); + ?> </head> <body class="wp-admin <?php echo apply_filters( 'admin_body_class', '' ); ?>"> <div id="wpwrap"> <div id="wpcontent"> <div id="wphead"> -<h1><?php bloginfo('name'); ?><span id="viewsite"><a href="<?php echo trailingslashit( get_option('home') ); ?>"><?php _e('Visit Site') ?></a></span></h1> +<h1><?php if ( '' == get_bloginfo('name') ) echo ' '; else echo get_bloginfo('name'); ?><span id="viewsite"><a href="<?php echo trailingslashit( get_option('home') ); ?>"><?php _e('Visit Site') ?></a></span></h1> </div> -<div id="user_info"><p><?php printf(__('Howdy, <a href="%1$s">%2$s</a>!'), 'profile.php', $user_identity) ?> | <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a> | <?php _e('<a href="http://codex.wordpress.org/">Help</a>') ?> | <?php _e('<a href="http://wordpress.org/support/">Forums</a>') ?></p></div> + +<?php +$gears_compat = false; + +if ( ($is_gecko || $is_winIE) && strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'webkit') === false ) { + $gears_compat = true; +?> + <div id="gears-info-box" class="info-box" style="display:none;"> + <img src="images/gear.png" title="Gear" alt="" class="gears-img" /> + <div id="gears-msg1"> + <h3 class="info-box-title"><?php _e('Speed up WordPress'); ?></h3> + <p><?php _e('WordPress has support for Gears that adds new features to your web browser.'); ?><br /> + <a href="http://gears.google.com/" target="_blank" style="font-weight:normal;"><?php _e('More information...'); ?></a></p> + <p><?php _e('After installing and enabling it, most of the WordPress images, scripts and CSS files will be stored on this computer. This will speed up page loading.'); ?></p> + <p><strong><?php _e('Please make sure you are not using a public or shared computer.'); ?></strong></p> + <div class="submit"><button onclick="window.location = 'http://gears.google.com/?action=install&return=<?php echo urlencode( admin_url() ); ?>';" class="button"><?php _e('Install Now'); ?></button> + <button class="button" style="margin-left:10px;" onclick="document.getElementById('gears-info-box').style.display='none';">Cancel</button></div> + </div> + + <div id="gears-msg2" style="display:none;"> + <h3 class="info-box-title"><?php _e('Gears Status'); ?></h3> + <p><?php _e('Gears is installed on this computer but is not enabled for use with WordPress.'); ?></p> + <p><?php _e('To enable it, make sure this web site is not on the denied list in Gears Settings under your browser\'s Tools menu, then click the button below.'); ?></p> + <p><strong><?php _e('However if this is a public or shared computer, Gears should not be enabled.'); ?></strong></p> + <div class="submit"><button class="button" onclick="wpGears.getPermission();"><?php _e('Enable Gears'); ?></button> + <button class="button" style="margin-left:10px;" onclick="document.getElementById('gears-info-box').style.display='none';">Cancel</button></div> + </div> + + <div id="gears-msg3" style="display:none;"> + <h3 class="info-box-title"><?php _e('Gears Status'); ?></h3> + <p><?php _e('Gears is installed and enabled on this computer. You can disable it from your browser Tools menu.'); ?></p> + <p><?php _e('If there are any errors, try disabling Gears, then reload the page and enable it again.'); ?></p> + <p><?php _e('Local storage status:'); ?> <span id="gears-wait"><span style="color:#f00;"><?php _e('Please wait! Updating files:'); ?></span> <span id="gears-upd-number"></span></span></p> + <div class="submit"><button class="button" onclick="document.getElementById('gears-info-box').style.display='none';"><?php _e('Close'); ?></button></div> + </div> + </div> + +<?php } ?> + +<div id="user_info"><p><?php printf(__('Howdy, <a href="%1$s">%2$s</a>!'), 'profile.php', $user_identity) ?> | <a href="<?php echo site_url('wp-login.php?action=logout', 'login') ?>" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a> | <?php _e('<a href="http://codex.wordpress.org/">Help</a>') ?> | <?php _e('<a href="http://wordpress.org/support/">Forums</a>') ?> | <?php if ( $gears_compat ) { ?><span id="gears-menu"><a href="#" onclick="wpGears.message(1);return false;"><?php _e('Speed up!') ?></a></span><?php } ?></p></div> <?php require(ABSPATH . 'wp-admin/menu-header.php'); |