From 355a7dc37a061deb3b9f58d184c1ced8f81b2752 Mon Sep 17 00:00:00 2001
From: Brian Miyaji <brian@themeboy.com>
Date: Tue, 13 Dec 2016 11:43:57 +1100
Subject: [PATCH] Use inline team logos in event list

---
 assets/css/sportspress.css | 19 +++++++++++++++++--
 templates/event-list.php   | 20 +++++++++++++++-----
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/assets/css/sportspress.css b/assets/css/sportspress.css
index 0bab54a7..07b65a43 100644
--- a/assets/css/sportspress.css
+++ b/assets/css/sportspress.css
@@ -327,17 +327,32 @@
 .sp-event-list .data-away {
 	text-align: left;
 }
+.sp-event-list td.has-logo {
+	line-height: 2em;
+}
+.sp-event-list .team-logo {
+	width: 2em;
+	height: 2em;
+	margin-right: 0.5em;
+	display: inline-block;
+	vertical-align: middle;
+	text-align: center;
+}
+.sp-event-list .team-logo img {
+	width: auto;
+	height: auto;
+	max-width: 2em;
+	max-height: 2em;
+}
 .sp-event-list .data-home img,
 .sp-event-list .data-away img {
 	display: inline-block;
 	vertical-align: middle;
 }
 .sp-event-list .data-home img {
-	float: right;
 	margin-left: 8px;
 }
 .sp-event-list .data-away img {
-	float: left;
 	margin-right: 8px;
 }
 .sp-event-list-format-homeaway .data-time {
diff --git a/templates/event-list.php b/templates/event-list.php
index 95459904..d9ec5e41 100644
--- a/templates/event-list.php
+++ b/templates/event-list.php
@@ -171,17 +171,27 @@ endif;
 					$main_results = apply_filters( 'sportspress_event_list_main_results', sp_get_main_results( $event ), $event->ID );
 
 					$teams_output = '';
+					$team_class = '';
 					$teams_array = array();
 					$team_logos = array();
 
 					if ( $teams ):
-						foreach ( $teams as $team ):
+						foreach ( $teams as $t => $team ):
 							$name = sp_get_team_name( $team, $abbreviate_teams );
 							if ( $name ):
 
 								if ( $show_team_logo ):
-									$name = sp_get_logo( $team, 'mini' ) . ' ' . $name;
-									$team_logos[] = sp_get_logo( $team, 'mini' );
+									if ( has_post_thumbnail( $team ) ):
+										$logo = '<span class="team-logo">' . sp_get_logo( $team, 'mini' ) . '</span>';
+										$team_logos[] = $logo;
+										$team_class .= ' has-logo';
+										
+										if ( $t ):
+											$name = $logo . ' ' . $name;
+										else:
+											$name .= ' ' . $logo;
+										endif;
+									endif;
 								endif;
 
 								if ( $link_teams ):
@@ -219,7 +229,7 @@ endif;
 							case 'homeaway':
 								if ( sp_column_active( $usecolumns, 'event' ) ) {
 									$team = array_shift( $teams_array );
-									echo '<td class="data-home">' . $team . '</td>';
+									echo '<td class="data-home' . $team_class . '">' . $team . '</td>';
 
 									if ( 'combined' == $time_format && sp_column_active( $usecolumns, 'time' ) ) {
 										echo '<td class="data-time">';
@@ -244,7 +254,7 @@ endif;
 									}
 
 									$team = array_shift( $teams_array );
-									echo '<td class="data-away">' . $team . '</td>';
+									echo '<td class="data-away' . $team_class . '">' . $team . '</td>';
 
 									if ( in_array( $time_format, array( 'separate', 'time' ) ) && sp_column_active( $usecolumns, 'time' ) ) {
 										echo '<td class="data-time">';