| - + | diff --git a/agent/recurring_invoice.php b/agent/recurring_invoice.php index 8ae82a531..0ddb42318 100644 --- a/agent/recurring_invoice.php +++ b/agent/recurring_invoice.php @@ -227,7 +227,7 @@ if (isset($_GET['recurring_invoice_id'])) {
| - + diff --git a/agent/ticket.php b/agent/ticket.php index fc13735e7..9902bdae3 100644 --- a/agent/ticket.php +++ b/agent/ticket.php @@ -573,7 +573,7 @@ if (isset($_GET['ticket_id'])) { data-modal-url="modals/ticket/ticket_priority.php?id=" > - + diff --git a/agent/ticket_kanban.php b/agent/ticket_kanban.php index cab8a3818..770bfcdf9 100644 --- a/agent/ticket_kanban.php +++ b/agent/ticket_kanban.php @@ -153,7 +153,7 @@ $kanban = array_values($statuses); - + diff --git a/agent/ticket_list.php b/agent/ticket_list.php index d50cc48b3..c5c691605 100644 --- a/agent/ticket_list.php +++ b/agent/ticket_list.php @@ -391,7 +391,7 @@ if ($tickets) { data-modal-url="modals/ticket/ticket_priority.php?id=" > - + | diff --git a/agent/transactions.php b/agent/transactions.php index a83fa583c..9c9e31a11 100644 --- a/agent/transactions.php +++ b/agent/transactions.php @@ -519,7 +519,7 @@ if ($account_filter) { -+ |
diff --git a/client/includes/header.php b/client/includes/header.php
index 5156c3635..898388bfd 100644
--- a/client/includes/header.php
+++ b/client/includes/header.php
@@ -157,9 +157,9 @@ header("X-Frame-Options: DENY"); // Legacy
$_SESSION['alert_type'] = "info";
}
?>
-
+
-
+
|
- + | diff --git a/client/quotes.php b/client/quotes.php index 59b0ffae3..bc084818f 100644 --- a/client/quotes.php +++ b/client/quotes.php @@ -49,7 +49,7 @@ $quotes_sql = mysqli_query($mysqli, "SELECT quote_amount, quote_date, quote_id, } if ($quote_status == "Sent") { - $quote_badge_color = "warning text-white"; + $quote_badge_color = "warning"; } elseif ($quote_status == "Viewed") { $quote_badge_color = "primary"; } elseif ($quote_status == "Accepted") { @@ -70,7 +70,7 @@ $quotes_sql = mysqli_query($mysqli, "SELECT quote_amount, quote_date, quote_id,- + | diff --git a/client/unpaid_invoices.php b/client/unpaid_invoices.php index 9c9106947..874107dd3 100644 --- a/client/unpaid_invoices.php +++ b/client/unpaid_invoices.php @@ -119,7 +119,7 @@ $balance = $invoice_amounts - $amount_paid; } if ($invoice_status == "Sent") { - $invoice_badge_color = "warning text-white"; + $invoice_badge_color = "warning"; } elseif ($invoice_status == "Viewed") { $invoice_badge_color = "info"; } elseif ($invoice_status == "Partial") { diff --git a/css/itflow_custom.css b/css/itflow_custom.css index c1eeb4156..2636b75e7 100644 --- a/css/itflow_custom.css +++ b/css/itflow_custom.css @@ -594,3 +594,25 @@ a:not(.dropdown-item):not(.btn-app):not(.nav-link):not(.brand-link):not(.page-li .theme-teal .nav-pills { --bs-nav-pills-link-active-color: #000; } + +/* --- Theme swatch colours ----------------------------------------------- + admin/settings_theme.php renders each choice as . AdminLTE 3 defined those; v4 does not, so every swatch + on the theme picker rendered with no colour at all - you could not see + what you were selecting. Same accent hexes the themes themselves use. */ +.text-black { color: #000000 !important; } +.text-blue { color: #007bff !important; } +.text-cyan { color: #17a2b8 !important; } +.text-fuchsia { color: #f012be !important; } +.text-gray { color: #6c757d !important; } +.text-green { color: #28a745 !important; } +.text-indigo { color: #6610f2 !important; } +.text-lightblue { color: #3c8dbc !important; } +.text-maroon { color: #d81b60 !important; } +.text-navy { color: #001f3f !important; } +.text-olive { color: #3d9970 !important; } +.text-orange { color: #fd7e14 !important; } +.text-pink { color: #e83e8c !important; } +.text-purple { color: #6f42c1 !important; } +.text-red { color: #dc3545 !important; } +.text-teal { color: #20c997 !important; } diff --git a/functions/app.php b/functions/app.php index df45126dc..b835e97be 100644 --- a/functions/app.php +++ b/functions/app.php @@ -39,7 +39,7 @@ function getAssetIcon($asset_type) { function getInvoiceBadgeColor($invoice_status) { if ($invoice_status == "Sent") { - $invoice_badge_color = "warning text-white"; + $invoice_badge_color = "warning"; } elseif ($invoice_status == "Viewed") { $invoice_badge_color = "info"; } elseif ($invoice_status == "Partial") { diff --git a/functions/sanitize.php b/functions/sanitize.php index 64cd31878..ed8f90711 100644 --- a/functions/sanitize.php +++ b/functions/sanitize.php @@ -169,6 +169,28 @@ function escapeCsvFormula($value) { * existed there were four separate implementations and one of them interpolated * raw. */ +/** + * Map a flashAlert type onto a real Bootstrap contextual class. + * + * flashAlert() is called with more type names than Bootstrap has classes - + * 'error', 'alert' and a typo'd 'errpr' among them - so interpolating the raw + * value produced alert-error / alert-alert, which style nothing at all. + */ +function alertStyleClass($type) { + + $alert_classes = [ + 'success' => 'success', + 'info' => 'info', + 'warning' => 'warning', + 'alert' => 'warning', + 'error' => 'danger', + 'errpr' => 'danger', + 'danger' => 'danger', + ]; + + return $alert_classes[$type] ?? 'secondary'; +} + function alertMessageHtml($message) { $allowed_tags = [ diff --git a/guest/guest_view_invoice.php b/guest/guest_view_invoice.php index f885cf79b..3046f8959 100644 --- a/guest/guest_view_invoice.php +++ b/guest/guest_view_invoice.php @@ -217,7 +217,7 @@ if ($balance > 0) {