Merge remote-tracking branch 'origin/feature-responsive' into feature-responsive

This commit is contained in:
Brian Miyaji
2017-12-16 09:19:50 +11:00
5 changed files with 113 additions and 24 deletions

View File

@@ -94,7 +94,7 @@ if ( $show_title && false === $title && $id ):
endif;
$labels = array();
//Create a unique identifier based on the current time in microseconds
$identifier = uniqid('eventlist_');
$identifier = uniqid( 'eventlist_' );
?>
<div class="sp-template sp-template-event-list">
<?php if ( $title ) { ?>
@@ -450,10 +450,10 @@ $identifier = uniqid('eventlist_');
</table>
</div>
<?php
//var_dump($labels);
// If responsive tables are enabled then load the inline css code
if ($responsive == true){
sportspress_responsive_tables_css($labels,$identifier);
if ( true == $responsive ){
$theme_name = wp_get_theme()->get( 'Name' );
sportspress_responsive_tables_css( $labels, $identifier, $theme_name );
}
if ( $id && $show_all_events_link )
echo '<div class="sp-calendar-link sp-view-all-link"><a href="' . get_permalink( $id ) . '">' . __( 'View all events', 'sportspress' ) . '</a></div>';

View File

@@ -23,7 +23,7 @@ if ( ! isset( $subs ) ) $subs = array();
$responsive = get_option( 'sportspress_enable_responsive_tables', 'yes' ) == 'yes' ? true : false;
$rlabels = array();
//Create a unique identifier based on the current time in microseconds
$identifier = uniqid('performance_');
$identifier = uniqid( 'performance_' );
?>
<div class="sp-template sp-template-event-performance sp-template-event-performance-<?php echo $mode; ?><?php if ( isset( $class ) ) { echo ' ' . $class; } ?>">
<?php if ( $caption ): ?>
@@ -267,6 +267,7 @@ $identifier = uniqid('performance_');
</div>
<?php
// If responsive tables are enabled then load the inline css code
if ($responsive == true && $mode == 'values'){
sportspress_responsive_tables_css($rlabels,$identifier);
if ( true == $responsive && $mode == 'values' ){
$theme_name = wp_get_theme()->get( 'Name' );
sportspress_responsive_tables_css( $rlabels, $identifier, $theme_name );
}

View File

@@ -49,7 +49,7 @@ if ( $show_title && false === $title && $id ):
endif;
//Create a unique identifier based on the current time in microseconds
$identifier = uniqid('table_');
$identifier = uniqid( 'table_' );
$output = '';
@@ -65,8 +65,9 @@ $data = $table->data();
// The first row should be column labels
$labels = $data[0];
// If responsive tables are enabled then load the inline css code
if ($responsive == true){
sportspress_responsive_tables_css($labels,$identifier);
if ( true == $responsive ){
$theme_name = wp_get_theme()->get( 'Name' );
sportspress_responsive_tables_css( $labels, $identifier, $theme_name );
}
// Remove the first row to leave us with the actual data
unset( $data[0] );
@@ -178,7 +179,6 @@ $output .= '</div>';
if ( $show_full_table_link )
$output .= '<div class="sp-league-table-link sp-view-all-link"><a href="' . get_permalink( $id ) . '">' . __( 'View full table', 'sportspress' ) . '</a></div>';
?>
<div class="sp-template sp-template-league-table">
<?php echo $output; ?>

View File

@@ -57,10 +57,11 @@ $data = $list->data();
// The first row should be column labels
$labels = $data[0];
//Create a unique identifier based on the current time in microseconds
$identifier = uniqid('playerlist_');
$identifier = uniqid( 'playerlist_' );
// If responsive tables are enabled then load the inline css code
if ($responsive == true){
sportspress_responsive_tables_css($labels,$identifier);
if ( true == $responsive ){
$theme_name = wp_get_theme()->get( 'Name' );
sportspress_responsive_tables_css( $labels, $identifier, $theme_name );
}
// Remove the first row to leave us with the actual data
unset( $data[0] );