From 8a4c8d8039549a36493dd89dcca2d045d95854df Mon Sep 17 00:00:00 2001 From: Brian Miyaji Date: Sat, 23 Aug 2014 21:53:02 +1000 Subject: [PATCH] Add div wrappers to templates --- templates/countdown.php | 70 ++++---- templates/event-blocks.php | 108 ++++++------ templates/event-calendar.php | 6 +- templates/event-details.php | 40 ++--- templates/event-list.php | 260 +++++++++++++++-------------- templates/event-performance.php | 286 ++++++++++++++++---------------- templates/event-results.php | 6 +- templates/event-venue.php | 34 ++-- templates/event-video.php | 10 +- templates/league-table.php | 5 +- templates/player-details.php | 4 +- templates/player-gallery.php | 89 +++++----- templates/player-list.php | 6 +- templates/player-statistics.php | 7 +- templates/staff-details.php | 6 +- templates/team-columns.php | 5 +- 16 files changed, 491 insertions(+), 451 deletions(-) diff --git a/templates/countdown.php b/templates/countdown.php index a280e67a..23f68229 100644 --- a/templates/countdown.php +++ b/templates/countdown.php @@ -28,43 +28,45 @@ extract( $defaults, EXTR_SKIP ); if ( ! isset( $post ) ) return; ?> -
-

post_title; ?>

- ID, 'sp_venue' ); - if ( $venues ): - ?> -
ID, 'sp_venue' ); ?>
- ID, 'sp_league' ); - if ( $leagues ): - foreach( $leagues as $league ): - $term = get_term( $league->term_id, 'sp_league' ); +
+
+

post_title; ?>

+ ID, 'sp_venue' ); + if ( $venues ): ?> -
name; ?>
+
ID, 'sp_venue' ); ?>
post_date ); - $interval = date_diff( $now, $date ); + if ( isset( $show_league ) && $show_league ): + $leagues = get_the_terms( $post->ID, 'sp_league' ); + if ( $leagues ): + foreach( $leagues as $league ): + $term = get_term( $league->term_id, 'sp_league' ); + ?> +
name; ?>
+ invert ? 0 : $interval->days; - $h = $interval->invert ? 0 : $interval->h; - $i = $interval->invert ? 0 : $interval->i; - $s = $interval->invert ? 0 : $interval->s; - ?> -

+ $now = new DateTime( current_time( 'mysql', 0 ) ); + $date = new DateTime( $post->post_date ); + $interval = date_diff( $now, $date ); + + $days = $interval->invert ? 0 : $interval->days; + $h = $interval->invert ? 0 : $interval->h; + $i = $interval->invert ? 0 : $interval->i; + $s = $interval->invert ? 0 : $interval->s; + ?> +

