From 914ed84a407a6a1b99e53075cdded82529dc3433 Mon Sep 17 00:00:00 2001
From: alextselegidis <alextselegidis@gmail.com>
Date: Mon, 15 Nov 2021 09:49:08 +0100
Subject: [PATCH] The view files use the new layout slots

---
 .../views/pages/account/account_login_page.php | 18 +++++++++++++++---
 .../pages/account/account_logout_page.php      |  8 ++++++++
 .../account/account_no_permissions_page.php    |  6 ++++++
 .../pages/account/account_recovery_page.php    |  6 ++++++
 .../pages/booking/booking_cancellation.php     |  2 +-
 .../pages/booking/booking_message_page.php     |  7 +++++++
 .../views/pages/booking/booking_page.php       |  7 +++++++
 .../pages/booking/booking_success_page.php     |  7 +++++++
 .../views/pages/customers/customers_page.php   |  7 +++++++
 .../views/pages/services/services_page.php     |  7 +++++++
 .../views/pages/settings/settings_page.php     |  7 +++++++
 application/views/pages/users/users_page.php   |  7 +++++++
 12 files changed, 85 insertions(+), 4 deletions(-)

diff --git a/application/views/pages/account/account_login_page.php b/application/views/pages/account/account_login_page.php
index bd9b1de1..8871e48e 100644
--- a/application/views/pages/account/account_login_page.php
+++ b/application/views/pages/account/account_login_page.php
@@ -5,8 +5,14 @@
  */
 ?>
 
+<?php extend('layouts/account/account_layout') ?>
+
+<?php section('content') ?>
+
 <h2><?= lang('backend_section') ?></h2>
+
 <p><?= lang('you_need_to_login') ?></p>
+
 <hr>
 <div class="alert d-none"></div>
 
@@ -32,15 +38,21 @@
     </div>
 
     <a href="<?= site_url('user/forgot_password') ?>" class="forgot-password">
-        <?= lang('forgot_your_password') ?></a>
+        <?= lang('forgot_your_password') ?>
+    </a>
     |
     <span id="select-language" class="badge badge-success">
-          <?= ucfirst(config('language')) ?>
-        </span>
+        <?= ucfirst(config('language')) ?>
+    </span>
 
 </form>
+<?php section('content') ?>
+
+<?php section('scripts') ?>
 
 <script src="<?= asset_url('assets/vendor/@fortawesome-fontawesome-free/fontawesome.min.js') ?>"></script>
 <script src="<?= asset_url('assets/vendor/@fortawesome-fontawesome-free/solid.min.js') ?>"></script>
 <script src="<?= asset_url('assets/js/general_functions.js') ?>"></script>
 <script src="<?= asset_url('assets/js/login.js') ?>"></script>
+
+<?php section('scripts') ?>
diff --git a/application/views/pages/account/account_logout_page.php b/application/views/pages/account/account_logout_page.php
index 71398dde..bfbc4e22 100644
--- a/application/views/pages/account/account_logout_page.php
+++ b/application/views/pages/account/account_logout_page.php
@@ -1,4 +1,9 @@
+<?php extend('layouts/account/account_layout') ?>
+
+<?php section('content') ?>
+
 <h3><?= lang('log_out') ?></h3>
+
 <p>
     <?= lang('logout_success') ?>
 </p>
@@ -15,3 +20,6 @@
     <?= lang('backend_section') ?>
 </a>
 
+<?php section('content') ?>
+
+
diff --git a/application/views/pages/account/account_no_permissions_page.php b/application/views/pages/account/account_no_permissions_page.php
index 0cd21891..dcc50f88 100644
--- a/application/views/pages/account/account_no_permissions_page.php
+++ b/application/views/pages/account/account_no_permissions_page.php
@@ -1,3 +1,7 @@
+<?php extend('layouts/account/account_layout') ?>
+
+<?php section('content') ?>
+
 <h3><?= lang('no_privileges') ?></h3>
 <p>
     <?= lang('no_privileges_message') ?>
@@ -9,3 +13,5 @@
     <i class="icon-calendar icon-white mr-2"></i>
     <?= lang('backend_calendar') ?>
 </a>
+
+<?php section('content') ?>
diff --git a/application/views/pages/account/account_recovery_page.php b/application/views/pages/account/account_recovery_page.php
index f5f3f06d..7a3bf392 100644
--- a/application/views/pages/account/account_recovery_page.php
+++ b/application/views/pages/account/account_recovery_page.php
@@ -1,3 +1,7 @@
+<?php extend('layouts/account/account_layout') ?>
+
+<?php section('content') ?>
+
 <h2><?= lang('forgot_your_password') ?></h2>
 <p><?= lang('type_username_and_email_for_new_password') ?></p>
 <hr>
@@ -22,3 +26,5 @@
     <a href="<?= site_url('user/login') ?>" class="user-login">
         <?= lang('go_to_login') ?></a>
 </form>
+
+<?php section('content') ?>
diff --git a/application/views/pages/booking/booking_cancellation.php b/application/views/pages/booking/booking_cancellation.php
index 47d1f1d8..97ca4b4b 100644
--- a/application/views/pages/booking/booking_cancellation.php
+++ b/application/views/pages/booking/booking_cancellation.php
@@ -33,4 +33,4 @@
                     class="btn btn-danger btn-sm"><?= lang('delete') ?></button>
         </div>
     </div>
