From 4446f26399d1d4ecd6a37e5e224adcac62f63bc7 Mon Sep 17 00:00:00 2001 From: Alex Tselegidis Date: Sat, 14 Jan 2023 09:40:18 +0100 Subject: [PATCH] Make the backend footer sticky and remove the "placeFooterToBottom" function --- .../views/components/backend_footer.php | 2 +- application/views/layouts/backend_layout.php | 10 ++++++--- assets/css/general.scss | 4 ++++ assets/js/layouts/backend_layout.js | 21 ------------------- assets/js/pages/account.js | 2 -- assets/js/pages/api_settings.js | 2 -- assets/js/pages/booking_settings.js | 2 -- assets/js/pages/business_settings.js | 2 -- assets/js/pages/general_settings.js | 2 -- assets/js/pages/google_analytics_settings.js | 2 -- assets/js/pages/legal_settings.js | 2 -- assets/js/pages/matomo_analytics_settings.js | 2 -- assets/js/pages/providers.js | 8 ------- assets/js/utils/calendar_table_view.js | 9 -------- 14 files changed, 12 insertions(+), 58 deletions(-) diff --git a/application/views/components/backend_footer.php b/application/views/components/backend_footer.php index dcb6f68c..29ff3ced 100644 --- a/application/views/components/backend_footer.php +++ b/application/views/components/backend_footer.php @@ -5,7 +5,7 @@ * @var string $user_display_name */ ?> -
+
Easy!Appointments Logo diff --git a/application/views/layouts/backend_layout.php b/application/views/layouts/backend_layout.php index c1ab2715..97c11c0a 100644 --- a/application/views/layouts/backend_layout.php +++ b/application/views/layouts/backend_layout.php @@ -24,11 +24,15 @@ - + - vars('active_menu')]) ?> +
- + vars('active_menu')]) ?> + + + +
vars('user_display_name')]) ?> diff --git a/assets/css/general.scss b/assets/css/general.scss index 29778b99..d4d26096 100644 --- a/assets/css/general.scss +++ b/assets/css/general.scss @@ -9,6 +9,10 @@ * @since v1.5.0 * ---------------------------------------------------------------------------- */ +html { + height: 100%; +} + @-moz-document url-prefix() { body .checkbox input[type='checkbox'] { float: left; diff --git a/assets/js/layouts/backend_layout.js b/assets/js/layouts/backend_layout.js index 0185770f..92b0d416 100644 --- a/assets/js/layouts/backend_layout.js +++ b/assets/js/layouts/backend_layout.js @@ -37,20 +37,6 @@ window.App.Layouts.Backend = (function () { const PRIV_SYSTEM_SETTINGS = 'system_settings'; const PRIV_USER_SETTINGS = 'user_settings'; - function placeFooterToBottom() { - if (window.innerHeight > $('body').height()) { - $footer.css({ - 'position': 'absolute', - 'width': '100%', - 'bottom': '0px' - }); - } else { - $footer.css({ - 'position': 'static' - }); - } - } - /** * Display backend notifications to user. * @@ -103,12 +89,6 @@ window.App.Layouts.Backend = (function () { * Initialize the module. */ function initialize() { - $(window) - .on('resize', () => { - App.Layouts.Backend.placeFooterToBottom(); - }) - .trigger('resize'); - $(document).ajaxStart(() => { $loading.show(); }); @@ -139,7 +119,6 @@ window.App.Layouts.Backend = (function () { PRIV_USERS, PRIV_SYSTEM_SETTINGS, PRIV_USER_SETTINGS, - placeFooterToBottom, displayNotification }; })(); diff --git a/assets/js/pages/account.js b/assets/js/pages/account.js index 09877adb..7e7723bc 100644 --- a/assets/js/pages/account.js +++ b/assets/js/pages/account.js @@ -190,8 +190,6 @@ App.Pages.Account = (function () { $saveSettings.on('click', onSaveSettingsClick); $username.on('change', onUsernameChange); - - App.Layouts.Backend.placeFooterToBottom(); } document.addEventListener('DOMContentLoaded', initialize); diff --git a/assets/js/pages/api_settings.js b/assets/js/pages/api_settings.js index ad7bfe83..7c7e1baa 100644 --- a/assets/js/pages/api_settings.js +++ b/assets/js/pages/api_settings.js @@ -97,8 +97,6 @@ App.Pages.ApiSettings = (function () { const apiSettings = vars('api_settings'); deserialize(apiSettings); - - App.Layouts.Backend.placeFooterToBottom(); } document.addEventListener('DOMContentLoaded', initialize); diff --git a/assets/js/pages/booking_settings.js b/assets/js/pages/booking_settings.js index 6a71b78b..406fe85d 100644 --- a/assets/js/pages/booking_settings.js +++ b/assets/js/pages/booking_settings.js @@ -221,8 +221,6 @@ App.Pages.BookingSettings = (function () { deserialize(bookingSettings); applyInitialState(); - - App.Layouts.Backend.placeFooterToBottom(); } document.addEventListener('DOMContentLoaded', initialize); diff --git a/assets/js/pages/business_settings.js b/assets/js/pages/business_settings.js index 6a4f8c61..b4ef9173 100644 --- a/assets/js/pages/business_settings.js +++ b/assets/js/pages/business_settings.js @@ -166,8 +166,6 @@ App.Pages.BusinessSettings = (function () { $saveSettings.on('click', onSaveSettingsClick); $applyGlobalWorkingPlan.on('click', onApplyGlobalWorkingPlan); - - App.Layouts.Backend.placeFooterToBottom(); } document.addEventListener('DOMContentLoaded', initialize); diff --git a/assets/js/pages/general_settings.js b/assets/js/pages/general_settings.js index 1b119d0d..06d415b5 100644 --- a/assets/js/pages/general_settings.js +++ b/assets/js/pages/general_settings.js @@ -172,8 +172,6 @@ App.Pages.GeneralSettings = (function () { const generalSettings = vars('general_settings'); deserialize(generalSettings); - - App.Layouts.Backend.placeFooterToBottom(); } document.addEventListener('DOMContentLoaded', initialize); diff --git a/assets/js/pages/google_analytics_settings.js b/assets/js/pages/google_analytics_settings.js index 063c49d6..009dcbeb 100644 --- a/assets/js/pages/google_analytics_settings.js +++ b/assets/js/pages/google_analytics_settings.js @@ -97,8 +97,6 @@ App.Pages.GoogleAnalyticsSettings = (function () { const googleAnalyticsSettings = vars('google_analytics_settings'); deserialize(googleAnalyticsSettings); - - App.Layouts.Backend.placeFooterToBottom(); } document.addEventListener('DOMContentLoaded', initialize); diff --git a/assets/js/pages/legal_settings.js b/assets/js/pages/legal_settings.js index f3573ce4..027708ae 100644 --- a/assets/js/pages/legal_settings.js +++ b/assets/js/pages/legal_settings.js @@ -150,8 +150,6 @@ App.Pages.LegalSettings = (function () { deserialize(legalSettings); $saveSettings.on('click', onSaveSettingsClick); - - App.Layouts.Backend.placeFooterToBottom(); } document.addEventListener('DOMContentLoaded', initialize); diff --git a/assets/js/pages/matomo_analytics_settings.js b/assets/js/pages/matomo_analytics_settings.js index 331113fb..ee7bff75 100644 --- a/assets/js/pages/matomo_analytics_settings.js +++ b/assets/js/pages/matomo_analytics_settings.js @@ -97,8 +97,6 @@ App.Pages.MatomoAnalyticsSettings = (function () { const matomoAnalyticsSettings = vars('matomo_analytics_settings'); deserialize(matomoAnalyticsSettings); - - App.Layouts.Backend.placeFooterToBottom(); } document.addEventListener('DOMContentLoaded', initialize); diff --git a/assets/js/pages/providers.js b/assets/js/pages/providers.js index 58531c75..4281a927 100755 --- a/assets/js/pages/providers.js +++ b/assets/js/pages/providers.js @@ -215,13 +215,6 @@ App.Pages.Providers = (function () { } }); - /** - * Event: Display Provider Details "Click" - */ - $providers.on('shown.bs.tab', 'a[data-bs-toggle="tab"]', () => { - App.Layouts.Backend.placeFooterToBottom(); - }); - /** * Event: Reset Working Plan Button "Click". */ @@ -461,7 +454,6 @@ App.Pages.Providers = (function () { .find('.edit-working-plan-exception, .delete-working-plan-exception') .prop('disabled', true); $providers.find('.working-plan input:checkbox').prop('disabled', true); - App.Layouts.Backend.placeFooterToBottom(); } /** diff --git a/assets/js/utils/calendar_table_view.js b/assets/js/utils/calendar_table_view.js index b550a093..077d6958 100755 --- a/assets/js/utils/calendar_table_view.js +++ b/assets/js/utils/calendar_table_view.js @@ -127,9 +127,6 @@ App.Utils.CalendarTableView = (function () { currentDate = moment(currentDate).add({days: 1}).toDate(); } - - // setCalendarViewSize(); - App.Layouts.Backend.placeFooterToBottom(); }); }); @@ -536,8 +533,6 @@ App.Utils.CalendarTableView = (function () { $('#calendar .calendar-view').remove(); - App.Layouts.Backend.placeFooterToBottom(); - const $calendarView = $('
', { 'class': 'calendar-view' }).appendTo('#calendar'); @@ -559,8 +554,6 @@ App.Utils.CalendarTableView = (function () { setCalendarViewSize(); - App.Layouts.Backend.placeFooterToBottom(); - // Activate calendar navigation. $('#calendar .calendar-header .btn').removeClass('disabled').prop('disabled', false); @@ -676,8 +669,6 @@ App.Utils.CalendarTableView = (function () { // Add the unavailabilities to the column. /** @var {Array} events.unavailabilities */ createUnavailabilities($providerColumn, events.unavailabilities); - - App.Layouts.Backend.placeFooterToBottom(); } /**