| @@ -11,9 +11,9 @@ | ||
| 11 | 11 | Domain Path: /languages |
| 12 | 12 | Description: Visually compresses the administratrive meta-boxes so that more admin page content can be initially seen. The plugin that lets you hide 'unnecessary' items from the WordPress administration menu, for alle roles of your install. You can also hide post meta controls on the edit-area to simplify the interface. It is possible to simplify the admin in different for all roles. |
| 13 | 13 | Author: Frank Bültge |
| 14 | 14 | Author URI: http://bueltge.de/ |
| 15 | -Version: 1.7.15 | |
| 15 | +Version: 1.7.17 | |
| 16 | 16 | License: GPL |
| 17 | 17 | */ |
| 18 | 18 | |
| 19 | 19 | /** |
| @@ -199,9 +199,9 @@ | ||
| 199 | 199 | /** |
| 200 | 200 | * check user-option and add new style |
| 201 | 201 | * @uses $pagenow |
| 202 | 202 | */ |
| 203 | -function _mw_adminimize_init() { | |
| 203 | +function _mw_adminimize_admin_init() { | |
| 204 | 204 | global $pagenow, $menu, $submenu, $adminimizeoptions, $wp_version; |
| 205 | 205 | |
| 206 | 206 | if ( function_exists('get_post_type_object') ) { |
| 207 | 207 | if ( isset($_GET['post']) ) |
| @@ -383,11 +383,8 @@ | ||
| 383 | 383 | |
| 384 | 384 | // global_options |
| 385 | 385 | add_action('admin_head', '_mw_adminimize_set_global_option', 1); |
| 386 | 386 | |
| 387 | - // admin bar | |
| 388 | - _mw_adminimize_remove_admin_bar(); | |
| 389 | - | |
| 390 | 387 | // set metabox post option |
| 391 | 388 | $post_pages = array('post-new.php', 'post.php', 'post'); |
| 392 | 389 | if ( in_array( $pagenow, $post_pages ) || in_array($post_type, $post_pages) ) { |
| 393 | 390 | if ( ( esc_attr($_SERVER['QUERY_STRING']) != 'post_type=page' ) && ($post_type != 'page') ) |
| @@ -417,11 +414,12 @@ | ||
| 417 | 414 | |
| 418 | 415 | // on init of WordPress |
| 419 | 416 | add_action( 'init', '_mw_adminimize_textdomain' ); |
| 420 | 417 | add_action( 'init', '_mw_adminimize_register_styles' ); |
| 421 | -add_action( 'init', '_mw_adminimize_init', 1 ); | |
| 418 | +add_action( 'init', '_mw_adminimize_remove_admin_bar' ); | |
| 422 | 419 | |
| 423 | 420 | // on admin init |
| 421 | +add_action( 'admin_init', '_mw_adminimize_admin_init', 1 ); | |
| 424 | 422 | add_action( 'admin_menu', '_mw_adminimize_add_settings_page' ); |
| 425 | 423 | add_action( 'admin_menu', '_mw_adminimize_remove_dashboard' ); |
| 426 | 424 | add_action( 'admin_init', '_mw_adminimize_admin_styles', 1 ); |
| 427 | 425 | |
| @@ -551,9 +549,27 @@ | ||
| 551 | 549 | global $wp_version; |
| 552 | 550 | |
| 553 | 551 | $_mw_adminimize_path = WP_PLUGIN_URL . '/' . plugin_basename( dirname(__FILE__) ) . '/css/'; |
| 554 | 552 | |
| 555 | - if ( version_compare( $wp_version, '2.7alpha', '>=' ) ) { | |
| 553 | + if ( version_compare( $wp_version, '3.0alpha', '>=' ) ) { | |
| 554 | + | |
| 555 | + // MW Adminimize Classic Tweak | |
| 556 | + $styleName = 'Adminimize:' . ' Tweak ' . __('Blue'); | |
| 557 | + wp_admin_css_color ( | |
| 558 | + 'mw_classic_tweak', $styleName, $_mw_adminimize_path . 'mw_classic28_tweak.css', | |
| 559 | + array('#073447', '#21759b', '#eaf3fa', '#bbd8e7') | |
| 560 | + ); | |
| 561 | + | |
| 562 | + // MW Adminimize Fresh Tweak | |
| 563 | + $styleName = 'Adminimize:' . ' Tweak ' . __('Gray'); | |
| 564 | + wp_admin_css_color ( | |
| 565 | + 'mw_fresh_tweak', $styleName, $_mw_adminimize_path . 'mw_fresh28_tweak.css', | |
| 566 | + array('#464646', '#6d6d6d', '#f1f1f1', '#dfdfdf') | |
| 567 | + ); | |
| 568 | + | |
| 569 | + } | |
| 570 | + | |
| 571 | + if ( version_compare( $wp_version, '2.7alpha', '>=' ) && version_compare( $wp_version, '3.0alpha', '<' ) ) { | |
| 556 | 572 | // MW Adminimize Classic |
| 557 | 573 | $styleName = 'Adminimize:' . ' ' . __('Blue'); |
| 558 | 574 | wp_admin_css_color ( |
| 559 | 575 | 'mw_classic', $styleName, $_mw_adminimize_path . 'mw_classic27.css', |
| @@ -594,9 +610,9 @@ | ||
| 594 | 610 | 'mw_fresh_tweak', $styleName, $_mw_adminimize_path . 'mw_fresh28_tweak.css', |
| 595 | 611 | array('#464646', '#6d6d6d', '#f1f1f1', '#dfdfdf') |
| 596 | 612 | ); |
| 597 | 613 | |
| 598 | - } else { | |
| 614 | + } elseif ( version_compare( $wp_version, '2.7alpha', '<' ) ) { | |
| 599 | 615 | // MW Adminimize Classic |
| 600 | 616 | $styleName = 'MW Adminimize:' . ' ' . __('Classic'); |
| 601 | 617 | wp_admin_css_color ( |
| 602 | 618 | 'mw_classic', $styleName, $_mw_adminimize_path . 'mw_classic.css', |
| @@ -941,9 +957,9 @@ | ||
| 941 | 957 | |
| 942 | 958 | foreach ($user_roles as $role) { |
| 943 | 959 | $disabled_global_option_[$role] = _mw_adminimize_getOptionValue('mw_adminimize_disabled_global_option_'. $role .'_items'); |
| 944 | 960 | } |
| 945 | - | |
| 961 | + | |
| 946 | 962 | foreach ($user_roles as $role) { |
| 947 | 963 | if ( !isset($disabled_global_option_[$role]['0']) ) |
| 948 | 964 | $disabled_global_option_[$role]['0'] = ''; |
| 949 | 965 | } |
| @@ -966,8 +982,9 @@ | ||
| 966 | 982 | add_filter( 'show_admin_bar', '__return_false' ); |
| 967 | 983 | wp_deregister_script( 'admin-bar' ); |
| 968 | 984 | wp_deregister_style( 'admin-bar' ); |
| 969 | 985 | remove_action( 'wp_footer', 'wp_admin_bar_render', 1000 ); |
| 986 | + remove_action( 'wp_head', '_admin_bar_bump_cb' ); | |
| 970 | 987 | } |
| 971 | 988 | } |
| 972 | 989 | |
| 973 | 990 | |