+
\ No newline at end of file diff --git a/templates/event-blocks.php b/templates/event-blocks.php index efd462a1..6f96f64b 100644 --- a/templates/event-blocks.php +++ b/templates/event-blocks.php @@ -37,71 +37,73 @@ $usecolumns = $calendar->columns; if ( isset( $columns ) ) $usecolumns = $columns; ?> -
- - - - +
+
+ + + 0 ) - $limit = $number; + if ( intval( $number ) > 0 ) + $limit = $number; - foreach ( $data as $event ): - if ( isset( $limit ) && $i >= $limit ) continue; + foreach ( $data as $event ): + if ( isset( $limit ) && $i >= $limit ) continue; - $results = get_post_meta( $event->ID, 'sp_results', true ); + $results = get_post_meta( $event->ID, 'sp_results', true ); - $teams = array_unique( get_post_meta( $event->ID, 'sp_team' ) ); - $logos = array(); - $main_results = array(); + $teams = array_unique( get_post_meta( $event->ID, 'sp_team' ) ); + $logos = array(); + $main_results = array(); - $j = 0; - foreach( $teams as $team ): - $j++; - if ( has_post_thumbnail ( $team ) ): - if ( $link_teams ): - $logo = '' . get_the_post_thumbnail( $team, 'sportspress-fit-icon', array( 'class' => 'team-logo logo-' . ( $j % 2 ? 'odd' : 'even' ) ) ) . ''; - else: - $logo = get_the_post_thumbnail( $team, 'sportspress-fit-icon', array( 'class' => 'team-logo logo-' . ( $j % 2 ? 'odd' : 'even' ) ) ); + $j = 0; + foreach( $teams as $team ): + $j++; + if ( has_post_thumbnail ( $team ) ): + if ( $link_teams ): + $logo = '' . get_the_post_thumbnail( $team, 'sportspress-fit-icon', array( 'class' => 'team-logo logo-' . ( $j % 2 ? 'odd' : 'even' ) ) ) . ''; + else: + $logo = get_the_post_thumbnail( $team, 'sportspress-fit-icon', array( 'class' => 'team-logo logo-' . ( $j % 2 ? 'odd' : 'even' ) ) ); + endif; + $logos[] = $logo; endif; - $logos[] = $logo; - endif; - $team_results = sp_array_value( $results, $team, null ); + $team_results = sp_array_value( $results, $team, null ); - if ( $primary_result ): - $team_result = sp_array_value( $team_results, $primary_result, null ); - else: - if ( is_array( $team_results ) ): - end( $team_results ); - $team_result = prev( $team_results ); + if ( $primary_result ): + $team_result = sp_array_value( $team_results, $primary_result, null ); else: - $team_result = null; + if ( is_array( $team_results ) ): + end( $team_results ); + $team_result = prev( $team_results ); + else: + $team_result = null; + endif; endif; - endif; - if ( $team_result != null ) - $main_results[] = $team_result; + if ( $team_result != null ) + $main_results[] = $team_result; + endforeach; + ?> + + + + - - - - - -
+ + + post_status == 'future' ): ?> +
+ +
+ +

post_title; ?>

+
- - - post_status == 'future' ): ?> -
- -
- -

post_title; ?>

-
+ + +
\n\t\n\t\n\t"; if ( $id && $show_all_events_link ) $calendar_output .= '' . __( 'View all events', 'sportspress' ) . ''; - -echo apply_filters( 'sportspress_event_calendar', $calendar_output ); +?> +
+ +
diff --git a/templates/event-details.php b/templates/event-details.php index 3924cf62..81b8ee29 100644 --- a/templates/event-details.php +++ b/templates/event-details.php @@ -30,22 +30,24 @@ if ( $seasons ): $data[ __( 'Season', 'sportspress' ) ] = $season->name; endif; ?> -

-
- - - - $value ): ?> - - - - - - - - - - - -
-
+
+

