From 9697dbf569561008a1d0a07c1aa98d5474b23198 Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Tue, 2 Sep 2025 12:14:36 +0530 Subject: [PATCH] CHANGE_UI_FIX - VADIVEL J 2025-09-01 --- app/Controllers/LeadsController.php | 2 +- app/Views/employee_list.php | 9 ++- app/Views/layout/header.php | 107 ++++++++++++++++++++-------- app/Views/test_members_list.php | 31 +++++--- 4 files changed, 106 insertions(+), 43 deletions(-) diff --git a/app/Controllers/LeadsController.php b/app/Controllers/LeadsController.php index d5f8ea12..db13f832 100644 --- a/app/Controllers/LeadsController.php +++ b/app/Controllers/LeadsController.php @@ -4947,7 +4947,7 @@ class LeadsController extends BaseController // Start table with clean styling $html .= "

{$category}

"; - $html .= ""; + $html .= "
"; // Table header with light background $html .= ""; diff --git a/app/Views/employee_list.php b/app/Views/employee_list.php index 79a04ff9..af1cde66 100755 --- a/app/Views/employee_list.php +++ b/app/Views/employee_list.php @@ -57,12 +57,13 @@ table.dataTable tbody td {
-
+

+ Members -

+
@@ -122,7 +123,9 @@ table.dataTable tbody td {
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index 7da54833..c94398b4 100755 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -115,11 +115,6 @@ font-family: 'Poppins' !important; } - body{ - margin-top:20px; - background:#FAFAFA; - } - .content{ min-height: 70vh; } @@ -129,6 +124,10 @@ background-color: #000 !important; /* keep background black */ } + .container-fluid{ + padding:0px 40px 0px 40px !important; + } + @@ -145,6 +144,7 @@ display:flex; flex-flow:row nowrap; justify-content:space-between; + margin-top:20px; } .nav-flex{ @@ -547,20 +547,6 @@ a.app-badge-secondary:focus, a.app-badge-secondary.focus { - - - - @@ -647,7 +633,7 @@ a.app-badge-secondary:focus, a.app-badge-secondary.focus { table[data-custom-table-css="table"] { border-collapse: separate !important; border-spacing: 0 8px !important; - width: 100%; + width: 100% !important; } @@ -739,9 +725,9 @@ a.app-badge-secondary:focus, a.app-badge-secondary.focus { .modal.show .modal-dialog .modal-content, .modal .modal-dialog .modal-content { - border-radius: 10px !important; - overflow: hidden !important; - box-shadow: none; + border-radius: 10px !important; + overflow: hidden !important; + box-shadow: none; } .modal .parsley-examples { @@ -790,7 +776,6 @@ a.app-badge-secondary:focus, a.app-badge-secondary.focus { .modal .form-control { background-color: #ECECEC !important; border: 1px solid #ccc; /* optional */ - /* color: #000; keep text readable */ box-shadow: none !important; } @@ -902,6 +887,38 @@ a.app-badge-secondary:focus, a.app-badge-secondary.focus { top: 7px !important; } + /* Apply to normal inputs and selects */ + input, + select { + border-radius: 10px !important; + box-shadow: 0px 2px 4px 0px #00000024 !important; + border-color: #ffff !important; + } + + input[type='file'] { + padding:10px !important; + background-color: white !important; + } + + /* Apply to Select2 (single select) */ + .select2-container .select2-selection--single { + border-radius: 10px !important; + box-shadow: 0px 2px 4px 0px #00000024 !important; + height: 38px; /* match bootstrap input height */ + display: flex; + align-items: center; + border-color: #ffff !important; + } + + /* Apply to Select2 (multiple select) */ + .select2-container .select2-selection--multiple { + border-radius: 10px !important; + box-shadow: 0px 2px 4px 0px #00000024 !important; + border-color: #ffff !important; + } + + + @@ -909,28 +926,41 @@ a.app-badge-secondary:focus, a.app-badge-secondary.focus { + + + + + + + diff --git a/app/Views/test_members_list.php b/app/Views/test_members_list.php index 02ec054f..28ebd031 100644 --- a/app/Views/test_members_list.php +++ b/app/Views/test_members_list.php @@ -91,12 +91,7 @@ th, td { text-align: center; /* Or left/right depending on your preference */ vertical-align: middle; /* Ensures content is vertically centered */ } -input[type="checkbox"] { - width: 16px; /* Standard checkbox size */ - height: 16px; - margin: 0; /* Remove default margin */ - vertical-align: middle; /* Align with text or other elements */ -} + th:first-child, td:first-child { width: 50px; /* Adjust width as needed */ } @@ -108,6 +103,24 @@ th:first-child, td:first-child { table-layout: fixed; /* Prevent columns from resizing dynamically */ } +.unmapEmployees{ + background-color:#00999E ; + margin-right:10px; +} +.mapEmployees{ + background-color:#00999E ; + margin-right:10px; +} + +.unmapEmployees:hover{ + background-color:#00999E ; + margin-right:10px; +} +.mapEmployees:hover{ + background-color:#00999E ; + margin-right:10px; +} + @@ -533,13 +546,15 @@ document.addEventListener("DOMContentLoaded", function () { text:'Map Employees', action: function(e, dt, node, config) { mapEmployees(); - } + }, + className:"mapEmployees" }, { text:'Unmap Employees', action: function(e, dt, node, config) { unmapEmployees(); - } + }, + className:"unmapEmployees" }], language: { search: "_INPUT_",