diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index ecfa125d..543f620b 100644 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -1346,8 +1346,8 @@ function worked_grid_before($gridsquare, $type, $band, $mode) $ci =& get_instance(); switch($name) { case 'Mode': $ret.= ''; $ret.= $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE . ''; break; - case 'RSTS': $ret.= '' . $row->COL_RST_SENT; if ($row->COL_STX) { $ret.= ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; $ret.=sprintf("%03d", $row->COL_STX); $ret.= '';} if ($row->COL_STX_STRING) { $ret.= ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_STX_STRING . '';} $ret.= ''; break; - case 'RSTR': $ret.= '' . $row->COL_RST_RCVD; if ($row->COL_SRX) { $ret.= ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; $ret.=sprintf("%03d", $row->COL_SRX); $ret.= '';} if ($row->COL_SRX_STRING) { $ret.= ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_SRX_STRING . '';} $ret.= ''; break; + case 'RSTS': $ret.= '' . $row->COL_RST_SENT; if ($row->COL_STX) { $ret.= ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; $ret.=sprintf("%03d", $row->COL_STX); $ret.= '';} if ($row->COL_STX_STRING) { $ret.= ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_STX_STRING . '';} $ret.= ''; break; + case 'RSTR': $ret.= '' . $row->COL_RST_RCVD; if ($row->COL_SRX) { $ret.= ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; $ret.=sprintf("%03d", $row->COL_SRX); $ret.= '';} if ($row->COL_SRX_STRING) { $ret.= ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_SRX_STRING . '';} $ret.= ''; break; case 'Country': $ret.= '' . ucwords(strtolower(($row->COL_COUNTRY))); if ($row->end != NULL) $ret.= ' '.$ci->lang->line('gen_hamradio_deleted_dxcc').'' . ''; break; case 'IOTA': $ret.= '' . ($row->COL_IOTA) . ''; break; case 'SOTA': $ret.= '' . ($row->COL_SOTA_REF) . ''; break; diff --git a/application/models/Cq.php b/application/models/Cq.php index b4fecee5..4ae15de7 100644 --- a/application/models/Cq.php +++ b/application/models/Cq.php @@ -45,14 +45,14 @@ class CQ extends CI_Model{ if ($postdata['worked'] != NULL) { $cqBand = $this->getCQWorked($location_list, $band, $postdata); foreach ($cqBand as $line) { - $bandCq[$line->col_cqz][$band] = '
col_cqz) . '","' . $band . '","'. $postdata['mode'] . '","CQZone","")\'>W
'; + $bandCq[$line->col_cqz][$band] = '
col_cqz) . '","' . $band . '","'. $postdata['mode'] . '","CQZone","")\'>W
'; $cqZ[$line->col_cqz]['count']++; } } if ($postdata['confirmed'] != NULL) { $cqBand = $this->getCQConfirmed($location_list, $band, $postdata); foreach ($cqBand as $line) { - $bandCq[$line->col_cqz][$band] = '
col_cqz) . '","' . $band . '","'. $postdata['mode'] . '","CQZone","'.$qsl.'")\'>C
'; + $bandCq[$line->col_cqz][$band] = '
col_cqz) . '","' . $band . '","'. $postdata['mode'] . '","CQZone","'.$qsl.'")\'>C
'; $cqZ[$line->col_cqz]['count']++; } } diff --git a/application/models/Dok.php b/application/models/Dok.php index 1ae0cbd9..2f7fc297 100644 --- a/application/models/Dok.php +++ b/application/models/Dok.php @@ -35,7 +35,7 @@ function get_dok_array($bands, $postdata, $location_list) { $dokBand = $this->getDokWorked($location_list, $band, $postdata); foreach ($dokBand as $line) { if (array_key_exists($line->COL_DARC_DOK, $bandDok)) { /* For now ignore DOKs which are logged but not existing in the official lists any more */ - $bandDok[$line->COL_DARC_DOK][$band] = '
COL_DARC_DOK . '","' . $band . '","' . $postdata['mode'] . '","DOK", "")\'>W
'; + $bandDok[$line->COL_DARC_DOK][$band] = '
COL_DARC_DOK . '","' . $band . '","' . $postdata['mode'] . '","DOK", "")\'>W
'; $doks[$line->COL_DARC_DOK]['count']++; } } @@ -45,7 +45,7 @@ function get_dok_array($bands, $postdata, $location_list) { $dokBand = $this->getDokConfirmed($location_list, $band, $postdata); foreach ($dokBand as $line) { if (array_key_exists($line->COL_DARC_DOK, $bandDok)) { /* For now ignore DOKs which are logged but not existing in the official lists any more */ - $bandDok[$line->COL_DARC_DOK][$band] = '
COL_DARC_DOK . '","' . $band . '","' . $postdata['mode'] . '","DOK", "'.$qsl.'")\'>C
'; + $bandDok[$line->COL_DARC_DOK][$band] = '
COL_DARC_DOK . '","' . $band . '","' . $postdata['mode'] . '","DOK", "'.$qsl.'")\'>C
'; $doks[$line->COL_DARC_DOK]['count']++; } } diff --git a/application/models/Dxcc.php b/application/models/Dxcc.php index 076dce78..b02e940d 100644 --- a/application/models/Dxcc.php +++ b/application/models/Dxcc.php @@ -95,7 +95,7 @@ class DXCC extends CI_Model { if ($postdata['worked'] != NULL) { $workedDXCC = $this->getDxccBandWorked($location_list, $band, $postdata); foreach ($workedDXCC as $wdxcc) { - $dxccMatrix[$wdxcc->dxcc][$band] = '
name).'","'. $band . '","'. $postdata['mode'] . '","DXCC", "")\'>W
'; + $dxccMatrix[$wdxcc->dxcc][$band] = '
name).'","'. $band . '","'. $postdata['mode'] . '","DXCC", "")\'>W
'; } } @@ -103,7 +103,7 @@ class DXCC extends CI_Model { if ($postdata['confirmed'] != NULL) { $confirmedDXCC = $this->getDxccBandConfirmed($location_list, $band, $postdata); foreach ($confirmedDXCC as $cdxcc) { - $dxccMatrix[$cdxcc->dxcc][$band] = '
name).'","'. $band . '","'. $postdata['mode'] . '","DXCC","'.$qsl.'")\'>C
'; + $dxccMatrix[$cdxcc->dxcc][$band] = '
name).'","'. $band . '","'. $postdata['mode'] . '","DXCC","'.$qsl.'")\'>C
'; } } } diff --git a/application/models/Iota.php b/application/models/Iota.php index 2135c6b6..a543c650 100644 --- a/application/models/Iota.php +++ b/application/models/Iota.php @@ -26,7 +26,7 @@ class IOTA extends CI_Model { if ($postdata['worked'] != NULL) { $workedIota = $this->getIotaBandWorked($location_list, $band, $postdata); foreach ($workedIota as $wiota) { - $iotaMatrix[$wiota->tag][$band] = '
tag.'","'. $band . '","'. $postdata['mode'] . '","IOTA")\'>W
'; + $iotaMatrix[$wiota->tag][$band] = '
tag.'","'. $band . '","'. $postdata['mode'] . '","IOTA")\'>W
'; } } @@ -34,7 +34,7 @@ class IOTA extends CI_Model { if ($postdata['confirmed'] != NULL) { $confirmedIota = $this->getIotaBandConfirmed($location_list, $band, $postdata); foreach ($confirmedIota as $ciota) { - $iotaMatrix[$ciota->tag][$band] = '
tag.'","'. $band . '","'. $postdata['mode'] . '","IOTA")\'>C
'; + $iotaMatrix[$ciota->tag][$band] = '
tag.'","'. $band . '","'. $postdata['mode'] . '","IOTA")\'>C
'; } } } diff --git a/application/models/Was.php b/application/models/Was.php index 34686121..f53e8638 100644 --- a/application/models/Was.php +++ b/application/models/Was.php @@ -45,14 +45,14 @@ class was extends CI_Model { if ($postdata['worked'] != NULL) { $wasBand = $this->getWasWorked($location_list, $band, $postdata); foreach ($wasBand as $line) { - $bandWas[$line->col_state][$band] = '
col_state . '","' . $band . '","'. $postdata['mode'] . '","WAS", "")\'>W
'; + $bandWas[$line->col_state][$band] = '
col_state . '","' . $band . '","'. $postdata['mode'] . '","WAS", "")\'>W
'; $states[$line->col_state]['count']++; } } if ($postdata['confirmed'] != NULL) { $wasBand = $this->getWasConfirmed($location_list, $band, $postdata); foreach ($wasBand as $line) { - $bandWas[$line->col_state][$band] = '
col_state . '","' . $band . '","'. $postdata['mode'] . '","WAS", "'.$qsl.'")\'>C
'; + $bandWas[$line->col_state][$band] = '
col_state . '","' . $band . '","'. $postdata['mode'] . '","WAS", "'.$qsl.'")\'>C
'; $states[$line->col_state]['count']++; } } diff --git a/application/views/api/help.php b/application/views/api/help.php index 7c8ed746..a6113362 100644 --- a/application/views/api/help.php +++ b/application/views/api/help.php @@ -16,7 +16,7 @@

