From 1340fa6e9f8ac7d6990a5487752b947c15f4ee79 Mon Sep 17 00:00:00 2001
From: Alex Tselegidis <alextselegidis@gmail.com>
Date: Wed, 27 Jul 2022 02:45:52 +0300
Subject: [PATCH] Update the settings related navigation

---
 .../views/components/backend_header.php       |  18 +-
 application/views/components/settings_nav.php |  35 ++++
 application/views/pages/booking_settings.php  |   5 +-
 application/views/pages/business_settings.php |   5 +-
 application/views/pages/general_settings.php  |   5 +-
 application/views/pages/integrations.php      | 157 +++++++++---------
 application/views/pages/legal_settings.php    |   5 +-
 7 files changed, 134 insertions(+), 96 deletions(-)
 create mode 100755 application/views/components/settings_nav.php

diff --git a/application/views/components/backend_header.php b/application/views/components/backend_header.php
index 3b6acda8..f631d5d6 100755
--- a/application/views/components/backend_header.php
+++ b/application/views/components/backend_header.php
@@ -85,25 +85,13 @@
             <li class="nav-item dropdown <?= $active . $hidden ?>">
                 <a class="nav-link dropdown-toggle" href="#" data-bs-toggle="dropdown"
                    data-tippy-content="<?= lang('settings_hint') ?>">
-                    <i class="fas fa-cogs me-2"></i>
-                    <?= lang('settings') ?>
+                    <i class="fas fa-user me-2"></i>
+                    <?= vars('user_display_name') ?>
                 </a>
                 <div class="dropdown-menu dropdown-menu-end">
                     <?php if (can('view', PRIV_SYSTEM_SETTINGS)): ?>
                         <a class="dropdown-item" href="<?= site_url('general_settings') ?>">
-                            <?= lang('general') ?>
-                        </a>
-                        <a class="dropdown-item" href="<?= site_url('booking_settings') ?>">
-                            <?= lang('booking') ?>
-                        </a>
-                        <a class="dropdown-item" href="<?= site_url('business_settings') ?>">
-                            <?= lang('business') ?>
-                        </a>
-                        <a class="dropdown-item" href="<?= site_url('legal_settings') ?>">
-                            <?= lang('legal') ?>
-                        </a>
-                        <a class="dropdown-item" href="<?= site_url('integrations') ?>">
-                            <?= lang('integrations') ?>
+                            <?= lang('settings') ?>
                         </a>
                     <?php endif ?>
                     <a class="dropdown-item" href="<?= site_url('account') ?>">
diff --git a/application/views/components/settings_nav.php b/application/views/components/settings_nav.php
new file mode 100755
index 00000000..533ae9c2
--- /dev/null
+++ b/application/views/components/settings_nav.php
@@ -0,0 +1,35 @@
+<h4 class="mt-4 text-black-50 pb-2 border-bottom mb-2">
+    <?= lang('settings') ?>
+</h4>
+
+<ul id="settings-nav" class="nav flex-column">
+    <li class="nav-item mb-2">
+        <a class="nav-link" href="<?= site_url('general_settings') ?>">
+            <?= lang('general_settings') ?>
+        </a>
+    </li>
+    
+    <li class="nav-item mb-2">
+        <a class="nav-link" href="<?= site_url('booking_settings') ?>">
+            <?= lang('booking_settings') ?>
+        </a>
+    </li>
+    
+    <li class="nav-item mb-2">
+        <a class="nav-link" href="<?= site_url('business_settings') ?>">
+            <?= lang('business_logic') ?>
+        </a>
+    </li>
+    
+    <li class="nav-item mb-2">
+        <a class="nav-link" href="<?= site_url('legal_settings') ?>">
+            <?= lang('legal_contents') ?>
+        </a>
+    </li>
+    
+    <li class="nav-item mb-2">
+        <a class="nav-link" href="<?= site_url('integrations') ?>">
+            <?= lang('integrations') ?>
+        </a>
+    </li>
+</ul>
diff --git a/application/views/pages/booking_settings.php b/application/views/pages/booking_settings.php
index 1d898a12..20bf60e8 100755
--- a/application/views/pages/booking_settings.php
+++ b/application/views/pages/booking_settings.php
@@ -5,7 +5,10 @@
 <div id="booking-settings-page" class="container backend-page">
     <div id="booking-settings">
         <div class="row">
