From 4b6495b01a67c7f9f019072e82237f2ed1104ea1 Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Tue, 23 Jan 2024 16:44:30 -0500
Subject: [PATCH] UI Update for Asset Listing, combined columns to allow for a
 better display

---
 client_assets.php          | 16 +++++++++++-----
 client_contact_details.php | 37 +++++++++++++++++++++----------------
 2 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/client_assets.php b/client_assets.php
index 3572c8b1..a710ff78 100644
--- a/client_assets.php
+++ b/client_assets.php
@@ -149,13 +149,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 <table class="table border table-hover">
                     <thead class="thead-light <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
                     <tr>
-                        <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_name&order=<?php echo $disp; ?>">Name</a></th>
-                        <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_description&order=<?php echo $disp; ?>">Description</a></th>
+                        <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_name&order=<?php echo $disp; ?>">Name / Description</a></th>
                         <?php if ($_GET['type'] !== 'virtual' && $_GET['type'] !== 'servers') { ?>
                             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_type&order=<?php echo $disp; ?>">Type</a></th>
                         <?php }
                         if ($_GET['type'] !== 'virtual') { ?>
-                            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_make&order=<?php echo $disp; ?>">Make/Model</a></th>
+                            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_make&order=<?php echo $disp; ?>">Make / Model</a></th>
                         <?php }
                         if ($_GET['type'] !== 'virtual') { ?>
                             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_serial&order=<?php echo $disp; ?>">Serial Number</a></th>
@@ -305,14 +304,21 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     </div>
 
                                 <?php } ?>
+                                <div class="mt-0">
+                                    <small class="text-muted"><?php echo $asset_description; ?></small>
+                                </div>
 
                             </th>
