From e80ae7a3b842314e06a36b5bf552f8a2525918a6 Mon Sep 17 00:00:00 2001
From: Brian Miyaji <brian@themeboy.com>
Date: Sat, 15 Mar 2014 20:04:18 +1100
Subject: [PATCH] Display event formats in admin list

---
 admin/hooks/manage-posts-columns.php | 14 +++++++---
 admin/post-types/event.php           | 39 ++++++++++++----------------
 assets/css/admin.css                 |  2 ++
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/admin/hooks/manage-posts-columns.php b/admin/hooks/manage-posts-columns.php
index 77c0dcd8..917bb00b 100644
--- a/admin/hooks/manage-posts-columns.php
+++ b/admin/hooks/manage-posts-columns.php
@@ -9,6 +9,17 @@ add_filter( 'manage_page_posts_columns', 'sportspress_manage_posts_columns' );
 function sportspress_manage_posts_custom_column( $column, $post_id ) {
 	global $post;
 	switch ( $column ):
+		case 'sp_format':
+			$format = get_post_meta( $post_id, 'sp_format', true );
+			switch ( $format ):
+				case 'friendly':
+					echo '<span class="dashicons sp-icon-smile tips" title="' . __( 'Friendly', 'sportspress' ) . '"></span>';
+					break;
+				default:
+					echo '<span class="dashicons sp-icon-crown tips" title="' . __( 'League', 'sportspress' ) . '"></span>';
+					break;
+			endswitch;
+			break;
 		case 'sp_icon':
 			edit_post_link( get_the_post_thumbnail( $post_id, 'sportspress-fit-icon' ), '', '', $post_id );
 			break;
@@ -96,9 +107,6 @@ function sportspress_manage_posts_custom_column( $column, $post_id ) {
 		case 'sp_player':
 			echo sportspress_posts( $post_id, 'sp_player' );
 			break;
-		case 'sp_event':
-			echo get_post_meta ( $post_id, 'sp_event' ) ? sizeof( get_post_meta ( $post_id, 'sp_event' ) ) : '&mdash;';
-			break;
 		case 'sp_league':
 			echo get_the_terms ( $post_id, 'sp_league' ) ? the_terms( $post_id, 'sp_league' ) : '&mdash;';
 			break;
diff --git a/admin/post-types/event.php b/admin/post-types/event.php
index ac523389..39435087 100644
--- a/admin/post-types/event.php
+++ b/admin/post-types/event.php
@@ -28,6 +28,23 @@ function sportspress_event_post_init() {
 }
 add_action( 'init', 'sportspress_event_post_init' );
 
+function sportspress_event_edit_columns() {
+	$columns = array(
+		'cb' => '<input type="checkbox" />',
+		'sp_format' => '<span class="dashicons sp-icon-calendar tips" title="' . __( 'Format', 'sportspress' ) . '"></span>',
+		'title' => __( 'Event', 'sportspress' ),
+		'date' => __( 'Date', 'sportspress' ),
+		'sp_time' => __( 'Time', 'sportspress' ),
+		'sp_team' => __( 'Teams', 'sportspress' ),
+		'sp_league' => __( 'League', 'sportspress' ),
+		'sp_season' => __( 'Season', 'sportspress' ),
+		'sp_venue' => __( 'Venue', 'sportspress' ),
+		'sp_views' => __( 'Views', 'sportspress' ),
+	);
+	return $columns;
+}
+add_filter( 'manage_edit-sp_event_columns', 'sportspress_event_edit_columns' );
+
 function sportspress_event_display_scheduled( $posts ) {
 	global $wp_query, $wpdb;
 	if ( is_single() && $wp_query->post_count == 0 && isset( $wp_query->query_vars['sp_event'] )) {
@@ -221,25 +238,3 @@ function sportspress_event_results_meta( $post ) {
 function sportspress_event_article_meta( $post ) {
 	wp_editor( $post->post_content, 'content' );
 }
-
-function sportspress_event_edit_columns() {
-	$columns = array(
-		'cb' => '<input type="checkbox" />',
-		'date' => '<span class="dashicons sp-icon-calendar tips" title="' . __( 'Date', 'sportspress' ) . '"></span>',
-		'sp_time' => '<span class="dashicons sp-icon-clock tips" title="' . __( 'Time', 'sportspress' ) . '"></span>',
-		'title' => __( 'Event', 'sportspress' ),
-		'sp_team' => __( 'Teams', 'sportspress' ),
-		'sp_league' => __( 'League', 'sportspress' ),
-		'sp_season' => __( 'Season', 'sportspress' ),
-		'sp_venue' => __( 'Venue', 'sportspress' ),
-		'sp_views' => __( 'Views', 'sportspress' ),
-	);
-	return $columns;
-}
-add_filter( 'manage_edit-sp_event_columns', 'sportspress_event_edit_columns' );
-
-function sportspress_event_edit_sortable_columns( $columns ) {
-	$columns['sp_datetime'] = 'sp_datetime';
-	return $columns;
-}
-//add_filter( 'manage_edit-sp_event_sortable_columns', 'sportspress_event_edit_sortable_columns' );
diff --git a/assets/css/admin.css b/assets/css/admin.css
index 494f3b29..a4e8a786 100644
--- a/assets/css/admin.css
+++ b/assets/css/admin.css
@@ -314,6 +314,8 @@ table.widefat.sp-league-table th input[type=checkbox] {
 	vertical-align: middle;
 }
 
+table.widefat th.column-sp_format,
+table.widefat td.column-sp_format,
 table.widefat th.column-sp_icon,
 table.widefat td.column-sp_icon,
 table.widefat th.column-sp_number,