-<?php endif; ?>
+<?php endif ?>
diff --git a/application/views/pages/booking/booking_message_page.php b/application/views/pages/booking/booking_message_page.php
index 785ae936..0fc93660 100644
--- a/application/views/pages/booking/booking_message_page.php
+++ b/application/views/pages/booking/booking_message_page.php
@@ -6,6 +6,10 @@
  */
 ?>
 
+<?php extend('layouts/message/message_layout') ?>
+
+<?php section('content') ?>
+
 <div>
     <img id="message-icon" src="<?= $message_icon ?>" alt="warning">
 </div>
@@ -15,3 +19,6 @@
 
     <p><?= $message_text ?></p>
 </div>
+
+<?php section('content') ?>
+
diff --git a/application/views/pages/booking/booking_page.php b/application/views/pages/booking/booking_page.php
index 4700b468..df6bd3b1 100755
--- a/application/views/pages/booking/booking_page.php
+++ b/application/views/pages/booking/booking_page.php
@@ -20,6 +20,10 @@
  */
 ?>
 
+<?php extend('layouts/booking/booking_layout') ?>
+
+<?php section('content') ?>
+
 <!-- Booking Cancellation Frame -->
 
 <?php require __DIR__ . '/booking_cancellation.php' ?>
@@ -39,3 +43,6 @@
 <!-- Appointment Data Confirmation -->
 
 <?php require __DIR__ . '/booking_step_4.php' ?>
+
+<?php section('content') ?>
+
diff --git a/application/views/pages/booking/booking_success_page.php b/application/views/pages/booking/booking_success_page.php
index f948421e..39c7f623 100755
--- a/application/views/pages/booking/booking_success_page.php
+++ b/application/views/pages/booking/booking_success_page.php
@@ -8,6 +8,10 @@
  */
 ?>
 
+<?php extend('layouts/message/message_layout') ?>
+
+<?php section('content') ?>
+
 <div>
     <img id="success-icon" class="mt-0 mb-2" src="<?= base_url('assets/img/success.png') ?>" alt="success"/>
 </div>
@@ -51,3 +55,6 @@
         googleApiScope: 'https://www.googleapis.com/auth/calendar'
     };
 </script>
+
+<?php section('content') ?>
+
diff --git a/application/views/pages/customers/customers_page.php b/application/views/pages/customers/customers_page.php
index aacef993..e29978d8 100755
--- a/application/views/pages/customers/customers_page.php
+++ b/application/views/pages/customers/customers_page.php
@@ -15,6 +15,11 @@
  * @var array $privileges
  */
 ?>
+
+<?php extend('layouts/backend/backend_layout') ?>
+
+<?php section('content') ?>
+
 <script src="<?= asset_url('assets/vendor/jquery-ui-timepicker-addon/jquery-ui-timepicker-addon.min.js') ?>"></script>
 <script src="<?= asset_url('assets/js/backend_customers_helper.js') ?>"></script>
 <script src="<?= asset_url('assets/js/backend_customers.js') ?>"></script>
@@ -202,3 +207,5 @@
         </div>
     </div>
 </div>
+
+<?php section('content') ?>
diff --git a/application/views/pages/services/services_page.php b/application/views/pages/services/services_page.php
index 07b7fc54..d4421d13 100755
--- a/application/views/pages/services/services_page.php
+++ b/application/views/pages/services/services_page.php
@@ -13,6 +13,11 @@
  * @var array $privileges
  */
 ?>
+
+<?php extend('layouts/backend/backend_layout') ?>
+
+<?php section('content') ?>
+
 <script src="<?= asset_url('assets/js/backend_services_helper.js') ?>"></script>
 <script src="<?= asset_url('assets/js/backend_categories_helper.js') ?>"></script>
 <script src="<?= asset_url('assets/js/backend_services.js') ?>"></script>
@@ -281,3 +286,5 @@
         </div>
     </div>
 </div>
+
+<?php section('content') ?>
diff --git a/application/views/pages/settings/settings_page.php b/application/views/pages/settings/settings_page.php
index 45bde40f..dbab14f8 100755
--- a/application/views/pages/settings/settings_page.php
+++ b/application/views/pages/settings/settings_page.php
@@ -14,6 +14,11 @@
  * @var array $privileges
  */
 ?>
+
+<?php extend('layouts/backend/backend_layout') ?>
+
+<?php section('content') ?>
+
 <script src="<?= asset_url('assets/js/backend_settings_system.js') ?>"></script>
 <script src="<?= asset_url('assets/js/backend_settings_user.js') ?>"></script>
 <script src="<?= asset_url('assets/js/backend_settings.js') ?>"></script>
@@ -682,3 +687,5 @@
 
     </div>
 </div>
+
+<?php section('content') ?>
diff --git a/application/views/pages/users/users_page.php b/application/views/pages/users/users_page.php
index 1ec5cc71..ee491d20 100755
--- a/application/views/pages/users/users_page.php
+++ b/application/views/pages/users/users_page.php
@@ -20,6 +20,10 @@
  */
 ?>
 
+<?php extend('layouts/backend/backend_layout') ?>
+
+<?php section('content') ?>
+
 <script src="<?= asset_url('assets/js/backend_users_admins.js') ?>"></script>
 <script src="<?= asset_url('assets/js/backend_users_providers.js') ?>"></script>
 <script src="<?= asset_url('assets/js/backend_users_secretaries.js') ?>"></script>
@@ -796,3 +800,6 @@
         </div>
     </div>
 </div>
+
+<?php section('content') ?>
+