-                            <td><?php echo $asset_description_display; ?></td>
                             <?php if ($_GET['type'] !== 'virtual' && $_GET['type'] !== 'servers') { ?>
                                 <td><?php echo $asset_type; ?></td>
                             <?php } ?>
                             <?php if ($_GET['type'] !== 'virtual') { ?>
-                                <td><?php echo "$asset_make $asset_model"; ?></td>
+                                <td>
+                                    <?php echo $asset_make; ?>
+                                    <div class="mt-0">
+                                        <small class="text-muted"><?php echo $asset_model; ?></small>
+                                    </div>
+                                </td>
                             <?php } ?>
                             <?php if ($_GET['type'] !== 'virtual') { ?>
                                 <td><?php echo $asset_serial_display; ?></td>
diff --git a/client_contact_details.php b/client_contact_details.php
index 863b94d8..6eeaffd6 100644
--- a/client_contact_details.php
+++ b/client_contact_details.php
@@ -84,33 +84,33 @@ if (isset($_GET['contact_id'])) {
                     </div>
                     <hr>
                     <?php if ($location_name) { ?>
-                        <div><i class="fa fa-fw fa-map-marker-alt text-secondary mr-3"></i><?php echo $location_name; ?></div>
+                        <div><i class="fa fa-fw fa-map-marker-alt text-secondary mr-2"></i><?php echo $location_name; ?></div>
                     <?php }
                     if ($contact_email) { ?>
-                        <div class="mt-2"><i class="fa fa-fw fa-envelope text-secondary mr-3"></i><a href='mailto:<?php echo $contact_email; ?>'><?php echo $contact_email; ?></a><button class='btn btn-sm clipboardjs' data-clipboard-text='<?php echo $contact_email; ?>'><i class='far fa-copy text-secondary'></i></button></div>
+                        <div class="mt-2"><i class="fa fa-fw fa-envelope text-secondary mr-2"></i><a href='mailto:<?php echo $contact_email; ?>'><?php echo $contact_email; ?></a><button class='btn btn-sm clipboardjs' data-clipboard-text='<?php echo $contact_email; ?>'><i class='far fa-copy text-secondary'></i></button></div>
                     <?php }
                     if ($contact_phone) { ?>
-                        <div class="mt-2"><i class="fa fa-fw fa-phone text-secondary mr-3"></i><a href="tel:<?php echo "$contact_phone"?>"><?php echo "$contact_phone $contact_extension"; ?></a></div>
+                        <div class="mt-2"><i class="fa fa-fw fa-phone text-secondary mr-2"></i><a href="tel:<?php echo "$contact_phone"?>"><?php echo "$contact_phone $contact_extension"; ?></a></div>
                     <?php }
                     if ($contact_mobile) { ?>
-                        <div class="mt-2"><i class="fa fa-fw fa-mobile-alt text-secondary mr-3"></i><a href="tel:<?php echo $contact_mobile; ?>"><?php echo $contact_mobile; ?></a></div>
+                        <div class="mt-2"><i class="fa fa-fw fa-mobile-alt text-secondary mr-2"></i><a href="tel:<?php echo $contact_mobile; ?>"><?php echo $contact_mobile; ?></a></div>
                     <?php }
                     if ($contact_pin) { ?>
-                        <div class="mt-2"><i class="fa fa-fw fa-key text-secondary mr-3"></i><?php echo $contact_pin; ?></div>
+                        <div class="mt-2"><i class="fa fa-fw fa-key text-secondary mr-2"></i><?php echo $contact_pin; ?></div>
                     <?php }
                     if ($contact_primary) { ?>
-                        <div class="mt-2 text-success"><i class="fa fa-fw fa-check mr-3"></i>Primary Contact</div>
+                        <div class="mt-2 text-success"><i class="fa fa-fw fa-check mr-2"></i>Primary Contact</div>
                     <?php }
                     if ($contact_important) { ?>
-                        <div class="mt-2 text-dark text-bold"><i class="fa fa-fw fa-check mr-3"></i>Important</div>
+                        <div class="mt-2 text-dark text-bold"><i class="fa fa-fw fa-check mr-2"></i>Important</div>
                     <?php }
                     if ($contact_technical) { ?>
-                        <div class="mt-2"><i class="fa fa-fw fa-check text-secondary mr-3"></i>Technical</div>
+                        <div class="mt-2"><i class="fa fa-fw fa-check text-secondary mr-2"></i>Technical</div>
                     <?php }
                     if ($contact_billing) { ?>
-                        <div class="mt-2"><i class="fa fa-fw fa-check text-secondary mr-3"></i>Billing</div>
+                        <div class="mt-2"><i class="fa fa-fw fa-check text-secondary mr-2"></i>Billing</div>
                     <?php } ?>
-                    <div class="mt-2"><i class="fa fa-fw fa-clock text-secondary mr-3"></i><?php echo date('Y-m-d', strtotime($contact_created_at)); ?></div>
+                    <div class="mt-2"><i class="fa fa-fw fa-clock text-secondary mr-2"></i><?php echo date('Y-m-d', strtotime($contact_created_at)); ?></div>
 
                     <?php require_once "client_contact_edit_modal.php";
  ?>
@@ -149,12 +149,10 @@ if (isset($_GET['contact_id'])) {
                         <table class="table table-striped table-borderless table-hover">
                             <thead>
                             <tr>
-                                <th>Name</th>
-                                <th>Description</th>
+                                <th>Name/Description</th>
                                 <th>Type</th>
                                 <th>Make/Model</th>
                                 <th>Serial Number</th>
-                                <th>Operating System</th>
                                 <th>Install Date</th>
                                 <th>Status</th>
                                 <th class="text-center">Action</th>
@@ -216,12 +214,19 @@ if (isset($_GET['contact_id'])) {
                                     <th>
                                         <i class="fa fa-fw text-secondary fa-<?php echo $device_icon; ?> mr-2"></i>
                                         <a class="text-secondary" href="#" data-toggle="modal" data-target="#editAssetModal<?php echo $asset_id; ?>"><?php echo $asset_name; ?></a>
+                                        <div class="mt-0">
+                                            <small class="text-muted"><?php echo $asset_description; ?></small>
+                                        </div>
                                     </th>
-                                    <td><?php echo $asset_description; ?></td>
                                     <td><?php echo $asset_type; ?></td>
-                                    <td><?php echo "$asset_make $asset_model"; ?></td>
+                                    <td>
+                                        <?php echo $asset_make; ?>
+                                        <div class="mt-0"> 
+                                            <small class="text-muted"><?php echo $asset_model; ?></small>
+                                        </div>
+                                    </td>
                                     <td><?php echo $asset_serial_display; ?></td>
-                                    <td><?php echo $asset_os_display; ?></td>
+                                    
                                     <td><?php echo $asset_install_date_display; ?></td>
                                     <td><?php echo $asset_status; ?></td>
                                     <td>