From c8bd47d1e5f263b285b63436af44c78673aebd87 Mon Sep 17 00:00:00 2001 From: Alex Tselegidis Date: Tue, 14 Dec 2021 08:08:06 +0100 Subject: [PATCH] Removed the "_page" postfix from page view files --- application/controllers/Admins.php | 2 +- application/controllers/Backend.php | 12 ++++++------ application/controllers/Booking.php | 10 +++++----- application/controllers/Calendar.php | 2 +- application/controllers/Customers.php | 2 +- application/controllers/Providers.php | 2 +- application/controllers/Secretaries.php | 2 +- application/controllers/Service_categories.php | 2 +- application/controllers/Services.php | 2 +- .../views/pages/{admins_page.php => admins.php} | 0 .../views/pages/{booking_page.php => booking.php} | 0 ...{booking_message_page.php => booking_message.php} | 0 ...{booking_success_page.php => booking_success.php} | 0 .../views/pages/{calendar_page.php => calendar.php} | 0 .../pages/{customers_page.php => customers.php} | 0 ...{instance_update_page.php => instance_update.php} | 0 .../pages/{providers_page.php => providers.php} | 0 .../pages/{secretaries_page.php => secretaries.php} | 0 ...ce_categories_page.php => service_categories.php} | 0 .../views/pages/{services_page.php => services.php} | 0 application/views/{users_page.php => users.php} | 0 21 files changed, 18 insertions(+), 18 deletions(-) rename application/views/pages/{admins_page.php => admins.php} (100%) rename application/views/pages/{booking_page.php => booking.php} (100%) rename application/views/pages/{booking_message_page.php => booking_message.php} (100%) rename application/views/pages/{booking_success_page.php => booking_success.php} (100%) rename application/views/pages/{calendar_page.php => calendar.php} (100%) rename application/views/pages/{customers_page.php => customers.php} (100%) rename application/views/pages/{instance_update_page.php => instance_update.php} (100%) rename application/views/pages/{providers_page.php => providers.php} (100%) rename application/views/pages/{secretaries_page.php => secretaries.php} (100%) rename application/views/pages/{service_categories_page.php => service_categories.php} (100%) rename application/views/pages/{services_page.php => services.php} (100%) rename application/views/{users_page.php => users.php} (100%) diff --git a/application/controllers/Admins.php b/application/controllers/Admins.php index 67c6c196..0c79a0ea 100644 --- a/application/controllers/Admins.php +++ b/application/controllers/Admins.php @@ -52,7 +52,7 @@ class Admins extends EA_Controller { $role_slug = session('role_slug'); - $this->load->view('pages/admins_page', [ + $this->load->view('pages/admins', [ 'page_title' => lang('admins'), 'active_menu' => PRIV_USERS, 'user_display_name' => $this->accounts->get_user_display_name($user_id), diff --git a/application/controllers/Backend.php b/application/controllers/Backend.php index 8b31e0cf..6084860e 100755 --- a/application/controllers/Backend.php +++ b/application/controllers/Backend.php @@ -105,7 +105,7 @@ class Backend extends EA_Controller { $view['edit_appointment'] = NULL; } - $this->load->view('pages/calendar_page', $view); + $this->load->view('pages/calendar', $view); } /** @@ -208,7 +208,7 @@ class Backend extends EA_Controller { $this->set_user_data($view); - $this->load->view('pages/customers_page', $view); + $this->load->view('pages/customers', $view); } /** @@ -241,7 +241,7 @@ class Backend extends EA_Controller { $view['timezones'] = $this->timezones->to_array(); $this->set_user_data($view); - $this->load->view('pages/services_page', $view); + $this->load->view('pages/services', $view); } /** @@ -276,7 +276,7 @@ class Backend extends EA_Controller { $view['working_plan_exceptions'] = '{}'; $this->set_user_data($view); - $this->load->view('pages/users_page', $view); + $this->load->view('pages/users', $view); } /** @@ -320,7 +320,7 @@ class Backend extends EA_Controller { $this->set_user_data($view); - $this->load->view('pages/settings_page', $view); + $this->load->view('pages/settings', $view); } /** @@ -350,6 +350,6 @@ class Backend extends EA_Controller { $view = ['success' => FALSE, 'exception' => $e->getMessage()]; } - $this->load->view('pages/instance_update_page', $view); + $this->load->view('pages/instance_update', $view); } } diff --git a/application/controllers/Booking.php b/application/controllers/Booking.php index 2ff0815f..5c798698 100755 --- a/application/controllers/Booking.php +++ b/application/controllers/Booking.php @@ -110,7 +110,7 @@ class Booking extends EA_Controller { if (empty($results)) { // The requested appointment was not found in the database. - $this->load->view('pages/booking_message_page', [ + $this->load->view('pages/booking_message', [ 'message_title' => lang('appointment_not_found'), 'message_text' => lang('appointment_does_not_exist_in_db'), 'message_icon' => base_url('assets/img/error.png') @@ -130,7 +130,7 @@ class Booking extends EA_Controller { $hours = floor($book_advance_timeout / 60); $minutes = ($book_advance_timeout % 60); - $this->load->view('pages/booking_message_page', [ + $this->load->view('pages/booking_message', [ 'message_title' => lang('appointment_locked'), 'message_text' => strtr(lang('appointment_locked_message'), [ '{$limit}' => sprintf('%02d:%02d', $hours, $minutes) @@ -163,7 +163,7 @@ class Booking extends EA_Controller { $customer = []; } - $this->load->view('pages/booking_page', [ + $this->load->view('pages/booking', [ 'available_services' => $available_services, 'available_providers' => $available_providers, 'company_name' => $company_name, @@ -238,7 +238,7 @@ class Booking extends EA_Controller { $exceptions[] = $e; } - $this->load->view('pages/booking_message_page', [ + $this->load->view('pages/booking_message', [ 'message_title' => lang('appointment_cancelled_title'), 'message_text' => lang('appointment_cancelled'), 'message_icon' => base_url('assets/img/success.png'), @@ -278,7 +278,7 @@ class Booking extends EA_Controller { $exceptions = $this->session->flashdata('book_success') ?? []; - $this->load->view('pages/booking_success_page', [ + $this->load->view('pages/booking_success', [ 'page_title' => lang('success'), 'appointment_data' => $appointment, 'provider_data' => [ diff --git a/application/controllers/Calendar.php b/application/controllers/Calendar.php index f8cfcc5d..1b686f66 100644 --- a/application/controllers/Calendar.php +++ b/application/controllers/Calendar.php @@ -95,7 +95,7 @@ class Calendar extends EA_Controller { $this->appointments_model->load($edit_appointment, ['customer']); } - $this->load->view('pages/calendar_page', [ + $this->load->view('pages/calendar', [ 'page_title' => lang('calendar'), 'active_menu' => PRIV_APPOINTMENTS, 'user_display_name' => $this->accounts->get_user_display_name($user_id), diff --git a/application/controllers/Customers.php b/application/controllers/Customers.php index 003e0d97..113cded4 100644 --- a/application/controllers/Customers.php +++ b/application/controllers/Customers.php @@ -53,7 +53,7 @@ class Customers extends EA_Controller { $role_slug = session('role_slug'); - $this->load->view('pages/customers_page', [ + $this->load->view('pages/customers', [ 'page_title' => lang('customers'), 'active_menu' => PRIV_CUSTOMERS, 'user_display_name' => $this->accounts->get_user_display_name($user_id), diff --git a/application/controllers/Providers.php b/application/controllers/Providers.php index 79364944..ff23db25 100644 --- a/application/controllers/Providers.php +++ b/application/controllers/Providers.php @@ -53,7 +53,7 @@ class Providers extends EA_Controller { $role_slug = session('role_slug'); - $this->load->view('pages/providers_page', [ + $this->load->view('pages/providers', [ 'page_title' => lang('providers'), 'active_menu' => PRIV_USERS, 'user_display_name' => $this->accounts->get_user_display_name($user_id), diff --git a/application/controllers/Secretaries.php b/application/controllers/Secretaries.php index df0d9975..8221da4d 100644 --- a/application/controllers/Secretaries.php +++ b/application/controllers/Secretaries.php @@ -53,7 +53,7 @@ class Secretaries extends EA_Controller { $role_slug = session('role_slug'); - $this->load->view('pages/secretaries_page', [ + $this->load->view('pages/secretaries', [ 'page_title' => lang('secretaries'), 'active_menu' => PRIV_USERS, 'user_display_name' => $this->accounts->get_user_display_name($user_id), diff --git a/application/controllers/Service_categories.php b/application/controllers/Service_categories.php index 202ad194..d85c5b0c 100644 --- a/application/controllers/Service_categories.php +++ b/application/controllers/Service_categories.php @@ -52,7 +52,7 @@ class Service_categories extends EA_Controller { $role_slug = session('role_slug'); - $this->load->view('pages/service_categories_page', [ + $this->load->view('pages/service_categories', [ 'page_title' => lang('services'), 'active_menu' => PRIV_SERVICES, 'user_display_name' => $this->accounts->get_user_display_name($user_id), diff --git a/application/controllers/Services.php b/application/controllers/Services.php index eaed4f52..1945d8a2 100644 --- a/application/controllers/Services.php +++ b/application/controllers/Services.php @@ -52,7 +52,7 @@ class Services extends EA_Controller { $role_slug = session('role_slug'); - $this->load->view('pages/services_page', [ + $this->load->view('pages/services', [ 'page_title' => lang('services'), 'active_menu' => PRIV_SERVICES, 'user_display_name' => $this->accounts->get_user_display_name($user_id), diff --git a/application/views/pages/admins_page.php b/application/views/pages/admins.php similarity index 100% rename from application/views/pages/admins_page.php rename to application/views/pages/admins.php diff --git a/application/views/pages/booking_page.php b/application/views/pages/booking.php similarity index 100% rename from application/views/pages/booking_page.php rename to application/views/pages/booking.php diff --git a/application/views/pages/booking_message_page.php b/application/views/pages/booking_message.php similarity index 100% rename from application/views/pages/booking_message_page.php rename to application/views/pages/booking_message.php diff --git a/application/views/pages/booking_success_page.php b/application/views/pages/booking_success.php similarity index 100% rename from application/views/pages/booking_success_page.php rename to application/views/pages/booking_success.php diff --git a/application/views/pages/calendar_page.php b/application/views/pages/calendar.php similarity index 100% rename from application/views/pages/calendar_page.php rename to application/views/pages/calendar.php diff --git a/application/views/pages/customers_page.php b/application/views/pages/customers.php similarity index 100% rename from application/views/pages/customers_page.php rename to application/views/pages/customers.php diff --git a/application/views/pages/instance_update_page.php b/application/views/pages/instance_update.php similarity index 100% rename from application/views/pages/instance_update_page.php rename to application/views/pages/instance_update.php diff --git a/application/views/pages/providers_page.php b/application/views/pages/providers.php similarity index 100% rename from application/views/pages/providers_page.php rename to application/views/pages/providers.php diff --git a/application/views/pages/secretaries_page.php b/application/views/pages/secretaries.php similarity index 100% rename from application/views/pages/secretaries_page.php rename to application/views/pages/secretaries.php diff --git a/application/views/pages/service_categories_page.php b/application/views/pages/service_categories.php similarity index 100% rename from application/views/pages/service_categories_page.php rename to application/views/pages/service_categories.php diff --git a/application/views/pages/services_page.php b/application/views/pages/services.php similarity index 100% rename from application/views/pages/services_page.php rename to application/views/pages/services.php diff --git a/application/views/users_page.php b/application/views/users.php similarity index 100% rename from application/views/users_page.php rename to application/views/users.php