From 90b0194bddbc1b8fbe631f81fe29f00631085238 Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Mon, 22 Sep 2025 12:45:36 +0530
Subject: [PATCH] CHANGE_UI_Issues - VADIVEL J 2025-09-22

---
 app/Views/client_info.php   |  34 ++++++++----
 app/Views/layout/footer.php |  18 +++++--
 app/Views/layout/header.php | 101 +++++++++++++++++++++---------------
 app/Views/view_deposit.php  |   4 +-
 4 files changed, 99 insertions(+), 58 deletions(-)

diff --git a/app/Views/client_info.php b/app/Views/client_info.php
index 0b43ecb5..aeb052cf 100755
--- a/app/Views/client_info.php
+++ b/app/Views/client_info.php
@@ -21,8 +21,18 @@
 
                     <div class="row" style="padding-top: 20px;margin-bottom: 18px;">
                         <div class="col-6">
-                            <h4 style="position: relative;left: 18px;top: 2px;">Client Basic Info - <strong> <?= $client['client_name'] ?> (
-                                <?= $client['short_name'] ?> ) </strong></h4>
+                            
+                        <h4 style="position: relative; left: 18px; top: 2px;">
+                        <span class="client_info_close fs-6" id="close_btn"> 
+                            <i class="mdi mdi-chevron-left" style="font-size: 28px;cursor:pointer;"></i> 
+                        </span> 
+                        <span>
+                            Client Basic Info - 
+                            <strong> <?= $client['client_name'] ?> ( <?= $client['short_name'] ?> ) </strong>
+                        </span>
+
+                        </h4>
+
                         </div>
 
                         <div class="col-6">
@@ -30,8 +40,6 @@
                             <div class="row">
 
                                 <div class="col-6" style="position: relative;left: 455px;">
-                                    <button id="close_btn"
-                                        class="btn btn-primary waves-effect waves-light client_info_close">Close</button>
                                 </div>
                                 <div class="col-1 float-right" style="position: relative;left: 255px;">
                                     <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse"
@@ -125,28 +133,36 @@
                                                 <?php if($value['open_for_enrollment'] == 'Open' ) { ?>
 
                                                 <span
-                                                    class="badge badge-success"><?= $value['open_for_enrollment']  ?></span>
+                                                    class="px-2 py-1"
+                                                    style="background-color: #F9F8CD; color: #000 !important; border-radius:10px !important; "
+                                                    ><?= $value['open_for_enrollment']  ?></span>
 
                                                 <?php } else if($value['open_for_enrollment'] == 'Closed') { ?>
 
                                                 <span
-                                                    class="badge badge-warning"><?= $value['open_for_enrollment']  ?></span>
+                                                    class="px-2 py-1"
+                                                    style="background-color: #C2C2C2; color: #000 !important; border-radius:10px !important;"><?= $value['open_for_enrollment']  ?></span>
 
                                                 <?php } else { ?>
 
                                                 <span
-                                                    class="badge badge-secondary"><?= $value['open_for_enrollment']  ?></span>
+                                                    style="background-color: #E26728; color: #000 !important; border-radius:10px !important;"
+                                                    class="px-2 py-1"><?= $value['open_for_enrollment']  ?></span>
 
                                                 <?php } ?>
                                             </td>
                                             <td>
                                                 <?php if($value['policy_status'] == 'Active' ) { ?>
 
-                                                <span class="badge badge-success"><?= $value['policy_status']  ?></span>
+                                                <span 
+                                                style="background-color: #D1F8E7; color: #000 !important; border-radius:10px !important;"
+                                                class="px-2 py-1"><?= $value['policy_status']  ?></span>
 
                                                 <?php } else { ?>
 
-                                                <span class="badge badge-danger"><?= $value['policy_status']  ?></span>
+                                                <span 
+                                                style="background-color: #BD0707; color: #000 !important; border-radius:10px !important;"
+                                                class="px-2 py-1 "><?= $value['policy_status']  ?></span>
 
                                                 <?php } ?>
                                             </td>