-            <div class="col-lg-8 offset-lg-2">
+            <div class="col-sm-3 offset-sm-1">
+                <?php component('settings_nav') ?>
+            </div>
+            <div class="col-sm-6">
                 <form>
                     <fieldset>
                         <legend class="d-flex justify-content-between align-items-center border-bottom mb-4 py-2">
diff --git a/application/views/pages/business_settings.php b/application/views/pages/business_settings.php
index 23224fe5..53cac98a 100755
--- a/application/views/pages/business_settings.php
+++ b/application/views/pages/business_settings.php
@@ -5,7 +5,10 @@
 <div id="business-logic-page" class="container backend-page">
     <div id="business-logic">
         <div class="row">
-            <div class="col-lg-8 offset-lg-2">
+            <div class="col-sm-3 offset-sm-1">
+                <?php component('settings_nav') ?>
+            </div>
+            <div class="col-sm-6">
                 <form>
                     <fieldset>
                         <legend class="d-flex justify-content-between align-items-center border-bottom mb-4 py-2">
diff --git a/application/views/pages/general_settings.php b/application/views/pages/general_settings.php
index 968c8cef..8358c6f2 100755
--- a/application/views/pages/general_settings.php
+++ b/application/views/pages/general_settings.php
@@ -5,7 +5,10 @@
 <div id="general-settings-page" class="container backend-page">
     <div id="general-settings">
         <div class="row">
-            <div class="col-lg-8 offset-lg-2">
+            <div class="col-sm-3 offset-sm-1">
+                <?php component('settings_nav') ?>
+            </div>
+            <div class="col-sm-6">
                 <form>
                     <fieldset>
                         <legend class="d-flex justify-content-between align-items-center border-bottom mb-4 py-2">
diff --git a/application/views/pages/integrations.php b/application/views/pages/integrations.php
index 65b90417..695ab2dc 100755
--- a/application/views/pages/integrations.php
+++ b/application/views/pages/integrations.php
@@ -3,106 +3,109 @@
 <?php section('content') ?>
 
 <div id="integrations-page" class="container backend-page">
-    <div id="integrations" class="col-lg-8 offset-lg-2">
+    <div class="row">
+        <div class="col-sm-3 offset-sm-1">
+            <?php component('settings_nav') ?>
+        </div>
+        <div id="integrations" class="col-sm-6">
+            <h3 class="text-muted border-bottom py-2">
+                <?= lang('integrations') ?>
+            </h3>
 
-        <h3 class="text-muted border-bottom py-2">
-            <?= lang('integrations') ?>
-        </h3>
+            <p class="mb-5">
+                <?= lang('integrations_info') ?>
+            </p>
 
-        <p class="mb-5">
-            <?= lang('integrations_info') ?>
-        </p>
-
-        <div class="row">
-            <div class="col-sm-6">
-                <div class="card mb-5">
-                    <div class="card-header">
-                        <strong>
-                            <?= lang('webhooks') ?>
-                        </strong>
-                    </div>
-                    <div class="card-body">
-                        <div class="mb-3 integration-info">
-                            <small>
-                                <?= lang('webhooks_info') ?>
-                            </small>
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="card mb-5">
+                        <div class="card-header">
+                            <strong>
+                                <?= lang('webhooks') ?>
+                            </strong>
                         </div>
+                        <div class="card-body">
+                            <div class="mb-3 integration-info">
+                                <small>
+                                    <?= lang('webhooks_info') ?>
+                                </small>
+                            </div>
 
-                        <a href="<?= site_url('webhooks') ?>" class="btn btn-outline-primary">
-                            <i class="fas fa-cogs me-2"></i>
-                            <?= lang('configure') ?>
-                        </a>
+                            <a href="<?= site_url('webhooks') ?>" class="btn btn-outline-primary">
+                                <i class="fas fa-cogs me-2"></i>
+                                <?= lang('configure') ?>
+                            </a>
+                        </div>
                     </div>
                 </div>
-            </div>
 
