From 680dbb04cefc487d77e33c0baa80375cd263b991 Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Mon, 9 Jun 2025 13:30:13 -0400
Subject: [PATCH] Fix UI Regression with Indenting Columns in Tickets listing
 when Open and Closed tickets are filters

---
 tickets_compact.php | 15 ++++++++-------
 tickets_list.php    | 13 ++++++++-----
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/tickets_compact.php b/tickets_compact.php
index 6a3f8fea..9421a284 100644
--- a/tickets_compact.php
+++ b/tickets_compact.php
@@ -6,14 +6,15 @@
             <div class="table-responsive-sm">
                 <table class="table table-striped table-borderless table-hover">
                     <thead class="text-dark <?php if (!$num_rows[0]) { echo "d-none"; } ?>">
-                    <tr>
-                        <?php if ($_GET['status'] !== 'Closed') { ?>
+                    <tr>        
                         <td>
+                            <?php if ($_GET['status'] !== 'Closed') { ?>
                             <div class="form-check">
                                 <input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)" onKeyPress="checkAll(this)">
                             </div>
+                            <?php } ?>
                         </td>
-                        <?php } ?>
+                        
                         <th scope="col">
                             <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_subject&order=<?php echo $disp; ?>">
                                 Ticket <?php if ($sort == 'ticket_subject') { echo $order_icon; } ?>
@@ -167,14 +168,14 @@
 
                         <tr class="<?php if(empty($ticket_closed_at) && empty($ticket_updated_at)) { echo "text-bold"; }?> <?php if (empty($ticket_closed_at) && $ticket_reply_type == "Client") { echo "table-warning"; } ?>">
 
-                            <!-- Ticket Bulk Select (for open tickets) -->
-                            <?php if (empty($ticket_closed_at)) { ?>
                             <td>
+                                <!-- Ticket Bulk Select (for open tickets) -->
+                                <?php if (empty($ticket_closed_at)) { ?>
                                 <div class="form-check">
                                     <input class="form-check-input bulk-select" type="checkbox" name="ticket_ids[]" value="<?php echo $ticket_id ?>">
-                                </div>   
+                                </div>
+                                <?php } ?>  
                             </td>
-                            <?php } ?>
 
                             <!-- Ticket Subject -->
                             <td>
diff --git a/tickets_list.php b/tickets_list.php
index 325afd03..aea0428b 100644
--- a/tickets_list.php
+++ b/tickets_list.php
@@ -7,13 +7,15 @@
                     <table class="table table-striped table-borderless table-hover">
                         <thead class="text-dark <?php if (!$num_rows[0]) { echo "d-none"; } ?> text-nowrap">
                         <tr>
-                            <?php if ($_GET['status'] !== 'Closed') { ?>
+                            
                             <td>
+                                <?php if ($_GET['status'] !== 'Closed') { ?>
                                 <div class="form-check">
                                     <input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)" onkeydown="checkAll(this)">
                                 </div>
+                                <?php } ?>
                             </td>
-                            <?php } ?>
+
                             <th>
                                 <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_number&order=<?php echo $disp; ?>">
                                     Ticket <?php if ($sort == 'ticket_number') { echo $order_icon; } ?>
@@ -181,14 +183,15 @@
 
                             <tr class="<?php if(empty($ticket_closed_at) && empty($ticket_updated_at)) { echo "text-bold"; }?> <?php if (empty($ticket_closed_at) && $ticket_reply_type == "Client") { echo "table-warning"; } ?>">
 
-                                <!-- Ticket Bulk Select (for open tickets) -->
-                                <?php if (empty($ticket_closed_at)) { ?>
                                 <td>
+                                    <!-- Ticket Bulk Select (for open tickets) -->
+                                    <?php if (empty($ticket_closed_at)) { ?>
                                     <div class="form-check">
                                         <input class="form-check-input bulk-select" type="checkbox" name="ticket_ids[]" value="<?php echo $ticket_id ?>">
                                     </div>
+                                    <?php } ?>
                                 </td>
-                                <?php } ?>
+                                
                                 <!-- Ticket Number -->
                                 <td>
                                     <a href="ticket.php?<?php echo $client_url; ?>ticket_id=<?php echo $ticket_id; ?>">