+
+ + + + $value ): ?> + + + + + + + + + + + +
+
+
\ No newline at end of file diff --git a/templates/event-list.php b/templates/event-list.php index 56012c34..8a8c0ad7 100644 --- a/templates/event-list.php +++ b/templates/event-list.php @@ -47,146 +47,148 @@ if ( isset( $columns ) ): $usecolumns = explode( ',', $columns ); endif; ?> -
- - - - ' . __( 'Date', 'sportspress' ) . ''; - - if ( $usecolumns == null || in_array( 'event', $usecolumns ) ) - echo ''; - - if ( $usecolumns == null || in_array( 'teams', $usecolumns ) ) - echo ''; - - if ( $usecolumns == null || in_array( 'time', $usecolumns ) ) - echo ''; - - if ( $usecolumns == null || in_array( 'venue', $usecolumns ) ) - echo ''; - - if ( $usecolumns == null || in_array( 'article', $usecolumns ) ) - echo ''; - ?> - - - - 0 ) - $limit = $number; - - foreach ( $data as $event ): - if ( isset( $limit ) && $i >= $limit ) continue; - - $teams = get_post_meta( $event->ID, 'sp_team' ); - $results = get_post_meta( $event->ID, 'sp_results', true ); - $video = get_post_meta( $event->ID, 'sp_video', true ); - - $main_results = array(); - $teams_output = ''; - - if ( $teams ): - foreach ( $teams as $team ): - $name = get_the_title( $team ); - if ( $name ): - $team_results = sp_array_value( $results, $team, null ); - - if ( $primary_result ): - $team_result = sp_array_value( $team_results, $primary_result, null ); - else: - if ( is_array( $team_results ) ): - unset( $team_results['outcome'] ); - $team_result = end( $team_results ); - else: - $team_result = null; - endif; - endif; - - if ( $link_teams ): - $teams_output .= '' . $name . ''; - else: - $teams_output .= $name; - endif; - - if ( $team_result != null ): - $main_results[] = $team_result; - $teams_output .= ' (' . $team_result . ')'; - endif; - - $teams_output .= '
'; - endif; - endforeach; - else: - $teams_output .= '—'; - endif; - - echo ''; - - echo ''; +
+
+
' . __( 'Event', 'sportspress' ) . '' . __( 'Teams', 'sportspress' ) . '' . __( 'Time/Results', 'sportspress' ) . '' . __( 'Venue', 'sportspress' ) . '' . __( 'Article', 'sportspress' ) . '
' . get_post_time( get_option( 'date_format' ), false, $event, true ) . '
+ + + ' . __( 'Date', 'sportspress' ) . ''; if ( $usecolumns == null || in_array( 'event', $usecolumns ) ) - echo ''; + echo ''; - if ( $usecolumns == null || in_array( 'teams', $usecolumns ) ): - echo ''; + + if ( $usecolumns == null || in_array( 'time', $usecolumns ) ) + echo ''; + + if ( $usecolumns == null || in_array( 'venue', $usecolumns ) ) + echo ''; + + if ( $usecolumns == null || in_array( 'article', $usecolumns ) ) + echo ''; + ?> + + + + 0 ) + $limit = $number; + + foreach ( $data as $event ): + if ( isset( $limit ) && $i >= $limit ) continue; + + $teams = get_post_meta( $event->ID, 'sp_team' ); + $results = get_post_meta( $event->ID, 'sp_results', true ); + $video = get_post_meta( $event->ID, 'sp_video', true ); + + $main_results = array(); + $teams_output = ''; + + if ( $teams ): + foreach ( $teams as $team ): + $name = get_the_title( $team ); + if ( $name ): + $team_results = sp_array_value( $results, $team, null ); + + if ( $primary_result ): + $team_result = sp_array_value( $team_results, $primary_result, null ); + else: + if ( is_array( $team_results ) ): + unset( $team_results['outcome'] ); + $team_result = end( $team_results ); + else: + $team_result = null; + endif; + endif; + + if ( $link_teams ): + $teams_output .= '' . $name . ''; + else: + $teams_output .= $name; + endif; + + if ( $team_result != null ): + $main_results[] = $team_result; + $teams_output .= ' (' . $team_result . ')'; + endif; + + $teams_output .= '
'; + endif; + endforeach; + else: + $teams_output .= '—'; + endif; + + echo ''; + + echo ''; + + if ( $usecolumns == null || in_array( 'event', $usecolumns ) ) + echo ''; + + if ( $usecolumns == null || in_array( 'teams', $usecolumns ) ): + echo ''; + endif; + + if ( $usecolumns == null || in_array( 'time', $usecolumns ) ): + echo ''; endif; - if ( $usecolumns == null || in_array( 'time', $usecolumns ) ): - echo ''; - endif; - - if ( $usecolumns == null || in_array( 'venue', $usecolumns ) ): - echo ''; - endif; - - if ( $usecolumns == null || in_array( 'article', $usecolumns ) ): - echo ''; + endif; + + if ( $usecolumns == null || in_array( 'article', $usecolumns ) ): + echo ''; - endif; + echo ' + '; + endif; - echo ''; + echo ''; - $i++; - endforeach; - ?> - -
' . $event->post_title . '' . __( 'Event', 'sportspress' ) . ''; - echo $teams_output; + if ( $usecolumns == null || in_array( 'teams', $usecolumns ) ) + echo '' . __( 'Teams', 'sportspress' ) . '' . __( 'Time/Results', 'sportspress' ) . '' . __( 'Venue', 'sportspress' ) . '' . __( 'Article', 'sportspress' ) . '
' . get_post_time( get_option( 'date_format' ), false, $event, true ) . '' . $event->post_title . ''; + echo $teams_output; + echo ''; + if ( ! empty( $main_results ) ): + echo implode( ' - ', $main_results ); + else: + echo get_post_time( get_option( 'time_format' ), false, $event, true ); + endif; echo ''; - if ( ! empty( $main_results ) ): - echo implode( ' - ', $main_results ); - else: - echo get_post_time( get_option( 'time_format' ), false, $event, true ); - endif; - echo ''; - if ( $link_venues ): - the_terms( $event->ID, 'sp_venue' ); - else: - $venues = get_the_terms( $event->ID, 'sp_venue' ); - foreach ( $venues as $venue ): - echo $venue->name; - endforeach; - endif; - echo ' - '; - - if ( $video ): - echo '
'; - elseif ( has_post_thumbnail( $event->ID ) ): - echo '
'; + if ( $usecolumns == null || in_array( 'venue', $usecolumns ) ): + echo '		'; + if ( $link_venues ): + the_terms( $event->ID, 'sp_venue' ); + else: + $venues = get_the_terms( $event->ID, 'sp_venue' ); + foreach ( $venues as $venue ): + echo $venue->name; + endforeach; endif; - if ( $event->post_content !== null ): - if ( $event->post_status == 'publish' ): - _e( 'Recap', 'sportspress' ); - else: - _e( 'Preview', 'sportspress' ); + echo ' + '; + + if ( $video ): + echo '
'; + elseif ( has_post_thumbnail( $event->ID ) ): + echo '
'; + endif; + if ( $event->post_content !== null ): + if ( $event->post_status == 'publish' ): + _e( 'Recap', 'sportspress' ); + else: + _e( 'Preview', 'sportspress' ); + endif; endif; - endif; - echo ' -
+ $i++; + endforeach; + ?> + + +
-

