Shorten Description, Text dark IP and make table smaller in IPs

This commit is contained in:
johnnyq
2026-09-01 18:54:44 -04:00
parent 0c690c4e51
commit 9e8c4d002a
4 changed files with 10 additions and 25 deletions

View File

@@ -556,11 +556,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
$asset_type = escapeHtml($row['asset_type']); $asset_type = escapeHtml($row['asset_type']);
$asset_name = escapeHtml($row['asset_name']); $asset_name = escapeHtml($row['asset_name']);
$asset_description = escapeHtml($row['asset_description']); $asset_description = escapeHtml($row['asset_description']);
if ($asset_description) {
$asset_description_display = $asset_description;
} else {
$asset_description_display = "-";
}
$asset_make = escapeHtml($row['asset_make']); $asset_make = escapeHtml($row['asset_make']);
$asset_model = escapeHtml($row['asset_model']); $asset_model = escapeHtml($row['asset_model']);
$asset_serial = escapeHtml($row['asset_serial']); $asset_serial = escapeHtml($row['asset_serial']);

View File

@@ -268,12 +268,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
$category_name = escapeHtml($row['category_name']); $category_name = escapeHtml($row['category_name']);
$account_name = escapeHtml($row['account_name']); $account_name = escapeHtml($row['account_name']);
$expense_account_id = intval($row['expense_account_id']); $expense_account_id = intval($row['expense_account_id']);
$client_name = escapeHtml($row['client_name']); $client_name = escapeHtml($row['client_name']) ?: '-';
if(empty($client_name)) {
$client_name_display = "-";
} else {
$client_name_display = $client_name;
}
$expense_client_id = intval($row['expense_client_id']); $expense_client_id = intval($row['expense_client_id']);
if (empty($expense_receipt)) { if (empty($expense_receipt)) {
@@ -307,7 +302,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<td><?= $vendor_name ?></td> <td><?= $vendor_name ?></td>
<td class="text-end font-monospace"><?= numfmt_format_currency($currency_format, $expense_amount, $expense_currency_code) ?></td> <td class="text-end font-monospace"><?= numfmt_format_currency($currency_format, $expense_amount, $expense_currency_code) ?></td>
<td><?= $account_name ?></td> <td><?= $account_name ?></td>
<td><?= $client_name_display ?></td> <td><?= $client_name ?></td>
<td> <td>
<div class="dropdown dropstart text-center"> <div class="dropdown dropstart text-center">
<button class="btn btn-secondary btn-sm" type="button" data-bs-toggle="dropdown"> <button class="btn btn-secondary btn-sm" type="button" data-bs-toggle="dropdown">

View File

@@ -224,7 +224,7 @@ if (mysqli_num_rows($sql) == 0) {
<form id="bulkActions" action="post.php" method="post"> <form id="bulkActions" action="post.php" method="post">
<input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>"> <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
<table class="table table-striped table-borderless table-hover mb-0"> <table class="table table-striped table-borderless table-hover table-sm mb-0">
<thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>"> <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
<tr> <tr>
<td class="checkbox-column border-end"> <td class="checkbox-column border-end">
@@ -233,17 +233,17 @@ if (mysqli_num_rows($sql) == 0) {
</div> </div>
</td> </td>
<th> <th>
<a class="text-secondary" href="?<?= $url_query_strings_sort ?>&sort=ip_address&order=<?= $disp ?>"> <a class="text-dark" href="?<?= $url_query_strings_sort ?>&sort=ip_address&order=<?= $disp ?>">
IP Address <?php if ($sort == 'ip_address') { echo $order_icon; } ?> IP Address <?php if ($sort == 'ip_address') { echo $order_icon; } ?>
</a> </a>
</th> </th>
<th> <th>
<a class="text-secondary" href="?<?= $url_query_strings_sort ?>&sort=ip_hostname&order=<?= $disp ?>"> <a class="text-dark" href="?<?= $url_query_strings_sort ?>&sort=ip_hostname&order=<?= $disp ?>">
Hostname <?php if ($sort == 'ip_hostname') { echo $order_icon; } ?> Hostname <?php if ($sort == 'ip_hostname') { echo $order_icon; } ?>
</a> </a>
</th> </th>
<th> <th>
<a class="text-secondary" href="?<?= $url_query_strings_sort ?>&sort=ip_description&order=<?= $disp ?>"> <a class="text-dark" href="?<?= $url_query_strings_sort ?>&sort=ip_description&order=<?= $disp ?>">
Description <?php if ($sort == 'ip_description') { echo $order_icon; } ?> Description <?php if ($sort == 'ip_description') { echo $order_icon; } ?>
</a> </a>
</th> </th>
@@ -256,8 +256,8 @@ if (mysqli_num_rows($sql) == 0) {
while ($row = mysqli_fetch_assoc($sql_ips)) { while ($row = mysqli_fetch_assoc($sql_ips)) {
$ip_id = intval($row['ip_id']); $ip_id = intval($row['ip_id']);
$ip_address = escapeHtml($row['ip_address']); $ip_address = escapeHtml($row['ip_address']);
$ip_hostname = escapeHtml($row['ip_hostname']); $ip_hostname = escapeHtml($row['ip_hostname']) ?: '-';
$ip_description = escapeHtml($row['ip_description']); $ip_description = escapeHtml($row['ip_description']) ?: '-';
?> ?>
<tr> <tr>

View File

@@ -232,12 +232,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
while ($row = mysqli_fetch_assoc($sql)) { while ($row = mysqli_fetch_assoc($sql)) {
$product_id = intval($row['product_id']); $product_id = intval($row['product_id']);
$product_name = escapeHtml($row['product_name']); $product_name = escapeHtml($row['product_name']);
$product_description = escapeHtml($row['product_description']); $product_description = escapeHtml($row['product_description']) ?: '-';
if (empty($product_description)) {
$product_description_display = "-";
} else {
$product_description_display = "<div style='white-space:pre-line'>$product_description</div>";
}
$product_qty = intval($row['product_qty']); $product_qty = intval($row['product_qty']);
$product_code = escapeHtml($row['product_code']); $product_code = escapeHtml($row['product_code']);
$product_location = escapeHtml($row['product_location']) ?: '-'; $product_location = escapeHtml($row['product_location']) ?: '-';
@@ -267,7 +262,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
</a> </a>
</td> </td>
<td><?= $category_name ?></td> <td><?= $category_name ?></td>
<td><?= $product_description_display ?></td> <td><div style='white-space:pre-line'><?= $product_description ?></div></td>
<?php if ($type_filter == 'product') { ?> <?php if ($type_filter == 'product') { ?>
<td><?= $product_qty ?></td> <td><?= $product_qty ?></td>
<td><?= $product_location ?></td> <td><?= $product_location ?></td>