Merge pull request #566 from alicolville/remove-legacy

10.7

assets/js/ws-ls.js

@@ -24,24 +24,6 @@ jQuery( document ).ready( function ( $ ) {
                 function() { window.location.replace( ws_ls_config[ 'current-url' ] + '?target-cleared=true&wt-user-id=' + user_id ) } );
   });
 
-  // -----------------------------------------------------------------------
-  // Tabs (ZoZo)
-  // -----------------------------------------------------------------------
-
-  // Just saved data or cancelled?  If so, set default Tab to be "In Detail"
-  let default_tab = ( ws_ls_querystring_value( 'ws-edit-saved' ) || ws_ls_querystring_value( 'ws-edit-cancel' ) ) ? 'tab2' : 'tab1';
-
-  let tabs_are_ready = function( event, item ) {
-      $( '#ws-ls-tabs-loading' ).addClass( 'ws-ls-hide' );
-      $( '#' + item.id ).addClass( 'ws-ls-force-show' );
-      $( '#' + item.id ).removeClass( 'ws-ls-hide' );
-  };
-
-  ws_ls_config[ 'tab-config' ][ 'defaultTab' ]  = default_tab;
-  ws_ls_config[ 'tab-config' ][ 'ready' ]       = tabs_are_ready;
-
-  tabs_global = $( '#ws-ls-tabs' ).zozoTabs( ws_ls_config[ 'tab-config' ] );
-
   // -----------------------------------------------------------------------
   // Progress Bar
   // -----------------------------------------------------------------------

docs/shortcodes.md

@@ -33,7 +33,6 @@ The majority of the public facing functionality are implemented using [WordPress
 |[[wt-group-view-as-table]]({{ site.baseurl }}/shortcodes/wt-group-view-as-table.html)|Display a table of summary information for users within a given [group]({{ site.baseurl }}/groups.html).
 |[[wt-waist-to-hip-ratio-calculator]]({{ site.baseurl }}/shortcodes/wt-waist-to-hip-ratio-calculator.html)|Displays a Waist-to-Hip ratio calculator for your users to use.|
 |[[wt-if]]({{ site.baseurl }}/shortcodes/wt-if.html)|Add conditional display logic based on whether WT data has been completed or not.|
-|[[wt-legacy]]({{ site.baseurl }}/shortcodes/wt-legacy.html) |A legacy version of [[wt]]({{ site.baseurl }}/shortcodes/wt.html).|  
 |[[wt-league-table]]({{ site.baseurl }}/shortcodes/wt-league-table.html)|Display a league table of Weight Tracker users.|
 |[[wt-macronutrients]]({{ site.baseurl }}/shortcodes/wt-macronutrients.html)|Displays a macronutrient figure from the macronutrient intake calculations.|
 |[[wt-macronutrients-table]]({{ site.baseurl }}/shortcodes/wt-macronutrients-table.html)|Displays recommendations on the best way to split your calorie intake.|

includes/admin-pages/awards/page-awards-add-update.php

@@ -23,7 +23,7 @@ function ws_ls_awards_add_update_page() {
             $mandatory_fields = array_merge( $mandatory_fields, [ 'weight_percentage' ] );
         } else if ( 'weight' === $award['category'] ) {
             if( ws_ls_setting( 'use-imperial' ) ) {
-                if ( 'stones_pounds' === ws_ls_setting( 'weight-unit' ) ) {
+                if ( 'stones_pounds' === ws_ls_setting() ) {
                     $mandatory_fields = array_merge( $mandatory_fields, [ 'stones', 'pounds' ] );
                     $award['value'] = ws_ls_convert_stones_pounds_to_kg( $award['stones'], $award['pounds'] );
                 } else {
@@ -159,7 +159,7 @@ function ws_ls_awards_add_update_page() {
 
                                                     if( ws_ls_setting( 'use-imperial' ) ) {
 
-                                                       if ( 'stones_pounds' === ws_ls_setting( 'weight-unit' ) ) {
+                                                       if ( 'stones_pounds' === ws_ls_setting() ) {
 
                                                            if ( true === $validation_fail ) {
                                                                $weight['stones'] = $award['stones'];