- $id, 'index' => $index ) ); - endif; - ?> -
- - - - - - - - $label ): ?> - - - - - - - - - +

+ $id, 'index' => $index ) ); + endif; + ?> +
+
# 
+ + + + + + + $label ): ?> + + + + + + + + + $sub ): - if ( ! $sub_id ) - continue; - $lineup_sub_relation[ sp_array_value( $sub, 'sub', 0 ) ] = $sub_id; - endforeach; - - $i = 0; - foreach( $data as $player_id => $row ): - - if ( ! $player_id ) - continue; - - $name = get_the_title( $player_id ); - - if ( ! $name ) - continue; - - echo ''; - - $number = sp_array_value( $row, 'number', ' ' ); - - // Player number - echo ''; - - if ( $link_posts ): - $permalink = get_post_permalink( $player_id ); - $name = '' . $name . ''; - if ( isset( $row['status'] ) && $row['status'] == 'sub' ): - $name = '(' . $name . ')'; - endif; - endif; - - if ( array_key_exists( $player_id, $lineup_sub_relation ) ): - $name .= ' ' . sp_array_value( sp_array_value( $data, $lineup_sub_relation[ $player_id ], array() ), 'number', null ) . ''; - elseif ( isset( $row['sub'] ) && $row['sub'] ): - $name .= ' ' . sp_array_value( sp_array_value( $data, $row['sub'], array() ), 'number', null ) . ''; - endif; - - echo ''; - - if ( $mode == 'icons' ); echo ''; + + $number = sp_array_value( $row, 'number', ' ' ); + + // Player number + echo ''; + + if ( $link_posts ): + $permalink = get_post_permalink( $player_id ); + $name = '' . $name . ''; + if ( isset( $row['status'] ) && $row['status'] == 'sub' ): + $name = '(' . $name . ')'; endif; - else: - if ( array_key_exists( $key, $row ) && $row[ $key ] != '' ): + endif; + + if ( array_key_exists( $player_id, $lineup_sub_relation ) ): + $name .= ' ' . sp_array_value( sp_array_value( $data, $lineup_sub_relation[ $player_id ], array() ), 'number', null ) . ''; + elseif ( isset( $row['sub'] ) && $row['sub'] ): + $name .= ' ' . sp_array_value( sp_array_value( $data, $row['sub'], array() ), 'number', null ) . ''; + endif; + + echo ''; + + if ( $mode == 'icons' ); echo ''; + elseif ( intval( $value ) && $mode == 'icons' ): + $performance_id = sp_array_value( $performance_ids, $key, null ); + if ( $performance_id && has_post_thumbnail( $performance_id ) ): + echo str_repeat( get_the_post_thumbnail( $performance_id, 'sportspress-fit-mini' ) . ' ', $value ); + endif; + endif; + endforeach; + + if ( $mode == 'icons' ); echo ''; + + echo ''; + + $i++; + + endforeach; + ?> + + + + <> + +  '; + echo ''; + endif; + + $row = $data[0]; + + if ( $mode == 'icons' ) echo ''; - elseif ( intval( $value ) && $mode == 'icons' ): - $performance_id = sp_array_value( $performance_ids, $key, null ); - if ( $performance_id && has_post_thumbnail( $performance_id ) ): - echo str_repeat( get_the_post_thumbnail( $performance_id, 'sportspress-fit-mini' ) . ' ', $value ); + if ( $mode == 'values' ): + echo ''; + elseif ( intval( $value ) && $mode == 'icons' ): + $performance_id = sp_array_value( $performance_ids, $key, null ); + if ( $performance_id && has_post_thumbnail( $performance_id ) ): + echo str_repeat( get_the_post_thumbnail( $performance_id, 'sportspress-fit-mini' ) . ' ', $value ); + endif; endif; - endif; - endforeach; - - if ( $mode == 'icons' ); echo ''; + endforeach; - echo ''; - - $i++; - - endforeach; - ?> - - - - <> - -  '; - echo ''; - endif; - - $row = $data[0]; - - if ( $mode == 'icons' ) echo ''; - elseif ( intval( $value ) && $mode == 'icons' ): - $performance_id = sp_array_value( $performance_ids, $key, null ); - if ( $performance_id && has_post_thumbnail( $performance_id ) ): - echo str_repeat( get_the_post_thumbnail( $performance_id, 'sportspress-fit-mini' ) . ' ', $value ); - endif; - endif; - endforeach; - - if ( $mode == 'icons' ) echo ''; - ?> - - > - -
# 
' . $number . '' . $name . ''; - - foreach( $labels as $key => $label ): - if ( $key == 'name' ) + $lineup_sub_relation = array(); + foreach ( $subs as $sub_id => $sub ): + if ( ! $sub_id ) continue; - $value = '—'; - if ( $key == 'position' ): - if ( array_key_exists( $key, $row ) && $row[ $key ] != '' ): - $position = get_term_by( 'id', $row[ $key ], 'sp_position' ); - if ( $position ) $value = $position->name; + $lineup_sub_relation[ sp_array_value( $sub, 'sub', 0 ) ] = $sub_id; + endforeach; + + $i = 0; + foreach( $data as $player_id => $row ): + + if ( ! $player_id ) + continue; + + $name = get_the_title( $player_id ); + + if ( ! $name ) + continue; + + echo '
' . $number . '' . $name . ''; + + foreach( $labels as $key => $label ): + if ( $key == 'name' ) + continue; + $value = '—'; + if ( $key == 'position' ): + if ( array_key_exists( $key, $row ) && $row[ $key ] != '' ): + $position = get_term_by( 'id', $row[ $key ], 'sp_position' ); + if ( $position ) $value = $position->name; + endif; + else: + if ( array_key_exists( $key, $row ) && $row[ $key ] != '' ): + $value = $row[ $key ]; + else: + $value = 0; + endif; + endif; + if ( ! array_key_exists( $key, $totals ) ): + $totals[ $key ] = 0; + endif; + $totals[ $key ] += $value; + + if ( $mode == 'values' ): + echo '' . $value . '
' . __( 'Total', 'sportspress' ) . ''; + + foreach( $labels as $key => $label ): + if ( $key == 'name' ) + continue; + if ( $key == 'position' ): + $value = '—'; + elseif ( array_key_exists( $key, $row ) && $row[ $key ] != '' ): $value = $row[ $key ]; else: - $value = 0; + $value = sp_array_value( $totals, $key, 0 ); endif; - endif; - if ( ! array_key_exists( $key, $totals ) ): - $totals[ $key ] = 0; - endif; - $totals[ $key ] += $value; - if ( $mode == 'values' ): - echo '' . $value . '' . $value . '
' . __( 'Total', 'sportspress' ) . ''; - - foreach( $labels as $key => $label ): - if ( $key == 'name' ) - continue; - if ( $key == 'position' ): - $value = '—'; - elseif ( array_key_exists( $key, $row ) && $row[ $key ] != '' ): - $value = $row[ $key ]; - else: - $value = sp_array_value( $totals, $key, 0 ); - endif; - - if ( $mode == 'values' ): - echo '' . $value . '
+ if ( $mode == 'icons' ) echo ''; + ?> + + > + + +
' . '' . ''; endif; - -echo $output; +?> +
+ +
diff --git a/templates/event-venue.php b/templates/event-venue.php index 2033462e..988001b8 100644 --- a/templates/event-venue.php +++ b/templates/event-venue.php @@ -32,25 +32,27 @@ foreach( $venues as $venue ): $latitude = sp_array_value( $meta, 'sp_latitude', 0 ); $longitude = sp_array_value( $meta, 'sp_longitude', 0 ); ?> -

