diff --git a/admin/globals/formats.php b/admin/globals/formats.php new file mode 100644 index 00000000..cfb4703c --- /dev/null +++ b/admin/globals/formats.php @@ -0,0 +1,14 @@ + array(), 'list' => array() ); + + $sportspress_formats['event']['league'] = __( 'League', 'sportspress' ); + $sportspress_formats['event']['friendly'] = __( 'Friendly', 'sportspress' ); + + $sportspress_formats['list']['list'] = __( 'List', 'sportspress' ); + $sportspress_formats['list']['roster'] = __( 'Roster', 'sportspress' ); + $sportspress_formats['list']['gallery'] = __( 'Gallery', 'sportspress' ); +} +add_action( 'init', 'sportspress_define_formats_global', 10 ); diff --git a/admin/hooks/admin-init.php b/admin/hooks/admin-init.php index 7c9dbf24..1b0b3ec6 100644 --- a/admin/hooks/admin-init.php +++ b/admin/hooks/admin-init.php @@ -7,7 +7,6 @@ function sportspress_admin_init() { 'sp_player', 'sp_list', 'sp_staff', - 'sp_sponsor', 'sp_config', ); diff --git a/admin/hooks/gettext.php b/admin/hooks/gettext.php index 0418a3bb..524d181d 100644 --- a/admin/hooks/gettext.php +++ b/admin/hooks/gettext.php @@ -3,7 +3,7 @@ function sportspress_gettext( $translated_text, $untranslated_text, $domain ) { global $typenow; if ( is_admin() ): - if ( in_array( $typenow, array( 'sp_team', 'sp_sponsor' ) ) ): + if ( in_array( $typenow, array( 'sp_team' ) ) ): switch ( $untranslated_text ): case 'Set featured image': $translated_text = __( 'Select Logo', 'sportspress' ); @@ -42,14 +42,6 @@ function sportspress_gettext( $translated_text, $untranslated_text, $domain ) { break; endswitch; endif; - - if ( in_array( $typenow, array( 'sp_sponsor' ) ) ): - switch ( $untranslated_text ): - case 'Enter title here': - $translated_text = __( 'Sponsor', 'sportspress' ); - break; - endswitch; - endif; if ( in_array( $typenow, array( 'sp_player', 'sp_staff' ) ) ): switch ( $untranslated_text ): diff --git a/admin/hooks/manage-posts-columns.php b/admin/hooks/manage-posts-columns.php index e6fc1f3b..77c0dcd8 100644 --- a/admin/hooks/manage-posts-columns.php +++ b/admin/hooks/manage-posts-columns.php @@ -108,9 +108,6 @@ function sportspress_manage_posts_custom_column( $column, $post_id ) { case 'sp_venue': echo get_the_terms ( $post_id, 'sp_venue' ) ? the_terms( $post_id, 'sp_venue' ) : '—'; break; - case 'sp_sponsor': - echo get_the_terms ( $post_id, 'sp_sponsor' ) ? the_terms( $post_id, 'sp_sponsor' ) : '—'; - break; case 'sp_time': echo get_post_time( 'H:i', false, $post ); break; diff --git a/admin/hooks/register-activation-hook.php b/admin/hooks/register-activation-hook.php index 3831578a..e6089ae0 100644 --- a/admin/hooks/register-activation-hook.php +++ b/admin/hooks/register-activation-hook.php @@ -75,17 +75,6 @@ function sportspress_activation_hook() { 'delete_private_sp_tables' => true, 'delete_published_sp_tables' => true, - 'edit_sp_sponsor' => true, - 'edit_sp_sponsors' => true, - 'edit_private_sp_sponsors' => true, - 'edit_published_sp_sponsors' => true, - 'read_sp_sponsors' => true, - 'read_private_sp_sponsors' => true, - 'publish_sp_sponsors' => true, - 'delete_sp_sponsors' => true, - 'delete_private_sp_sponsors' => true, - 'delete_published_sp_sponsors' => true, - 'view_sportspress_reports' => true, ) ); diff --git a/admin/hooks/save-post.php b/admin/hooks/save-post.php index 6faa4dbc..e8170457 100644 --- a/admin/hooks/save-post.php +++ b/admin/hooks/save-post.php @@ -45,9 +45,6 @@ function sportspress_save_post( $post_id ) { // Update season taxonomy wp_set_post_terms( $post_id, sportspress_array_value( $_POST, 'sp_season', 0 ), 'sp_season' ); - // Update tournament taxonomy - wp_set_post_terms( $post_id, sportspress_array_value( $_POST, 'sp_tournament', 0 ), 'sp_tournament' ); - // Update venue taxonomy wp_set_post_terms( $post_id, sportspress_array_value( $_POST, 'sp_venue', 0 ), 'sp_venue' ); diff --git a/admin/post-types/event.php b/admin/post-types/event.php index febd3972..ac523389 100644 --- a/admin/post-types/event.php +++ b/admin/post-types/event.php @@ -61,13 +61,13 @@ function sportspress_event_meta_init( $post ) { } function sportspress_event_format_meta( $post ) { - $format = get_post_meta( $post->ID, 'sp_format', true ); + global $sportspress_formats; + $the_format = get_post_meta( $post->ID, 'sp_format', true ); ?>
- > -
> -
> -
+ $format ): ?> + >
+
ID, 'sp_type', null ); $league_id = sportspress_get_the_term_id( $post->ID, 'sp_league', 0 ); $season_id = sportspress_get_the_term_id( $post->ID, 'sp_season', 0 ); - $tournament_id = sportspress_get_the_term_id( $post->ID, 'sp_tournament', 0 ); $venue_id = sportspress_get_the_term_id( $post->ID, 'sp_venue', 0 ); ?>
-
+

-
-

-

- 'sp_tournament', - 'name' => 'sp_tournament', - 'selected' => $tournament_id, - 'values' => 'term_id', - 'show_option_none' => __( '-- Not set --', 'sportspress' ), - ); - if ( ! sportspress_dropdown_taxonomies( $args ) ): - sportspress_taxonomy_adder( 'sp_tournament', 'sp_team', __( 'Add New', 'sportspress' ) ); - endif; - ?> -

