From 64e8c28a17e91dc2c9f0e76d32513a30d8e820b7 Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Sun, 26 Nov 2023 15:01:34 +0000
Subject: [PATCH] [QSO] Fixed Badge colours not functioning correctly

---
 application/views/qso/index.php |  2 +-
 assets/js/sections/qso.js       | 42 ++++++++++++++++-----------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index a6878e51..3a581113 100755
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -110,7 +110,7 @@
                 <div class="mb-3 col-md-9">
                   <label for="callsign"><?php echo lang('gen_hamradio_callsign'); ?></label><?php if ($this->optionslib->get_option('dxcache_url') != '') { ?>&nbsp;<i id="check_cluster" data-bs-toggle="tooltip" title="Search DXCluster for latest Spot" class="fas fa-search"></i> <?php } ?>
                   <input type="text" class="form-control" id="callsign" name="callsign" required>
-                  <small id="callsign_info" class="badge text-bg-danger"></small> <a id="lotw_link"><small id="lotw_info" class="badge text-bg-success"></small></a>
+                  <small id="callsign_info" class="badge text-bg-secondary"></small> <a id="lotw_link"><small id="lotw_info" class="badge text-bg-success"></small></a>
                 </div>
                 <div class="mb-3 col-md-3 align-self-center">
                   <small id="qrz_info" class="badge text-bg-secondary"></small>
diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js
index 37afbad1..58f0a962 100644
--- a/assets/js/sections/qso.js
+++ b/assets/js/sections/qso.js
@@ -425,20 +425,20 @@ function changebadge(entityname) {
 		{
 
 			$('#callsign_info').removeClass("lotw_info_orange");
-			$('#callsign_info').removeClass("badge-secondary");
-			$('#callsign_info').removeClass("badge-success");
-			$('#callsign_info').removeClass("badge-danger");
+			$('#callsign_info').removeClass("text-bg-secondary");
+			$('#callsign_info').removeClass("text-bg-success");
+			$('#callsign_info').removeClass("text-bg-danger");
 			$('#callsign_info').attr('title', '');
 
 			if (result.confirmed) {
-				$('#callsign_info').addClass("badge-success");
+				$('#callsign_info').addClass("text-bg-success");
 				$('#callsign_info').attr('title', 'DXCC was already worked and confirmed in the past on this band and mode!');
 			} else if (result.workedBefore) {
-				$('#callsign_info').addClass("badge-success");
+				$('#callsign_info').addClass("text-bg-success");
 				$('#callsign_info').addClass("lotw_info_orange");
 				$('#callsign_info').attr('title', 'DXCC was already worked in the past on this band and mode!');
 			} else {
-				$('#callsign_info').addClass("badge-danger");
+				$('#callsign_info').addClass("text-bg-danger");
 				$('#callsign_info').attr('title', 'New DXCC, not worked on this band and mode!');
 			}
 		})
@@ -447,20 +447,20 @@ function changebadge(entityname) {
 		{
 			// Reset CSS values before updating
 			$('#callsign_info').removeClass("lotw_info_orange");
-			$('#callsign_info').removeClass("badge-secondary");
-			$('#callsign_info').removeClass("badge-success");
-			$('#callsign_info').removeClass("badge-danger");
+			$('#callsign_info').removeClass("text-bg-secondary");
+			$('#callsign_info').removeClass("text-bg-success");
+			$('#callsign_info').removeClass("text-bg-danger");
 			$('#callsign_info').attr('title', '');
 
 			if (result.confirmed) {
-				$('#callsign_info').addClass("badge-success");
+				$('#callsign_info').addClass("text-bg-success");
 				$('#callsign_info').attr('title', 'DXCC was already worked and confirmed in the past on this band and mode!');
 			} else if (result.workedBefore) {
-				$('#callsign_info').addClass("badge-success");
+				$('#callsign_info').addClass("text-bg-success");
 				$('#callsign_info').addClass("lotw_info_orange");
 				$('#callsign_info').attr('title', 'DXCC was already worked in the past on this band and mode!');
 			} else {
-				$('#callsign_info').addClass("badge-danger");
+				$('#callsign_info').addClass("text-bg-danger");
 				$('#callsign_info').attr('title', 'New DXCC, not worked on this band and mode!');
 			}
 		})
@@ -493,9 +493,9 @@ function reset_fields() {
 	$("#callsign").removeClass("confirmedGrid");
 	$("#callsign").removeClass("workedGrid");
 	$("#callsign").removeClass("newGrid");
-	$('#callsign_info').removeClass("badge-secondary");
-	$('#callsign_info').removeClass("badge-success");
-	$('#callsign_info').removeClass("badge-danger");
+	$('#callsign_info').removeClass("text-bg-secondary");
+	$('#callsign_info').removeClass("text-bg-success");
+	$('#callsign_info').removeClass("text-bg-danger");
 	$('#callsign-image').attr('style', 'display: none;');
 	$('#callsign-image-content').text("");
 	$('#qsl_via').val("");
@@ -960,9 +960,9 @@ $('#dxcc_id').on('change', function() {
 			$('#country').val(convert_case(result.dxcc.name));
 			$('#cqz').val(convert_case(result.dxcc.cqz));
 
-			$('#callsign_info').removeClass("badge-secondary");
-			$('#callsign_info').removeClass("badge-success");
-			$('#callsign_info').removeClass("badge-danger");
+			$('#callsign_info').removeClass("text-bg-secondary");
+			$('#callsign_info').removeClass("text-bg-success");
+			$('#callsign_info').removeClass("text-bg-danger");
 			$('#callsign_info').attr('title', '');
 			$('#callsign_info').text(convert_case(result.dxcc.name));
 
@@ -1031,9 +1031,9 @@ function resetDefaultQSOFields() {
 	$("#callsign").removeClass("workedGrid");
 	$("#callsign").removeClass("confirmedGrid");
 	$("#callsign").removeClass("newGrid");
-	$('#callsign_info').removeClass("badge-secondary");
-	$('#callsign_info').removeClass("badge-success");
-	$('#callsign_info').removeClass("badge-danger");
+	$('#callsign_info').removeClass("text-bg-secondary");
+	$('#callsign_info').removeClass("text-bg-success");
+	$('#callsign_info').removeClass("text-bg-danger");
 	$('#input_usa_state').val("");
 	$('#callsign-image').attr('style', 'display: none;');
 	$('#callsign-image-content').text("");