From 7138d5af58dfe8779ad3376d366dc37a2a80b440 Mon Sep 17 00:00:00 2001 From: ryan Date: Thu, 27 Nov 2008 21:11:25 +0000 Subject: [PATCH] Create Tools screen. fixes #8361 git-svn-id: http://svn.automattic.com/wordpress/trunk@9929 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/admin.php | 6 +++--- wp-admin/css/colors-fresh.css | 2 +- wp-admin/import.php | 1 + wp-admin/includes/plugin.php | 4 ++-- wp-admin/menu.php | 11 +++++------ wp-admin/options-writing.php | 3 --- wp-admin/{turbo.php => tools.php} | 13 ++++++++++--- 7 files changed, 22 insertions(+), 18 deletions(-) rename wp-admin/{turbo.php => tools.php} (87%) diff --git a/wp-admin/admin.php b/wp-admin/admin.php index 0a721cf29..e639e86d0 100644 --- a/wp-admin/admin.php +++ b/wp-admin/admin.php @@ -60,8 +60,8 @@ if (isset($plugin_page)) { if( ! $page_hook = get_plugin_page_hook($plugin_page, $pagenow) ) { $page_hook = get_plugin_page_hook($plugin_page, $plugin_page); // backwards compatibility for plugins using add_management_page - if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook($plugin_page, 'import.php') ) { - wp_redirect('import.php?page=' . $plugin_page); + if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook($plugin_page, 'tools.php') ) { + wp_redirect('tool.php?page=' . $plugin_page); exit; } } @@ -112,7 +112,7 @@ if (isset($plugin_page)) { include(ABSPATH . "wp-admin/import/$importer.php"); } - $parent_file = 'import.php'; + $parent_file = 'tools.php'; $submenu_file = 'import.php'; $title = __('Import'); diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index 1f3807d33..ff6c3b206 100644 --- a/wp-admin/css/colors-fresh.css +++ b/wp-admin/css/colors-fresh.css @@ -1587,7 +1587,7 @@ form p.submit a.cancel:hover { background: transparent url(../images/icons32.png) no-repeat -600px -5px; } -#icon-import, +#icon-tools, #icon-admin { background: transparent url(../images/icons32.png) no-repeat -432px -5px; } diff --git a/wp-admin/import.php b/wp-admin/import.php index a2f37c328..64408f033 100644 --- a/wp-admin/import.php +++ b/wp-admin/import.php @@ -10,6 +10,7 @@ require_once ('admin.php'); $title = __('Import'); require_once ('admin-header.php'); +$parent_file = 'tools.php'; ?>
diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index f126d3bc6..5b1a635fa 100644 --- a/wp-admin/includes/plugin.php +++ b/wp-admin/includes/plugin.php @@ -625,7 +625,7 @@ function add_submenu_page( $parent, $page_title, $menu_title, $access_level, $fi * @return unknown */ function add_management_page( $page_title, $menu_title, $access_level, $file, $function = '' ) { - return add_submenu_page( 'import.php', $page_title, $menu_title, $access_level, $file, $function ); + return add_submenu_page( 'tools.php', $page_title, $menu_title, $access_level, $file, $function ); } function add_options_page( $page_title, $menu_title, $access_level, $file, $function = '' ) { @@ -1032,4 +1032,4 @@ function settings_fields($option_group) { wp_nonce_field("$option_group-options"); } -?> \ No newline at end of file +?> diff --git a/wp-admin/menu.php b/wp-admin/menu.php index c8ccf9b8a..3c4157d76 100644 --- a/wp-admin/menu.php +++ b/wp-admin/menu.php @@ -83,12 +83,11 @@ if ( current_user_can('edit_users') ) { $submenu['profile.php'][5] = array(__('Your Profile'), 'read', 'profile.php'); } -$menu[45] = array( __('Tools'), 'manage_options', 'import.php', '', 'menu-top', 'menu-tools', 'div' ); - $submenu['import.php'][5] = array( __('Import'), 'import', 'import.php' ); - $submenu['import.php'][10] = array( __('Export'), 'import', 'export.php' ); - if ( ! $is_opera ) - $submenu['import.php'][20] = array( __('Turbo'), 'read', 'turbo.php' ); - $submenu['import.php'][30] = array( __('Upgrade'), 'install_plugins', 'update-core.php'); +$menu[45] = array( __('Tools'), 'manage_options', 'tools.php', '', 'menu-top', 'menu-tools', 'div' ); + $submenu['tools.php'][5] = array( __('Tools'), 'read', 'tools.php' ); + $submenu['tools.php'][10] = array( __('Import'), 'import', 'import.php' ); + $submenu['tools.php'][15] = array( __('Export'), 'import', 'export.php' ); + $submenu['tools.php'][20] = array( __('Upgrade'), 'install_plugins', 'update-core.php'); $menu[50] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top', 'menu-settings', 'div' ); $submenu['options-general.php'][10] = array(__('General'), 'manage_options', 'options-general.php'); diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php index 63fda90e6..ede84ebf3 100644 --- a/wp-admin/options-writing.php +++ b/wp-admin/options-writing.php @@ -126,9 +126,6 @@ wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'default_email_categor -

-

-

diff --git a/wp-admin/turbo.php b/wp-admin/tools.php similarity index 87% rename from wp-admin/turbo.php rename to wp-admin/tools.php index 1f4885178..1a6ac0438 100644 --- a/wp-admin/turbo.php +++ b/wp-admin/tools.php @@ -9,16 +9,19 @@ /** WordPress Administration Bootstrap */ require_once('admin.php'); -$title = __('Turbo'); +$title = __('Tools'); wp_enqueue_script( 'wp-gears' ); require_once('admin-header.php'); +screen_icon(); +?> +

+
- -

+

@@ -78,6 +81,10 @@ if ( ! $is_opera ) { +

+

+ \ No newline at end of file