From 5058e380ae1d82329e7e461c5e3073a7135e8e9c Mon Sep 17 00:00:00 2001
From: alext <alextselegidis@gmail.com>
Date: Tue, 28 Nov 2017 15:42:12 +0100
Subject: [PATCH] Replaced jquery ui spinner component with native number input
 field.

---
 src/application/views/backend/services.php |  4 +--
 src/application/views/backend/settings.php | 10 +++----
 src/assets/css/backend.css                 | 33 +---------------------
 src/assets/js/backend_services.js          |  5 ----
 src/assets/js/backend_services_helper.js   |  3 --
 src/assets/js/backend_settings.js          |  5 ----
 6 files changed, 8 insertions(+), 52 deletions(-)

diff --git a/src/application/views/backend/services.php b/src/application/views/backend/services.php
index 749df52e..13c1b763 100644
--- a/src/application/views/backend/services.php
+++ b/src/application/views/backend/services.php
@@ -97,7 +97,7 @@
 
                     <div class="form-group">
                         <label for="service-duration"><?= lang('duration_minutes') ?> *</label>
-                        <input id="service-duration" class="form-control required" >
+                        <input id="service-duration" class="form-control required" type="number" min="15">
                     </div>
 
                     <div class="form-group">
@@ -129,7 +129,7 @@
 
                     <div class="form-group">
                         <label for="service-attendants-number"><?= lang('attendants_number') ?> *</label>
-                        <input id="service-attendants-number" class="form-control required" >
+                        <input id="service-attendants-number" class="form-control required" type="number" min="1">
                     </div>
 
                     <div class="form-group">
diff --git a/src/application/views/backend/settings.php b/src/application/views/backend/settings.php
index cd03e254..7548bbc1 100644
--- a/src/application/views/backend/settings.php
+++ b/src/application/views/backend/settings.php
@@ -270,12 +270,12 @@
                             <br>
 
                             <h4><?= lang('book_advance_timeout') ?></h4>
-                            <span class="help-block">
-                                <?= lang('book_advance_timeout_hint') ?>
-                            </span>
                             <div class="form-group">
-                                <label for="book-advance-timeout"><?= lang('timeout_minutes') ?></label>
-                                <input id="book-advance-timeout" data-field="book_advance_timeout" class="form-control">
+                                <label for="book-advance-timeout" class="control-label"><?= lang('timeout_minutes') ?></label>
+                                <input id="book-advance-timeout" data-field="book_advance_timeout" class="form-control" type="number" min="15">
+                                <p class="help-block">
+                                    <?= lang('book_advance_timeout_hint') ?>
+                                </p>
                             </div>
                         </div>
                         <div class="col-xs-12 col-sm-5 breaks-wrapper">
diff --git a/src/assets/css/backend.css b/src/assets/css/backend.css
index 28548f3d..e2c3077f 100644
--- a/src/assets/css/backend.css
+++ b/src/assets/css/backend.css
@@ -551,13 +551,6 @@ body .form-horizontal .controls {
     cursor: pointer;
 }
 
-#services-page .record-details .ui-spinner {
-    border: none;
-    margin-bottom: 10px;
-    display: block;
-    color: #666;
-}
-
 #services-page .record-details .ui-state-disabled {
     opacity: 1;
 }
@@ -566,12 +559,6 @@ body .form-horizontal .controls {
     margin: 0px;
 }
 
-#services-page .record-details .ui-spinner a {
-    cursor: pointer;
-    background: none;
-    border: none;
-}
-
 #services-page .record-details h3 a {
     font-size: 24px;
     margin-left: 10px;
@@ -746,25 +733,7 @@ body .form-horizontal .controls {
 }
 
 #business-logic #book-advance-timeout {
-    margin: 0 0 0 10px;
-    width: 50px;
-    color: #666;
-}
-
-#business-logic .ui-spinner {
-    border: none;
-    width: 80px;
-    color: #666;
-}
-
-#business-logic .ui-state-disabled {
-    opacity: 1;
-}
-
-#business-logic .ui-spinner a {
-    cursor: pointer;
-    background: none;
-    border: none;
+    width: 100px;
 }
 
 #settings-page #user-notifications,
diff --git a/src/assets/js/backend_services.js b/src/assets/js/backend_services.js
index bab22a21..ef912cb5 100644
--- a/src/assets/js/backend_services.js
+++ b/src/assets/js/backend_services.js
@@ -47,11 +47,6 @@ window.BackendServices = window.BackendServices || {};
         });
         $('#service-category').append(new Option('- ' + EALang.no_category + ' -', null)).val('null');
 
-        $('#service-duration, #service-attendants-number').spinner({
-            min: 1,
-            disabled: true // default
-        });
-
         // Instantiate helper object (service helper by default).
         helper = servicesHelper;
         helper.resetForm();
diff --git a/src/assets/js/backend_services_helper.js b/src/assets/js/backend_services_helper.js
index cf897242..1d8a847d 100644
--- a/src/assets/js/backend_services_helper.js
+++ b/src/assets/js/backend_services_helper.js
@@ -93,7 +93,6 @@
             $('#services .save-cancel-group').show();
             $('#services .record-details').find('input, textarea').prop('readonly', false);
             $('#services .record-details').find('select').prop('disabled', false);
-            $('#service-duration, #service-attendants-number').spinner('enable');
 
             $('#filter-services button').prop('disabled', true);
             $('#filter-services .results').css('color', '#AAA');
@@ -151,7 +150,6 @@
             $('#services .save-cancel-group').show();
             $('#services .record-details').find('input, textarea').prop('readonly', false);
             $('#services .record-details select').prop('disabled', false);
-            $('#service-duration, #service-attendants-number').spinner('enable');
 
             $('#filter-services button').prop('disabled', true);
             $('#filter-services .results').css('color', '#AAA');
@@ -272,7 +270,6 @@
         $('#edit-service, #delete-service').prop('disabled', true);
         $('#services .record-details').find('input, textarea').prop('readonly', true);
         $('#services .record-details').find('select').prop('disabled', true);
-        $('#service-duration, #service-attendants-number').spinner('disable');
 
         $('#filter-services .selected').removeClass('selected');
         $('#filter-services button').prop('disabled', false);
diff --git a/src/assets/js/backend_settings.js b/src/assets/js/backend_settings.js
index 9269fbd2..7a6edd6f 100644
--- a/src/assets/js/backend_settings.js
+++ b/src/assets/js/backend_settings.js
@@ -74,11 +74,6 @@ window.BackendSettings = window.BackendSettings || {};
         exports.wp.setup(workingPlan);
         exports.wp.timepickers(false);
 
-        // Book Advance Timeout Spinner
-        $('#book-advance-timeout').spinner({
-            'min': 0
-        });
-
         // Load user settings into form
         $('#user-id').val(GlobalVariables.settings.user.id);
         $('#first-name').val(GlobalVariables.settings.user.first_name);