From f2b97402fd7db6b0f864cdae6c6611747acb96de Mon Sep 17 00:00:00 2001 From: "Mastej, Matt" Date: Tue, 5 May 2020 13:35:33 -0400 Subject: [PATCH 01/18] bootstrap 4 and font awesome --- application/views/appointments/book.php | 63 +- .../views/appointments/book_success.php | 22 +- application/views/appointments/message.php | 2 +- application/views/backend/calendar.php | 62 +- application/views/backend/customers.php | 46 +- application/views/backend/header.php | 129 +- application/views/backend/services.php | 76 +- application/views/backend/settings.php | 125 +- application/views/backend/users.php | 155 +- application/views/general/error404.php | 6 +- application/views/general/installation.php | 2 +- application/views/general/update.php | 2 +- application/views/user/forgot_password.php | 2 +- application/views/user/login.php | 10 +- application/views/user/logout.php | 9 +- application/views/user/no_privileges.php | 2 +- assets/bootstrap/css/bootstrap-grid.css | 3899 +++++++++ assets/bootstrap/css/bootstrap-grid.css.map | 1 + assets/bootstrap/css/bootstrap-grid.min.css | 7 + .../bootstrap/css/bootstrap-grid.min.css.map | 1 + assets/bootstrap/css/bootstrap-reboot.css | 327 + assets/bootstrap/css/bootstrap-reboot.css.map | 1 + assets/bootstrap/css/bootstrap-reboot.min.css | 8 + .../css/bootstrap-reboot.min.css.map | 1 + assets/bootstrap/css/bootstrap.min.css.map | 1 + assets/bootstrap/js/bootstrap.bundle.js | 7134 +++++++++++++++++ assets/bootstrap/js/bootstrap.bundle.js.map | 1 + assets/bootstrap/js/bootstrap.bundle.min.js | 7 + .../bootstrap/js/bootstrap.bundle.min.js.map | 1 + assets/bootstrap/js/bootstrap.js.map | 1 + assets/bootstrap/js/bootstrap.min.js.map | 1 + assets/css/backend.css | 81 +- assets/css/frontend.css | 12 +- assets/css/general.css | 17 + assets/ext/bootstrap/css/bootstrap.css.map | 2 +- assets/ext/bootstrap/css/bootstrap.min.css | 16 +- assets/ext/bootstrap/js/bootstrap.min.js | 12 +- .../js/backend_calendar_appointments_modal.js | 8 +- assets/js/backend_customers_helper.js | 10 +- assets/js/backend_services_helper.js | 8 +- assets/js/backend_settings.js | 2 +- assets/js/backend_users.js | 18 +- assets/js/backend_users_admins.js | 6 +- assets/js/backend_users_providers.js | 18 +- assets/js/backend_users_secretaries.js | 6 +- assets/js/frontend_book.js | 2 +- assets/js/working_plan.js | 52 +- package-lock.json | 4628 +++++------ package.json | 2 +- 49 files changed, 13864 insertions(+), 3140 deletions(-) create mode 100644 assets/bootstrap/css/bootstrap-grid.css create mode 100644 assets/bootstrap/css/bootstrap-grid.css.map create mode 100644 assets/bootstrap/css/bootstrap-grid.min.css create mode 100644 assets/bootstrap/css/bootstrap-grid.min.css.map create mode 100644 assets/bootstrap/css/bootstrap-reboot.css create mode 100644 assets/bootstrap/css/bootstrap-reboot.css.map create mode 100644 assets/bootstrap/css/bootstrap-reboot.min.css create mode 100644 assets/bootstrap/css/bootstrap-reboot.min.css.map create mode 100644 assets/bootstrap/css/bootstrap.min.css.map create mode 100644 assets/bootstrap/js/bootstrap.bundle.js create mode 100644 assets/bootstrap/js/bootstrap.bundle.js.map create mode 100644 assets/bootstrap/js/bootstrap.bundle.min.js create mode 100644 assets/bootstrap/js/bootstrap.bundle.min.js.map create mode 100644 assets/bootstrap/js/bootstrap.js.map create mode 100644 assets/bootstrap/js/bootstrap.min.js.map diff --git a/application/views/appointments/book.php b/application/views/appointments/book.php index 3ac56825..73325a58 100755 --- a/application/views/appointments/book.php +++ b/application/views/appointments/book.php @@ -14,6 +14,7 @@ + @@ -21,8 +22,8 @@
-
-
+
+
@@ -48,23 +49,23 @@
-
+

-
+
- +
-
+

-
+
@@ -93,7 +94,7 @@ - - +
@@ -161,10 +162,10 @@
-
@@ -177,11 +178,11 @@

-
+
-
+
@@ -191,15 +192,15 @@
- -
@@ -212,7 +213,7 @@

-
+
@@ -233,7 +234,7 @@
-
+
@@ -283,14 +284,14 @@
- -
@@ -301,15 +302,15 @@

-
-
+
+
settings_model->get_setting('require_captcha') === '1'): ?>
-
+

CAPTCHA - +

@@ -320,14 +321,14 @@
-
@@ -393,7 +394,7 @@ - + diff --git a/application/views/appointments/book_success.php b/application/views/appointments/book_success.php index f1ddfa94..476e2fe4 100755 --- a/application/views/appointments/book_success.php +++ b/application/views/appointments/book_success.php @@ -9,30 +9,26 @@ +
-
-
- -
- +
+
+
+
-
+
' . lang('appointment_registered') . '

' . lang('appointment_details_was_sent_to_you') . '

' . lang('check_spam_folder') . '

- ' . + ' . lang('go_to_booking_page') . ' '; @@ -40,7 +36,7 @@ if (config('google_sync_feature')) { echo ' '; } @@ -61,7 +57,7 @@
- + diff --git a/application/views/appointments/message.php b/application/views/appointments/message.php index 8280bffe..e16a2815 100644 --- a/application/views/appointments/message.php +++ b/application/views/appointments/message.php @@ -18,7 +18,7 @@ - + diff --git a/application/views/backend/calendar.php b/application/views/backend/calendar.php index a4919af9..cd4401d8 100755 --- a/application/views/backend/calendar.php +++ b/application/views/backend/calendar.php @@ -42,38 +42,38 @@
-
-
-
- -
-
+
- -
- - @@ -92,25 +92,25 @@
- - - -
@@ -125,12 +125,12 @@