From e3d9c677c170ec34b52dfa0546eb4600d6996abd Mon Sep 17 00:00:00 2001
From: Anthony Correa <a@correa.co>
Date: Sat, 7 Mar 2026 13:39:01 -0600
Subject: [PATCH] Consolidate team ordering and add explicit away-first
 settings

---
 includes/sp-event-team-ordering.php | 272 +++++++++++++
 templates/event-list.php            | 576 ++++++++++++++++++++++++++++
 templates/event-results.php         | 133 +++++++
 tonys-sportspress-enhancements.php  |   1 +
 4 files changed, 982 insertions(+)
 create mode 100644 includes/sp-event-team-ordering.php
 create mode 100644 templates/event-list.php
 create mode 100644 templates/event-results.php

diff --git a/includes/sp-event-team-ordering.php b/includes/sp-event-team-ordering.php
new file mode 100644
index 0000000..635c425
--- /dev/null
+++ b/includes/sp-event-team-ordering.php
@@ -0,0 +1,272 @@
+<?php
+/**
+ * Unified team-ordering behavior for SportsPress event admin and frontend lists.
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Check whether SportsPress reverse teams option is enabled.
+ *
+ * @return bool
+ */
+function tony_sportspress_reverse_teams_enabled() {
+	return get_option( 'sportspress_event_reverse_teams', 'no' ) === 'yes';
+}
+
+/**
+ * Add Away | Home option to Event List title format setting.
+ *
+ * @param array $options Event list settings options.
+ * @return array
+ */
+function tony_sportspress_event_list_add_away_home_option( $options ) {
+	if ( ! is_array( $options ) ) {
+		return $options;
+	}
+
+	foreach ( $options as &$option ) {
+		if ( ! is_array( $option ) || ! isset( $option['id'] ) || 'sportspress_event_list_title_format' !== $option['id'] ) {
+			continue;
+		}
+
+		if ( ! isset( $option['options'] ) || ! is_array( $option['options'] ) ) {
+			continue;
+		}
+
+		if ( ! array_key_exists( 'awayhome', $option['options'] ) ) {
+			$option['options']['awayhome'] = sprintf( '%s | %s', esc_attr__( 'Away', 'sportspress' ), esc_attr__( 'Home', 'sportspress' ) );
+		}
+	}
+	unset( $option );
+
+	return $options;
+}
+add_filter( 'sportspress_event_list_options', 'tony_sportspress_event_list_add_away_home_option' );
+
+/**
+ * Clarify wording of SportsPress Teams reverse-order option.
+ *
+ * @param array $options Team options.
+ * @return array
+ */
+function tony_sportspress_relabel_reverse_teams_option( $options ) {
+	if ( ! is_array( $options ) ) {
+		return $options;
+	}
+
+	foreach ( $options as &$option ) {
+		if ( ! is_array( $option ) || ! isset( $option['id'] ) || 'sportspress_event_reverse_teams' !== $option['id'] ) {
+			continue;
+		}
+
+		$option['desc'] = esc_attr__( 'Show away team first', 'tonys-sportspress-enhancements' );
+	}
+	unset( $option );
+
+	return $options;
+}
+add_filter( 'sportspress_event_logo_options', 'tony_sportspress_relabel_reverse_teams_option' );
+
+/**
+ * Add Event Results team order option.
+ *
+ * @param array $options Event Results options.
+ * @return array
+ */
+function tony_sportspress_add_event_results_order_option( $options ) {
+	if ( ! is_array( $options ) ) {
+		return $options;
+	}
+
+	$options[] = array(
+		'title'   => esc_attr__( 'Order', 'sportspress' ),
+		'desc'    => esc_attr__( 'Show away team first', 'tonys-sportspress-enhancements' ),
+		'id'      => 'tony_sportspress_event_results_away_first',
+		'default' => 'yes',
+		'type'    => 'checkbox',
+	);
+
+	return $options;
+}
+add_filter( 'sportspress_result_options', 'tony_sportspress_add_event_results_order_option' );
+
+/**
+ * Override SportsPress event templates with plugin versions.
+ *
+ * @param string $template      Located template path.
+ * @param string $template_name Template filename.
+ * @param string $template_path Template base path.
+ * @return string
+ */
+function tony_sportspress_locate_event_list_template( $template, $template_name, $template_path ) {
+	$supported = array(
+		'event-list.php',
+		'event-results.php',
+	);
+
+	if ( ! in_array( $template_name, $supported, true ) ) {
+		return $template;
+	}
+
+	$override = dirname( __DIR__ ) . '/templates/' . $template_name;
+	if ( file_exists( $override ) ) {
+		return $override;
+	}
+
+	return $template;
+}
+add_filter( 'sportspress_locate_template', 'tony_sportspress_locate_event_list_template', 10, 3 );
+
+/**
+ * Add admin styles for explicit Home/Away labels on event edit screens.
+ */
+function tony_sportspress_event_team_order_admin_styles() {
+	$screen = get_current_screen();
+	if ( ! $screen || 'sp_event' !== $screen->post_type ) {
+		return;
+	}
+	?>
+	<style>
+		#sp_teamdiv .sp-instance {
+			padding-top: 8px;
+			border-top: 1px solid #dcdcde;
+		}
+		#sp_teamdiv .sp-instance:first-child {
+			padding-top: 0;
+			border-top: 0;
+		}
+		#sp_teamdiv .tony-sp-home-away-label {
+			margin: 0 0 8px;
+			font-size: 12px;
+			letter-spacing: 0.02em;
+			text-transform: uppercase;
+			color: #50575e;
+		}
+	</style>
+	<?php
+}
+add_action( 'admin_head-post.php', 'tony_sportspress_event_team_order_admin_styles' );
+add_action( 'admin_head-post-new.php', 'tony_sportspress_event_team_order_admin_styles' );
+
+/**
+ * Add explicit Home/Away labels and reverse visual order in event edit teams metabox.
+ */
+function tony_sportspress_event_team_order_admin_script() {
+	$screen = get_current_screen();
+	if ( ! $screen || 'sp_event' !== $screen->post_type ) {
+		return;
+	}
+
+	$slot_labels     = array(
+		__( 'Home Team', 'tonys-sportspress-enhancements' ),
+		__( 'Away Team', 'tonys-sportspress-enhancements' ),
+	);
+	$show_away_first = tony_sportspress_reverse_teams_enabled();
+	?>
+	<script>
+	(function($) {
+		function applyHomeAwayLabels() {
+			var labels = <?php echo wp_json_encode( $slot_labels ); ?>;
+			var showAwayFirst = <?php echo $show_away_first ? 'true' : 'false'; ?>;
+			var $instances = $('#sp_teamdiv .sp-instance');
+
+			if (!$instances.length) {
+				return;
+			}
+
+			var $container = $instances.first().parent();
+			$instances.css('order', '');
+
+			if (showAwayFirst && $instances.length > 1) {
+				$container.css({
+					display: 'flex',
+					flexDirection: 'column'
+				});
+				$instances.each(function(index) {
+					$(this).css('order', index + 1);
+				});
+				$instances.eq(0).css('order', 2);
+				$instances.eq(1).css('order', 1);
+			}
+
+			$instances.each(function(index) {
+				var label = labels[index] || ('Team ' + (index + 1));
+				var $instance = $(this);
+
+				if (!$instance.children('.tony-sp-home-away-label').length) {
+					$instance.prepend('<p class="tony-sp-home-away-label"><strong>' + label + '</strong></p>');
+				} else {
+					$instance.children('.tony-sp-home-away-label').find('strong').text(label);
+				}
+
+				$instance.find('select[name="sp_team[]"]').first().attr('aria-label', label);
+			});
+		}
+
+		$(applyHomeAwayLabels);
+		$(document).on('sp-init-chosen sp-init', applyHomeAwayLabels);
+	})(jQuery);
+	</script>
+	<?php
+}
+add_action( 'admin_footer-post.php', 'tony_sportspress_event_team_order_admin_script' );
+add_action( 'admin_footer-post-new.php', 'tony_sportspress_event_team_order_admin_script' );
+
+/**
+ * Normalize event-list results array to match event team order.
+ *
+ * @param array $main_results Team results array.
+ * @param int   $event_id     Event ID.
+ * @return array
+ */
+function tony_sportspress_event_list_score_order( $main_results, $event_id ) {
+	if ( ! is_array( $main_results ) || empty( $main_results ) ) {
+		return $main_results;
+	}
+
+	$teams = (array) get_post_meta( $event_id, 'sp_team', false );
+	$teams = array_values( array_filter( array_map( 'absint', $teams ) ) );
+	if ( empty( $teams ) ) {
+		return $main_results;
+	}
+
+	$ordered = array();
+
+	foreach ( $teams as $index => $team_id ) {
+		if ( array_key_exists( $team_id, $main_results ) ) {
+			$ordered[ $team_id ] = $main_results[ $team_id ];
+			continue;
+		}
+
+		// SportsPress main_results() can be positional (0,1,...) in team order.
+		if ( array_key_exists( $index, $main_results ) ) {
+			$ordered[ $team_id ] = $main_results[ $index ];
+		}
+	}
+
+	if ( empty( $ordered ) ) {
+		return $main_results;
+	}
+
+	foreach ( $main_results as $team_id => $result ) {
+		if ( array_key_exists( $team_id, $ordered ) ) {
+			continue;
+		}
+
+		// Skip positional keys that have already been remapped to team IDs.
+		if ( is_int( $team_id ) || ctype_digit( (string) $team_id ) ) {
+			$position = (int) $team_id;
+			if ( array_key_exists( $position, $teams ) ) {
+				continue;
+			}
+		}
+
+		$ordered[ $team_id ] = $result;
+	}
+
+	return $ordered;
+}
+add_filter( 'sportspress_event_list_main_results', 'tony_sportspress_event_list_score_order', 999, 2 );
diff --git a/templates/event-list.php b/templates/event-list.php
new file mode 100644
index 0000000..b6f9610
--- /dev/null
+++ b/templates/event-list.php
@@ -0,0 +1,576 @@
+<?php
+/**
+ * Event List
+ *
+ * @author      ThemeBoy
+ * @package     SportsPress/Templates
+ * @version     2.7.23
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+
+$defaults = array(
+	'id'                   => null,
+	'title'                => false,
+	'status'               => 'default',
+	'format'               => 'default',
+	'date'                 => 'default',
+	'date_from'            => 'default',
+	'date_to'              => 'default',
+	'date_past'            => 'default',
+	'date_future'          => 'default',
+	'date_relative'        => 'default',
+	'day'                  => 'default',
+	'league'               => null,
+	'season'               => null,
+	'venue'                => null,
+	'team'                 => null,
+	'teams_past'           => null,
+	'date_before'          => null,
+	'player'               => null,
+	'number'               => -1,
+	'show_team_logo'       => get_option( 'sportspress_event_list_show_logos', 'no' ) == 'yes' ? true : false,
+	'link_events'          => get_option( 'sportspress_link_events', 'yes' ) == 'yes' ? true : false,
+	'link_teams'           => get_option( 'sportspress_link_teams', 'no' ) == 'yes' ? true : false,
+	'link_venues'          => get_option( 'sportspress_link_venues', 'yes' ) == 'yes' ? true : false,
+	'responsive'           => get_option( 'sportspress_enable_responsive_tables', 'no' ) == 'yes' ? true : false,
+	'sortable'             => get_option( 'sportspress_enable_sortable_tables', 'yes' ) == 'yes' ? true : false,
+	'scrollable'           => get_option( 'sportspress_enable_scrollable_tables', 'yes' ) == 'yes' ? true : false,
+	'paginated'            => get_option( 'sportspress_event_list_paginated', 'yes' ) == 'yes' ? true : false,
+	'rows'                 => get_option( 'sportspress_event_list_rows', 10 ),
+	'order'                => 'default',
+	'columns'              => null,
+	'show_all_events_link' => false,
+	'show_title'           => get_option( 'sportspress_event_list_show_title', 'yes' ) == 'yes' ? true : false,
+	'title_format'         => get_option( 'sportspress_event_list_title_format', 'title' ),
+	'time_format'          => get_option( 'sportspress_event_list_time_format', 'combined' ),
+);
+
+extract( $defaults, EXTR_SKIP );
+
+$calendar = new SP_Calendar( $id );
+if ( $status != 'default' ) {
+	$calendar->status = $status;
+}
+if ( $format != 'default' ) {
+	$calendar->event_format = $format;
+}
+if ( $date != 'default' ) {
+	$calendar->date = $date;
+}
+if ( $date_from != 'default' ) {
+	$calendar->from = $date_from;
+}
+if ( $date_to != 'default' ) {
+	$calendar->to = $date_to;
+}
+if ( $date_past != 'default' ) {
+	$calendar->past = $date_past;
+}
+if ( $date_future != 'default' ) {
+	$calendar->future = $date_future;
+}
+if ( $date_relative != 'default' ) {
+	$calendar->relative = $date_relative;
+}
+if ( $league ) {
+	$calendar->league = $league;
+}
+if ( $season ) {
+	$calendar->season = $season;
+}
+if ( $venue ) {
+	$calendar->venue = $venue;
+}
+if ( $team ) {
+	$calendar->team = $team;
+}
+if ( $teams_past ) {
+	$calendar->teams_past = $teams_past;
+}
+if ( $date_before ) {
+	$calendar->date_before = $date_before;
+}
+if ( $player ) {
+	$calendar->player = $player;
+}
+if ( $order != 'default' ) {
+	$calendar->order = $order;
+}
+if ( $day != 'default' ) {
+	$calendar->day = $day;
+}
+$data       = $calendar->data();
+$usecolumns = $calendar->columns;
+
+if ( isset( $columns ) ) :
+	if ( is_array( $columns ) ) {
+		$usecolumns = $columns;
+	} else {
+		$usecolumns = explode( ',', $columns );
+	}
+endif;
+
+$title_format_raw    = $title_format;
+$is_awayhome_format  = 'awayhome' === $title_format_raw;
+if ( $is_awayhome_format ) {
+	$title_format = 'homeaway';
+}
+$home_label = $is_awayhome_format ? esc_attr__( 'Away', 'sportspress' ) : esc_attr__( 'Home', 'sportspress' );
+$away_label = $is_awayhome_format ? esc_attr__( 'Home', 'sportspress' ) : esc_attr__( 'Away', 'sportspress' );
+
+if ( $show_title && false === $title && $id ) :
+	$caption = $calendar->caption;
+	if ( $caption ) {
+		$title = $caption;
+	} else {
+		$title = get_the_title( $id );
+	}
+endif;
+$labels = array();
+// Create a unique identifier based on the current time in microseconds
+$identifier = uniqid( 'eventlist_' );
+?>
+<div class="sp-template sp-template-event-list">
+	<?php if ( $title ) { ?>
+		<h4 class="sp-table-caption"><?php echo wp_kses_post( $title ); ?></h4>
+	<?php } ?>
+	<div class="sp-table-wrapper">
+		<table class="sp-event-list sp-event-list-format-<?php echo esc_attr( $title_format ); ?> sp-data-table
+																	<?php
+																	if ( $paginated ) {
+																		?>
+			 sp-paginated-table
+																		 <?php
+																	} if ( $sortable ) {
+																		?>
+			 sp-sortable-table
+																		 <?php
+																	} if ( $responsive ) {
+																												echo ' sp-responsive-table ' . esc_attr( $identifier ); } if ( $scrollable ) {
+																		?>
+													 sp-scrollable-table <?php } ?>" data-sp-rows="<?php echo esc_attr( $rows ); ?>">
+			<thead>
+				<tr>
+					<?php
+					echo '<th class="data-date">' . esc_attr__( 'Date', 'sportspress' ) . '</th>';
+
+					switch ( $title_format ) {
+						case 'homeaway':
+							if ( sp_column_active( $usecolumns, 'event' ) ) {
+								echo '<th class="data-home">' . esc_html( $home_label ) . '</th>';
+							}
+
+							if ( 'combined' == $time_format && sp_column_active( $usecolumns, 'time' ) ) {
+								echo '<th class="data-time">' . esc_attr__( 'Time/Results', 'sportspress' ) . '</th>';
+								$labels[] = esc_attr__( 'Time/Results', 'sportspress' );
+							} elseif ( in_array( $time_format, array( 'separate', 'results' ) ) && sp_column_active( $usecolumns, 'results' ) ) {
+								echo '<th class="data-results">' . esc_attr__( 'Results', 'sportspress' ) . '</th>';
+							}
+
+							if ( sp_column_active( $usecolumns, 'event' ) ) {
+								echo '<th class="data-away">' . esc_html( $away_label ) . '</th>';
+							}
+
+							if ( in_array( $time_format, array( 'separate', 'time' ) ) && sp_column_active( $usecolumns, 'time' ) ) {
+								echo '<th class="data-time">' . esc_attr__( 'Time', 'sportspress' ) . '</th>';
+							}
+							break;
+						default:
+							if ( sp_column_active( $usecolumns, 'event' ) ) {
+								if ( $title_format == 'teams' ) {
+									echo '<th class="data-teams">' . esc_attr__( 'Teams', 'sportspress' ) . '</th>';
+								} else {
+									echo '<th class="data-event">' . esc_attr__( 'Event', 'sportspress' ) . '</th>';
+								}
+							}
+
+							switch ( $time_format ) {
+								case 'separate':
+									if ( sp_column_active( $usecolumns, 'time' ) ) {
+										echo '<th class="data-time">' . esc_attr__( 'Time', 'sportspress' ) . '</th>';
+									}
+									if ( sp_column_active( $usecolumns, 'results' ) ) {
+										echo '<th class="data-results">' . esc_attr__( 'Results', 'sportspress' ) . '</th>';
+									}
+									break;
+								case 'time':
+									if ( sp_column_active( $usecolumns, 'time' ) ) {
+										echo '<th class="data-time">' . esc_attr__( 'Time', 'sportspress' ) . '</th>';
+									}
+									break;
+								case 'results':
+									if ( sp_column_active( $usecolumns, 'results' ) ) {
+										echo '<th class="data-results">' . esc_attr__( 'Results', 'sportspress' ) . '</th>';
+									}
+									break;
+								default:
+									if ( sp_column_active( $usecolumns, 'time' ) ) {
+										echo '<th class="data-time">' . esc_attr__( 'Time/Results', 'sportspress' ) . '</th>';
+									}
+							}
+					}
+
+					if ( sp_column_active( $usecolumns, 'league' ) ) {
+						echo '<th class="data-league">' . esc_attr__( 'League', 'sportspress' ) . '</th>';
+					}
+
+					if ( sp_column_active( $usecolumns, 'season' ) ) {
+						echo '<th class="data-season">' . esc_attr__( 'Season', 'sportspress' ) . '</th>';
+					}
+
+					if ( sp_column_active( $usecolumns, 'venue' ) ) {
+						echo '<th class="data-venue">' . esc_attr__( 'Venue', 'sportspress' ) . '</th>';
+					} else {
+						echo '<th style="display:none;" class="data-venue">' . esc_attr__( 'Venue', 'sportspress' ) . '</th>';
+					}
+
+					if ( sp_column_active( $usecolumns, 'article' ) ) {
+						echo '<th class="data-article">' . esc_attr__( 'Article', 'sportspress' ) . '</th>';
+					}
+
+					if ( sp_column_active( $usecolumns, 'day' ) ) {
+						echo '<th class="data-day">' . esc_attr__( 'Match Day', 'sportspress' ) . '</th>';
+					}
+
+					do_action( 'sportspress_event_list_head_row', $usecolumns );
+					?>
+				</tr>
+			</thead>
+			<tbody>
+				<?php
+				$i = 0;
+
+				if ( is_numeric( $number ) && $number > 0 ) {
+					$limit = $number;
+				}
+
+				foreach ( $data as $event ) :
+					if ( isset( $limit ) && $i >= $limit ) {
+						continue;
+					}
+
+					$teams  = get_post_meta( $event->ID, 'sp_team' );
+					$video  = get_post_meta( $event->ID, 'sp_video', true );
+					$status = get_post_meta( $event->ID, 'sp_status', true );
+
+					$main_results = apply_filters( 'sportspress_event_list_main_results', sp_get_main_results( $event ), $event->ID );
+
+					$reverse_results = $is_awayhome_format;
+					$reverse_teams   = false;
+					if ( 'homeaway' === $title_format ) {
+						$reverse_teams = $is_awayhome_format;
+					} elseif ( 'teams' === $title_format ) {
+						$reverse_teams = get_option( 'sportspress_event_reverse_teams', 'no' ) === 'yes' ? true : false;
+					}
+
+					if ( $reverse_results ) {
+						$main_results = array_reverse( $main_results, true );
+					}
+
+					$teams_output = '';
+					$team_class   = '';
+					$teams_array  = array();
+					$team_logos   = array();
+
+					if ( $teams ) :
+						foreach ( $teams as $t => $team ) :
+							$name = sp_team_short_name( $team );
+							if ( $name ) :
+
+								$name = '<meta itemprop="name" content="' . $name . '">' . $name;
+
+								if ( $show_team_logo ) :
+									if ( has_post_thumbnail( $team ) ) :
+										$logo         = '<span class="team-logo">' . sp_get_logo( $team, 'mini', array( 'itemprop' => 'url' ) ) . '</span>';
+										$team_logos[] = $logo;
+										$team_class  .= ' has-logo';
+
+										if ( $t ) :
+											$name = $logo . ' ' . $name;
+										else :
+											$name .= ' ' . $logo;
+										endif;
+									endif;
+								endif;
+
+								if ( $link_teams ) :
+									$team_output = '<a href="' . get_post_permalink( $team ) . '" itemprop="url">' . $name . '</a>';
+								else :
+									$team_output = $name;
+								endif;
+
+								$team_result = sp_array_value( $main_results, $team, null );
+
+								if ( $team_result != null ) :
+									if ( $usecolumns != null && ! in_array( 'time', $usecolumns ) ) :
+										$team_output .= ' (' . $team_result . ')';
+									endif;
+								endif;
+
+								$teams_array[] = $team_output;
+
+								$teams_output .= $team_output . '<br>';
+							endif;
+						endforeach;
+					else :
+						$teams_output .= '&mdash;';
+					endif;
+
+					echo '<tr class="sp-row sp-post' . ( $i % 2 == 0 ? ' alternate' : '' ) . ' sp-row-no-' . esc_attr( $i ) . '" itemscope itemtype="http://schema.org/SportsEvent">';
+
+						$date_html = '<date>' . get_post_time( 'Y-m-d H:i:s', false, $event ) . '</date>' . apply_filters( 'sportspress_event_date', get_post_time( get_option( 'date_format' ), false, $event, true ), $event->ID );
+
+					if ( $link_events ) {
+						$date_html = '<a href="' . get_post_permalink( $event->ID, false, true ) . '" itemprop="url">' . $date_html . '</a>';
+					}
+
+						echo '<td class="data-date" itemprop="startDate" content="' . esc_attr( mysql2date( 'Y-m-d\TH:i:sP', $event->post_date ) ) . '" data-label="' . esc_attr__( 'Date', 'sportspress' ) . '">' . wp_kses( $date_html, array( 'a' => array( 'href' => array(), 'itemprop' => array() ), 'date' => array() ) ) . '</td>';
+
+						// Check if the reverse_teams option is selected and alter the teams order
+					if ( $reverse_teams ) {
+						$teams_array = array_reverse( $teams_array, true );
+					}
+
+					switch ( $title_format ) {
+						case 'homeaway':
+							if ( sp_column_active( $usecolumns, 'event' ) ) {
+								$team = array_shift( $teams_array );
+								echo '<td class="data-home' . esc_attr( $team_class ) . '" itemprop="competitor" itemscope itemtype="http://schema.org/SportsTeam" data-label="' . esc_attr( $home_label ) . '">' . wp_kses_post( $team ) . '</td>';
+							}
+
+							if ( 'combined' == $time_format && sp_column_active( $usecolumns, 'time' ) ) {
+								echo '<td class="data-time ' . esc_attr( $status ) . '" data-label="' . esc_attr__( 'Time/Results', 'sportspress' ) . '">';
+								if ( $link_events ) {
+									echo '<a href="' . esc_url( get_post_permalink( $event->ID, false, true ) ) . '" itemprop="url">';
+								}
+								if ( ! empty( $main_results ) ) :
+									echo wp_kses_post( implode( ' - ', $main_results ) );
+									else :
+										echo '<date>&nbsp;' . wp_kses_post( get_post_time( 'H:i:s', false, $event ) ) . '</date>' . wp_kses_post( apply_filters( 'sportspress_event_time', sp_get_time( $event ), $event->ID ) );
+									endif;
+									if ( $link_events ) {
+										echo '</a>';
+									}
+									echo '</td>';
+							} elseif ( in_array( $time_format, array( 'separate', 'results' ) ) && sp_column_active( $usecolumns, 'results' ) ) {
+								echo '<td class="data-results" data-label="' . esc_attr__( 'Results', 'sportspress' ) . '">';
+								if ( $link_events ) {
+									echo '<a href="' . esc_url( get_post_permalink( $event->ID, false, true ) ) . '" itemprop="url">';
+								}
+								if ( ! empty( $main_results ) ) :
+									echo wp_kses_post( implode( ' - ', $main_results ) );
+									else :
+										echo '-';
+									endif;
+									if ( $link_events ) {
+										echo '</a>';
+									}
+									echo '</td>';
+							}
+
+							if ( sp_column_active( $usecolumns, 'event' ) ) {
+								$team = array_shift( $teams_array );
+								echo '<td class="data-away' . esc_attr( $team_class ) . '" itemprop="competitor" itemscope itemtype="http://schema.org/SportsTeam" data-label="' . esc_attr( $away_label ) . '">' . wp_kses_post( $team ) . '</td>';
+							}
+
+							if ( in_array( $time_format, array( 'separate', 'time' ) ) && sp_column_active( $usecolumns, 'time' ) ) {
+								echo '<td class="data-time ' . esc_attr( $status ) . '" data-label="' . esc_attr__( 'Time', 'sportspress' ) . '">';
+								if ( $link_events ) {
+									echo '<a href="' . esc_url( get_post_permalink( $event->ID, false, true ) ) . '" itemprop="url">';
+								}
+								echo '<date>&nbsp;' . wp_kses_post( get_post_time( 'H:i:s', false, $event ) ) . '</date>' . wp_kses_post( apply_filters( 'sportspress_event_time', sp_get_time( $event ), $event->ID ) );
+								if ( $link_events ) {
+									echo '</a>';
+								}
+								echo '</td>';
+							}
+							break;
+						default:
+							if ( sp_column_active( $usecolumns, 'event' ) ) {
+								if ( $title_format == 'teams' ) {
+									echo '<td class="data-event data-teams" data-label="' . esc_attr__( 'Teams', 'sportspress' ) . '">' . wp_kses_post( $teams_output ) . '</td>';
+								} else {
+									$title_html = implode( ' ', $team_logos ) . ' ' . $event->post_title;
+									if ( $link_events ) {
+										$title_html = '<a href="' . get_post_permalink( $event->ID, false, true ) . '" itemprop="url name">' . $title_html . '</a>';
+									}
+									echo '<td class="data-event" data-label="' . esc_attr__( 'Event', 'sportspress' ) . '">' . wp_kses_post( $title_html ) . '</td>';
+								}
+							}
+
+							switch ( $time_format ) {
+								case 'separate':
+									if ( sp_column_active( $usecolumns, 'time' ) ) {
+										echo '<td class="data-time ' . esc_attr( $status ) . '" data-label="' . esc_attr__( 'Time', 'sportspress' ) . '">';
+										if ( $link_events ) {
+											echo '<a href="' . esc_url( get_post_permalink( $event->ID, false, true ) ) . '" itemprop="url">';
+										}
+										echo '<date>&nbsp;' . wp_kses_post( get_post_time( 'H:i:s', false, $event ) ) . '</date>' . wp_kses_post( apply_filters( 'sportspress_event_time', sp_get_time( $event ), $event->ID ) );
+										if ( $link_events ) {
+											echo '</a>';
+										}
+										echo '</td>';
+									}
+									if ( sp_column_active( $usecolumns, 'results' ) ) {
+										echo '<td class="data-results" data-label="' . esc_attr__( 'Results', 'sportspress' ) . '">';
+										if ( $link_events ) {
+											echo '<a href="' . esc_url( get_post_permalink( $event->ID, false, true ) ) . '" itemprop="url">';
+										}
+										if ( ! empty( $main_results ) ) :
+											echo wp_kses_post( implode( ' - ', $main_results ) );
+											else :
+												echo '-';
+											endif;
+											if ( $link_events ) {
+												echo '</a>';
+											}
+											echo '</td>';
+									}
+									break;
+								case 'time':
+									if ( sp_column_active( $usecolumns, 'time' ) ) {
+										echo '<td class="data-time ' . esc_attr( $status ) . '" data-label="' . esc_attr__( 'Time', 'sportspress' ) . '">';
+										if ( $link_events ) {
+											echo '<a href="' . esc_url( get_post_permalink( $event->ID, false, true ) ) . '" itemprop="url">';
+										}
+										echo '<date>&nbsp;' . wp_kses_post( get_post_time( 'H:i:s', false, $event ) ) . '</date>' . wp_kses_post( apply_filters( 'sportspress_event_time', sp_get_time( $event ), $event->ID ) );
+										if ( $link_events ) {
+											echo '</a>';
+										}
+										echo '</td>';
+									}
+									break;
+								case 'results':
+									if ( sp_column_active( $usecolumns, 'results' ) ) {
+										echo '<td class="data-results" data-label="' . esc_attr__( 'Results', 'sportspress' ) . '">';
+										if ( $link_events ) {
+											echo '<a href="' . esc_url( get_post_permalink( $event->ID, false, true ) ) . '" itemprop="url">';
+										}
+										if ( ! empty( $main_results ) ) :
+											echo wp_kses_post( implode( ' - ', $main_results ) );
+											else :
+												echo '-';
+											endif;
+											if ( $link_events ) {
+												echo '</a>';
+											}
+											echo '</td>';
+									}
+									break;
+								default:
+									if ( sp_column_active( $usecolumns, 'time' ) ) {
+										echo '<td class="data-time ' . esc_attr( $status ) . '" data-label="' . esc_attr__( 'Time/Results', 'sportspress' ) . '">';
+										if ( $link_events ) {
+											echo '<a href="' . esc_url( get_post_permalink( $event->ID, false, true ) ) . '" itemprop="url">';
+										}
+										if ( ! empty( $main_results ) ) :
+											echo wp_kses_post( implode( ' - ', $main_results ) );
+											else :
+												echo '<date>&nbsp;' . wp_kses_post( get_post_time( 'H:i:s', false, $event ) ) . '</date>' . wp_kses_post( apply_filters( 'sportspress_event_time', sp_get_time( $event ), $event->ID ) );
+											endif;
+											if ( $link_events ) {
+												echo '</a>';
+											}
+											echo '</td>';
+									}
+							}
+					}
+
+					if ( sp_column_active( $usecolumns, 'league' ) ) :
+						echo '<td class="data-league" data-label="' . esc_attr__( 'League', 'sportspress' ) . '">';
+						$leagues = get_the_terms( $event->ID, 'sp_league' );
+						if ( $leagues ) :
+							echo wp_kses_post( implode( ', ', wp_list_pluck( $leagues, 'name' ) ) );
+							endif;
+						echo '</td>';
+						endif;
+
+					if ( sp_column_active( $usecolumns, 'season' ) ) :
+						echo '<td class="data-season" data-label="' . esc_attr__( 'Season', 'sportspress' ) . '">';
+						$seasons = get_the_terms( $event->ID, 'sp_season' );
+						if ( $seasons ) :
+							echo wp_kses_post( implode( ', ', wp_list_pluck( $seasons, 'name' ) ) );
+							endif;
+						echo '</td>';
+						endif;
+
+					if ( sp_column_active( $usecolumns, 'venue' ) ) :
+						echo '<td class="data-venue" data-label="' . esc_attr__( 'Venue', 'sportspress' ) . '" itemprop="location" itemscope itemtype="http://schema.org/Place">';
+						echo '<div itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">';
+						if ( $link_venues ) :
+							the_terms( $event->ID, 'sp_venue' );
+							else :
+								$venues = get_the_terms( $event->ID, 'sp_venue' );
+								if ( $venues ) :
+									echo wp_kses_post( implode( ', ', wp_list_pluck( $venues, 'name' ) ) );
+								endif;
+							endif;
+							echo '</div>';
+							echo '</td>';
+						else :
+							echo '<td style="display:none;" class="data-venue" data-label="' . esc_attr__( 'Venue', 'sportspress' ) . '" itemprop="location" itemscope itemtype="http://schema.org/Place">';
+							echo '<div itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">';
+							esc_attr_e( 'N/A', 'sportspress' );
+							echo '</div>';
+							echo '</td>';
+						endif;
+
+						if ( sp_column_active( $usecolumns, 'article' ) ) :
+							echo '<td class="data-article" data-label="' . esc_attr__( 'Article', 'sportspress' ) . '">';
+							if ( $link_events ) {
+								echo '<a href="' . esc_url( get_post_permalink( $event->ID, false, true ) ) . '" itemprop="url">';
+							}
+
+							if ( $video ) :
+								echo '<div class="dashicons dashicons-video-alt"></div>';
+								elseif ( has_post_thumbnail( $event->ID ) ) :
+									echo '<div class="dashicons dashicons-camera"></div>';
+								endif;
+								if ( $event->post_content !== null ) :
+									if ( $event->post_status == 'publish' ) :
+										esc_attr_e( 'Recap', 'sportspress' );
+									else :
+										esc_attr_e( 'Preview', 'sportspress' );
+									endif;
+								endif;
+
+								if ( $link_events ) {
+									echo '</a>';
+								}
+								echo '</td>';
+						endif;
+
+						if ( sp_column_active( $usecolumns, 'day' ) ) :
+							echo '<td class="data-day" data-label="' . esc_attr__( 'Match Day', 'sportspress' ) . '">';
+							$day = get_post_meta( $event->ID, 'sp_day', true );
+							if ( '' == $day ) {
+								echo '-';
+							} else {
+								echo wp_kses_post( $day );
+							}
+							echo '</td>';
+						endif;
+
+						do_action( 'sportspress_event_list_row', $event, $usecolumns );
+
+						echo '</tr>';
+
+						$i++;
+				endforeach;
+				?>
+			</tbody>
+		</table>
+	</div>
+	<?php
+	// If responsive tables are enabled then load the inline css code
+	if ( $responsive ) {
+		// sportspress_responsive_tables_css( $identifier );
+	}
+	if ( $id && $show_all_events_link ) {
+		echo '<div class="sp-calendar-link sp-view-all-link"><a href="' . esc_url( get_permalink( $id ) ) . '">' . esc_attr__( 'View all events', 'sportspress' ) . '</a></div>';
+	}
+	?>
+</div>
diff --git a/templates/event-results.php b/templates/event-results.php
new file mode 100644
index 0000000..d0b0ce1
--- /dev/null
+++ b/templates/event-results.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * Event Results
+ *
+ * @author      ThemeBoy
+ * @package     SportsPress/Templates
+ * @version   2.7.1
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+if ( get_option( 'sportspress_event_show_results', 'yes' ) === 'no' ) {
+	return;
+}
+
+if ( ! isset( $id ) ) {
+	$id = get_the_ID();
+}
+
+$event  = new SP_Event( $id );
+$status = $event->status();
+
+if ( 'results' != $status ) {
+	return;
+}
+
+if ( ! isset( $caption ) ) {
+	$caption = esc_attr__( 'Results', 'sportspress' );
+}
+
+// Get event result data
+$data = $event->results();
+
+// The first row should be column labels
+$labels = $data[0];
+
+// Remove the first row to leave us with the actual data
+unset( $data[0] );
+
+$data = array_filter( $data );
+
+if ( empty( $data ) ) {
+	return false;
+}
+
+$scrollable    = get_option( 'sportspress_enable_scrollable_tables', 'yes' ) == 'yes' ? true : false;
+$link_teams    = get_option( 'sportspress_link_teams', 'no' ) == 'yes' ? true : false;
+$show_outcomes = array_key_exists( 'outcome', $labels );
+
+// Initialize
+$output     = '';
+$table_rows = '';
+$i          = 0;
+
+// Event Results row order is controlled by a dedicated Event Results option.
+$away_first = get_option( 'tony_sportspress_event_results_away_first', 'yes' ) === 'yes' ? true : false;
+if ( $away_first ) {
+	$data = array_reverse( $data, true );
+}
+
+foreach ( $data as $team_id => $result ) :
+	if ( $show_outcomes ) :
+		$outcomes       = array();
+		$result_outcome = sp_array_value( $result, 'outcome' );
+		if ( ! is_array( $result_outcome ) ) :
+			$outcomes = array( '&mdash;' );
+		else :
+			foreach ( $result_outcome as $outcome ) :
+				$the_outcome = get_page_by_path( $outcome, OBJECT, 'sp_outcome' );
+				if ( is_object( $the_outcome ) ) :
+					$outcomes[] = $the_outcome->post_title;
+				endif;
+			endforeach;
+		endif;
+	endif;
+
+	unset( $result['outcome'] );
+
+	$table_rows .= '<tr class="' . ( $i % 2 == 0 ? 'odd' : 'even' ) . '">';
+
+	$team_name = sp_team_short_name( $team_id );
+
+	if ( $link_teams && sp_post_exists( $team_id ) ) :
+		$team_name = '<a href="' . get_post_permalink( $team_id ) . '">' . $team_name . '</a>';
+	endif;
+
+	$table_rows .= '<td class="data-name">' . $team_name . '</td>';
+
+	foreach ( $labels as $key => $label ) :
+		if ( in_array( $key, array( 'name', 'outcome' ) ) ) {
+			continue;
+		}
+		if ( array_key_exists( $key, $result ) && $result[ $key ] != '' ) :
+			$value = $result[ $key ];
+		else :
+			$value = apply_filters( 'sportspress_event_empty_result_string', '&mdash;' );
+		endif;
+		$table_rows .= '<td class="data-' . $key . '">' . $value . '</td>';
+	endforeach;
+
+	if ( $show_outcomes ) :
+		$table_rows .= '<td class="data-outcome">' . implode( ', ', $outcomes ) . '</td>';
+	endif;
+
+	$table_rows .= '</tr>';
+
+	$i++;
+endforeach;
+
+if ( empty( $table_rows ) ) :
+
+	return false;
+
+else :
+
+	$output .= '<h4 class="sp-table-caption">' . $caption . '</h4>';
+
+	$output .= '<div class="sp-table-wrapper">' .
+		'<table class="sp-event-results sp-data-table' . ( $scrollable ? ' sp-scrollable-table' : '' ) . '"><thead>' .
+		'<th class="data-name">' . esc_attr__( 'Team', 'sportspress' ) . '</th>';
+	foreach ( $labels as $key => $label ) :
+		$output .= '<th class="data-' . $key . '">' . $label . '</th>';
+	endforeach;
+	$output .= '</tr>' . '</thead>' . '<tbody>';
+	$output .= $table_rows;
+	$output .= '</tbody>' . '</table>' . '</div>';
+
+endif;
+?>
+<div class="sp-template sp-template-event-results">
+	<?php echo wp_kses_post( $output ); ?>
+</div>
diff --git a/tonys-sportspress-enhancements.php b/tonys-sportspress-enhancements.php
index 4553e30..c6f67b8 100644
--- a/tonys-sportspress-enhancements.php
+++ b/tonys-sportspress-enhancements.php
@@ -20,3 +20,4 @@ require_once plugin_dir_path(__FILE__) . 'includes/sp-event-permalink.php';
 require_once plugin_dir_path(__FILE__) . 'includes/sp-event-csv.php';
 require_once plugin_dir_path(__FILE__) . 'includes/sp-event-admin-week-filter.php';
 require_once plugin_dir_path(__FILE__) . 'includes/sp-event-quick-edit-officials.php';
+require_once plugin_dir_path(__FILE__) . 'includes/sp-event-team-ordering.php';