diff --git a/assets/js/admin/sportspress-admin.js b/assets/js/admin/sportspress-admin.js index 59658264..8fdd052f 100644 --- a/assets/js/admin/sportspress-admin.js +++ b/assets/js/admin/sportspress-admin.js @@ -27,8 +27,8 @@ jQuery(document).ready(function($){ // Auto key placeholder $("#poststuff #title").on("keyup", function() { val = $(this).val().replace(/[^a-z]/gi,"").toLowerCase(); - $("#sp_variable").attr("placeholder", val); - $("#sp_default_variable").val(val); + $("#sp_key").attr("placeholder", val); + $("#sp_default_key").val(val); }); // Activate auto key placeholder diff --git a/includes/admin/post-types/class-sp-admin-cpt-column.php b/includes/admin/post-types/class-sp-admin-cpt-column.php index 4be71198..6c52929d 100644 --- a/includes/admin/post-types/class-sp-admin-cpt-column.php +++ b/includes/admin/post-types/class-sp-admin-cpt-column.php @@ -41,7 +41,7 @@ class SP_Admin_CPT_Column extends SP_Admin_CPT { $columns = array( 'cb' => '', 'title' => __( 'Label', 'sportspress' ), - 'sp_variable' => __( 'Variable', 'sportspress' ), + 'sp_key' => __( 'Key', 'sportspress' ), 'sp_equation' => __( 'Equation', 'sportspress' ), 'sp_precision' => __( 'Rounding', 'sportspress' ), 'sp_order' => __( 'Sort Order', 'sportspress' ), @@ -55,7 +55,7 @@ class SP_Admin_CPT_Column extends SP_Admin_CPT { */ public function custom_columns( $column, $post_id ) { switch ( $column ): - case 'sp_variable': + case 'sp_key': global $post; echo $post->post_name; break; diff --git a/includes/admin/post-types/class-sp-admin-cpt-metric.php b/includes/admin/post-types/class-sp-admin-cpt-metric.php index a97f30b0..d6d52fa6 100644 --- a/includes/admin/post-types/class-sp-admin-cpt-metric.php +++ b/includes/admin/post-types/class-sp-admin-cpt-metric.php @@ -41,7 +41,7 @@ class SP_Admin_CPT_Metric extends SP_Admin_CPT { $columns = array( 'cb' => '', 'title' => __( 'Label', 'sportspress' ), - 'sp_variable' => __( 'Variable', 'sportspress' ), + 'sp_key' => __( 'Variable', 'sportspress' ), ); return $columns; } @@ -52,7 +52,7 @@ class SP_Admin_CPT_Metric extends SP_Admin_CPT { */ public function custom_columns( $column, $post_id ) { switch ( $column ): - case 'sp_variable': + case 'sp_key': global $post; echo $post->post_name; break; diff --git a/includes/admin/post-types/class-sp-admin-cpt-outcome.php b/includes/admin/post-types/class-sp-admin-cpt-outcome.php index c97cfc3b..00f30117 100644 --- a/includes/admin/post-types/class-sp-admin-cpt-outcome.php +++ b/includes/admin/post-types/class-sp-admin-cpt-outcome.php @@ -41,7 +41,7 @@ class SP_Admin_CPT_Outcome extends SP_Admin_CPT { $columns = array( 'cb' => '', 'title' => __( 'Label', 'sportspress' ), - 'sp_variable' => __( 'Variable', 'sportspress' ), + 'sp_key' => __( 'Variable', 'sportspress' ), ); return $columns; } @@ -52,7 +52,7 @@ class SP_Admin_CPT_Outcome extends SP_Admin_CPT { */ public function custom_columns( $column, $post_id ) { switch ( $column ): - case 'sp_variable': + case 'sp_key': global $post; echo $post->post_name; break; diff --git a/includes/admin/post-types/class-sp-admin-cpt-performance.php b/includes/admin/post-types/class-sp-admin-cpt-performance.php index 05f5db0f..d9fb733d 100644 --- a/includes/admin/post-types/class-sp-admin-cpt-performance.php +++ b/includes/admin/post-types/class-sp-admin-cpt-performance.php @@ -41,7 +41,7 @@ class SP_Admin_CPT_Performance extends SP_Admin_CPT { $columns = array( 'cb' => '', 'title' => __( 'Label', 'sportspress' ), - 'sp_variable' => __( 'Variable', 'sportspress' ), + 'sp_key' => __( 'Variable', 'sportspress' ), ); return $columns; } @@ -52,7 +52,7 @@ class SP_Admin_CPT_Performance extends SP_Admin_CPT { */ public function custom_columns( $column, $post_id ) { switch ( $column ): - case 'sp_variable': + case 'sp_key': global $post; echo $post->post_name; break; diff --git a/includes/admin/post-types/class-sp-admin-cpt-result.php b/includes/admin/post-types/class-sp-admin-cpt-result.php index 9f3d6cb3..8336462d 100644 --- a/includes/admin/post-types/class-sp-admin-cpt-result.php +++ b/includes/admin/post-types/class-sp-admin-cpt-result.php @@ -41,7 +41,7 @@ class SP_Admin_CPT_Result extends SP_Admin_CPT { $columns = array( 'cb' => '', 'title' => __( 'Label', 'sportspress' ), - 'sp_variable' => __( 'Variable', 'sportspress' ), + 'sp_key' => __( 'Variable', 'sportspress' ), ); return $columns; } @@ -52,9 +52,9 @@ class SP_Admin_CPT_Result extends SP_Admin_CPT { */ public function custom_columns( $column, $post_id ) { switch ( $column ): - case 'sp_variable': + case 'sp_key': global $post; - echo $post->post_name; + echo $post->post_name . 'for, ' . $post->post_name . 'against'; break; endswitch; } diff --git a/includes/admin/post-types/class-sp-admin-cpt-statistic.php b/includes/admin/post-types/class-sp-admin-cpt-statistic.php index 3618365e..5fd7d703 100644 --- a/includes/admin/post-types/class-sp-admin-cpt-statistic.php +++ b/includes/admin/post-types/class-sp-admin-cpt-statistic.php @@ -41,7 +41,7 @@ class SP_Admin_CPT_Statistic extends SP_Admin_CPT { $columns = array( 'cb' => '', 'title' => __( 'Label', 'sportspress' ), - 'sp_variable' => __( 'Variable', 'sportspress' ), + 'sp_key' => __( 'Key', 'sportspress' ), 'sp_equation' => __( 'Equation', 'sportspress' ), 'sp_precision' => __( 'Rounding', 'sportspress' ), ); @@ -54,7 +54,7 @@ class SP_Admin_CPT_Statistic extends SP_Admin_CPT { */ public function custom_columns( $column, $post_id ) { switch ( $column ): - case 'sp_variable': + case 'sp_key': global $post; echo $post->post_name; break; 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 487f6561..8908e68d 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 @@ -28,10 +28,10 @@ class SP_Meta_Box_Column_Details { // Defaults if ( $precision == '' ) $precision = 0; ?> -

+

- - + +

diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-metric-details.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-metric-details.php index 763e6424..0a01a67f 100644 --- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-metric-details.php +++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-metric-details.php @@ -24,8 +24,8 @@ class SP_Meta_Box_Metric_Details { ?>

- - + +

- - + +

- - + +

- - + +

-

+

- - + +

diff --git a/includes/admin/settings/class-sp-settings-config.php b/includes/admin/settings/class-sp-settings-config.php index 01462442..bde943ca 100644 --- a/includes/admin/settings/class-sp-settings-config.php +++ b/includes/admin/settings/class-sp-settings-config.php @@ -156,7 +156,7 @@ class SP_Settings_Config extends SP_Settings_Page { - + @@ -180,7 +180,7 @@ class SP_Settings_Config extends SP_Settings_Page { > post_name ); ?>> - post_name; ?>for / post_name; ?>against + post_name; ?>for, post_name; ?>against @@ -274,7 +274,7 @@ class SP_Settings_Config extends SP_Settings_Page { - + @@ -383,7 +383,7 @@ class SP_Settings_Config extends SP_Settings_Page { - + diff --git a/includes/sp-core-functions.php b/includes/sp-core-functions.php index 064e68ac..e0bab847 100644 --- a/includes/sp-core-functions.php +++ b/includes/sp-core-functions.php @@ -3003,7 +3003,7 @@ if ( !function_exists( 'sp_delete_duplicate_post' ) ) { function sp_delete_duplicate_post( &$post ) { global $wpdb; - $key = isset( $post['sp_variable'] ) ? $post['sp_variable'] : null; + $key = isset( $post['sp_key'] ) ? $post['sp_key'] : null; if ( ! $key ) $key = $post['post_title']; $id = sp_array_value( $post, 'post_ID', 'var' ); $title = sp_get_eos_safe_slug( $key, $id ); diff --git a/includes/sp-template-hooks.php b/includes/sp-template-hooks.php index d990402c..5884955b 100644 --- a/includes/sp-template-hooks.php +++ b/includes/sp-template-hooks.php @@ -104,7 +104,7 @@ function sportspress_gettext( $translated_text, $untranslated_text, $domain ) { if ( sp_is_config_type( $typenow ) ): switch ( $untranslated_text ): case 'Slug': - $translated_text = __( 'Variable', 'sportspress' ); + $translated_text = ( in_array( $typenow, array( 'sp_column', 'sp_statistic' ) ) ) ? __( 'Key', 'sportspress' ) : __( 'Variable', 'sportspress' ); break; endswitch; endif; @@ -180,9 +180,9 @@ function sportspress_sanitize_title( $title ) { elseif ( isset( $_POST ) && array_key_exists( 'post_type', $_POST ) && sp_is_config_type( $_POST['post_type'] ) ): - $key = isset( $_POST['sp_variable'] ) ? $_POST['sp_variable'] : null; + $key = isset( $_POST['sp_key'] ) ? $_POST['sp_key'] : null; - if ( ! $key ) $key = isset( $_POST['sp_default_variable'] ) ? $_POST['sp_default_variable'] : null; + if ( ! $key ) $key = isset( $_POST['sp_default_key'] ) ? $_POST['sp_default_key'] : null; if ( ! $key ) $key = $_POST['post_title'];