diff --git a/includes/admin/settings/class-sp-settings-events.php b/includes/admin/settings/class-sp-settings-events.php index 1ee2a337..4202c7d8 100644 --- a/includes/admin/settings/class-sp-settings-events.php +++ b/includes/admin/settings/class-sp-settings-events.php @@ -213,7 +213,7 @@ class SP_Settings_Events extends SP_Settings_Page { apply_filters( 'sportspress_event_logo_options', array( array( 'title' => __( 'Display', 'sportspress' ), - 'desc' => __( 'Display team names', 'sportspress' ), + 'desc' => __( 'Name', 'sportspress' ), 'id' => 'sportspress_event_logos_show_team_names', 'default' => 'no', 'type' => 'checkbox', @@ -221,7 +221,15 @@ class SP_Settings_Events extends SP_Settings_Page { ), array( - 'desc' => __( 'Display results', 'sportspress' ), + 'desc' => __( 'Time', 'sportspress' ), + 'id' => 'sportspress_event_logos_show_time', + 'default' => 'no', + 'type' => 'checkbox', + 'checkboxgroup' => '', + ), + + array( + 'desc' => __( 'Results', 'sportspress' ), 'id' => 'sportspress_event_logos_show_results', 'default' => 'no', 'type' => 'checkbox', diff --git a/templates/event-logos.php b/templates/event-logos.php index 9d59f652..3b16a5be 100644 --- a/templates/event-logos.php +++ b/templates/event-logos.php @@ -11,6 +11,7 @@ if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( get_option( 'sportspress_event_show_logos', 'yes' ) === 'no' ) return; $show_team_names = get_option( 'sportspress_event_logos_show_team_names', 'no' ) === 'yes' ? true : false; +$show_time = get_option( 'sportspress_event_logos_show_time', 'no' ) === 'yes' ? true : false; $show_results = get_option( 'sportspress_event_logos_show_results', 'no' ) === 'yes' ? true : false; if ( ! isset( $id ) ) @@ -20,6 +21,8 @@ if ( $show_results ) { $results = sp_get_main_results( $id ); if ( empty( $results ) ) { $show_results = false; + } else { + $show_time = false; } } @@ -50,7 +53,7 @@ if ( $teams ): if ( get_option( 'sportspress_link_teams', 'no' ) == 'yes' ) $logo = '' . $logo . ''; // Add result - if ( $show_results ) { + if ( $show_results && ! empty( $results ) ) { $team_result = array_shift( $results ); $team_result = apply_filters( 'sportspress_event_logos_team_result', $team_result, $id, $team ); if ( $alt ) { @@ -60,13 +63,23 @@ if ( $teams ): } } - $team_logos[] = ''; - $i++; + // Add logo to array + if ( '' !== $logo ) { + $team_logos[] = ''; + $i++; + } endforeach; $team_logos = array_filter( $team_logos ); if ( ! empty( $team_logos ) ): echo '
'; - $delimiter = get_option( 'sportspress_event_teams_delimiter', 'vs' ); + + // Assign delimiter + if ( $show_time && sizeof( $teams ) <= 2 ) { + $delimiter = '' . get_the_time( get_option('time_format'), $id ) . ''; + } else { + $delimiter = get_option( 'sportspress_event_teams_delimiter', 'vs' ); + } + echo implode( ' ' . $delimiter . ' ', $team_logos ); echo '
'; endif;