From 0e2db0e5b40cab2451f06334f9a53c2418e775d4 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 25 Nov 2023 23:30:56 +0100 Subject: [PATCH 1/9] removed borders on simplefle --- application/views/simplefle/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index c846fee3..19705695 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -55,7 +55,7 @@
-
+
@@ -114,7 +114,7 @@
-
+
From 003ca6a1d04764907b003c1ec58bef476be79e96 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 25 Nov 2023 23:34:58 +0100 Subject: [PATCH 2/9] made button more visible --- application/views/contesting/index.php | 2 +- application/views/qso/index.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/views/contesting/index.php b/application/views/contesting/index.php index 13582c09..b9fcc426 100644 --- a/application/views/contesting/index.php +++ b/application/views/contesting/index.php @@ -159,7 +159,7 @@
- +
diff --git a/application/views/qso/index.php b/application/views/qso/index.php index c2c3091e..0cb23697 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -544,7 +544,7 @@
- +
@@ -585,7 +585,7 @@ - diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index a4207e1b..82ba3d12 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -31,7 +31,7 @@ function updateRow(qso) { cells.eq(c++).text(qso.de); } if (user_options.dx.show == "true"){ - cells.eq(c++).html(''+qso.dx+'' + (qso.callsign == '' ? '' : ' L') + ' Lookup ' + qso.dx + ' on QRZ.com Lookup ' + qso.dx + ' on HamQTH'); + cells.eq(c++).html(''+qso.dx+'' + (qso.callsign == '' ? '' : ' L') + ' Lookup ' + qso.dx + ' on QRZ.com Lookup ' + qso.dx + ' on HamQTH'); } if (user_options.mode.show == "true"){ cells.eq(c++).text(qso.mode); @@ -82,7 +82,7 @@ function updateRow(qso) { cells.eq(c++).html(qso.iota); } - $('[data-toggle="tooltip"]').tooltip(); + $('[data-bs-toggle="tooltip"]').tooltip(); return row; } @@ -124,7 +124,7 @@ function loadQSOTable(rows) { data.push(qso.de); } if (user_options.dx.show == "true"){ - data.push(''+qso.dx+'' + (qso.callsign == '' ? '' : ' L') + ' Lookup ' + qso.dx + ' on QRZ.com Lookup ' + qso.dx + ' on HamQTH'); + data.push(''+qso.dx+'' + (qso.callsign == '' ? '' : ' L') + ' Lookup ' + qso.dx + ' on QRZ.com Lookup ' + qso.dx + ' on HamQTH'); } if (user_options.mode.show == "true"){ data.push(qso.mode); @@ -180,7 +180,7 @@ function loadQSOTable(rows) { table.row(createdRow).node().id = 'qsoID-' + qso.qsoID; } table.draw(); - $('[data-toggle="tooltip"]').tooltip(); + $('[data-bs-toggle="tooltip"]').tooltip(); } function processNextCallbookItem() { diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js index b3090454..37afbad1 100644 --- a/assets/js/sections/qso.js +++ b/assets/js/sections/qso.js @@ -629,9 +629,9 @@ $("#callsign").focusout(function() { } $('#lotw_link').attr('href',"https://lotw.arrl.org/lotwuser/act?act="+callsign); $('#lotw_link').attr('target',"_blank"); - $('#lotw_info').attr('data-toggle',"tooltip"); - $('#lotw_info').attr('data-original-title',"LoTW User. Last upload was "+result.lotw_days+" days ago"); - $('[data-toggle="tooltip"]').tooltip(); + $('#lotw_info').attr('data-bs-toggle',"tooltip"); + $('#lotw_info').attr('title',"LoTW User. Last upload was "+result.lotw_days+" days ago"); + $('[data-bs-toggle="tooltip"]').tooltip(); } $('#qrz_info').html(''); $('#qrz_info').attr('title', 'Lookup '+callsign+' info on qrz.com'); diff --git a/src/QSLManager/QSO.php b/src/QSLManager/QSO.php index 80ed37e3..698e8aea 100644 --- a/src/QSLManager/QSO.php +++ b/src/QSLManager/QSO.php @@ -236,16 +236,16 @@ class QSO if ($data['COL_QSL_SENT'] != "N") { switch ($data['COL_QSL_SENT']) { case "Y": - $qslstring .= "class=\"qsl-green\" data-bs-toggle=\"tooltip\" data-original-title=\"".$CI->lang->line('general_word_sent'); + $qslstring .= "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".$CI->lang->line('general_word_sent'); break; case "Q": - $qslstring .= "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".$CI->lang->line('general_word_queued'); + $qslstring .= "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".$CI->lang->line('general_word_queued'); break; case "R": - $qslstring .= "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".$CI->lang->line('general_word_requested'); + $qslstring .= "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".$CI->lang->line('general_word_requested'); break; case "I": - $qslstring .= "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" data-original-title=\"".$CI->lang->line('general_word_invalid_ignore'); + $qslstring .= "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".$CI->lang->line('general_word_invalid_ignore'); break; default: $qslstring .= "class=\"qsl-red"; @@ -281,16 +281,16 @@ class QSO if ($data['COL_QSL_RCVD'] != "N") { switch ($data['COL_QSL_RCVD']) { case "Y": - $qslstring .= "class=\"qsl-green\" data-bs-toggle=\"tooltip\" data-original-title=\"".$CI->lang->line('general_word_received'); + $qslstring .= "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".$CI->lang->line('general_word_received'); break; case "Q": - $qslstring .= "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".$CI->lang->line('general_word_queued'); + $qslstring .= "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".$CI->lang->line('general_word_queued'); break; case "R": - $qslstring .= "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".$CI->lang->line('general_word_requested'); + $qslstring .= "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".$CI->lang->line('general_word_requested'); break; case "I": - $qslstring .= "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" data-original-title=\"".$CI->lang->line('general_word_invalid_ignore'); + $qslstring .= "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".$CI->lang->line('general_word_invalid_ignore'); break; default: $qslstring .= "class=\"qsl-red"; @@ -335,7 +335,7 @@ class QSO $lotwstring = 'lang->line('lotw_short')." ".$CI->lang->line('general_word_sent'); + $lotwstring .= "title=\"" . $CI->lang->line('lotw_short')." ".$CI->lang->line('general_word_sent'); if ($data['COL_LOTW_QSLSDATE'] != null) { $timestamp = strtotime($data['COL_LOTW_QSLSDATE']); $lotwstring .= " ". ($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -347,7 +347,7 @@ class QSO $lotwstring .= 'lang->line('lotw_short') ." ". $CI->lang->line('general_word_received'); + $lotwstring .= "title=\"". $CI->lang->line('lotw_short') ." ". $CI->lang->line('general_word_received'); if ($data['COL_LOTW_QSLRDATE'] != null) { $timestamp = strtotime($data['COL_LOTW_QSLRDATE']); @@ -372,7 +372,7 @@ class QSO $eqslstring = 'lang->line('eqsl_short')." ".$CI->lang->line('general_word_sent'); + $eqslstring .= "title=\"".$CI->lang->line('eqsl_short')." ".$CI->lang->line('general_word_sent'); if ($data['COL_EQSL_QSLSDATE'] != null) { $timestamp = strtotime($data['COL_EQSL_QSLSDATE']); @@ -385,7 +385,7 @@ class QSO $eqslstring .= ' class="eqsl-' . (($data['COL_EQSL_QSL_SENT'] =='Y') ? 'green':'red') . '">▲lang->line('eqsl_short')." ".$CI->lang->line('general_word_received'); + $eqslstring .= "title=\"".$CI->lang->line('eqsl_short')." ".$CI->lang->line('general_word_received'); if ($data['COL_EQSL_QSLRDATE'] != null) { $timestamp = strtotime($data['COL_EQSL_QSLRDATE']); From b5a790d1337a876585e0d06be30d68af7e59f24c Mon Sep 17 00:00:00 2001 From: int2001 Date: Sun, 26 Nov 2023 09:00:47 +0000 Subject: [PATCH 7/9] and one bunch more of tooltips --- assets/js/sections/distances.js | 2 +- assets/js/sections/ffma.js | 2 +- assets/js/sections/gridmap.js | 2 +- assets/js/sections/gridmaster.js | 2 +- assets/js/sections/ja_gridmaster.js | 2 +- assets/js/sections/oqrs.js | 4 ++-- assets/js/sections/qslprint.js | 4 ++-- assets/js/sections/simplefle.js | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/assets/js/sections/distances.js b/assets/js/sections/distances.js index 9b7cbe57..5ae46b30 100644 --- a/assets/js/sections/distances.js +++ b/assets/js/sections/distances.js @@ -150,7 +150,7 @@ function getDistanceQsos(distance) { nl2br: false, message: html, onshown: function(dialog) { - $('[data-toggle="tooltip"]').tooltip(); + $('[data-bs-toggle="tooltip"]').tooltip(); $('.contacttable').DataTable({ "pageLength": 25, responsive: false, diff --git a/assets/js/sections/ffma.js b/assets/js/sections/ffma.js index 5055da81..d6496d5b 100644 --- a/assets/js/sections/ffma.js +++ b/assets/js/sections/ffma.js @@ -107,7 +107,7 @@ function spawnGridsquareModal(loc_4char) { message: html, onshown: function(dialog) { - $('[data-toggle="tooltip"]').tooltip(); + $('[data-bs-toggle="tooltip"]').tooltip(); $('.contacttable').DataTable({ "pageLength": 25, responsive: false, diff --git a/assets/js/sections/gridmap.js b/assets/js/sections/gridmap.js index f832ad1f..519671bf 100644 --- a/assets/js/sections/gridmap.js +++ b/assets/js/sections/gridmap.js @@ -130,7 +130,7 @@ function spawnGridsquareModal(loc_4char) { message: html, onshown: function(dialog) { - $('[data-toggle="tooltip"]').tooltip(); + $('[data-bs-toggle="tooltip"]').tooltip(); $('.contacttable').DataTable({ "pageLength": 25, responsive: false, diff --git a/assets/js/sections/gridmaster.js b/assets/js/sections/gridmaster.js index 9d150d8e..b4d8c5f5 100644 --- a/assets/js/sections/gridmaster.js +++ b/assets/js/sections/gridmaster.js @@ -107,7 +107,7 @@ function spawnGridsquareModal(loc_4char) { message: html, onshown: function(dialog) { - $('[data-toggle="tooltip"]').tooltip(); + $('[data-bs-toggle="tooltip"]').tooltip(); $('.contacttable').DataTable({ "pageLength": 25, responsive: false, diff --git a/assets/js/sections/ja_gridmaster.js b/assets/js/sections/ja_gridmaster.js index 6859cdd5..f80b4c30 100644 --- a/assets/js/sections/ja_gridmaster.js +++ b/assets/js/sections/ja_gridmaster.js @@ -108,7 +108,7 @@ function spawnGridsquareModal(loc_4char) { message: html, onshown: function(dialog) { - $('[data-toggle="tooltip"]').tooltip(); + $('[data-bs-toggle="tooltip"]').tooltip(); $('.contacttable').DataTable({ "pageLength": 25, responsive: false, diff --git a/assets/js/sections/oqrs.js b/assets/js/sections/oqrs.js index 1a1f506e..67d57197 100644 --- a/assets/js/sections/oqrs.js +++ b/assets/js/sections/oqrs.js @@ -328,7 +328,7 @@ function searchLog(callsign) { nl2br: false, message: html, onshown: function(dialog) { - $('[data-toggle="tooltip"]').tooltip(); + $('[data-bs-toggle="tooltip"]').tooltip(); }, buttons: [{ label: lang_admin_close, @@ -358,7 +358,7 @@ function searchLogTimeDate(id) { nl2br: false, message: html, onshown: function(dialog) { - $('[data-toggle="tooltip"]').tooltip(); + $('[data-bs-toggle="tooltip"]').tooltip(); }, buttons: [{ label: lang_admin_close, diff --git a/assets/js/sections/qslprint.js b/assets/js/sections/qslprint.js index 910c6c7e..7a2c2059 100644 --- a/assets/js/sections/qslprint.js +++ b/assets/js/sections/qslprint.js @@ -32,7 +32,7 @@ function openQsoList(callsign) { nl2br: false, message: html, onshown: function(dialog) { - $('[data-toggle="tooltip"]').tooltip(); + $('[data-bs-toggle="tooltip"]').tooltip(); }, buttons: [{ label: lang_admin_close, @@ -96,7 +96,7 @@ function showOqrs(id) { nl2br: false, message: html, onshown: function(dialog) { - $('[data-toggle="tooltip"]').tooltip(); + $('[data-bs-toggle="tooltip"]').tooltip(); }, buttons: [{ label: lang_admin_close, diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index 01837141..534e4977 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -245,7 +245,7 @@ function handleInput() { ${extraQsoDate} ${qsotime} ${callsign} - ${band} + ${band} ${mode} ${rst_s} ${rst_r} From 64e8c28a17e91dc2c9f0e76d32513a30d8e820b7 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Sun, 26 Nov 2023 15:01:34 +0000 Subject: [PATCH 8/9] [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 @@
optionslib->get_option('dxcache_url') != '') { ?>  - +
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(""); From 4a5c979514b0c482f9e857cd9b20ffd678068de4 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Sun, 26 Nov 2023 15:03:25 +0000 Subject: [PATCH 9/9] Fixed other instances of badge being incorrect --- application/views/qslprint/qsolist.php | 2 +- application/views/search/result.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/views/qslprint/qsolist.php b/application/views/qslprint/qsolist.php index 19ed115e..1e960ddf 100644 --- a/application/views/qslprint/qsolist.php +++ b/application/views/qslprint/qsolist.php @@ -38,7 +38,7 @@ if ($qsos->result() != NULL) { echo ''; $timestamp = strtotime($qsl->COL_TIME_ON); echo date('H:i', $timestamp); echo ''; echo ''; echo $qsl->COL_SUBMODE==null?$qsl->COL_MODE:$qsl->COL_SUBMODE; echo ''; echo ''; if($qsl->COL_SAT_NAME != null) { echo $qsl->COL_SAT_NAME; } else { echo strtolower($qsl->COL_BAND ?? ""); }; echo ''; - echo '' . $qsl->station_callsign . ''; + echo '' . $qsl->station_callsign . ''; echo '' . $qsl->COL_QSL_VIA . ''; echo ''; echo_qsl_sent_via($qsl->COL_QSL_SENT_VIA); echo ''; echo ''; diff --git a/application/views/search/result.php b/application/views/search/result.php index 4cc2ed8d..b6ed83cb 100644 --- a/application/views/search/result.php +++ b/application/views/search/result.php @@ -27,9 +27,9 @@ ".strtoupper($callsign['gridsquare']).""; + echo " ".strtoupper($callsign['gridsquare']).""; } else { - echo " ".strtoupper($callsign['gridsquare']).""; + echo " ".strtoupper($callsign['gridsquare']).""; } ?>