From 4cd103d81c132e736808aafe2da3bb326914ea0b Mon Sep 17 00:00:00 2001 From: Brian Miyaji Date: Tue, 9 Dec 2014 18:05:15 +1100 Subject: [PATCH] sp => sports press to prevent conflict with SendPress --- assets/css/slickmap.css | 2 +- includes/admin/class-sp-admin-assets.php | 6 +-- includes/admin/class-sp-admin-menus.php | 49 +++++++++----------- includes/admin/views/html-admin-config.php | 2 +- includes/admin/views/html-admin-overview.php | 38 +++++++-------- 5 files changed, 47 insertions(+), 50 deletions(-) diff --git a/assets/css/slickmap.css b/assets/css/slickmap.css index c041b989..dd5a3649 100644 --- a/assets/css/slickmap.css +++ b/assets/css/slickmap.css @@ -6,7 +6,7 @@ Version 1.1 Copyright (c) 2009 Astuteo, LLC http://astuteo.com */ -.sp-overview-wrap { +.sportspress-overview-wrap { margin-right: 0; } diff --git a/includes/admin/class-sp-admin-assets.php b/includes/admin/class-sp-admin-assets.php index 8ee9d757..5efe26a1 100755 --- a/includes/admin/class-sp-admin-assets.php +++ b/includes/admin/class-sp-admin-assets.php @@ -39,11 +39,11 @@ class SP_Admin_Assets { wp_enqueue_style( 'jquery-chosen', SP()->plugin_url() . '/assets/css/chosen.css', array(), '1.1.0' ); wp_enqueue_style( 'wp-color-picker' ); wp_enqueue_style( 'sportspress-admin', SP()->plugin_url() . '/assets/css/admin.css', array(), SP_VERSION ); - } elseif ( strpos( $screen->id, 'sp-config' ) !== false ) { + } elseif ( strpos( $screen->id, 'sportspress-config' ) !== false ) { wp_enqueue_style( 'sportspress-admin', SP()->plugin_url() . '/assets/css/admin.css', array(), SP_VERSION ); } - if ( strpos( $screen->id, 'sp-overview' ) !== false ) { + if ( strpos( $screen->id, 'sportspress-overview' ) !== false ) { wp_enqueue_style( 'sportspress-admin-slickmap', SP()->plugin_url() . '/assets/css/slickmap.css', array(), '1.1.0' ); } @@ -97,7 +97,7 @@ class SP_Admin_Assets { wp_register_script( 'sportspress-admin-widgets', SP()->plugin_url() . '/assets/js/admin/widgets.js', array( 'jquery' ), SP_VERSION, true ); // SportsPress admin pages - if ( in_array( $screen->id, sp_get_screen_ids() ) || strpos( $screen->id, 'sp-config' )) { + if ( in_array( $screen->id, sp_get_screen_ids() ) || strpos( $screen->id, 'sportspress-config' )) { wp_enqueue_script( 'jquery' ); wp_enqueue_script( 'chosen' ); wp_enqueue_script( 'jquery-ui-core' ); diff --git a/includes/admin/class-sp-admin-menus.php b/includes/admin/class-sp-admin-menus.php index e3e285a4..6ef4dea3 100755 --- a/includes/admin/class-sp-admin-menus.php +++ b/includes/admin/class-sp-admin-menus.php @@ -27,7 +27,7 @@ class SP_Admin_Menus { add_action( 'admin_menu', array( $this, 'overview_menu' ), 8 ); add_action( 'admin_menu', array( $this, 'leagues_menu' ), 9 ); add_action( 'admin_menu', array( $this, 'seasons_menu' ), 10 ); - add_filter( 'admin_menu', array( $this, 'menu_add' ), 20 ); + add_action( 'admin_menu', array( $this, 'modules_menu' ), 11 ); add_action( 'admin_head', array( $this, 'menu_highlight' ) ); add_action( 'admin_head', array( $this, 'menu_rename' ) ); @@ -53,14 +53,14 @@ class SP_Admin_Menus { * Add menu item */ public function overview_menu() { - add_submenu_page( 'sportspress', __( 'Overview', 'sportspress' ), __( 'Overview', 'sportspress' ), 'manage_sportspress', 'sp-overview', array( $this, 'overview_page' ) ); + add_submenu_page( 'sportspress', __( 'Overview', 'sportspress' ), __( 'Overview', 'sportspress' ), 'manage_sportspress', 'sportspress-overview', array( $this, 'overview_page' ) ); } /** * Add menu item */ public function config_menu() { - add_submenu_page( 'sportspress', __( 'Configure', 'sportspress' ), __( 'Configure', 'sportspress' ), 'manage_sportspress', 'sp-config', array( $this, 'config_page' ) ); + add_submenu_page( 'sportspress', __( 'Configure', 'sportspress' ), __( 'Configure', 'sportspress' ), 'manage_sportspress', 'sportspress-config', array( $this, 'config_page' ) ); } /** @@ -77,6 +77,13 @@ class SP_Admin_Menus { add_submenu_page( 'sportspress', __( 'Seasons', 'sportspress' ), __( 'Seasons', 'sportspress' ), 'manage_sportspress', 'edit-tags.php?taxonomy=sp_season'); } + /** + * Add menu item + */ + public function modules_menu() { + add_submenu_page( 'sportspress', __( 'Modules', 'sportspress' ), __( 'Modules', 'sportspress' ), 'manage_sportspress', 'sportspress-extend', array( $this, 'config_page' ) ); + } + /** * Highlights the correct top level admin menu item for post type add screens. * @@ -89,15 +96,13 @@ class SP_Admin_Menus { if ( $screen->id == 'edit-sp_role' ) $this->highlight_admin_menu( 'edit.php?post_type=sp_player', 'edit-tags.php?taxonomy=sp_role&post_type=sp_player' ); elseif ( is_sp_config_type( $typenow ) ) - $this->highlight_admin_menu( 'sportspress', 'sp-config' ); + $this->highlight_admin_menu( 'sportspress', 'sportspress-config' ); elseif ( $typenow == 'sp_calendar' ) $this->highlight_admin_menu( 'edit.php?post_type=sp_event', 'edit.php?post_type=sp_calendar' ); elseif ( $typenow == 'sp_table' ) $this->highlight_admin_menu( 'edit.php?post_type=sp_team', 'edit.php?post_type=sp_table' ); elseif ( $typenow == 'sp_list' ) $this->highlight_admin_menu( 'edit.php?post_type=sp_player', 'edit.php?post_type=sp_list' ); - elseif ( $typenow == 'sp_staff' ) - $this->highlight_admin_menu( 'edit.php?post_type=sp_player', 'edit.php?post_type=sp_staff' ); } /** @@ -111,11 +116,6 @@ class SP_Admin_Menus { if ( isset( $submenu['sportspress'] ) && isset( $submenu['sportspress'][0] ) && isset( $submenu['sportspress'][0][0] ) ) $submenu['sportspress'][0][0] = __( 'Settings', 'sportspress' ); - - foreach ( $menu as $index => $values ): - if ( sp_array_value( $values, 0 ) === __( 'Players', 'sportspress' ) ) - $menu[ $index ][0] = __( 'Players & Staff', 'sportspress' ); - endforeach; } public function parent_file( $parent_file ) { @@ -143,6 +143,7 @@ class SP_Admin_Menus { $sportspress_event = array_search( 'edit.php?post_type=sp_event', $menu_order ); $sportspress_team = array_search( 'edit.php?post_type=sp_team', $menu_order ); $sportspress_player = array_search( 'edit.php?post_type=sp_player', $menu_order ); + $sportspress_staff = array_search( 'edit.php?post_type=sp_staff', $menu_order ); // Loop through menu order and do some rearranging foreach ( $menu_order as $index => $item ): @@ -153,10 +154,12 @@ class SP_Admin_Menus { $sportspress_menu_order[] = 'edit.php?post_type=sp_event'; $sportspress_menu_order[] = 'edit.php?post_type=sp_team'; $sportspress_menu_order[] = 'edit.php?post_type=sp_player'; + $sportspress_menu_order[] = 'edit.php?post_type=sp_staff'; unset( $menu_order[ $sportspress_separator ] ); unset( $menu_order[ $sportspress_event ] ); unset( $menu_order[ $sportspress_team ] ); unset( $menu_order[ $sportspress_player ] ); + unset( $menu_order[ $sportspress_staff ] ); // Apply to added menu items $menu_items = apply_filters( 'sportspress_menu_items', array() ); @@ -203,25 +206,31 @@ class SP_Admin_Menus { $menu[ $separator_position ] = array( '', 'read', 'separator-sportspress', '', 'wp-menu-separator sportspress' ); endif; - // Remove "Leagues" and "Seasons" links from Events submenu + // Remove "Competitions" and "Seasons" links from Events submenu if ( isset( $submenu['edit.php?post_type=sp_event'] ) ): $submenu['edit.php?post_type=sp_event'] = array_filter( $submenu['edit.php?post_type=sp_event'], array( $this, 'remove_leagues' ) ); $submenu['edit.php?post_type=sp_event'] = array_filter( $submenu['edit.php?post_type=sp_event'], array( $this, 'remove_seasons' ) ); endif; - // Remove "Venues", "Leagues" and "Seasons" links from Teams submenu + // Remove "Venues", "Competitions" and "Seasons" links from Teams submenu if ( isset( $submenu['edit.php?post_type=sp_team'] ) ): $submenu['edit.php?post_type=sp_team'] = array_filter( $submenu['edit.php?post_type=sp_team'], array( $this, 'remove_venues' ) ); $submenu['edit.php?post_type=sp_team'] = array_filter( $submenu['edit.php?post_type=sp_team'], array( $this, 'remove_leagues' ) ); $submenu['edit.php?post_type=sp_team'] = array_filter( $submenu['edit.php?post_type=sp_team'], array( $this, 'remove_seasons' ) ); endif; - // Remove "Leagues" and "Seasons" links from Players submenu + // Remove "Competitions" and "Seasons" links from Players submenu if ( isset( $submenu['edit.php?post_type=sp_player'] ) ): $submenu['edit.php?post_type=sp_player'] = array_filter( $submenu['edit.php?post_type=sp_player'], array( $this, 'remove_leagues' ) ); $submenu['edit.php?post_type=sp_player'] = array_filter( $submenu['edit.php?post_type=sp_player'], array( $this, 'remove_seasons' ) ); endif; + // Remove "Competitions" and "Seasons" links from Staff submenu + if ( isset( $submenu['edit.php?post_type=sp_staff'] ) ): + $submenu['edit.php?post_type=sp_staff'] = array_filter( $submenu['edit.php?post_type=sp_staff'], array( $this, 'remove_leagues' ) ); + $submenu['edit.php?post_type=sp_staff'] = array_filter( $submenu['edit.php?post_type=sp_staff'], array( $this, 'remove_seasons' ) ); + endif; + $user_roles = $current_user->roles; $user_role = array_shift($user_roles); @@ -232,18 +241,6 @@ class SP_Admin_Menus { endif; } - /** - * Add missing SP menu items in admin. - */ - public function menu_add() { - global $menu, $submenu, $current_user; - - // Add "Jobs" to Players submenu - if ( isset( $submenu['edit.php?post_type=sp_player'] ) ): - array_splice( $submenu['edit.php?post_type=sp_player'], 5, 0, array( array( __( 'Jobs', 'sportspress' ), 'manage_categories', 'edit-tags.php?taxonomy=sp_role&post_type=sp_player' ) ) ); - endif; - } - /** * Init the overview page */ diff --git a/includes/admin/views/html-admin-config.php b/includes/admin/views/html-admin-config.php index 2549179e..25339412 100644 --- a/includes/admin/views/html-admin-config.php +++ b/includes/admin/views/html-admin-config.php @@ -1,4 +1,4 @@ -
+

diff --git a/includes/admin/views/html-admin-overview.php b/includes/admin/views/html-admin-overview.php index eb10bb93..e0328122 100644 --- a/includes/admin/views/html-admin-overview.php +++ b/includes/admin/views/html-admin-overview.php @@ -1,4 +1,4 @@ -
+

@@ -10,7 +10,7 @@ @@ -18,7 +18,7 @@