Removed the "_page" postfix from page view files

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),

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);
     }
 }

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' => [

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),

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),

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),

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),

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),

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),