diff --git a/agent/asset_details.php b/agent/asset_details.php index 710f1f5f..ae0686e4 100644 --- a/agent/asset_details.php +++ b/agent/asset_details.php @@ -452,13 +452,13 @@ if (isset($_GET['asset_id'])) {
-

Interfaces

+

Interfaces

- - +
Add Multiple @@ -474,7 +474,7 @@ if (isset($_GET['asset_id'])) {
-
-
- -
- - "> - - - - - - - - - - - - - - + +
+
-
- -
- 		Name / PortTypeNetworkIPMACConnected ToAction
+ "> + + + + + + + + + + + + + + $network_name" - : '-'; + // Prepare display text + $interface_mac_display = $interface_mac ?: '-'; + $interface_ip_display = $interface_ip ?: '-'; + $interface_type_display = $interface_type ?: '-'; + $network_name_display = $network_name + ? "$network_name" + : '-'; - // Connected interface details - $connected_asset_id = intval($row['connected_asset_id']); - $connected_asset_name = nullable_htmlentities($row['connected_asset_name']); - $connected_asset_type = nullable_htmlentities($row['connected_asset_type']); - $connected_asset_icon = getAssetIcon($connected_asset_type); - $connected_interface_name = nullable_htmlentities($row['connected_interface_name']); + // Connected interface details + $connected_asset_id = intval($row['connected_asset_id']); + $connected_asset_name = nullable_htmlentities($row['connected_asset_name']); + $connected_asset_type = nullable_htmlentities($row['connected_asset_type']); + $connected_asset_icon = getAssetIcon($connected_asset_type); + $connected_interface_name = nullable_htmlentities($row['connected_interface_name']); - // Show either "-" or "AssetName - Port" - if ($connected_asset_name) { - $connected_to_display = " - $connected_asset_name - $connected_interface_name - "; - } else { - $connected_to_display = "-"; - } - ?> - - - - - - - - - + + + + + + + + - - - -
+
+ +
+ 		Name / PortTypeNetworkIPMACConnected ToAction
-
- -
- 		- - - (Primary)"; } ?> - - - -
- 		-
- -
- - Edit + // Show either "-" or "AssetName - Port" + if ($connected_asset_name) { + $connected_to_display = " + $connected_asset_name - $connected_interface_name + "; + } else { + $connected_to_display = "-"; + } + ?> +
+
+ +
+ 		+ + + (Primary)"; } ?> + + + +
+ 		+
+ +
+ + Edit + + +
+ + Delete - -
- - Delete - - -
+
-
-
-
-
+
+ + + + + +
+
"> diff --git a/agent/assets.php b/agent/assets.php index 6c29a4c3..4b58ec10 100644 --- a/agent/assets.php +++ b/agent/assets.php @@ -319,9 +319,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - @@ -432,7 +429,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); text-nowrap"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + +
+
@@ -442,33 +439,17 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Name - 		Type Model - - Serial - - - - OS - - @@ -555,11 +536,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $asset_serial_display = "-"; } $asset_os = nullable_htmlentities($row['asset_os']); - if ($asset_os) { - $asset_os_display = $asset_os; - } else { - $asset_os_display = "-"; - } $asset_ip = getFallBack(nullable_htmlentities($row['interface_ip'])); $asset_ipv6 = nullable_htmlentities($row['interface_ipv6']); $asset_nat_ip = nullable_htmlentities($row['interface_nat_ip']); @@ -656,7 +632,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?>
+
@@ -666,7 +642,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
"; } ?>
+
+ + + "; } ?>
@@ -679,58 +658,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- -
- -
- 		- -
- 		- - - -
+
+ -
-
@@ -753,6 +687,45 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
+
+
+
+
+
+ 		+ +
+ 		+
+
+ 		+
diff --git a/agent/certificates.php b/agent/certificates.php index cfb3a9e5..bbeb4773 100644 --- a/agent/certificates.php +++ b/agent/certificates.php @@ -156,7 +156,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); "> - -
+
@@ -227,7 +227,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?>
+
diff --git a/agent/clients.php b/agent/clients.php index f1d8a782..8ce11992 100644 --- a/agent/clients.php +++ b/agent/clients.php @@ -296,7 +296,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); bg-light"> - - - - = 1) && $config_module_enable_accounting == 1) { ?>
+
@@ -377,7 +377,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('contact_id') AS num FROM contacts WHERE contact_client_id = $client_id AND contact_archived_at IS NULL")); $contact_count = $row['num']; if ($contact_count) { - $contact_count_display = "$contact_count"; + $contact_count_display = "$contact_count Contacts"; } else { $contact_count_display = ''; } @@ -386,7 +386,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_client_id = $client_id AND vendor_archived_at IS NULL")); $vendor_count = $row['num']; if ($vendor_count) { - $vendor_count_display = "$vendor_count"; + $vendor_count_display = "$vendor_count Vendors"; } else { $vendor_count_display = ''; } @@ -395,7 +395,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('asset_id') AS num FROM assets WHERE asset_client_id = $client_id AND asset_archived_at IS NULL")); $asset_count = $row['num']; if ($asset_count) { - $asset_count_display = "$asset_count"; + $asset_count_display = "$asset_count Assets"; } else { $asset_count_display = ''; } @@ -404,7 +404,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('credential_id') AS num FROM credentials WHERE credential_client_id = $client_id AND credential_archived_at IS NULL")); $credential_count = $row['num']; if ($credential_count) { - $credential_count_display = "$credential_count"; + $credential_count_display = "$credential_count Credentials"; } else { $credential_count_display = ''; } @@ -413,7 +413,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('software_id') AS num FROM software WHERE software_client_id = $client_id AND software_archived_at IS NULL")); $software_count = $row['num']; if ($software_count) { - $software_count_display = "$software_count"; + $software_count_display = "$software_count Software"; } else { $software_count_display = ''; } @@ -422,18 +422,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_client_id = $client_id AND ticket_archived_at IS NULL")); $ticket_count = $row['num']; if ($ticket_count) { - $ticket_count_display = "$ticket_count"; + $ticket_count_display = "$ticket_count Tickets"; } else { $ticket_count_display = ''; } // Client Tags - $client_tag_name_display_array = array(); $client_tag_id_array = array(); $sql_client_tags = mysqli_query($mysqli, "SELECT * FROM client_tags LEFT JOIN tags ON client_tags.tag_id = tags.tag_id WHERE client_id = $client_id ORDER BY tag_name ASC"); while ($row = mysqli_fetch_assoc($sql_client_tags)) { - $client_tag_id = intval($row['tag_id']); $client_tag_name = nullable_htmlentities($row['tag_name']); $client_tag_color = nullable_htmlentities($row['tag_color']); @@ -446,7 +444,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); } $client_tag_id_array[] = $client_tag_id; - $client_tag_name_display_array[] = "$client_tag_name"; + $client_tag_name_display_array[] = "$client_tag_name"; } $client_tags_display = implode('', $client_tag_name_display_array); @@ -491,32 +489,34 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?>
+
- - - -
- + +
+ +
+
+
+
+
- - -
- -
- -
- Abbreviation:
- Created:
-
+
- + + + + diff --git a/agent/contacts.php b/agent/contacts.php index 87742c64..73eacde9 100644 --- a/agent/contacts.php +++ b/agent/contacts.php @@ -292,7 +292,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); "> - -
+
@@ -465,7 +465,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?>
+
diff --git a/agent/credentials.php b/agent/credentials.php index 62633e6c..5ec6a538 100644 --- a/agent/credentials.php +++ b/agent/credentials.php @@ -280,7 +280,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); text-nowrap"> - "> -
+
@@ -419,7 +419,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?>
+
diff --git a/agent/domains.php b/agent/domains.php index 4f0249d8..926b5034 100644 --- a/agent/domains.php +++ b/agent/domains.php @@ -182,7 +182,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); text-nowrap"> - -
+
@@ -285,7 +285,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?>
+
diff --git a/agent/expenses.php b/agent/expenses.php index d5bfd3a5..2403b438 100644 --- a/agent/expenses.php +++ b/agent/expenses.php @@ -206,7 +206,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); "> - -
+
@@ -285,7 +285,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?>
+
diff --git a/agent/files.php b/agent/files.php index b1d42f77..3cb87b63 100644 --- a/agent/files.php +++ b/agent/files.php @@ -681,7 +681,7 @@ $num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num']) "> - -
+
@@ -748,7 +748,7 @@ $num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num']) } ?>
+
diff --git a/agent/invoices.php b/agent/invoices.php index 188869f5..9ed7ef1a 100644 --- a/agent/invoices.php +++ b/agent/invoices.php @@ -259,7 +259,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); text-nowrap"> - -
+
@@ -370,7 +370,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?>
+
diff --git a/agent/locations.php b/agent/locations.php index 07006655..164dba37 100644 --- a/agent/locations.php +++ b/agent/locations.php @@ -220,7 +220,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); "> - -
+
@@ -326,7 +326,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?>
+
@@ -334,7 +334,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- +
>
diff --git a/agent/networks.php b/agent/networks.php index 02978b94..9cc73456 100644 --- a/agent/networks.php +++ b/agent/networks.php @@ -195,7 +195,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); "> - -
+
@@ -286,7 +286,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?>
+
diff --git a/agent/products.php b/agent/products.php index b20e9a8c..55944a3a 100644 --- a/agent/products.php +++ b/agent/products.php @@ -167,7 +167,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); text-nowrap"> - -
+
@@ -245,7 +245,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?>
+
diff --git a/agent/recurring_tickets.php b/agent/recurring_tickets.php index 7147f2e4..f2f6da66 100644 --- a/agent/recurring_tickets.php +++ b/agent/recurring_tickets.php @@ -220,7 +220,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); text-nowrap"> - -
+
@@ -297,7 +297,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?>
+
diff --git a/agent/ticket_list.php b/agent/ticket_list.php index 294e343a..2bab24e4 100644 --- a/agent/ticket_list.php +++ b/agent/ticket_list.php @@ -7,8 +7,7 @@ text-nowrap"> - - "> -
+
@@ -192,7 +191,7 @@
+
diff --git a/agent/vendors.php b/agent/vendors.php index f95c73ce..a6dbbd0f 100644 --- a/agent/vendors.php +++ b/agent/vendors.php @@ -117,7 +117,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); text-nowrap"> - -
+
@@ -196,24 +196,25 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?>
+
- +
- +
- +
+ diff --git a/css/itflow_custom.css b/css/itflow_custom.css index d25f3eb6..9cee58d6 100644 --- a/css/itflow_custom.css +++ b/css/itflow_custom.css @@ -42,3 +42,19 @@ color: #f1c40f; font-weight: 900; } + +.checkbox-column { + width: 40px; + min-width: 40px; + text-align: center; +} + +.checkbox-column .form-check { + padding-left: 0; + margin-bottom: 0; +} + +.checkbox-column .form-check-input { + position: static; + margin: 0; +}