From efa051e749b653f7d028f6fe4e047efdeb061175 Mon Sep 17 00:00:00 2001
From: Brian Miyaji <brian@themeboy.com>
Date: Wed, 28 Jan 2015 13:58:54 +1100
Subject: [PATCH] Team Results => Event Results

---
 .../class-sp-meta-box-event-shortcode.php     |   2 +-
 .../settings/class-sp-settings-status.php     |   2 +-
 includes/admin/views/html-admin-config.php    | 258 +++++++++---------
 .../admin/views/html-admin-page-status.php    |   2 +-
 includes/sp-core-functions.php                |   2 +-
 templates/event-results.php                   |   2 +-
 6 files changed, 132 insertions(+), 136 deletions(-)

diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-shortcode.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-shortcode.php
index 51e3a462..b0c8837a 100644
--- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-shortcode.php
+++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-shortcode.php
@@ -24,7 +24,7 @@ class SP_Meta_Box_Event_Shortcode {
 			<?php _e( 'Copy this code and paste it into your post, page or text widget content.', 'sportspress' ); ?>
 		</p>
 		<p>
-			<strong><?php _e( 'Team Results', 'sportspress' ); ?></strong>
+			<strong><?php _e( 'Event Results', 'sportspress' ); ?></strong>
 		</p>
 		<p><input type="text" value="[event_results <?php echo $post->ID; ?>]" readonly="readonly" class="code widefat"></p>
 		<p>
diff --git a/includes/admin/settings/class-sp-settings-status.php b/includes/admin/settings/class-sp-settings-status.php
index 70f6c4da..79832ab2 100644
--- a/includes/admin/settings/class-sp-settings-status.php
+++ b/includes/admin/settings/class-sp-settings-status.php
@@ -270,7 +270,7 @@ class SP_Settings_Status extends SP_Settings_Page {
 					?></td>
 				</tr>
 				<tr>
-					<td><?php _e( 'Team Results', 'sportspress' ); ?>:</td>
+					<td><?php _e( 'Event Results', 'sportspress' ); ?>:</td>
 					<td><?php
 						$display_posts = array();
 						$posts = get_posts( array( 'post_type' => 'sp_result', 'orderby' => 'menu_order', 'order' => 'ASC', 'posts_per_page' => -1, 'post_status' => 'any' ) );
diff --git a/includes/admin/views/html-admin-config.php b/includes/admin/views/html-admin-config.php
index 5677f690..97458a09 100644
--- a/includes/admin/views/html-admin-config.php
+++ b/includes/admin/views/html-admin-config.php
@@ -55,81 +55,79 @@
 			</tr>
 		</tbody>
 	</table>
-	<?php if ( 'team' == get_option( 'sportspress_mode', 'team' ) ) { ?>
-		<table class="form-table">
-			<tbody>
-				<?php
-				$selection = get_option( 'sportspress_primary_result', 0 );
+	<table class="form-table">
+		<tbody>
+			<?php
+			$selection = get_option( 'sportspress_primary_result', 0 );
 
-				$args = array(
-					'post_type' => 'sp_result',
-					'numberposts' => -1,
-					'posts_per_page' => -1,
-						'orderby' => 'menu_order',
-						'order' => 'ASC'
-				);
-				$data = get_posts( $args );
-				?>
-				<tr valign="top">
-					<th scope="row" class="titledesc">
-						<?php _e( 'Team Results', 'sportspress' ) ?>
-						<p class="description"><?php _e( 'Used for events.', 'sportspress' ); ?></p>
-					</th>
-				    <td class="forminp">
-						<legend class="screen-reader-text"><span><?php _e( 'Team Results', 'sportspress' ) ?></span></legend>
-						<form>
-							<?php wp_nonce_field( 'sp-save-primary-result', 'sp-config-nonce', false ); ?>
-							<table class="widefat sp-admin-config-table">
-								<thead>
-									<tr>
-										<th class="radio" scope="col"><?php _e( 'Primary', 'sportspress' ); ?></th>
-										<th scope="col"><?php _e( 'Label', 'sportspress' ); ?></th>
-										<th scope="col"><?php _e( 'Variables', 'sportspress' ); ?></th>
-										<th scope="col"><?php _e( 'Description', 'sportspress' ); ?></th>
-										<th scope="col" class="edit"></th>
-									</tr>
-								</thead>
-								<tfoot>
-									<tr>
-										<th class="radio"><input type="radio" class="sp-primary-result-option" id="sportspress_primary_result_0" name="sportspress_primary_result" value="0" <?php checked( $selection, 0 ); ?>></th>
-										<th colspan="4"><label for="sportspress_primary_result_0">
-											<?php
-											if ( sizeof( $data ) > 0 ):
-												$default = end( $data );
-												reset( $data );
-												printf( __( 'Default (%s)', 'sportspress' ), $default->post_title );
-											else:
-												_e( 'Default', 'sportspress' );
-											endif;
-											?>
-										</label></th>
-									</tr>
-								</tfoot>
-								<?php if ( $data ): $i = 0; foreach ( $data as $row ): ?>
-									<tr<?php if ( $i % 2 == 0 ) echo ' class="alternate"'; ?>>
-										<td class="radio"><input type="radio" class="sp-primary-result-option" id="sportspress_primary_result_<?php echo $row->post_name; ?>" name="sportspress_primary_result" value="<?php echo $row->post_name; ?>" <?php checked( $selection, $row->post_name ); ?>></td>
-										<td class="row-title"><label for="sportspress_primary_result_<?php echo $row->post_name; ?>"><?php echo $row->post_title; ?></label></td>
-										<td><?php echo $row->post_name; ?>for, <?php echo $row->post_name; ?>against</td>
-										<td><p class="description"><?php echo $row->post_excerpt; ?></p></td>
-										<td class="edit"><a class="button" href="<?php echo get_edit_post_link( $row->ID ); ?>"><?php _e( 'Edit', 'sportspress' ); ?></s></td>
-									</tr>
-								<?php $i++; endforeach; else: ?>
-								<tr class="alternate">
-									<td colspan="5"><?php _e( 'No results found.', 'sportspress' ); ?></td>
+			$args = array(
+				'post_type' => 'sp_result',
+				'numberposts' => -1,
+				'posts_per_page' => -1,
+					'orderby' => 'menu_order',
+					'order' => 'ASC'
+			);
+			$data = get_posts( $args );
+			?>
+			<tr valign="top">
+				<th scope="row" class="titledesc">
+					<?php _e( 'Event Results', 'sportspress' ) ?>
+					<p class="description"><?php _e( 'Used for events.', 'sportspress' ); ?></p>
+				</th>
+			    <td class="forminp">
+					<legend class="screen-reader-text"><span><?php _e( 'Event Results', 'sportspress' ) ?></span></legend>
+					<form>
+						<?php wp_nonce_field( 'sp-save-primary-result', 'sp-config-nonce', false ); ?>
+						<table class="widefat sp-admin-config-table">
+							<thead>
+								<tr>
+									<th class="radio" scope="col"><?php _e( 'Primary', 'sportspress' ); ?></th>
+									<th scope="col"><?php _e( 'Label', 'sportspress' ); ?></th>
+									<th scope="col"><?php _e( 'Variables', 'sportspress' ); ?></th>
+									<th scope="col"><?php _e( 'Description', 'sportspress' ); ?></th>
+									<th scope="col" class="edit"></th>
 								</tr>
-							<?php endif; ?>
-							</table>
-						</form>
-						<div class="tablenav bottom">
-							<a class="button alignleft" href="<?php echo admin_url( 'edit.php?post_type=sp_result' ); ?>"><?php _e( 'View All', 'sportspress' ); ?></a>
-							<a class="button button-primary alignright" href="<?php echo admin_url( 'post-new.php?post_type=sp_result' ); ?>"><?php _e( 'Add New', 'sportspress' ); ?></a>
-							<br class="clear">
-						</div>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-	<?php } ?>
+							</thead>
+							<tfoot>
+								<tr>
+									<th class="radio"><input type="radio" class="sp-primary-result-option" id="sportspress_primary_result_0" name="sportspress_primary_result" value="0" <?php checked( $selection, 0 ); ?>></th>
+									<th colspan="4"><label for="sportspress_primary_result_0">
+										<?php
+										if ( sizeof( $data ) > 0 ):
+											$default = end( $data );
+											reset( $data );
+											printf( __( 'Default (%s)', 'sportspress' ), $default->post_title );
+										else:
+											_e( 'Default', 'sportspress' );
+										endif;
+										?>
+									</label></th>
+								</tr>
+							</tfoot>
+							<?php if ( $data ): $i = 0; foreach ( $data as $row ): ?>
+								<tr<?php if ( $i % 2 == 0 ) echo ' class="alternate"'; ?>>
+									<td class="radio"><input type="radio" class="sp-primary-result-option" id="sportspress_primary_result_<?php echo $row->post_name; ?>" name="sportspress_primary_result" value="<?php echo $row->post_name; ?>" <?php checked( $selection, $row->post_name ); ?>></td>
+									<td class="row-title"><label for="sportspress_primary_result_<?php echo $row->post_name; ?>"><?php echo $row->post_title; ?></label></td>
+									<td><?php echo $row->post_name; ?>for, <?php echo $row->post_name; ?>against</td>
+									<td><p class="description"><?php echo $row->post_excerpt; ?></p></td>
+									<td class="edit"><a class="button" href="<?php echo get_edit_post_link( $row->ID ); ?>"><?php _e( 'Edit', 'sportspress' ); ?></s></td>
+								</tr>
+							<?php $i++; endforeach; else: ?>
+							<tr class="alternate">
+								<td colspan="5"><?php _e( 'No results found.', 'sportspress' ); ?></td>
+							</tr>
+						<?php endif; ?>
+						</table>
+					</form>
+					<div class="tablenav bottom">
+						<a class="button alignleft" href="<?php echo admin_url( 'edit.php?post_type=sp_result' ); ?>"><?php _e( 'View All', 'sportspress' ); ?></a>
+						<a class="button button-primary alignright" href="<?php echo admin_url( 'post-new.php?post_type=sp_result' ); ?>"><?php _e( 'Add New', 'sportspress' ); ?></a>
+						<br class="clear">
+					</div>
+				</td>
+			</tr>
+		</tbody>
+	</table>
 	<table class="form-table">
 		<tbody>
 			<?php
@@ -181,64 +179,62 @@
 			</tr>
 		</tbody>
 	</table>
-	<?php if ( 'team' == get_option( 'sportspress_mode', 'team' ) ) { ?>
-		<table class="form-table">
-			<tbody>
-				<?php
-				$args = array(
-					'post_type' => 'sp_column',
-					'numberposts' => -1,
-					'posts_per_page' => -1,
-						'orderby' => 'menu_order',
-						'order' => 'ASC'
-				);
-				$data = get_posts( $args );
-				?>
-				<tr valign="top">
-					<th scope="row" class="titledesc">
-						<?php _e( 'Table Columns', 'sportspress' ) ?>
-						<p class="description"><?php _e( 'Used for league tables.', 'sportspress' ); ?></p>
-					</th>
-				    <td class="forminp">
-						<table class="widefat sp-admin-config-table">
-							<thead>
-								<tr>
-									<th scope="col"><?php _e( 'Label', 'sportspress' ); ?></th>
-									<th scope="col"><?php _e( 'Key', 'sportspress' ); ?></th>
-									<th scope="col"><?php _e( 'Equation', 'sportspress' ); ?></th>
-									<th scope="col"><?php _e( 'Rounding', 'sportspress' ); ?></th>
-									<th scope="col"><?php _e( 'Sort Order', 'sportspress' ); ?></th>
-									<th scope="col"><?php _e( 'Description', 'sportspress' ); ?></th>
-									<th scope="col" class="edit"></th>
-								</tr>
-							</thead>
-							<?php if ( $data ): $i = 0; foreach ( $data as $row ): ?>
-								<tr<?php if ( $i % 2 == 0 ) echo ' class="alternate"'; ?>>
-									<td class="row-title"><?php echo $row->post_title; ?></td>
-									<td><?php echo $row->post_name; ?></td>
-									<td><?php echo sp_get_post_equation( $row->ID ); ?></td>
-									<td><?php echo sp_get_post_precision( $row->ID ); ?></td>
-									<td><?php echo sp_get_post_order( $row->ID ); ?></td>
-									<td><p class="description"><?php echo $row->post_excerpt; ?></p></td>
-									<td class="edit"><a class="button" href="<?php echo get_edit_post_link( $row->ID ); ?>"><?php _e( 'Edit', 'sportspress' ); ?></s></td>
-								</tr>
-							<?php $i++; endforeach; else: ?>
-								<tr class="alternate">
-									<td colspan="7"><?php _e( 'No results found.', 'sportspress' ); ?></td>
-								</tr>
-							<?php endif; ?>
-						</table>
-						<div class="tablenav bottom">
-							<a class="button alignleft" href="<?php echo admin_url( 'edit.php?post_type=sp_column' ); ?>"><?php _e( 'View All', 'sportspress' ); ?></a>
-							<a class="button button-primary alignright" href="<?php echo admin_url( 'post-new.php?post_type=sp_column' ); ?>"><?php _e( 'Add New', 'sportspress' ); ?></a>
-							<br class="clear">
-						</div>
-					</fieldset>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-	<?php } ?>
+	<table class="form-table">
+		<tbody>
+			<?php
+			$args = array(
+				'post_type' => 'sp_column',
+				'numberposts' => -1,
+				'posts_per_page' => -1,
+					'orderby' => 'menu_order',
+					'order' => 'ASC'
+			);
+			$data = get_posts( $args );
+			?>
+			<tr valign="top">
+				<th scope="row" class="titledesc">
+					<?php _e( 'Table Columns', 'sportspress' ) ?>
+					<p class="description"><?php _e( 'Used for league tables.', 'sportspress' ); ?></p>
+				</th>
+			    <td class="forminp">
+					<table class="widefat sp-admin-config-table">
+						<thead>
+							<tr>
+								<th scope="col"><?php _e( 'Label', 'sportspress' ); ?></th>
+								<th scope="col"><?php _e( 'Key', 'sportspress' ); ?></th>
+								<th scope="col"><?php _e( 'Equation', 'sportspress' ); ?></th>
+								<th scope="col"><?php _e( 'Rounding', 'sportspress' ); ?></th>
+								<th scope="col"><?php _e( 'Sort Order', 'sportspress' ); ?></th>
+								<th scope="col"><?php _e( 'Description', 'sportspress' ); ?></th>
+								<th scope="col" class="edit"></th>
+							</tr>
+						</thead>
+						<?php if ( $data ): $i = 0; foreach ( $data as $row ): ?>
+							<tr<?php if ( $i % 2 == 0 ) echo ' class="alternate"'; ?>>
+								<td class="row-title"><?php echo $row->post_title; ?></td>
+								<td><?php echo $row->post_name; ?></td>
+								<td><?php echo sp_get_post_equation( $row->ID ); ?></td>
+								<td><?php echo sp_get_post_precision( $row->ID ); ?></td>
+								<td><?php echo sp_get_post_order( $row->ID ); ?></td>
+								<td><p class="description"><?php echo $row->post_excerpt; ?></p></td>
+								<td class="edit"><a class="button" href="<?php echo get_edit_post_link( $row->ID ); ?>"><?php _e( 'Edit', 'sportspress' ); ?></s></td>
+							</tr>
+						<?php $i++; endforeach; else: ?>
+							<tr class="alternate">
+								<td colspan="7"><?php _e( 'No results found.', 'sportspress' ); ?></td>
+							</tr>
+						<?php endif; ?>
+					</table>
+					<div class="tablenav bottom">
+						<a class="button alignleft" href="<?php echo admin_url( 'edit.php?post_type=sp_column' ); ?>"><?php _e( 'View All', 'sportspress' ); ?></a>
+						<a class="button button-primary alignright" href="<?php echo admin_url( 'post-new.php?post_type=sp_column' ); ?>"><?php _e( 'Add New', 'sportspress' ); ?></a>
+						<br class="clear">
+					</div>
+				</fieldset>
+				</td>
+			</tr>
+		</tbody>
+	</table>
 	<table class="form-table">
 		<tbody>
 			<?php
diff --git a/includes/admin/views/html-admin-page-status.php b/includes/admin/views/html-admin-page-status.php
index cbcae17a..39f77f74 100644
--- a/includes/admin/views/html-admin-page-status.php
+++ b/includes/admin/views/html-admin-page-status.php
@@ -234,7 +234,7 @@
 			?></td>
 		</tr>
 		<tr>
-			<td><?php _e( 'Team Results', 'sportspress' ); ?>:</td>
+			<td><?php _e( 'Event Results', 'sportspress' ); ?>:</td>
 			<td><?php
 				$display_posts = array();
 				$posts = get_posts( array( 'post_type' => 'sp_result', 'orderby' => 'menu_order', 'order' => 'ASC', 'posts_per_page' => -1, 'post_status' => 'any' ) );
diff --git a/includes/sp-core-functions.php b/includes/sp-core-functions.php
index 8fe3b6d9..e9dfcf37 100644
--- a/includes/sp-core-functions.php
+++ b/includes/sp-core-functions.php
@@ -1154,6 +1154,7 @@ function sp_get_text_options() {
 		__( 'Date', 'sportspress' ),
 		__( 'Details', 'sportspress' ),
 		__( 'Event', 'sportspress' ),
+		__( 'Event Results', 'sportspress' ),
 		__( 'Competition', 'sportspress' ),
 		__( 'Nationality', 'sportspress' ),
 		__( 'Outcome', 'sportspress' ),
@@ -1165,7 +1166,6 @@ function sp_get_text_options() {
 		__( 'Preview', 'sportspress' ),
 		__( 'Rank', 'sportspress' ),
 		__( 'Recap', 'sportspress' ),
-		__( 'Team Results', 'sportspress' ),
 		__( 'Season', 'sportspress' ),
 		__( 'Staff', 'sportspress' ),
 		__( 'Substitutes', 'sportspress' ),
diff --git a/templates/event-results.php b/templates/event-results.php
index 2773d15e..bab12ca8 100644
--- a/templates/event-results.php
+++ b/templates/event-results.php
@@ -96,7 +96,7 @@ if ( empty( $table_rows ) ):
 
 else:
 
-	$output .= '<h4 class="sp-table-caption">' . __( 'Team Results', 'sportspress' ) . '</h4>';
+	$output .= '<h4 class="sp-table-caption">' . __( 'Event Results', 'sportspress' ) . '</h4>';
 
 	$output .= '<div class="sp-table-wrapper">' .
 		'<table class="sp-event-results sp-data-table' . ( $responsive ? ' sp-responsive-table' : '' ) . ( $scrollable ? ' sp-scrollable-table' : '' ) . '"><thead>' .