-

ID, 'sp_format', true ); + global $sportspress_formats; + $the_format = get_post_meta( $post->ID, 'sp_format', true ); ?>

- > -
> -
> -
+ $format ): ?> + >
+
__( 'Sponsors', 'sportspress' ), - 'singular_name' => __( 'Sponsor', 'sportspress' ), - 'add_new_item' => __( 'Add New Sponsor', 'sportspress' ), - 'edit_item' => __( 'Edit Sponsor', 'sportspress' ), - 'new_item' => __( 'New', 'sportspress' ), - 'view_item' => __( 'View', 'sportspress' ), - 'search_items' => __( 'Search', 'sportspress' ), - 'not_found' => __( 'No results found.', 'sportspress' ), - 'not_found_in_trash' => __( 'No results found.', 'sportspress' ), - ); - $args = array( - 'label' => __( 'Sponsors', 'sportspress' ), - 'labels' => $labels, - 'public' => true, - 'has_archive' => false, - 'hierarchical' => false, - 'supports' => array( 'title', 'editor', 'author', 'thumbnail' ), - 'register_meta_box_cb' => 'sportspress_sponsor_meta_init', - 'rewrite' => array( 'slug' => get_option( 'sp_sponsor_slug', 'sponsor' ) ), - 'menu_icon' => 'dashicons-portfolio', - 'capability_type' => 'sp_sponsor' - ); - register_post_type( 'sp_sponsor', $args ); -} -add_action( 'init', 'sportspress_sponsor_post_init' ); - -function sportspress_sponsor_meta_init() { -} - -function sportspress_sponsor_edit_columns() { - $columns = array( - 'cb' => '', - 'sp_icon' => ' ', - 'title' => __( 'Name', 'sportspress' ), - 'sp_views' => __( 'Views', 'sportspress' ), - ); - return $columns; -} -add_filter( 'manage_edit-sp_sponsor_columns', 'sportspress_sponsor_edit_columns' ); diff --git a/admin/post-types/staff.php b/admin/post-types/staff.php index 0065caa2..5642daf1 100644 --- a/admin/post-types/staff.php +++ b/admin/post-types/staff.php @@ -21,7 +21,6 @@ function sportspress_staff_post_init() { 'register_meta_box_cb' => 'sportspress_staff_meta_init', 'rewrite' => array( 'slug' => get_option( 'sp_staff_slug', 'staff' ) ), 'show_in_menu' => 'edit.php?post_type=sp_player', - 'menu_icon' => 'dashicons-businessman', 'capability_type' => 'sp_staff' ); register_post_type( 'sp_staff', $args ); diff --git a/admin/terms/league.php b/admin/terms/league.php index ed1aa98d..8cf30b89 100644 --- a/admin/terms/league.php +++ b/admin/terms/league.php @@ -4,7 +4,7 @@ function sportspress_league_term_init() { 'name' => __( 'Leagues', 'sportspress' ), 'singular_name' => __( 'League', 'sportspress' ), 'all_items' => __( 'All', 'sportspress' ), - 'edit_item' => __( 'Edit', 'sportspress' ), + 'edit_item' => __( 'Edit League', 'sportspress' ), 'view_item' => __( 'View', 'sportspress' ), 'update_item' => __( 'Update', 'sportspress' ), 'add_new_item' => __( 'Add New', 'sportspress' ), diff --git a/admin/terms/position.php b/admin/terms/position.php index 2d6abfd4..fdf97535 100644 --- a/admin/terms/position.php +++ b/admin/terms/position.php @@ -4,7 +4,7 @@ function sportspress_position_term_init() { 'name' => __( 'Positions', 'sportspress' ), 'singular_name' => __( 'Position', 'sportspress' ), 'all_items' => __( 'All', 'sportspress' ), - 'edit_item' => __( 'Edit', 'sportspress' ), + 'edit_item' => __( 'Edit Position', 'sportspress' ), 'view_item' => __( 'View', 'sportspress' ), 'update_item' => __( 'Update', 'sportspress' ), 'add_new_item' => __( 'Add New', 'sportspress' ), diff --git a/admin/terms/season.php b/admin/terms/season.php index 85cb3a76..baa79f6c 100644 --- a/admin/terms/season.php +++ b/admin/terms/season.php @@ -4,7 +4,7 @@ function sportspress_season_term_init() { 'name' => __( 'Seasons', 'sportspress' ), 'singular_name' => __( 'Season', 'sportspress' ), 'all_items' => __( 'All', 'sportspress' ), - 'edit_item' => __( 'Edit', 'sportspress' ), + 'edit_item' => __( 'Edit Season', 'sportspress' ), 'view_item' => __( 'View', 'sportspress' ), 'update_item' => __( 'Update', 'sportspress' ), 'add_new_item' => __( 'Add New', 'sportspress' ), diff --git a/admin/terms/venue.php b/admin/terms/venue.php index 68128eed..2b6dbd88 100644 --- a/admin/terms/venue.php +++ b/admin/terms/venue.php @@ -4,7 +4,7 @@ function sportspress_venue_term_init() { 'name' => __( 'Venues', 'sportspress' ), 'singular_name' => __( 'Venue', 'sportspress' ), 'all_items' => __( 'All', 'sportspress' ), - 'edit_item' => __( 'Edit', 'sportspress' ), + 'edit_item' => __( 'Edit Venue', 'sportspress' ), 'view_item' => __( 'View', 'sportspress' ), 'update_item' => __( 'Update', 'sportspress' ), 'add_new_item' => __( 'Add New', 'sportspress' ), diff --git a/admin/tools/event-importer.php b/admin/tools/event-importer.php index 5b687fe0..b5ea1bcb 100644 --- a/admin/tools/event-importer.php +++ b/admin/tools/event-importer.php @@ -110,10 +110,13 @@ if ( class_exists( 'WP_Importer' ) ) { $header = fgetcsv( $handle, 0, $this->delimiter ); - if ( sizeof( $header ) >= 4 ): + if ( sizeof( $header ) >= 3 ): $loop = 0; + // Get event format + $event_format = ( empty( $_POST['sp_format'] ) ? false : $_POST['sp_format'] ); + // Get league $league = ( empty( $_POST['sp_league'] ) ? false : $_POST['sp_league'] ); @@ -128,7 +131,7 @@ if ( class_exists( 'WP_Importer' ) ) { while ( ( $row = fgetcsv( $handle, 0, $this->delimiter ) ) !== FALSE ): - $date = str_replace( '/', '-', $row[0] ); + $date = str_replace( '/', '-', trim( $row[0] ) ); unset( $row[0] ); if ( ! empty( $date ) ): @@ -145,10 +148,10 @@ if ( class_exists( 'WP_Importer' ) ) { endif; // Add time to date - $date .= ' ' . $row[1]; + $date .= ' ' . trim( $row[1] ); unset( $row[1] ); - $venue = $row[2]; + $venue = trim( $row[2] ); unset( $row[2] ); // Initialize arrays @@ -161,14 +164,14 @@ if ( class_exists( 'WP_Importer' ) ) { $teamdata = explode( '|', $team ); - $name = $teamdata[0]; + $name = trim( $teamdata[0] ); unset( $teamdata[0] ); $team_results = array(); if ( sizeof( $result_labels ) > 0 ): foreach( $result_labels as $key => $label ): - $team_results[ $key ] = array_shift( $teamdata ); + $team_results[ $key ] = trim( array_shift( $teamdata ) ); endforeach; endif; @@ -176,6 +179,8 @@ if ( class_exists( 'WP_Importer' ) ) { foreach ( $teamdata as $outcome ): + $outcome = trim( $outcome ); + // Get or insert outcome $outcome_object = get_page_by_path( $outcome, OBJECT, 'sp_outcome' ); if ( $outcome_object ): @@ -208,6 +213,11 @@ if ( class_exists( 'WP_Importer' ) ) { // Flag as import update_post_meta( $id, '_sp_import', 1 ); + // Update event format + if ( $event_format ): + update_post_meta( $id, 'sp_format', $event_format ); + endif; + // Update league if ( $league ): wp_set_object_terms( $id, $league, 'sp_league', false ); @@ -271,7 +281,7 @@ if ( class_exists( 'WP_Importer' ) ) { $team_name = $team_names[ $ti ]; $statistics = explode( '|', $player ); - $name = $statistics[0]; + $name = trim( $statistics[0] ); unset( $statistics[0] ); $player_statistics = array(); @@ -442,7 +452,7 @@ if ( class_exists( 'WP_Importer' ) ) { echo '
'; echo '

' . __( 'Hi there! Choose a .csv file to upload, then click "Upload file and import".', 'sportspress' ).'

'; - echo '

' . sprintf( __( 'Events need to be defined with columns in a specific order (4+ columns). Click here to download a sample.', 'sportspress' ), SPORTSPRESS_PLUGIN_URL . 'dummy-data/events-sample.csv' ) . '

'; + echo '

' . sprintf( __( 'Events need to be defined with columns in a specific order (3+ columns). Click here to download a sample.', 'sportspress' ), SPORTSPRESS_PLUGIN_URL . 'dummy-data/events-sample.csv' ) . '

'; $action = 'admin.php?import=sportspress_event_csv&step=1'; @@ -480,6 +490,16 @@ if ( class_exists( 'WP_Importer' ) ) {
+ +
+ +
+ +
+
+
+ +
'slug', 'show_option_none' => __( '-- Not set --', 'sportspress' ), ); - sportspress_dropdown_taxonomies( $args ); + if ( ! sportspress_dropdown_taxonomies( $args ) ): + echo '

' . __( 'None', 'sportspress' ) . '

'; + sportspress_taxonomy_adder( 'sp_league', 'sp_team', __( 'Add New', 'sportspress' ) ); + endif; ?> @@ -501,7 +524,10 @@ if ( class_exists( 'WP_Importer' ) ) { 'values' => 'slug', 'show_option_none' => __( '-- Not set --', 'sportspress' ), ); - sportspress_dropdown_taxonomies( $args ); + if ( ! sportspress_dropdown_taxonomies( $args ) ): + echo '

' . __( 'None', 'sportspress' ) . '

'; + sportspress_taxonomy_adder( 'sp_season', 'sp_team', __( 'Add New', 'sportspress' ) ); + endif; ?> diff --git a/assets/css/admin.css b/assets/css/admin.css index f53f9ca5..494f3b29 100644 --- a/assets/css/admin.css +++ b/assets/css/admin.css @@ -54,7 +54,6 @@ #adminmenu #menu-posts-sp_event .menu-icon-sp_event div.wp-menu-image:before, #adminmenu #menu-posts-sp_team .menu-icon-sp_team div.wp-menu-image:before, #adminmenu #menu-posts-sp_player .menu-icon-sp_player div.wp-menu-image:before, -#adminmenu #menu-posts-sp_sponsor .menu-icon-sp_sponsor div.wp-menu-image:before, #sp_formatdiv .post-format-icon:before { font-family: sportspress, dashicons !important; width: 20px; @@ -65,11 +64,6 @@ content: "\f313"; } -.post-state-format.post-format-tournament:before, .post-format-icon.post-format-tournament:before, a.post-state-format.format-tournament:before { - content: "\f325"; - font-family: dashicons !important; -} - .post-state-format.post-format-friendly:before, .post-format-icon.post-format-friendly:before, a.post-state-format.format-friendly:before { content: "\f328"; } diff --git a/assets/fonts/sportspress.eot b/assets/fonts/sportspress.eot index 9f245794..1ee9bb44 100755 Binary files a/assets/fonts/sportspress.eot and b/assets/fonts/sportspress.eot differ diff --git a/assets/fonts/sportspress.svg b/assets/fonts/sportspress.svg index 5d4f77a6..8dfd563f 100755 --- a/assets/fonts/sportspress.svg +++ b/assets/fonts/sportspress.svg @@ -11,7 +11,7 @@ - + diff --git a/assets/fonts/sportspress.ttf b/assets/fonts/sportspress.ttf index 3aecbea3..5872c1ee 100755 Binary files a/assets/fonts/sportspress.ttf and b/assets/fonts/sportspress.ttf differ diff --git a/assets/fonts/sportspress.woff b/assets/fonts/sportspress.woff index 187d01c7..8051f916 100755 Binary files a/assets/fonts/sportspress.woff and b/assets/fonts/sportspress.woff differ diff --git a/dummy-data/events-sample.csv b/dummy-data/events-sample.csv new file mode 100644 index 00000000..1ac6ecef --- /dev/null +++ b/dummy-data/events-sample.csv @@ -0,0 +1 @@ +Date,Time,Venue,Team 1,Team 2 2014/01/20,14:15:00,Little Park,Essendon Eagles|1|3|4|Win,Southbank Sharks|2|0|2|Loss ,,,Joe Allen|0|1|0|0,Daniel Sturridge|1|0|1|0 ,,,David Hardy|2|0|1|0,Jake Price|0|0|1|1 ,,,Jude Murray|0|2|0|0,Owen Goodwin|1|2|0|0 ,,,Isaac Hall|1|1|0|0,Dylan Gray|0|0|1|0 ,,,Nathan Knowles|1|0|0|1,Zachary Noble|0|0|2|0 2014/01/24,16:00:00,Big Stadium,Carlton Kangaroos|1|1|2|Win,Essendon Eagles|0|1|1|Loss ,,,Steven Gerrard|0|0|0|0,Joe Allen|1|0|3|0 ,,,Gabrielle Gonzalez|1|0|1|0,David Hardy|0|0|1|1 ,,,Harrison Hancock|0|2|0|0,Ellis Nicholls|0|1|0|0 ,,,Reece Reeves|1|0|0|0,Corey Kirk|0|0|1|0 ,,,Edward Colier|0|0|0|1,Isaac Hall|0|0|2|0 2014/03/14,16:00:00,Little Park,Southbank Sharks|2|0|2|Loss,Essendon Eagles|1|2|3|Win ,,,Daniel Sturridge|1|0|1|0,Joe Allen|1|1|0|0 ,,,Jake Price|1|0|0|0,David Hardy|0|0|1|0 ,,,Owen Goodwin|0|1|0|0,Jude Murray|1|0|1|0 ,,,Dylan Gray|0|1|1|0,Corey Kirk|1|1|0|0 ,,,Henry Chadwick|0|0|0|1,Spencer Duncan|0|0|0|1 2015/12/10,13:00:00,Little Park,Essendon Eagles,Carlton Kangaroos 2016/05/05,12:00:00,Big Stadium,Southbank Sharks,Carlton Kangaroos ,,,, ,,,, ,,,, \ No newline at end of file diff --git a/presets/sports/baseball.php b/presets/sports/baseball.php index 1209882a..d1291678 100644 --- a/presets/sports/baseball.php +++ b/presets/sports/baseball.php @@ -154,13 +154,13 @@ $sportspress_sports['baseball'] = array( // Outcomes 'sp_outcome' => array( array( - 'post_title' => 'W', + 'post_title' => 'Win', 'post_name' => 'w', 'meta' => array( ), ), array( - 'post_title' => 'L', + 'post_title' => 'Loss', 'post_name' => 'l', 'meta' => array( ), diff --git a/presets/sports/football.php b/presets/sports/football.php index 6705abcb..21b861fd 100644 --- a/presets/sports/football.php +++ b/presets/sports/football.php @@ -87,15 +87,15 @@ $sportspress_sports['football'] = array( // Outcomes 'sp_outcome' => array( array( - 'post_title' => 'W', + 'post_title' => 'Win', 'post_name' => 'w', ), array( - 'post_title' => 'L', + 'post_title' => 'Loss', 'post_name' => 'l', ), array( - 'post_title' => 'T', + 'post_title' => 'Tie', 'post_name' => 't', ), ), diff --git a/presets/sports/hockey.php b/presets/sports/hockey.php index 57c85e69..3928a3ed 100644 --- a/presets/sports/hockey.php +++ b/presets/sports/hockey.php @@ -72,15 +72,15 @@ $sportspress_sports['hockey'] = array( // Outcomes 'sp_outcome' => array( array( - 'post_title' => 'W', + 'post_title' => 'Win', 'post_name' => 'w' ), array( - 'post_title' => 'L', + 'post_title' => 'Loss', 'post_name' => 'l' ), array( - 'post_title' => 'OT', + 'post_title' => 'Overtime', 'post_name' => 'ot' ), ), diff --git a/presets/sports/rugby.php b/presets/sports/rugby.php index adeb3249..ec63eb4b 100644 --- a/presets/sports/rugby.php +++ b/presets/sports/rugby.php @@ -18,15 +18,15 @@ $sportspress_sports['rugby'] = array( // Outcomes 'sp_outcome' => array( array( - 'post_title' => 'W', + 'post_title' => 'Win', 'post_name' => 'w', ), array( - 'post_title' => 'D', + 'post_title' => 'Draw', 'post_name' => 'd', ), array( - 'post_title' => 'L', + 'post_title' => 'Loss', 'post_name' => 'l', ), ), diff --git a/presets/sports/soccer.php b/presets/sports/soccer.php index cb4e10ad..85bc2cdc 100644 --- a/presets/sports/soccer.php +++ b/presets/sports/soccer.php @@ -43,15 +43,15 @@ $sportspress_sports['soccer'] = array( // Outcomes 'sp_outcome' => array( array( - 'post_title' => 'W', + 'post_title' => 'Win', 'post_name' => 'w', ), array( - 'post_title' => 'D', + 'post_title' => 'Draw', 'post_name' => 'd', ), array( - 'post_title' => 'L', + 'post_title' => 'Loss', 'post_name' => 'l', ), ), diff --git a/sportspress.php b/sportspress.php index 68666a59..7b84c984 100644 --- a/sportspress.php +++ b/sportspress.php @@ -30,6 +30,7 @@ require_once dirname( __FILE__ ) . '/lib/eos/eos.class.php' ; require_once dirname( __FILE__ ) . '/admin/globals/continents.php'; require_once dirname( __FILE__ ) . '/admin/globals/countries.php'; require_once dirname( __FILE__ ) . '/admin/globals/sports.php'; +require_once dirname( __FILE__ ) . '/admin/globals/formats.php'; // Functions require_once dirname( __FILE__ ) . '/functions.php'; @@ -72,7 +73,6 @@ require_once dirname( __FILE__ ) . '/admin/post-types/table.php'; require_once dirname( __FILE__ ) . '/admin/post-types/player.php'; require_once dirname( __FILE__ ) . '/admin/post-types/list.php'; require_once dirname( __FILE__ ) . '/admin/post-types/staff.php'; -require_once dirname( __FILE__ ) . '/admin/post-types/sponsor.php'; // Terms require_once dirname( __FILE__ ) . '/admin/terms/league.php';