Translate SportsPress.', 'sportspress' ); ?>
' . $handle . ''; diff --git a/includes/admin/post-types/class-sp-admin-meta-boxes.php b/includes/admin/post-types/class-sp-admin-meta-boxes.php index 8a1c0f12..458aa8d0 100644 --- a/includes/admin/post-types/class-sp-admin-meta-boxes.php +++ b/includes/admin/post-types/class-sp-admin-meta-boxes.php @@ -7,7 +7,7 @@ * @author ThemeBoy * @category Admin * @package SportsPress/Admin/Meta Boxes - * @version 0.8 + * @version 1.0 */ if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly @@ -40,9 +40,11 @@ class SP_Admin_Meta_Boxes { // Save Statistic Meta Boxes add_action( 'sportspress_process_sp_statistic_meta', 'SP_Meta_Box_Statistic_Details::save', 10, 2 ); + add_action( 'sportspress_process_sp_statistic_meta', 'SP_Meta_Box_Statistic_Equation::save', 20, 2 ); // Save Column Meta Boxes add_action( 'sportspress_process_sp_column_meta', 'SP_Meta_Box_Column_Details::save', 10, 2 ); + add_action( 'sportspress_process_sp_column_meta', 'SP_Meta_Box_Column_Equation::save', 20, 2 ); // Save Event Meta Boxes add_action( 'sportspress_process_sp_event_meta', 'SP_Meta_Box_Event_Format::save', 10, 2 ); @@ -92,7 +94,8 @@ class SP_Admin_Meta_Boxes { add_meta_box( 'sp_detailsdiv', __( 'Details', 'sportspress' ), 'SP_Meta_Box_Outcome_Details::output', 'sp_outcome', 'normal', 'high' ); // Columns - add_meta_box( 'sp_detailsdiv', __( 'Details', 'sportspress' ), 'SP_Meta_Box_Column_Details::output', 'sp_column', 'normal', 'high' ); + add_meta_box( 'sp_detailsdiv', __( 'Details', 'sportspress' ), 'SP_Meta_Box_Column_Details::output', 'sp_column', 'side', 'default' ); + add_meta_box( 'sp_equationdiv', __( 'Equation', 'sportspress' ), 'SP_Meta_Box_Column_Equation::output', 'sp_column', 'normal', 'high' ); // Metrics add_meta_box( 'sp_detailsdiv', __( 'Details', 'sportspress' ), 'SP_Meta_Box_Metric_Details::output', 'sp_metric', 'normal', 'high' ); @@ -100,8 +103,9 @@ class SP_Admin_Meta_Boxes { // Performance add_meta_box( 'sp_detailsdiv', __( 'Details', 'sportspress' ), 'SP_Meta_Box_Performance_Details::output', 'sp_performance', 'normal', 'high' ); - // Metrics - add_meta_box( 'sp_detailsdiv', __( 'Details', 'sportspress' ), 'SP_Meta_Box_Statistic_Details::output', 'sp_statistic', 'normal', 'high' ); + // Statistics + add_meta_box( 'sp_detailsdiv', __( 'Details', 'sportspress' ), 'SP_Meta_Box_Statistic_Details::output', 'sp_statistic', 'side', 'default' ); + add_meta_box( 'sp_equationdiv', __( 'Equation', 'sportspress' ), 'SP_Meta_Box_Statistic_Equation::output', 'sp_statistic', 'normal', 'high' ); // Events add_meta_box( 'sp_shortcodediv', __( 'Shortcodes', 'sportspress' ), 'SP_Meta_Box_Event_Shortcode::output', 'sp_event', 'side', 'default' ); diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-column-details.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-column-details.php index ff286af3..07031d86 100644 --- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-column-details.php +++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-column-details.php @@ -5,7 +5,7 @@ * @author ThemeBoy * @category Admin * @package SportsPress/Admin/Meta Boxes - * @version 0.8 + * @version 1.0 */ if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly @@ -36,14 +36,6 @@ class SP_Meta_Box_Column_Details extends SP_Meta_Box_Config { --
- ID, $piece, array( 'team_event', 'outcome', 'result' ) ); - endforeach; - ?> -
@@ -79,7 +71,6 @@ class SP_Meta_Box_Column_Details extends SP_Meta_Box_Config { */ public static function save( $post_id, $post ) { self::delete_duplicate( $_POST ); - update_post_meta( $post_id, 'sp_equation', implode( ' ', sp_array_value( $_POST, 'sp_equation', array() ) ) ); update_post_meta( $post_id, 'sp_precision', (int) sp_array_value( $_POST, 'sp_precision', 1 ) ); update_post_meta( $post_id, 'sp_priority', sp_array_value( $_POST, 'sp_priority', '0' ) ); update_post_meta( $post_id, 'sp_order', sp_array_value( $_POST, 'sp_order', 'DESC' ) ); diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-column-equation.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-column-equation.php new file mode 100644 index 00000000..c5624b1c --- /dev/null +++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-column-equation.php @@ -0,0 +1,28 @@ +ID, 'sp_equation', true ); + self::builder( $post->post_title, $equation, array( 'team_event', 'outcome', 'result' ) ); + } +} \ No newline at end of file diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-config.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-config.php index 603a22bc..88a21041 100644 --- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-config.php +++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-config.php @@ -5,7 +5,7 @@ * @author ThemeBoy * @category Admin * @package SportsPress/Admin/Meta Boxes - * @version 0.8 + * @version 1.0 */ if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly @@ -22,118 +22,6 @@ class SP_Meta_Box_Config { self::delete_duplicate( $_POST ); } - public static function select( $postid, $selected = null, $groups = array() ) { - - if ( ! isset( $postid ) ) - return; - - // Initialize options array - $options = array(); - - // Add groups to options - foreach ( $groups as $group ): - switch ( $group ): - case 'player_event': - $options[ __( 'Events', 'sportspress' ) ] = array( '$eventsattended' => __( 'Attended', 'sportspress' ), '$eventsplayed' => __( 'Played', 'sportspress' ), '$eventsstarted' => __( 'Started', 'sportspress' ), '$eventssubbed' => __( 'Substituted', 'sportspress' ) ); - break; - case 'team_event': - $options[ __( 'Events', 'sportspress' ) ] = array( '$eventsplayed' => __( 'Played', 'sportspress' ) ); - break; - case 'result': - $options[ __( 'Results', 'sportspress' ) ] = self::optgroup( $postid, 'sp_result', array( 'for' => '→', 'against' => '←' ), null, false ); - break; - case 'outcome': - $options[ __( 'Outcomes', 'sportspress' ) ] = self::optgroup( $postid, 'sp_outcome', array() ); - $options[ __( 'Outcomes', 'sportspress' ) ]['$streak'] = __( 'Streak', 'sportspress' ); - $options[ __( 'Outcomes', 'sportspress' ) ]['$last5'] = __( 'Last 5', 'sportspress' ); - $options[ __( 'Outcomes', 'sportspress' ) ]['$last10'] = __( 'Last 10', 'sportspress' ); - break; - case 'performance': - $options[ __( 'Performance', 'sportspress' ) ] = self::optgroup( $postid, 'sp_performance' ); - break; - case 'metric': - $options[ __( 'Metric', 'sportspress' ) ] = self::optgroup( $postid, 'sp_metric' ); - break; - endswitch; - endforeach; - - // Create array of operators - $operators = array( '+' => '+', '-' => '−', '*' => '×', '/' => '÷', '(' => '(', ')' => ')' ); - - // Add operators to options - $options[ __( 'Operators', 'sportspress' ) ] = $operators; - - // Create array of constants - $max = 10; - $constants = array(); - for ( $i = 1; $i <= $max; $i ++ ): - $constants[$i] = $i; - endfor; - - // Add 100 to constants - $constants[100] = 100; - - // Add constants to options - $options[ __( 'Constants', 'sportspress' ) ] = (array) $constants; - - ?> - - $type, - 'numberposts' => -1, - 'posts_per_page' => -1, - 'orderby' => 'menu_order', - 'order' => 'ASC', - 'exclude' => $postid - ); - $vars = get_posts( $args ); - - // Add extra vars to the array - if ( isset( $defaults ) && is_array( $defaults ) ): - foreach ( $defaults as $key => $value ): - $arr[ $key ] = $value; - endforeach; - endif; - - // Add vars to the array - if ( isset( $variations ) && is_array( $variations ) ): - foreach ( $vars as $var ): - if ( $totals ) $arr[ '$' . $var->post_name ] = $var->post_title; - foreach ( $variations as $key => $value ): - $arr[ '$' . $var->post_name . $key ] = $var->post_title . ' ' . $value; - endforeach; - endforeach; - else: - foreach ( $vars as $var ): - $arr[ '$' . $var->post_name ] = $var->post_title; - endforeach; - endif; - - return (array) $arr; - } - public static function delete_duplicate( &$post ) { global $wpdb; @@ -152,5 +40,4 @@ class SP_Meta_Box_Config { return $post_name_check; } - -} \ No newline at end of file +} diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-equation.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-equation.php new file mode 100644 index 00000000..601369e6 --- /dev/null +++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-equation.php @@ -0,0 +1,146 @@ + __( 'Attended', 'sportspress' ), '$eventsplayed' => __( 'Played', 'sportspress' ), '$eventsstarted' => __( 'Started', 'sportspress' ), '$eventssubbed' => __( 'Substituted', 'sportspress' ) ); + break; + case 'team_event': + $options['Events'] = array( '$eventsplayed' => __( 'Played', 'sportspress' ) ); + break; + case 'result': + $options['Results'] = self::optgroup( 'sp_result', array( 'for' => '(' . __( 'for', 'sportspress' ) . ')', 'against' => '(' . __( 'against', 'sportspress' ) . ')' ), null, false ); + break; + case 'outcome': + $options['Outcomes'] = self::optgroup( 'sp_outcome' ); + $options['Outcomes']['$streak'] = __( 'Streak', 'sportspress' ); + $options['Outcomes']['$last5'] = __( 'Last 5', 'sportspress' ); + $options['Outcomes']['$last10'] = __( 'Last 10', 'sportspress' ); + break; + case 'performance': + $options['Performance'] = self::optgroup( 'sp_performance' ); + break; + case 'metric': + $options['Metric'] = self::optgroup( 'sp_metric' ); + break; + endswitch; + endforeach; + + // Create array of operators + $operators = array( '+' => '+', '-' => '−', '*' => '×', '/' => '÷', '(' => '(', ')' => ')' ); + + // Add operators to options + $options['Operators'] = $operators; + + // Create array of constants + $max = 10; + $constants = array(); + for ( $i = 0; $i <= $max; $i ++ ): + $constants[$i] = $i; + endfor; + + // Add 100 to constants + $constants[100] = 100; + + // Add constants to options + $options['Constants'] = (array) $constants; + ?> +
| + | + $value ): $parts[ $key ] = $value; + ?> + | + + +
|---|
diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-statistic-details.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-statistic-details.php index b28e0dac..1104472a 100644 --- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-statistic-details.php +++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-statistic-details.php @@ -5,7 +5,7 @@ * @author ThemeBoy * @category Admin * @package SportsPress/Admin/Meta Boxes - * @version 0.8 + * @version 1.0 */ if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly @@ -23,7 +23,6 @@ class SP_Meta_Box_Statistic_Details extends SP_Meta_Box_Config { */ public static function output( $post ) { wp_nonce_field( 'sportspress_save_data', 'sportspress_meta_nonce' ); - $equation = explode( ' ', get_post_meta( $post->ID, 'sp_equation', true ) ); $precision = get_post_meta( $post->ID, 'sp_precision', true ); // Defaults @@ -34,14 +33,6 @@ class SP_Meta_Box_Statistic_Details extends SP_Meta_Box_Config {
--
- ID, $piece, array( 'player_event', 'outcome', 'performance', 'metric' ) ); - endforeach; - ?> -
@@ -54,7 +45,6 @@ class SP_Meta_Box_Statistic_Details extends SP_Meta_Box_Config { */ public static function save( $post_id, $post ) { self::delete_duplicate( $_POST ); - update_post_meta( $post_id, 'sp_equation', implode( ' ', sp_array_value( $_POST, 'sp_equation', array() ) ) ); update_post_meta( $post_id, 'sp_precision', (int) sp_array_value( $_POST, 'sp_precision', 1 ) ); } diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-statistic-equation.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-statistic-equation.php new file mode 100644 index 00000000..1c81d88c --- /dev/null +++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-statistic-equation.php @@ -0,0 +1,28 @@ +ID, 'sp_equation', true ); + self::builder( $post->post_title, $equation, array( 'player_event', 'outcome', 'performance', 'metric' ) ); + } +} diff --git a/includes/admin/settings/class-sp-settings-general.php b/includes/admin/settings/class-sp-settings-general.php index 1d07eb3c..728329c9 100644 --- a/includes/admin/settings/class-sp-settings-general.php +++ b/includes/admin/settings/class-sp-settings-general.php @@ -107,6 +107,19 @@ class SP_Settings_General extends SP_Settings_Page { 'checkboxgroup' => 'end', 'desc_tip' => __( 'This will enable a script allowing the countdowns to be animated.', 'sportspress' ), ), + + array( + 'title' => __( 'Header Offset', 'sportspress' ), + 'id' => 'sportspress_header_offset', + 'class' => 'small-text', + 'default' => null, + 'placeholder' => __( 'Auto', 'sportspress' ), + 'desc' => 'px', + 'type' => 'number', + 'custom_attributes' => array( + 'step' => 1 + ), + ), array( 'type' => 'sectionend', 'id' => 'script_styling_options' ), @@ -167,7 +180,7 @@ class SP_Settings_General extends SP_Settings_Page {