Adjustments to event importer

2014-03-15 19:51:03 +11:00
parent f9ae46f9ce
commit a7df2745e1
27 changed files with 83 additions and 135 deletions
--- a/admin/globals/formats.php
+++ b/admin/globals/formats.php
@@ -0,0 +1,14 @@
+<?php
+function sportspress_define_formats_global() {
+	global $sportspress_formats;
+
+	$sportspress_formats = array( 'event' => 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 );
--- 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',
    );

--- 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' );
@@ -43,14 +43,6 @@ function sportspress_gettext( $translated_text, $untranslated_text, $domain ) {
 			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 ):
 			case 'Featured Image':
--- 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' ) : '&mdash;';
 			break;
-		case 'sp_sponsor':
-			echo get_the_terms ( $post_id, 'sp_sponsor' ) ? the_terms( $post_id, 'sp_sponsor' ) : '&mdash;';
-			break;
 		case 'sp_time':
 			echo get_post_time( 'H:i', false, $post );
 			break;
--- 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,
        )
    );
--- 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' );

--- 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 );
 	?>
 	<div id="post-formats-select">
-		<input type="radio" name="sp_format" class="post-format" id="post-format-league" value="league" <?php checked( true, ! $format || $format == 'league' ); ?>> <label for="post-format-league" class="post-format-icon post-format-league">League</label>
-		<br><input type="radio" name="sp_format" class="post-format" id="post-format-tournament" value="tournament" <?php checked( 'tournament', $format ); ?>> <label for="post-format-tournament" class="post-format-icon post-format-tournament">Tournament</label>
-		<br><input type="radio" name="sp_format" class="post-format" id="post-format-friendly" value="friendly" <?php checked( 'friendly', $format ); ?>> <label for="post-format-friendly" class="post-format-icon post-format-friendly">Friendly</label>
-		<br>
+		<?php foreach ( $sportspress_formats['event'] as $key => $format ): ?>
+			<input type="radio" name="sp_format" class="post-format" id="post-format-<?php echo $key; ?>" value="<?php echo $key; ?>" <?php checked( true, ( $key == 'league' && ! $the_format ) || $the_format == $key ); ?>> <label for="post-format-<?php echo $key; ?>" class="post-format-icon post-format-<?php echo $key; ?>"><?php echo $format; ?></label><br>
+		<?php endforeach; ?>
 	</div>
 	<?php
 }