The Cloudlog API (Application Programming Interface) lets third party systems access Cloudlog in a controlled way. Access to the API is managed via API keys.

You will need to generate an API key for each tool you wish to use (e.g. CloudlogCAT). Generate a read-write key if the application needs to send data to Cloudlog. Generate a read-only key if the application only needs to obtain data from Cloudlog.

-

API URL The API URL for this Cloudlog instance is:

+

API URL The API URL for this Cloudlog instance is:

Info It's good practice to delete a key if you are no longer using the associated application.

num_rows() > 0) { ?> @@ -35,7 +35,7 @@ result() as $row) { ?> - key; ?> + key; ?> description; ?> last_used; ?> 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/dashboard/index.php b/application/views/dashboard/index.php index 051b1164..89d8432b 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -22,8 +22,8 @@ function echo_table_col($row, $name) { $ci =& get_instance(); switch($name) { case 'Mode': echo ''; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE . ''; break; - case 'RSTS': echo '' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; printf("%03d", $row->COL_STX); echo '';} if ($row->COL_STX_STRING) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_STX_STRING . '';} echo ''; break; - case 'RSTR': echo '' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; printf("%03d", $row->COL_SRX); echo '';} if ($row->COL_SRX_STRING) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_SRX_STRING . '';} echo ''; break; + case 'RSTS': echo '' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; printf("%03d", $row->COL_STX); echo '';} if ($row->COL_STX_STRING) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_STX_STRING . '';} echo ''; break; + case 'RSTR': echo '' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; printf("%03d", $row->COL_SRX); echo '';} if ($row->COL_SRX_STRING) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_SRX_STRING . '';} echo ''; break; case 'Country': echo '' . ucwords(strtolower(($row->COL_COUNTRY))); if ($row->end != NULL) echo ' '.$ci->lang->line('gen_hamradio_deleted_dxcc').'' . ''; break; case 'IOTA': echo '' . ($row->COL_IOTA) . ''; break; case 'SOTA': echo '' . ($row->COL_SOTA_REF) . ''; break; @@ -222,7 +222,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { - + / / diff --git a/application/views/debug/main.php b/application/views/debug/main.php index 127a337b..e3f2a1c5 100644 --- a/application/views/debug/main.php +++ b/application/views/debug/main.php @@ -19,7 +19,7 @@ Base URL - config->item('base_url'); ?> ")'> + config->item('base_url'); ?> ")'> Migration diff --git a/application/views/oqrs/qsolist.php b/application/views/oqrs/qsolist.php index 0f634847..506a9943 100644 --- a/application/views/oqrs/qsolist.php +++ b/application/views/oqrs/qsolist.php @@ -47,16 +47,16 @@ if ($qsos->result() != NULL) { } switch ($qsl->COL_QSL_SENT) { case "Y": - echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_sent').$timestamp; + echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_sent').$timestamp; break; case "Q": - echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued').$timestamp; + echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_queued').$timestamp; break; case "R": - echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested').$timestamp; + echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_requested').$timestamp; break; case "I": - echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_invalid_ignore').$timestamp; + echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_invalid_ignore').$timestamp; break; default: echo "class=\"qsl-red"; @@ -89,16 +89,16 @@ if ($qsos->result() != NULL) { } switch ($qsl->COL_QSL_RCVD) { case "Y": - echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_received').$timestamp; + echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_received').$timestamp; break; case "Q": - echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued').$timestamp; + echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_queued').$timestamp; break; case "R": - echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested').$timestamp; + echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_requested').$timestamp; break; case "I": - echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_invalid_ignore').$timestamp; + echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_invalid_ignore').$timestamp; break; default: echo "class=\"qsl-red"; @@ -127,7 +127,7 @@ if ($qsos->result() != NULL) { echo ''; echo 'COL_EQSL_QSL_SENT == "Y") { - echo "data-original-title=\"".lang('eqsl_short')." ".lang('general_word_sent'); + echo "title=\"".lang('eqsl_short')." ".lang('general_word_sent'); if ($qsl->COL_EQSL_QSLSDATE != null) { $timestamp = strtotime($qsl->COL_EQSL_QSLSDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -140,7 +140,7 @@ if ($qsos->result() != NULL) { echo 'COL_EQSL_QSL_RCVD == "Y") { - echo "data-original-title=\"".lang('eqsl_short')." ".lang('general_word_received'); + echo "title=\"".lang('eqsl_short')." ".lang('general_word_received'); if ($qsl->COL_EQSL_QSLRDATE != null) { $timestamp = strtotime($qsl->COL_EQSL_QSLRDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -156,7 +156,7 @@ if ($qsos->result() != NULL) { echo ''; echo 'COL_LOTW_QSL_SENT == "Y") { - echo "data-original-title=\"".lang('lotw_short')." ".lang('general_word_sent'); + echo "title=\"".lang('lotw_short')." ".lang('general_word_sent'); if ($qsl->COL_LOTW_QSLSDATE != null) { $timestamp = strtotime($qsl->COL_LOTW_QSLSDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -169,7 +169,7 @@ if ($qsos->result() != NULL) { echo 'COL_LOTW_QSL_RCVD == "Y") { - echo "data-original-title=\"".lang('lotw_short')." ".lang('general_word_received'); + echo "title=\"".lang('lotw_short')." ".lang('general_word_received'); if ($qsl->COL_LOTW_QSLRDATE != null) { $timestamp = strtotime($qsl->COL_LOTW_QSLRDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); diff --git a/application/views/qslprint/qsolist.php b/application/views/qslprint/qsolist.php index 8beadda6..a7fba483 100644 --- a/application/views/qslprint/qsolist.php +++ b/application/views/qslprint/qsolist.php @@ -55,16 +55,16 @@ if ($qsos->result() != NULL) { } switch ($qsl->COL_QSL_SENT) { case "Y": - echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_sent').$timestamp; + echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_sent').$timestamp; break; case "Q": - echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued').$timestamp; + echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_queued').$timestamp; break; case "R": - echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested').$timestamp; + echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_requested').$timestamp; break; case "I": - echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_invalid_ignore').$timestamp; + echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_invalid_ignore').$timestamp; break; default: echo "class=\"qsl-red"; @@ -97,16 +97,16 @@ if ($qsos->result() != NULL) { } switch ($qsl->COL_QSL_RCVD) { case "Y": - echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_received').$timestamp; + echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_received').$timestamp; break; case "Q": - echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued').$timestamp; + echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_queued').$timestamp; break; case "R": - echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested').$timestamp; + echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_requested').$timestamp; break; case "I": - echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_invalid_ignore').$timestamp; + echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_invalid_ignore').$timestamp; break; default: echo "class=\"qsl-red"; @@ -135,7 +135,7 @@ if ($qsos->result() != NULL) { echo ''; echo 'COL_EQSL_QSL_SENT == "Y") { - echo "data-original-title=\"".lang('eqsl_short')." ".lang('general_word_sent'); + echo "title=\"".lang('eqsl_short')." ".lang('general_word_sent'); if ($qsl->COL_EQSL_QSLSDATE != null) { $timestamp = strtotime($qsl->COL_EQSL_QSLSDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -148,7 +148,7 @@ if ($qsos->result() != NULL) { echo 'COL_EQSL_QSL_RCVD == "Y") { - echo "data-original-title=\"".lang('eqsl_short')." ".lang('general_word_received'); + echo "title=\"".lang('eqsl_short')." ".lang('general_word_received'); if ($qsl->COL_EQSL_QSLRDATE != null) { $timestamp = strtotime($qsl->COL_EQSL_QSLRDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -164,7 +164,7 @@ if ($qsos->result() != NULL) { echo ''; echo 'COL_LOTW_QSL_SENT == "Y") { - echo "data-original-title=\"".lang('lotw_short')." ".lang('general_word_sent'); + echo "title=\"".lang('lotw_short')." ".lang('general_word_sent'); if ($qsl->COL_LOTW_QSLSDATE != null) { $timestamp = strtotime($qsl->COL_LOTW_QSLSDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -177,7 +177,7 @@ if ($qsos->result() != NULL) { echo 'COL_LOTW_QSL_RCVD == "Y") { - echo "data-original-title=\"".lang('lotw_short')." ".lang('general_word_received'); + echo "title=\"".lang('lotw_short')." ".lang('general_word_received'); if ($qsl->COL_LOTW_QSLRDATE) { $timestamp = strtotime($qsl->COL_LOTW_QSLRDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); diff --git a/application/views/qso/components/previous_contacts.php b/application/views/qso/components/previous_contacts.php index ed0b3bcf..6db3eb30 100644 --- a/application/views/qso/components/previous_contacts.php +++ b/application/views/qso/components/previous_contacts.php @@ -54,8 +54,8 @@ function echo_table_col($row, $name) { $ci =& get_instance(); switch($name) { case 'Mode': echo ''; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE . ''; break; - case 'RSTS': echo '' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; printf("%03d", $row->COL_STX); echo '';} if ($row->COL_STX_STRING) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_STX_STRING . '';} echo ''; break; - case 'RSTR': echo '' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; printf("%03d", $row->COL_SRX); echo '';} if ($row->COL_SRX_STRING) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_SRX_STRING . '';} echo ''; break; + case 'RSTS': echo '' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; printf("%03d", $row->COL_STX); echo '';} if ($row->COL_STX_STRING) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_STX_STRING . '';} echo ''; break; + case 'RSTR': echo '' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; printf("%03d", $row->COL_SRX); echo '';} if ($row->COL_SRX_STRING) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_SRX_STRING . '';} echo ''; break; case 'Country': echo '' . ucwords(strtolower(($row->COL_COUNTRY))); if ($row->end != NULL) echo ' '.$ci->lang->line('gen_hamradio_deleted_dxcc').'' . ''; break; case 'IOTA': echo '' . ($row->COL_IOTA) . ''; break; case 'SOTA': echo '' . ($row->COL_SOTA_REF) . ''; break; diff --git a/application/views/qso/index.php b/application/views/qso/index.php index c2c3091e..3a581113 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -61,9 +61,9 @@
- + - + required pattern="[0-2][0-9]:[0-5][0-9]">
@@ -71,7 +71,7 @@
- + required pattern="[0-2][0-9]:[0-5][0-9]">
@@ -93,7 +93,7 @@
- + required pattern="[0-2][0-9]:[0-5][0-9]">
@@ -108,7 +108,7 @@
- optionslib->get_option('dxcache_url') != '') { ?>  + optionslib->get_option('dxcache_url') != '') { ?> 
@@ -544,7 +544,7 @@
- +
@@ -585,7 +585,7 @@ - diff --git a/assets/css/cosmo/overrides.css b/assets/css/cosmo/overrides.css index 078f952c..dd3c47a6 100644 --- a/assets/css/cosmo/overrides.css +++ b/assets/css/cosmo/overrides.css @@ -19,10 +19,10 @@ border-radius: 0; } -.dxccBgDanger { +.awardsBgDanger { background-color: #f8d7db !important; } -.dxccBgSuccess { +.awardsBgSuccess { background-color: #d4edda !important; } diff --git a/assets/css/cyborg/overrides.css b/assets/css/cyborg/overrides.css index fedc312b..ff5bd366 100644 --- a/assets/css/cyborg/overrides.css +++ b/assets/css/cyborg/overrides.css @@ -2,11 +2,11 @@ * No overrides for the default theme as it aligns with general.css */ -.dxccBgDanger a { +.awardsBgDanger a { color: white; } -.dxccBgSuccess a{ +.awardsBgSuccess a{ color: white; } diff --git a/assets/css/darkly/overrides.css b/assets/css/darkly/overrides.css index bf441a24..f4327430 100644 --- a/assets/css/darkly/overrides.css +++ b/assets/css/darkly/overrides.css @@ -23,11 +23,11 @@ color: black !important; } -.dxccBgDanger a { +.awardsBgDanger a { color: white; } -.dxccBgSuccess a{ +.awardsBgSuccess a{ color: white; } diff --git a/assets/css/default/overrides.css b/assets/css/default/overrides.css index a8a2a28b..c8b304fc 100644 --- a/assets/css/default/overrides.css +++ b/assets/css/default/overrides.css @@ -10,11 +10,11 @@ thead > tr > td { border: 1px solid #ced4da; } -.dxccBgDanger { +.awardsBgDanger { background-color: #f8d7db !important; } -.dxccBgSuccess { +.awardsBgSuccess { background-color: #d4edda !important; } 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/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/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/qso.js b/assets/js/sections/qso.js index b3090454..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(""); @@ -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'); @@ -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(""); 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} 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']);