- - - - - - - - +
+

+
+ - + - + + + - + - - - -
$meta ) ); ?>
+ + + $meta ) ); ?> + + + + + + autoembed( $video_url ); + ?> +
+ autoembed( $video_url ); + ?> +
+ '; if ( $show_full_table_link ) $output .= '' . __( 'View full table', 'sportspress' ) . ''; -echo $output; +?> +
+ +
\ No newline at end of file diff --git a/templates/player-details.php b/templates/player-details.php index 080e3d97..e8ecf0e2 100644 --- a/templates/player-details.php +++ b/templates/player-details.php @@ -63,5 +63,5 @@ foreach( $data as $label => $value ): endforeach; $output .= ''; - -echo apply_filters( 'sportspress_player_details', $output ); +?> + \ No newline at end of file diff --git a/templates/player-gallery.php b/templates/player-gallery.php index d839c089..980b735a 100644 --- a/templates/player-gallery.php +++ b/templates/player-gallery.php @@ -91,56 +91,61 @@ if ( apply_filters( 'use_default_gallery_style', true ) ) "; $size_class = sanitize_html_class( $size ); $gallery_div = "\n"; + + if ( $show_all_players_link ) + echo '' . __( 'View all players', 'sportspress' ) . ''; + ?> + \ No newline at end of file diff --git a/templates/player-list.php b/templates/player-list.php index f3e9bfb2..884d5fbb 100644 --- a/templates/player-list.php +++ b/templates/player-list.php @@ -162,5 +162,7 @@ endforeach; if ( $show_all_players_link ) $output .= '' . __( 'View all players', 'sportspress' ) . ''; - -echo apply_filters( 'sportspress_player_list', $output ); +?> +
+ +
\ No newline at end of file diff --git a/templates/player-statistics.php b/templates/player-statistics.php index 7937776e..a0ab5b3b 100644 --- a/templates/player-statistics.php +++ b/templates/player-statistics.php @@ -60,7 +60,10 @@ if ( is_array( $leagues ) ): endforeach; $output .= '' . '' . ''; - - echo apply_filters( 'sportspress_player_statistics', $output ); + ?> +
+ +
+ $value ): endforeach; $output .= ''; - -echo apply_filters( 'sportspress_staff_details', $output ); +?> +
+ +
\ No newline at end of file diff --git a/templates/team-columns.php b/templates/team-columns.php index e93250d6..0bc18093 100644 --- a/templates/team-columns.php +++ b/templates/team-columns.php @@ -67,4 +67,7 @@ foreach ( $leagues as $league ): endforeach; -echo apply_filters( 'sportspress_team_columns', $output ); +?> +
+ +
\ No newline at end of file