diff --git a/admin/woocommerce-admin-content.php b/admin/woocommerce-admin-content.php index ee5f53a266e..4cbb6f4578b 100644 --- a/admin/woocommerce-admin-content.php +++ b/admin/woocommerce-admin-content.php @@ -22,9 +22,9 @@ function woocommerce_admin_help_tab_content() { '

' . sprintf(__( 'Thank you for using WooCommerce :) Should you need help using or extending WooCommerce please read the documentation. For further assistance you can use the community forum or if you have access, the members forum.', 'woocommerce' ), 'http://www.woothemes.com/woocommerce-docs/', 'http://www.woothemes.com/support-forum/?viewforum=150', 'http://www.woothemes.com/support-forum/') . '

' . - '

' . __( 'If you are having problems, or to assist us with support, please check the debugging page to identify any problems with your configuration:', 'woocommerce' ) . '

' . + '

' . __( 'If you are having problems, or to assist us with support, please check the status page to identify any problems with your configuration:', 'woocommerce' ) . '

' . - '

' . __( 'Debugging Info & Tools', 'woocommerce' ) . '

' . + '

' . __( 'System Status', 'woocommerce' ) . '

' . '

' . sprintf(__( 'If you come across a bug, or wish to contribute to the project you can also get involved on GitHub.', 'woocommerce' ), 'https://github.com/woothemes/woocommerce') . '

' diff --git a/admin/woocommerce-admin-init.php b/admin/woocommerce-admin-init.php index ef6dc96f206..1833f350b7a 100644 --- a/admin/woocommerce-admin-init.php +++ b/admin/woocommerce-admin-init.php @@ -15,6 +15,7 @@ * Sets up the admin menus in wordpress. */ add_action('admin_menu', 'woocommerce_admin_menu', 9); +add_action('admin_menu', 'woocommerce_admin_menu_after', 50); function woocommerce_admin_menu() { global $menu, $woocommerce; @@ -29,18 +30,22 @@ function woocommerce_admin_menu() { $reports_page = add_submenu_page('woocommerce', __('Reports', 'woocommerce'), __('Reports', 'woocommerce') , 'view_woocommerce_reports', 'woocommerce_reports', 'woocommerce_reports_page'); add_submenu_page('edit.php?post_type=product', __('Attributes', 'woocommerce'), __('Attributes', 'woocommerce'), 'manage_woocommerce_products', 'woocommerce_attributes', 'woocommerce_attributes_page'); - - $status_page = add_submenu_page( 'tools.php', __('WooCommerce Debug', 'woocommerce'), __('WC Debug', 'woocommerce') , 'manage_woocommerce', 'woocommerce_debug', 'woocommerce_debug_page'); - + add_action('load-' . $main_page, 'woocommerce_admin_help_tab'); add_action('load-' . $reports_page, 'woocommerce_admin_help_tab'); - $print_css_on = array( 'toplevel_page_woocommerce', 'woocommerce_page_woocommerce_reports', 'tools_page_woocommerce_debug', 'product_page_woocommerce_attributes', 'edit-tags.php', 'edit.php', 'index.php', 'post-new.php', 'post.php' ); + $print_css_on = array( 'toplevel_page_woocommerce', 'woocommerce_page_woocommerce_reports', 'woocommerce_page_woocommerce_status', 'product_page_woocommerce_attributes', 'edit-tags.php', 'edit.php', 'index.php', 'post-new.php', 'post.php' ); foreach ( $print_css_on as $page ) add_action( 'admin_print_styles-'. $page, 'woocommerce_admin_css' ); } +function woocommerce_admin_menu_after() { + + $status_page = add_submenu_page( 'woocommerce', __('WooCommerce Status', 'woocommerce'), __('System Status', 'woocommerce') , 'manage_woocommerce', 'woocommerce_status', 'woocommerce_status_page'); + +} + /** * Highlights the correct top level admin menu item for post type add screens. */ @@ -176,9 +181,9 @@ function woocommerce_attributes_page() { include_once( 'woocommerce-admin-attributes.php' ); woocommerce_attributes(); } -function woocommerce_debug_page() { - include_once( 'woocommerce-admin-debug.php' ); - woocommerce_debug(); +function woocommerce_status_page() { + include_once( 'woocommerce-admin-status.php' ); + woocommerce_status(); } /** diff --git a/admin/woocommerce-admin-debug.php b/admin/woocommerce-admin-status.php similarity index 94% rename from admin/woocommerce-admin-debug.php rename to admin/woocommerce-admin-status.php index 1776628cb02..7c35ee4dd8c 100644 --- a/admin/woocommerce-admin-debug.php +++ b/admin/woocommerce-admin-status.php @@ -7,7 +7,7 @@ * @package WooCommerce */ -function woocommerce_debug() { +function woocommerce_status() { global $woocommerce; $tools = apply_filters( 'wc_debug_tools', array( @@ -26,7 +26,7 @@ function woocommerce_debug() { ?>

-

+

' . sprintf( __('%s - We recommend setting memory to at least 64MB. See: Increasing memory allocated to PHP', 'woocommerce'), wp_convert_bytes_to_hr( $memory ), 'http://codex.wordpress.org/Editing_wp-config.php#Increasing_memory_allocated_to_PHP' ) . ''; + } else { + echo '' . wp_convert_bytes_to_hr( $memory ) . ''; + } ?> @@ -373,7 +379,7 @@ function woocommerce_debug() {

- +

diff --git a/readme.txt b/readme.txt index 1d1756166ea..284c41b6742 100644 --- a/readme.txt +++ b/readme.txt @@ -149,6 +149,7 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc == +* Tweak - Change debug page to status page to make it more noticeable. * Tweak - Broken up settings pages to ease development * Fix - Strange error where detecting the page (is_page etc) would break the canonical redirect in some instances when hooked into 'wp'. Used the later get_header hook instead. * Fix - fix for https://bugs.php.net/bug.php?id=61166 (thanks Max Rice)