From ee6729cf0ba66f4060e140fe07fc105efec84004 Mon Sep 17 00:00:00 2001 From: alextselegidis Date: Fri, 12 Nov 2021 16:51:25 +0100 Subject: [PATCH] Converted all the account related pages to the new layout structure --- application/controllers/User.php | 6 +- .../account/account_layout.php} | 49 ++---------- .../pages/account/account_login_page.php | 46 ++++++++++++ .../pages/account/account_logout_page.php | 17 +++++ .../account/account_no_permissions_page.php | 11 +++ .../pages/account/account_recovery_page.php | 24 ++++++ application/views/user/forgot_password.php | 75 ------------------- application/views/user/index.html | 10 --- application/views/user/logout.php | 55 -------------- application/views/user/no_privileges.php | 44 ----------- 10 files changed, 108 insertions(+), 229 deletions(-) rename application/views/{user/login.php => layouts/account/account_layout.php} (54%) create mode 100644 application/views/pages/account/account_login_page.php create mode 100644 application/views/pages/account/account_logout_page.php create mode 100644 application/views/pages/account/account_no_permissions_page.php create mode 100644 application/views/pages/account/account_recovery_page.php delete mode 100644 application/views/user/forgot_password.php delete mode 100644 application/views/user/index.html delete mode 100644 application/views/user/logout.php delete mode 100644 application/views/user/no_privileges.php diff --git a/application/controllers/User.php b/application/controllers/User.php index af27ce5d..7d38fd57 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -43,7 +43,7 @@ class User extends EA_Controller { */ public function login() { - $this->load->view('user/login', [ + $this->load->layout('layouts/account/account_layout', 'pages/account/account_login_page', [ 'base_url' => config('base_url'), 'company_name' => setting('company_name'), 'dest_url' => session('dest_url', site_url('backend')) @@ -57,7 +57,7 @@ class User extends EA_Controller { { $this->session->sess_destroy(); - $this->load->view('user/logout', [ + $this->load->layout('layouts/account/account_layout', 'pages/account/account_logout_page', [ 'base_url' => config('base_url'), 'company_name' => setting('company_name') ]); @@ -68,7 +68,7 @@ class User extends EA_Controller { */ public function forgot_password() { - $this->load->view('user/forgot_password', [ + $this->load->layout('layouts/account/account_layout', 'pages/account/account_recovery_page', [ 'base_url' => config('base_url'), 'company_name' => setting('company_name') ]); diff --git a/application/views/user/login.php b/application/views/layouts/account/account_layout.php similarity index 54% rename from application/views/user/login.php rename to application/views/layouts/account/account_layout.php index 9f9560a5..d9b2cccb 100644 --- a/application/views/user/login.php +++ b/application/views/layouts/account/account_layout.php @@ -48,50 +48,15 @@
-

-

-
-
-
-
- - -
-
- - -
+ -
- -
- - - - | - - - - -
- - Powered by - Easy!Appointments - -
-
+
+ + Powered by + Easy!Appointments + +
- - - - diff --git a/application/views/pages/account/account_login_page.php b/application/views/pages/account/account_login_page.php new file mode 100644 index 00000000..bd9b1de1 --- /dev/null +++ b/application/views/pages/account/account_login_page.php @@ -0,0 +1,46 @@ + + +

+

+
+
+ +
+
+ + +
+
+ + +
+ +
+ +
+ + + + | + + + + +
+ + + + + diff --git a/application/views/pages/account/account_logout_page.php b/application/views/pages/account/account_logout_page.php new file mode 100644 index 00000000..71398dde --- /dev/null +++ b/application/views/pages/account/account_logout_page.php @@ -0,0 +1,17 @@ +

+

+ +

+ +
+ + + + + + + + + + + diff --git a/application/views/pages/account/account_no_permissions_page.php b/application/views/pages/account/account_no_permissions_page.php new file mode 100644 index 00000000..0cd21891 --- /dev/null +++ b/application/views/pages/account/account_no_permissions_page.php @@ -0,0 +1,11 @@ +

+

+ +

+ +
+ + + + + diff --git a/application/views/pages/account/account_recovery_page.php b/application/views/pages/account/account_recovery_page.php new file mode 100644 index 00000000..f5f3f06d --- /dev/null +++ b/application/views/pages/account/account_recovery_page.php @@ -0,0 +1,24 @@ +

+

+
+
+
+
+ + +
+
+ + +
+ +
+ + + + +
diff --git a/application/views/user/forgot_password.php b/application/views/user/forgot_password.php deleted file mode 100644 index 21a08587..00000000 --- a/application/views/user/forgot_password.php +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - <?= lang('forgot_your_password') ?> | Easy!Appointments - - - - - - - - - - - - - - - - - - -
-

-

-
-
-
-
- - -
-
- - -
- -
- - - - -
- -
- - Powered by - Easy!Appointments - -
-
- - - - - - diff --git a/application/views/user/index.html b/application/views/user/index.html deleted file mode 100644 index 221ac80d..00000000 --- a/application/views/user/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - 403 Forbidden - - - -

Directory access is forbidden.

- - - diff --git a/application/views/user/logout.php b/application/views/user/logout.php deleted file mode 100644 index 9562d921..00000000 --- a/application/views/user/logout.php +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - <?= lang('log_out') ?> | Easy!Appointments - - - - - - - - - - - - - - - - - -
-

-

- -

- -
- - - - - - - - - - - -
- - Powered by - Easy!Appointments - -
-
- - diff --git a/application/views/user/no_privileges.php b/application/views/user/no_privileges.php deleted file mode 100644 index 2166ff61..00000000 --- a/application/views/user/no_privileges.php +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - <?= lang('no_privileges') ?> | Easy!Appointments - - - - - - - - - - - - - -
-

-

- -

- -
- - - - - - -
- - Powered by - Easy!Appointments - -
-
- -