From d433a58eb00f6bf324d04b3b2918ab15de4e18bd Mon Sep 17 00:00:00 2001
From: Brian Miyaji <brian@themeboy.com>
Date: Sat, 22 Mar 2014 17:09:23 +1100
Subject: [PATCH] Add table options to event statistics and simplify
 localization

---
 admin/settings/options-event.php  | 39 ++++++++++++++++++++++++++++++-
 admin/settings/options-player.php | 33 ++++++++------------------
 admin/settings/options-team.php   | 21 ++++-------------
 admin/settings/options-text.php   |  2 +-
 4 files changed, 53 insertions(+), 42 deletions(-)

diff --git a/admin/settings/options-event.php b/admin/settings/options-event.php
index 1997bdf3..f6cb5fe4 100644
--- a/admin/settings/options-event.php
+++ b/admin/settings/options-event.php
@@ -15,7 +15,7 @@ class SportsPressEventSettingsPage {
 		
 		add_settings_section(
 			'event',
-			__( 'Event Options', 'sportspress' ),
+			__( 'Events', 'sportspress' ),
 			'',
 			'sportspress_events'
 		);
@@ -28,6 +28,14 @@ class SportsPressEventSettingsPage {
 			'event'
 		);
 		
+		add_settings_field(	
+			'statistics',
+			__( 'Statistics', 'sportspress' ),
+			array( $this, 'statistics_callback' ),
+			'sportspress_events',
+			'event'
+		);
+		
 		add_settings_field(	
 			'results',
 			__( 'Results', 'sportspress' ),
@@ -60,6 +68,35 @@ class SportsPressEventSettingsPage {
 		<?php
 	}
 
+	function statistics_callback() {
+		$responsive = sportspress_array_value( $this->options, 'event_statistics_responsive', true );
+		$sortable = sportspress_array_value( $this->options, 'event_statistics_sortable', true );
+		$link_posts = sportspress_array_value( $this->options, 'event_statistics_link_posts', true );
+		?>
+		<fieldset>
+			<label for="sportspress_event_statistics_responsive">
+				<input id="sportspress_event_statistics_responsive_default" name="sportspress[event_statistics_responsive]" type="hidden" value="0">
+				<input id="sportspress_event_statistics_responsive" name="sportspress[event_statistics_responsive]" type="checkbox" value="1" <?php checked( $responsive ); ?>>
+				<?php _e( 'Responsive', 'sportspress' ); ?>
+			</label>
+		</fieldset>
+		<fieldset>
+			<label for="sportspress_event_statistics_sortable">
+				<input id="sportspress_event_statistics_sortable_default" name="sportspress[event_statistics_sortable]" type="hidden" value="0">
+				<input id="sportspress_event_statistics_sortable" name="sportspress[event_statistics_sortable]" type="checkbox" value="1" <?php checked( $sortable ); ?>>
+				<?php _e( 'Sortable', 'sportspress' ); ?>
+			</label>
+		</fieldset>
+		<fieldset>
+			<label for="sportspress_event_statistics_link_posts">
+				<input id="sportspress_event_statistics_link_posts_default" name="sportspress[event_statistics_link_posts]" type="hidden" value="0">
+				<input id="sportspress_event_statistics_link_posts" name="sportspress[event_statistics_link_posts]" type="checkbox" value="1" <?php checked( $link_posts ); ?>>
+				<?php _e( 'Link players', 'sportspress' ); ?>
+			</label>
+		</fieldset>
+		<?php
+	}
+
 	function results_callback() {
 		$main_result = sportspress_array_value( $this->options, 'main_result', 0 );
 
diff --git a/admin/settings/options-player.php b/admin/settings/options-player.php
index 3aaf6bde..981aa260 100644
--- a/admin/settings/options-player.php
+++ b/admin/settings/options-player.php
@@ -15,14 +15,14 @@ class SportsPressPlayerSettingsPage {
 		
 		add_settings_section(
 			'player',
-			__( 'Player Options', 'sportspress' ),
+			__( 'Players', 'sportspress' ),
 			'',
 			'sportspress_players'
 		);
 		
 		add_settings_section(
 			'list',
-			__( 'Player List Options', 'sportspress' ),
+			__( 'Player Lists', 'sportspress' ),
 			'',
 			'sportspress_players'
 		);
@@ -51,14 +51,6 @@ class SportsPressPlayerSettingsPage {
 			'list'
 		);
 		
-		add_settings_field(	
-			'players',
-			__( 'Players', 'sportspress' ),
-			array( $this, 'players_callback' ),
-			'sportspress_players',
-			'list'
-		);
-		
 		add_settings_field(	
 			'metrics',
 			__( 'Metrics', 'sportspress' ),
@@ -92,6 +84,7 @@ class SportsPressPlayerSettingsPage {
 	function list_callback() {
 		$responsive = sportspress_array_value( $this->options, 'player_list_responsive', true );
 		$sortable = sportspress_array_value( $this->options, 'player_list_sortable', true );
+		$link_posts = sportspress_array_value( $this->options, 'player_list_link_posts', true );
 		?>
 		<fieldset>
 			<label for="sportspress_player_list_responsive">
@@ -107,6 +100,13 @@ class SportsPressPlayerSettingsPage {
 				<?php _e( 'Sortable', 'sportspress' ); ?>
 			</label>
 		</fieldset>
+		<fieldset>
+			<label for="sportspress_player_list_link_posts">
+				<input id="sportspress_player_list_link_posts_default" name="sportspress[player_list_link_posts]" type="hidden" value="0">
+				<input id="sportspress_player_list_link_posts" name="sportspress[player_list_link_posts]" type="checkbox" value="1" <?php checked( $link_posts ); ?>>
+				<?php _e( 'Link players', 'sportspress' ); ?>
+			</label>
+		</fieldset>
 		<?php
 	}
 
@@ -123,19 +123,6 @@ class SportsPressPlayerSettingsPage {
 		<?php
 	}
 
-	function players_callback() {
-		$link_posts = sportspress_array_value( $this->options, 'player_list_link_posts', true );
-		?>
-		<fieldset>
-			<label for="sportspress_player_list_link_posts">
-				<input id="sportspress_player_list_link_posts_default" name="sportspress[player_list_link_posts]" type="hidden" value="0">
-				<input id="sportspress_player_list_link_posts" name="sportspress[player_list_link_posts]" type="checkbox" value="1" <?php checked( $link_posts ); ?>>
-				<?php _e( 'Display players as links', 'sportspress' ); ?>
-			</label>
-		</fieldset>
-		<?php
-	}
-
 	function metrics_callback() {
 		$args = array(
 			'post_type' => 'sp_metric',
diff --git a/admin/settings/options-team.php b/admin/settings/options-team.php
index 8020f77c..31278874 100644
--- a/admin/settings/options-team.php
+++ b/admin/settings/options-team.php
@@ -15,7 +15,7 @@ class SportsPressTeamSettingsPage {
 		
 		add_settings_section(
 			'table',
-			__( 'League Table Options', 'sportspress' ),
+			__( 'League Tables', 'sportspress' ),
 			'',
 			'sportspress_teams'
 		);
@@ -28,14 +28,6 @@ class SportsPressTeamSettingsPage {
 			'table'
 		);
 		
-		add_settings_field(	
-			'teams',
-			__( 'Teams', 'sportspress' ),
-			array( $this, 'teams_callback' ),
-			'sportspress_teams',
-			'table'
-		);
-		
 		add_settings_field(	
 			'columns',
 			__( 'Columns', 'sportspress' ),
@@ -48,6 +40,8 @@ class SportsPressTeamSettingsPage {
 	function table_callback() {
 		$responsive = sportspress_array_value( $this->options, 'league_table_responsive', true );
 		$sortable = sportspress_array_value( $this->options, 'league_table_sortable', true );
+		$show_team_logo = sportspress_array_value( $this->options, 'league_table_show_team_logo', false );
+		$link_posts = sportspress_array_value( $this->options, 'league_table_link_posts', false );
 		?>
 		<fieldset>
 			<label for="sportspress_league_table_responsive">
@@ -63,13 +57,6 @@ class SportsPressTeamSettingsPage {
 				<?php _e( 'Sortable', 'sportspress' ); ?>
 			</label>
 		</fieldset>
-		<?php
-	}
-
-	function teams_callback() {
-		$show_team_logo = sportspress_array_value( $this->options, 'league_table_show_team_logo', false );
-		$link_posts = sportspress_array_value( $this->options, 'league_table_link_posts', false );
-		?>
 		<fieldset>
 			<label for="sportspress_league_table_show_team_logo">
 				<input id="sportspress_league_table_show_team_logo_default" name="sportspress[league_table_show_team_logo]" type="hidden" value="0">
@@ -81,7 +68,7 @@ class SportsPressTeamSettingsPage {
 			<label for="sportspress_league_table_link_posts">
 				<input id="sportspress_league_table_link_posts_default" name="sportspress[league_table_link_posts]" type="hidden" value="0">
 				<input id="sportspress_league_table_link_posts" name="sportspress[league_table_link_posts]" type="checkbox" value="1" <?php checked( $link_posts ); ?>>
-				<?php _e( 'Display teams as links', 'sportspress' ); ?>
+				<?php _e( 'Link teams', 'sportspress' ); ?>
 			</label>
 		</fieldset>
 		<?php
diff --git a/admin/settings/options-text.php b/admin/settings/options-text.php
index 3bee8402..995cbcfe 100644
--- a/admin/settings/options-text.php
+++ b/admin/settings/options-text.php
@@ -16,7 +16,7 @@ class SportsPressTextSettingsPage {
 		
 		add_settings_section(
 			'text',
-			__( 'Text Settings', 'sportspress' ),
+			__( 'Text', 'sportspress' ),
 			'',
 			'sportspress_text'
 		);