diff --git a/app/Views/layout/footer.php b/app/Views/layout/footer.php
index e9386fef..80798b6c 100755
--- a/app/Views/layout/footer.php
+++ b/app/Views/layout/footer.php
@@ -1013,15 +1013,25 @@ function confirmActionSweertAlert(message = "Are you sure?", confirmText = "Yes,
 
 <script>
     $(document).ready(function() {
-        $('.img-inactive').on('click', function() {
+        const activeItem = localStorage.getItem("activeLi");
+        if (activeItem) {
+            $('.li-seperate a').removeClass('img-active').addClass('img-inactive');
+            $('#' + activeItem).children('a').first().removeClass('img-inactive').addClass('img-active');
+        }
 
-            $('.img-c').addClass('img-inactive');
-            $(this).removeClass('.img-inactive');
-            $(this).addClass('.img-active');
+        $('.li-seperate').on('click', function() {
+            // reset all anchors
+            $('.li-seperate a').removeClass('img-active').addClass('img-inactive');
+
+            // only the immediate <a> inside this <li>
+            $(this).children('a').first().removeClass('img-inactive').addClass('img-active');
+
+            localStorage.setItem("activeLi", $(this).attr("id"));
         });
     });
 </script>
 
+
 <script>
 $(document).ready(function(){
     $('.nav-link').click(function(){
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 3f2b6784..1915703f 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -137,6 +137,10 @@
                 min-height: 100vh !important;
         }   
 
+        body .content-page{
+            margin-top:90px !important;
+        }
+
     </style>
 
     <!-- navbar -->
@@ -146,7 +150,7 @@
             position: fixed !important; 
             z-index: 1000;           
             width: 90%;
-            margin-left: 130px !important;  
+            margin-left: 120px !important;  
             background: #fff;
         }
 
@@ -210,6 +214,28 @@
             position: fixed !important;
         }
 
+        .img-inactive {
+            background-color: white;
+            margin: 0px 12px;
+            border-radius: 5px;
+            border: 1px solid white;
+            padding: 8px !important;
+            min-height: 43px !important;
+        }
+
+        .li-seperate{
+            margin:10px 0px;
+        }
+
+        .img-active {
+            background-color: #B7F0F2;
+            margin: 0px 12px;
+            border-radius: 5px;
+            border: 2px solid #00999E;
+            padding: 8px !important;
+            min-height: 43px !important;
+        }
+
 
     </style>
 
@@ -682,27 +708,6 @@
         }
     </style>
 
-    <!-- img active inactive -->
-    <style>
-        .img-inactive {
-            background-color: white;
-            margin: 10px 12px;
-            border-radius: 5px;
-            border: 4px solid white;
-            padding: 8px !important;
-            min-height: 43px !important;
-        }
-
-        .img-active {
-            background-color: #B7F0F2;
-            margin: 10px 12px;
-            border-radius: 5px;
-            border: 4px solid #00999E;
-            padding: 8px !important;
-            min-height: 43px !important;
-        }
-    </style>
-
     <!-- table section starts -->
     <style>
         table[data-custom-table-css="table"] thead th {
@@ -1193,6 +1198,16 @@
             cursor: pointer;
             /* optional */
         }
+
+        .cancel-btn,
+        .modal-footer .cancel-btn
+        {
+            color: #000000!important;
+            background-color: #ffffff !important;
+            border-color: #E26728 !important; 
+        }
+
+
     </style>
 
     <!-- accordian -->
@@ -1554,14 +1569,14 @@
 
                     <li class="menu-logo">
                         <a href="<?= base_url('/dashboard/view') ?>">
-                            <img src="<?= base_url() . "public"; ?>/assets/images/Nhance_Favi.png" alt="Logo" height="24">
+                            <img src="<?= base_url() . "public"; ?>/assets/images/Nhance_Favi.png" alt="Logo" >
                         </a>
                     </li>
 
 
 
-                    <li>
-                        <a href="<?= base_url('/dashboard/view') ?>" class="img-inactive-not-working">
+                    <li class="li-seperate" id="dashboard-li" >
+                        <a href="<?= base_url('/dashboard/view') ?>" class="img-inactive">
                             <i class="ri-dashboard-line" style="color:black;"></i>
                             <span> Dashboard </span>
                         </a>
@@ -1569,8 +1584,8 @@
 
                     <!-- client -->
                     <?php if (in_array(get_role_id(), [1, 2, 3, 5])) { ?>
-                        <li>
-                            <a href="<?= base_url('/client/list') ?>" class="img-inactive-not-working">
+                        <li class="li-seperate" id="clients-li">
+                            <a href="<?= base_url('/client/list') ?>" class="img-inactive">
                                 <img style="border-radius: 5px;"
                                     src="<?= base_url() . "public"; ?>/assets/images/clients_sb.png" alt="Logo" height="24">
                                 <span> Clients </span>
@@ -1581,8 +1596,8 @@
 
                         <!-- Enrollment process -->
                         <?php if (in_array(get_role_id(), [1,2,3,5]) || in_array(ENROLLMENT_TEAM_ID, user_team())) { ?>
-                            <li>
-                                <a href="#sidebarDashboards" data-toggle="collapse" class="waves-effect img-inactive-not-working" >
+                            <li class="li-seperate" id="action-on-policies-li">
+                                <a href="#sidebarDashboards" data-toggle="collapse" class="waves-effect img-inactive" >
                                     <img style="border-radius: 5px;"
                                     src="<?= base_url() . "public"; ?>/assets/images/action_on_policies_sb.png" alt="Logo" height="20">
                                     <span> Action on Policies </span>
@@ -1616,8 +1631,8 @@
                         <!-- Masters -->
                         <?php if (get_role_id() == 1 || get_role_id() == 5) { ?>
 
-                            <li>
-                                <a href="#sidebarPolicies" data-toggle="collapse" class=" img-inactive-not-working">
+                            <li class="li-seperate" id="masters-li">
+                                <a href="#sidebarPolicies" data-toggle="collapse" class=" img-inactive">
                                     <img 
                                     src="<?= base_url() . "public"; ?>/assets/images/masters_sb.png" alt="Logo" height="20">
                                     <span> Masters </span>
@@ -1668,8 +1683,8 @@
 
                     <!-- Claims -->
                     <?php if (in_array(get_role_id(), [1, 2, 3, 5]) || in_array(CLAIMS_TEAM_ID, user_team())) { ?>
-                        <li>
-                            <a href="#sidebarDashboardsTicket" data-toggle="collapse" class="waves-effect img-inactive-not-working">
+                        <li class="li-seperate" id="claims-li">
+                            <a href="#sidebarDashboardsTicket" data-toggle="collapse" class="waves-effect img-inactive">
                                 <img
                                     src="<?= base_url() . "public"; ?>/assets/images/claims_sb.png" alt="Logo" height="20">
                                 <span> Claims </span>
@@ -1704,8 +1719,8 @@
 
                     <!-- leads -->
                     <?php if (in_array(get_role_id(), [1, 2, 3, 5]) || in_array(BUSINESS_SUPPORT_TEAM_ID, user_team()) || in_array(SALES_TEAM_ID, user_team())) { ?>
-                        <li>
-                            <a href="<?= base_url('/leads/list') ?>" class="img-inactive-not-working">
+                        <li class="li-seperate" id="leads-li">
+                            <a href="<?= base_url('/leads/list') ?>" class="img-inactive">
                                 <img
                                     src="<?= base_url() . "public"; ?>/assets/images/leads_sb.png" alt="Logo" height="20">
                                 <span> Leads </span>
@@ -1714,8 +1729,8 @@
                     <?php } ?>
                     <!-- Tickets -->
                     <?php if (in_array(get_role_id(), [1, 2, 3, 4, 5]) || in_array(CLAIMS_TEAM_ID, user_team())) { ?>
-                        <li>
-                            <a id="tickets" href="<?= base_url('/ticketList?return_type=web') ?>" class="waves-effect img-inactive-not-working">
+                        <li class="li-seperate" id="tickets-li" >
+                            <a id="tickets" href="<?= base_url('/ticketList?return_type=web') ?>" class="waves-effect img-inactive">
                                 <img src="<?= base_url() . "public"; ?>/assets/images/ticket.png" alt="Logo" height="20">
                                 <span>Tickets</span>
                             </a>
@@ -1723,8 +1738,8 @@
                     <?php } ?>
                     <!-- BDS -->
                     <?php if ((get_role_id() == 1 || get_role_id() == 5) || (in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()) || in_array(POS_TEAM_ID, user_team()))) { ?>
-                        <li>
-                            <a href="#policyTransactions" data-toggle="collapse" class="waves-effect img-inactive-not-working">
+                        <li class="li-seperate" id="policy-transactions-li">
+                            <a href="#policyTransactions" data-toggle="collapse" class="waves-effect img-inactive">
                                 <img
                                     src="<?= base_url() . "public"; ?>/assets/images/policy_transactions_sb.png" alt="Logo" height="20">
                                 <span> Policy Transactions </span>
@@ -1872,8 +1887,8 @@
 
                     <!-- Ad -->
                     <?php if (in_array(get_role_id(), [1, 2, 3, 5])) { ?>
-                        <li>
-                            <a id="app_content_management" href="#sidebarDashboardsmenu" data-toggle="collapse" class="waves-effect img-inactive-not-working" style="color: grey;">
+                        <li class="li-seperate" id="app-content-mng-li">
+                            <a id="app_content_management" href="#sidebarDashboardsmenu" data-toggle="collapse" class="waves-effect img-inactive" style="color: grey;">
                                 <img
                                     src="<?= base_url() . "public"; ?>/assets/images/app_content_mng_sb.png" alt="Logo" height="20">
                                 <span>App Content Mgmt</span>
@@ -1890,8 +1905,8 @@
                             </div>
                         </li>
                     <?php } ?>
-                    <li>
-                        <a id="user_manual" href="<?= base_url("autobookstackLogin") ?>" class="waves-effect img-inactive-not-working" target="_blank" rel="noopener noreferrer">
+                    <li class="li-seperate" id="user-manual-li">
+                        <a id="user_manual" href="<?= base_url("autobookstackLogin") ?>" class="waves-effect img-inactive" target="_blank" rel="noopener noreferrer">
                             <img
                                 src="<?= base_url() . "public"; ?>/assets/images/user_manual_sb.png" alt="Logo" height="20">
                             <span>User Manual</span>
diff --git a/app/Views/view_deposit.php b/app/Views/view_deposit.php
index bf25aeac..4a30c766 100755
--- a/app/Views/view_deposit.php
+++ b/app/Views/view_deposit.php
@@ -226,8 +226,8 @@
                 </div> -->
                 
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                    <button type="button" class="btn btn-primary" id="saveTransactionBtn">Save Transaction</button>
+                    <button type="button" class="btn cancel-btn" data-dismiss="modal">Cancel</button>
+                    <button type="button" class="btn btn-primary submit-btn" id="saveTransactionBtn">Submit</button>
                 </div>
 
             </div>