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/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; }