@@ -76,11 +76,10 @@ function sportspress_event_details_meta( $post ) {
 	$type = sportspress_get_the_term_id( $post->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 );
 	?>
 	<div>
-		<fieldset class="sp-event-format-field sp-league-event-field sp-league-event-field">
+		<fieldset class="sp-event-format-field sp-league-event-field sp-friendly-event-field">
 			<p><strong><?php _e( 'League', 'sportspress' ); ?></strong></p>
 			<p>
 				<?php
@@ -112,23 +111,6 @@ function sportspress_event_details_meta( $post ) {
 				?>
 			</p>
 		</fieldset>
-		<fieldset class="sp-event-format-field sp-tournament-event-field">
-			<p><strong><?php _e( 'Tournament', 'sportspress' ); ?></strong></p>
-			<p>
-				<?php
-				$args = array(
-					'taxonomy' => '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;
-				?>
-			</p>
-		</fieldset>
 		<p><strong><?php _e( 'Venue', 'sportspress' ); ?></strong></p>
 		<p>
 			<?php
--- a/admin/post-types/list.php
+++ b/admin/post-types/list.php
@@ -58,13 +58,13 @@ function sportspress_list_meta_init( $post ) {
 }

 function sportspress_list_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 );
 	?>
 	<div id="post-formats-select">
-		<input type="radio" name="sp_format" class="post-format" id="post-format-list" value="list" <?php checked( true, ! $format || $format == 'list' ); ?>> <label for="post-format-list" class="post-format-icon post-format-list"><?php _e( 'List', 'sportspress' ); ?></label>
-		<br><input type="radio" name="sp_format" class="post-format" id="post-format-roster" value="roster" <?php checked( 'roster', $format ); ?>> <label for="post-format-roster" class="post-format-icon post-format-roster"><?php _e( 'Roster', 'sportspress' ); ?></label>
-		<br><input type="radio" name="sp_format" class="post-format" id="post-format-gallery" value="gallery" <?php checked( 'gallery', $format ); ?>> <label for="post-format-gallery" class="post-format-icon post-format-gallery"><?php _e( 'Gallery', 'sportspress' ); ?></label>
-		<br>
+		<?php foreach ( $sportspress_formats['list'] as $key => $format ): ?>
+			<input type="radio" name="sp_format" class="post-format" id="post-format-<?php echo $key; ?>" value="<?php echo $key; ?>" <?php checked( true, ( $key == 'list' && ! $the_format ) || $the_format == $key ); ?>> <label for="post-format-<?php echo $key; ?>" class="post-format-icon post-format-<?php echo $key; ?>"><?php echo $format; ?></label><br>
+		<?php endforeach; ?>
 	</div>
 	<?php
 }
--- a/admin/post-types/sponsor.php
+++ b/admin/post-types/sponsor.php
@@ -1,42 +0,0 @@
-<?php
-function sportspress_sponsor_post_init() {
-	$labels = array(
-		'name' => __( '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' => '<input type="checkbox" />',
-		'sp_icon' => '&nbsp;',
-		'title' => __( 'Name', 'sportspress' ),
-		'sp_views' => __( 'Views', 'sportspress' ),
-	);
-	return $columns;
-}
-add_filter( 'manage_edit-sp_sponsor_columns', 'sportspress_sponsor_edit_columns' );
--- 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 );
--- 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' ),
--- 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' ),
--- 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' ),
--- 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' ),
--- 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 '<div class="narrow">';
 			echo '<p>' . __( 'Hi there! Choose a .csv file to upload, then click "Upload file and import".', 'sportspress' ).'</p>';

-			echo '<p>' . sprintf( __( 'Events need to be defined with columns in a specific order (4+ columns). <a href="%s">Click here to download a sample</a>.', 'sportspress' ), SPORTSPRESS_PLUGIN_URL . 'dummy-data/events-sample.csv' ) . '</p>';
+			echo '<p>' . sprintf( __( 'Events need to be defined with columns in a specific order (3+ columns). <a href="%s">Click here to download a sample</a>.', 'sportspress' ), SPORTSPRESS_PLUGIN_URL . 'dummy-data/events-sample.csv' ) . '</p>';

 			$action = 'admin.php?import=sportspress_event_csv&step=1';

@@ -480,6 +490,16 @@ if ( class_exists( 'WP_Importer' ) ) {
 								<th><label><?php _e( 'Delimiter', 'sportspress' ); ?></label><br/></th>
 								<td><input type="text" name="delimiter" placeholder="," size="2" /></td>
 							</tr>
+							<tr>
+								<th><label><?php _e( 'Format', 'sportspress' ); ?></label><br/></th>
+								<td id="sp_formatdiv">
+									<div id="post-formats-select">
+										<input type="radio" name="sp_format" class="post-format" id="post-format-league" value="league" checked="checked"> <label for="post-format-league" class="post-format-icon post-format-league">League</label>
+										<br><input type="radio" name="sp_format" class="post-format" id="post-format-friendly" value="friendly"> <label for="post-format-friendly" class="post-format-icon post-format-friendly">Friendly</label>
+										<br>
+									</div>
+								</td>
+							</tr>
 							<tr>
 								<th><label><?php _e( 'League', 'sportspress' ); ?></label><br/></th>
 								<td><?php
@@ -489,7 +509,10 @@ if ( class_exists( 'WP_Importer' ) ) {
 									'values' => 'slug',
 									'show_option_none' => __( '-- Not set --', 'sportspress' ),
 								);
-								sportspress_dropdown_taxonomies( $args );
+								if ( ! sportspress_dropdown_taxonomies( $args ) ):
+									echo '<p>' . __( 'None', 'sportspress' ) . '</p>';
+									sportspress_taxonomy_adder( 'sp_league', 'sp_team', __( 'Add New', 'sportspress' ) );
+								endif;
 								?></td>
 							</tr>
 							<tr>
@@ -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 '<p>' . __( 'None', 'sportspress' ) . '</p>';
+									sportspress_taxonomy_adder( 'sp_season', 'sp_team', __( 'Add New', 'sportspress' ) );
+								endif;
 								?></td>
 							</tr>
 						</tbody>
--- 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";
 }
--- a/assets/fonts/sportspress.eot
+++ b/assets/fonts/sportspress.eot
--- a/assets/fonts/sportspress.svg
+++ b/assets/fonts/sportspress.svg
@@ -11,7 +11,7 @@
 <glyph unicode="&#xf307;" d="M384 102.4h-256v179.2h-76.8v102.4l130.4 25.6c8.56-33.12 38.56-57.6 74.4-57.6s65.84 24.48 74.4 57.6l130.4-25.6v-102.4h-76.8v-179.2zM384 76.8v-51.2h-256v51.2h256z" />
 <glyph unicode="&#xf313;" d="M435.2 332.8h-0.8l0.8-177.6v-1.6c0-6.96-2.56-12.96-7.6-18s-11.040-7.6-18-7.6h-307.2c-7.2 0-13.28 2.56-18.24 7.6s-7.36 11.040-7.36 18v1.6l0.8 177.6h-0.8c-7.2 0-13.28 2.48-18.24 7.36s-7.36 11.040-7.36 18.24 2.48 13.28 7.36 18.24 10.96 7.36 18.080 7.36 13.12-2.48 18.24-7.36 7.52-11.040 7.52-18.24c0-8.8-3.6-15.76-10.8-20.8l87.6-124 66.4 147.2c-4.56 1.84-8.16 4.96-11.040 9.2s-4.16 8.96-4.16 14c0 7.2 2.48 13.28 7.36 18.24s10.96 7.36 18 7.36c7.040 0 13.12-2.48 18.24-7.36s7.6-11.040 7.6-18.24c0-5.040-1.44-9.76-4.16-14s-6.48-7.36-11.040-9.2l66.4-147.2 87.6 124c-7.2 5.040-10.8 12-10.8 20.8 0 7.2 2.48 13.28 7.36 18.24s10.96 7.36 18 7.36 13.12-2.48 18.24-7.36 7.6-11.040 7.6-18.24-2.56-13.28-7.6-18.24-11.040-7.36-18-7.36zM76.8 102.4h358.4c6.96 0 12.96-2.48 18-7.36s7.6-10.96 7.6-18-2.56-13.12-7.6-18.24-11.040-7.6-18-7.6h-358.4c-6.96 0-12.96 2.56-18 7.6s-7.6 11.12-7.6 18.16 2.48 13.040 7.36 18 11.040 7.44 18.24 7.44z" />
 <glyph unicode="&#xf322;" d="M430.8 56.56l-116.8 97.2h-160.4v-76.8c0-7.2-2.56-13.28-7.6-18.24s-11.040-7.36-18-7.36h-25.6c-7.2 0-13.28 2.48-18.24 7.36s-7.36 11.040-7.36 18.24v76.8c-7.2 0-13.28 2.48-18.24 7.36s-7.36 11.040-7.36 18.24v128c0 7.2 2.48 13.28 7.36 18.24s11.040 7.36 18.24 7.36h237.2l116.8 97.2c2.96 3.2 6.88 4.88 11.84 4.96s9.2-0.88 12.8-3.040 5.44-4.8 5.44-8v-362c0-3.2-1.76-5.84-5.44-8s-7.84-3.040-12.8-2.8c-4.96 0.4-8.88 2.080-11.84 5.28zM243.2 332.96h-51.2c3.44 0 6.48-1.28 8.96-3.84s3.84-5.52 3.84-8.96v-153.6c0-3.44-1.28-6.48-3.84-8.96s-5.52-3.84-8.96-3.84h51.2c-3.76 0-6.8 1.28-9.2 3.84s-3.6 5.52-3.6 8.96v153.6c0 3.44 1.2 6.48 3.6 8.96s5.44 3.84 9.2 3.84z" />
-<glyph unicode="&#xf325;" d="M130.857 223.143q-21.143 46.286-21.143 106h-73.143v-27.428q0-22.286 27-46.286t67.285-32.286zM438.857 301.714v27.428h-73.143q0-59.714-21.143-106 40.286 8.286 67.286 32.286t27 46.286zM475.428 338.286v-36.571q0-20.286-11.857-40.857t-32-37.143-49.428-27.857-61.572-12.714q-12-15.428-27.143-27.143-10.857-9.714-15-20.714t-4.143-25.572q0-15.428 8.714-26t27.857-10.572q21.428 0 38.143-13t16.714-32.714v-18.286q0-4-2.572-6.572t-6.572-2.572h-237.714q-4 0-6.572 2.572t-2.572 6.572v18.286q0 19.714 16.715 32.714t38.143 13q19.143 0 27.857 10.572t8.714 26q0 14.572-4.143 25.572t-15 20.714q-15.143 11.714-27.143 27.143-32.285 1.428-61.572 12.714t-49.428 27.857-32 37.143-11.857 40.857v36.572q0 11.428 8 19.428t19.428 8h82.285v27.428q0 18.857 13.428 32.286t32.285 13.428h164.571q18.857 0 32.286-13.428t13.428-32.286v-27.428h82.286q11.428 0 19.428-8t8-19.428z" horiz-adv-x="476" />
+<glyph unicode="&#xf325;" d="M381.28 261.12c-8.56-52.4-48.16-94.16-99.68-104.8v-54c0-28.32 22.96-51.28 51.28-51.28h25.6v-25.6h-204.96v25.6h25.6c28.32 0 51.28 22.96 51.28 51.28v54c-51.44 10.64-91.12 52.4-99.68 104.8-60.48 15.84-105.36 70.4-105.36 135.84 0 4.4 0.88 8.56 1.28 12.8h101.2v51.2h256.24v-51.28h101.2c0.4-4.32 1.28-8.4 1.28-12.8 0-65.44-44.8-119.92-105.28-135.76zM127.92 384.080h-75.6c4.96-44.4 34.96-81.040 75.6-95.6v95.6zM384.080 384.080v-95.6c40.64 14.56 70.56 51.2 75.6 95.6h-75.6z" />
 <glyph unicode="&#xf328;" d="M324 170.571q-10.572-34.572-39.428-55.714t-65.143-21.143-65.143 21.143-39.428 55.714q-2.285 7.143 1.143 13.857t10.857 9q7.143 2.286 13.857-1.143t9-10.857q7.143-22.857 26.428-37t43.286-14.143 43.286 14.143 26.428 37q2.286 7.428 9.143 10.857t14 1.143 10.572-9 1.143-13.857zM182.857 294.857q0-15.143-10.714-25.857t-25.857-10.714-25.857 10.714-10.715 25.857 10.715 25.857 25.857 10.714 25.857-10.714 10.714-25.857zM329.143 294.857q0-15.143-10.714-25.857t-25.857-10.714-25.857 10.714-10.714 25.857 10.714 25.857 25.857 10.714 25.857-10.714 10.714-25.857zM402.286 221.714q0 37.143-14.572 71t-39 58.286-58.286 39-71 14.572-71-14.572-58.285-39-39-58.286-14.572-71 14.572-71 39-58.286 58.285-39 71-14.572 71 14.572 58.286 39 39 58.286 14.572 71zM438.857 221.714q0-59.714-29.428-110.143t-79.857-79.857-110.143-29.428-110.143 29.428-79.857 79.857-29.428 110.143 29.428 110.143 79.857 79.857 110.143 29.428 110.143-29.428 79.857-79.857 29.428-110.143z" horiz-adv-x="439" />
 <glyph unicode="&#xf334;" d="M425.76 151.28c-6.16-15.76-14-29.84-23.2-42s-20.24-24.080-33.040-35.68c-12.8-11.52-24.56-21.2-35.36-28.88-10.88-7.6-22.080-14.88-33.84-21.68-11.84-6.8-20.16-11.44-25.12-13.92-4.96-2.4-8.96-4.24-11.92-5.52-2.24-1.2-4.64-1.68-7.28-1.68s-5.040 0.64-7.28 1.68c-3.040 1.28-6.88 3.12-11.92 5.52-5.040 2.4-13.36 7.040-25.12 13.92-11.76 6.8-23.040 14-33.84 21.68-10.88 7.68-22.56 17.28-35.36 28.88-12.8 11.52-23.84 23.36-33.040 35.68s-16.96 26.24-23.2 42c-6.32 15.76-9.44 31.76-9.44 47.76v215.040c0 4.8 1.68 9.12 5.28 12.64 3.6 3.52 7.76 5.28 12.64 5.28h322.56c4.8 0 9.12-1.68 12.64-5.28s5.28-7.76 5.28-12.64v-215.040c0-16-3.2-32-9.44-47.76zM384 380.8h-256v-181.92c0-33.36 22.4-67.52 67.12-102.32 17.92-14 38.24-27.040 60.88-38.96v0 0 0 0c22.64 11.92 42.96 24.96 60.88 38.96 44.72 34.88 67.12 68.96 67.12 102.32v181.92zM304.72 119.6c-14.32-11.6-30.56-22.4-48.72-32.24v0 0 267.68h102.4v-150.72c0-27.6-17.92-55.84-53.68-84.72z" />
 <glyph unicode="&#xf469;" d="M256 465.92c-130.073 0-235.52-105.472-235.52-235.52 0-130.073 105.447-235.52 235.52-235.52s235.52 105.447 235.52 235.52c0 130.074-105.447 235.52-235.52 235.52zM256 46.080c-101.811 0-184.32 82.534-184.32 184.32s82.509 184.32 184.32 184.32 184.32-82.534 184.32-184.32-82.509-184.32-184.32-184.32zM273.92 363.52h-35.84v-140.544l87.168-87.168 25.344 25.344-76.672 76.672z" />
--- a/assets/fonts/sportspress.ttf
+++ b/assets/fonts/sportspress.ttf
--- a/assets/fonts/sportspress.woff
+++ b/assets/fonts/sportspress.woff
--- a/dummy-data/events-sample.csv
+++ b/dummy-data/events-sample.csv
@@ -0,0 +1 @@
+Date,Time,Venue,Team 1,Team 2
--- 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(
 				),
--- 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',
 			),
 		),
--- 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'
 			),
 		),
--- 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',
 			),
 		),
--- 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',
 			),
 		),
--- 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';