-            <div class="col-sm-6">
-                <div class="card mb-5">
-                    <div class="card-header">
-                        <strong>
-                            <?= lang('google_analytics') ?>
-                        </strong>
-                    </div>
-                    <div class="card-body">
-                        <div class="mb-3 integration-info">
-                            <small>
-                                <?= lang('google_analytics_info') ?>
-                            </small>
+                <div class="col-sm-6">
+                    <div class="card mb-5">
+                        <div class="card-header">
+                            <strong>
+                                <?= lang('google_analytics') ?>
+                            </strong>
                         </div>
+                        <div class="card-body">
+                            <div class="mb-3 integration-info">
+                                <small>
+                                    <?= lang('google_analytics_info') ?>
+                                </small>
+                            </div>
 
-                        <a href="<?= site_url('google_analytics_settings') ?>" class="btn btn-outline-primary">
-                            <i class="fas fa-cogs me-2"></i>
-                            <?= lang('configure') ?>
-                        </a>
+                            <a href="<?= site_url('google_analytics_settings') ?>" class="btn btn-outline-primary">
+                                <i class="fas fa-cogs me-2"></i>
+                                <?= lang('configure') ?>
+                            </a>
+                        </div>
                     </div>
                 </div>
-            </div>
 
-            <div class="col-sm-6">
-                <div class="card mb-5">
-                    <div class="card-header">
-                        <strong>
-                            <?= lang('matomo_analytics') ?>
-                        </strong>
-                    </div>
-                    <div class="card-body">
-                        <div class="mb-3 integration-info">
-                            <small>
-                                <?= lang('matomo_analytics_info') ?>
-                            </small>
+                <div class="col-sm-6">
+                    <div class="card mb-5">
+                        <div class="card-header">
+                            <strong>
+                                <?= lang('matomo_analytics') ?>
+                            </strong>
                         </div>
+                        <div class="card-body">
+                            <div class="mb-3 integration-info">
+                                <small>
+                                    <?= lang('matomo_analytics_info') ?>
+                                </small>
+                            </div>
 
-                        <a href="<?= site_url('matomo_analytics_settings') ?>" class="btn btn-outline-primary">
-                            <i class="fas fa-cogs me-2"></i>
-                            <?= lang('configure') ?>
-                        </a>
+                            <a href="<?= site_url('matomo_analytics_settings') ?>" class="btn btn-outline-primary">
+                                <i class="fas fa-cogs me-2"></i>
+                                <?= lang('configure') ?>
+                            </a>
+                        </div>
                     </div>
                 </div>
-            </div>
 
-            <div class="col-sm-6">
-                <div class="card mb-5">
-                    <div class="card-header">
-                        <strong>
-                            <?= lang('api') ?>
-                        </strong>
-                    </div>
-                    <div class="card-body">
-                        <div class="mb-3 integration-info">
-                            <small>
-                                <?= lang('api_info') ?>
-                            </small>
+                <div class="col-sm-6">
+                    <div class="card mb-5">
+                        <div class="card-header">
+                            <strong>
+                                <?= lang('api') ?>
+                            </strong>
                         </div>
+                        <div class="card-body">
+                            <div class="mb-3 integration-info">
+                                <small>
+                                    <?= lang('api_info') ?>
+                                </small>
+                            </div>
 
-                        <a href="<?= site_url('api_settings') ?>" class="btn btn-outline-primary">
-                            <i class="fas fa-cogs me-2"></i>
-                            <?= lang('configure') ?>
-                        </a>
+                            <a href="<?= site_url('api_settings') ?>" class="btn btn-outline-primary">
+                                <i class="fas fa-cogs me-2"></i>
+                                <?= lang('configure') ?>
+                            </a>
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
-
     </div>
 </div>
 
diff --git a/application/views/pages/legal_settings.php b/application/views/pages/legal_settings.php
index 64f5b183..8206419c 100755
--- a/application/views/pages/legal_settings.php
+++ b/application/views/pages/legal_settings.php
@@ -5,7 +5,10 @@
 <div id="legal-settings-page" class="container backend-page">
     <div id="legal-contents">
         <div class="row">
-            <div class="col-lg-8 offset-lg-2">
+            <div class="col-sm-3 offset-sm-1">
+                <?php component('settings_nav') ?>
+            </div>
+            <div class="col-sm-6">
                 <form>
                     <fieldset>
                         <legend class="d-flex justify-content-between align-items-center border-bottom mb-4 py-2">