diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php
index 86ce804c..de19ebf5 100644
--- a/application/controllers/Logbook.php
+++ b/application/controllers/Logbook.php
@@ -533,7 +533,20 @@ class Logbook extends CI_Controller {
$html .= "
RST (R) | ";
$html .= "Band | ";
$html .= "Mode | ";
- $html .= "QSL | ";
+ switch($this->session->userdata('user_previous_qsl_type')) {
+ case 0:
+ $html .= "".$this->lang->line('gen_hamradio_qsl')." | ";
+ break;
+ case 1:
+ $html .= "".$this->lang->line('lotw_short')." | ";
+ break;
+ case 2:
+ $html .= "".$this->lang->line('eqsl_short')." | ";
+ break;
+ default:
+ $html .= "".$this->lang->line('gen_hamradio_qsl')." | ";
+ break;
+ }
$html .= " | ";
$html .= "";
@@ -565,44 +578,88 @@ class Logbook extends CI_Controller {
$html .= "".$row->COL_MODE." | ";
else
$html .= "".$row->COL_SUBMODE." | ";
- $html .= "";
- $html .= "COL_QSL_SENT) {
- case "Y":
- $html .= "green";
- break;
- case "Q":
- $html .= "yellow";
- break;
- case "R":
- $html .= "yellow";
- break;
- case "I":
- $html .= "grey";
- break;
- default:
- $html .= "red";
+ if ($this->session->userdata('user_previous_qsl_type') == 1) {
+ $html .= " | ";
+ $html .= "COL_LOTW_QSL_SENT) {
+ case "Y":
+ $html .= "green";
+ break;
+ default:
+ $html .= "red";
+ }
+ $html .= "\">▲";
+ $html .= "COL_LOTW_QSL_RCVD) {
+ case "Y":
+ $html .= "green";
+ break;
+ default:
+ $html .= "red";
+ }
+ $html .= "\">▼";
+ $html .= " | ";
+ } else if ($this->session->userdata('user_previous_qsl_type') == 2) {
+ $html .= "";
+ $html .= "COL_EQSL_QSL_SENT) {
+ case "Y":
+ $html .= "green";
+ break;
+ default:
+ $html .= "red";
+ }
+ $html .= "\">▲";
+ $html .= "COL_EQSL_QSL_RCVD) {
+ case "Y":
+ $html .= "green";
+ break;
+ default:
+ $html .= "red";
+ }
+ $html .= "\">▼";
+ $html .= " | ";
+ } else {
+ $html .= "";
+ $html .= "COL_QSL_SENT) {
+ case "Y":
+ $html .= "green";
+ break;
+ case "Q":
+ $html .= "yellow";
+ break;
+ case "R":
+ $html .= "yellow";
+ break;
+ case "I":
+ $html .= "grey";
+ break;
+ default:
+ $html .= "red";
+ }
+ $html .= "\">▲";
+ $html .= "COL_QSL_RCVD) {
+ case "Y":
+ $html .= "green";
+ break;
+ case "Q":
+ $html .= "yellow";
+ break;
+ case "R":
+ $html .= "yellow";
+ break;
+ case "I":
+ $html .= "grey";
+ break;
+ default:
+ $html .= "red";
+ }
+ $html .= "\">▼";
+ $html .= " | ";
}
- $html .= "\">▲";
- $html .= "COL_QSL_RCVD) {
- case "Y":
- $html .= "green";
- break;
- case "Q":
- $html .= "yellow";
- break;
- case "R":
- $html .= "yellow";
- break;
- case "I":
- $html .= "grey";
- break;
- default:
- $html .= "red";
- }
- $html .= "\">▼";
- $html .= "";
$html .= "".$row->station_callsign." | ";
$html .= "";
}
diff --git a/application/controllers/User.php b/application/controllers/User.php
index 7128e97f..c323bdb9 100644
--- a/application/controllers/User.php
+++ b/application/controllers/User.php
@@ -9,6 +9,8 @@ class User extends CI_Controller {
// Load language files
$this->lang->load(array(
'account',
+ 'lotw',
+ 'eqsl',
));
}
@@ -78,6 +80,7 @@ class User extends CI_Controller {
$data['user_column4'] = $this->input->post('user_column4');
$data['user_column5'] = $this->input->post('user_column5');
$data['user_show_profile_image'] = $this->input->post('user_show_profile_image');
+ $data['user_previous_qsl_type'] = $this->input->post('user_previous_qsl_type');
$this->load->view('user/add', $data);
} else {
$this->load->view('user/add', $data);
@@ -107,7 +110,8 @@ class User extends CI_Controller {
$this->input->post('user_column3'),
$this->input->post('user_column4'),
$this->input->post('user_column5'),
- $this->input->post('user_show_profile_image'))) {
+ $this->input->post('user_show_profile_image'),
+ $this->input->post('user_previous_qsl_type'))) {
// Check for errors
case EUSERNAMEEXISTS:
$data['username_error'] = 'Username '.$this->input->post('user_name').' already in use!';
@@ -147,6 +151,7 @@ class User extends CI_Controller {
$data['user_column4'] = $this->input->post('user_column4');
$data['user_column5'] = $this->input->post('user_column5');
$data['user_show_profile_image'] = $this->input->post('user_show_profile_image');
+ $data['user_previous_qsl_type'] = $this->input->post('user_previous_qsl_type');
$this->load->view('user/add', $data);
$this->load->view('interface_assets/footer');
}
@@ -336,6 +341,12 @@ class User extends CI_Controller {
$data['user_show_profile_image'] = $q->user_show_profile_image;
}
+ if($this->input->post('user_previous_qsl_type')) {
+ $data['user_previous_qsl_type'] = $this->input->post('user_previous_qsl_type', false);
+ } else {
+ $data['user_previous_qsl_type'] = $q->user_previous_qsl_type;
+ }
+
if($this->input->post('user_column1')) {
$data['user_column1'] = $this->input->post('user_column1', true);
} else {
@@ -418,6 +429,7 @@ class User extends CI_Controller {
$data['user_column4'] = $this->input->post('user_column4');
$data['user_column5'] = $this->input->post('user_column5');
$data['user_show_profile_image'] = $this->input->post('user_show_profile_image');
+ $data['user_previous_qsl_type'] = $this->input->post('user_previous_qsl_type');
$this->load->view('user/edit');
$this->load->view('interface_assets/footer');
}
diff --git a/application/language/bulgarian/qso_lang.php b/application/language/bulgarian/qso_lang.php
index 7e25aaf4..c709c76c 100644
--- a/application/language/bulgarian/qso_lang.php
+++ b/application/language/bulgarian/qso_lang.php
@@ -5,7 +5,7 @@ defined('BASEPATH') OR exit('Не е разрешен директен дост
// Tiles
$lang['qso_title_qso_map'] = 'Карта на QSO';
$lang['qso_title_suggestions'] = 'Предложения';
-$lang['qso_title_pervious_contacts'] = 'Предишни контакти';
+$lang['qso_title_previous_contacts'] = 'Предишни контакти';
// Input Help Text on the /QSO Display
$lang['qso_transmit_power_helptext'] = 'Посочете стойността на мощността във ватове. Въведете само цифри.';
diff --git a/application/language/chinese_simplified/qso_lang.php b/application/language/chinese_simplified/qso_lang.php
index e19987ec..f9f793d6 100644
--- a/application/language/chinese_simplified/qso_lang.php
+++ b/application/language/chinese_simplified/qso_lang.php
@@ -5,7 +5,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
// Tiles
$lang['qso_title_qso_map'] = 'QSO 地图';
$lang['qso_title_suggestions'] = '建议';
-$lang['qso_title_pervious_contacts'] = '先前通联';
+$lang['qso_title_previous_contacts'] = '先前通联';
// Input Help Text on the /QSO Display
$lang['qso_transmit_power_helptext'] = '以瓦特为单位设置功率值。在输入中仅填写数值。';
diff --git a/application/language/czech/qso_lang.php b/application/language/czech/qso_lang.php
index e0746e56..059657bb 100644
--- a/application/language/czech/qso_lang.php
+++ b/application/language/czech/qso_lang.php
@@ -5,7 +5,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
// Tiles
$lang['qso_title_qso_map'] = 'Mapa spojení';
$lang['qso_title_suggestions'] = 'Návrhy';
-$lang['qso_title_pervious_contacts'] = 'Předchozí spojení';
+$lang['qso_title_previous_contacts'] = 'Předchozí spojení';
// Input Help Text on the /QSO Display
$lang['qso_transmit_power_helptext'] = 'Zadej výkon ve Wattech. Jsou povolen pouz čísla';
diff --git a/application/language/dutch/qso_lang.php b/application/language/dutch/qso_lang.php
index dc0f3f5b..55916e5e 100644
--- a/application/language/dutch/qso_lang.php
+++ b/application/language/dutch/qso_lang.php
@@ -5,7 +5,7 @@ defined('BASEPATH') OR exit('Directe toegang tot scripts is niet toegestaan');
// Tiles
$lang['qso_title_qso_map'] = 'QSO Kaart';
$lang['qso_title_suggestions'] = 'Suggesties';
-$lang['qso_title_pervious_contacts'] = 'Eerdere verbindingen';
+$lang['qso_title_previous_contacts'] = 'Eerdere verbindingen';
// Input Help Text on the /QSO Display
$lang['qso_transmit_power_helptext'] = 'Geef vermogen in Watt. Vermeld alleen cijfers.';
@@ -22,4 +22,4 @@ $lang['qso_notes_helptext'] = 'Notities worden alleen in Cloudlog gebruikt en wo
// Button Text on /qso Display
$lang['qso_btn_reset_qso'] = 'Wis QSO';
-$lang['qso_btn_save_qso'] = 'Bewaar QSO';
\ No newline at end of file
+$lang['qso_btn_save_qso'] = 'Bewaar QSO';
diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php
index e3613182..dad4ee33 100644
--- a/application/language/english/qso_lang.php
+++ b/application/language/english/qso_lang.php
@@ -5,7 +5,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
// Tiles
$lang['qso_title_qso_map'] = 'QSO Map';
$lang['qso_title_suggestions'] = 'Suggestions';
-$lang['qso_title_pervious_contacts'] = 'Previous Contacts';
+$lang['qso_title_previous_contacts'] = 'Previous Contacts';
$lang['qso_title_image'] = 'Profile Picture';
// Input Help Text on the /QSO Display
diff --git a/application/language/finnish/qso_lang.php b/application/language/finnish/qso_lang.php
index 1587628f..e7fa05de 100644
--- a/application/language/finnish/qso_lang.php
+++ b/application/language/finnish/qso_lang.php
@@ -5,7 +5,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
// Tiles
$lang['qso_title_qso_map'] = 'Vasta-aseman sijainti kartalla';
$lang['qso_title_suggestions'] = 'Kutsumerkkiehdotukset';
-$lang['qso_title_pervious_contacts'] = 'Edelliset yhteydet';
+$lang['qso_title_previous_contacts'] = 'Edelliset yhteydet';
// Input Help Text on the /QSO Display
$lang['qso_transmit_power_helptext'] = 'Anna teholukema Watteina käyttäen vain numeroita.';
diff --git a/application/language/french/qso_lang.php b/application/language/french/qso_lang.php
index 63927bd3..aab4e008 100644
--- a/application/language/french/qso_lang.php
+++ b/application/language/french/qso_lang.php
@@ -5,7 +5,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
// Tiles
$lang['qso_title_qso_map'] = 'Carte QSO';
$lang['qso_title_suggestions'] = 'Suggestions';
-$lang['qso_title_pervious_contacts'] = 'Contacts précédents';
+$lang['qso_title_previous_contacts'] = 'Contacts précédents';
// Input Help Text on the /QSO Display
$lang['qso_transmit_power_helptext'] = 'Saisissez la ouissance en Watts en utilisant uniquement des chiffres.';
diff --git a/application/language/german/qso_lang.php b/application/language/german/qso_lang.php
index 0c655db4..b6227d09 100644
--- a/application/language/german/qso_lang.php
+++ b/application/language/german/qso_lang.php
@@ -5,7 +5,7 @@ defined('BASEPATH') OR exit('Direkter Zugriff auf Skripte ist nicht erlaubt');
// Tiles
$lang['qso_title_qso_map'] = 'QSO-Karte';
$lang['qso_title_suggestions'] = 'Vorschläge';
-$lang['qso_title_pervious_contacts'] = 'Vorherige Kontakte';
+$lang['qso_title_previous_contacts'] = 'Vorherige Kontakte';
$lang['qso_title_image'] = 'Profilbild';
// Input Help Text on the /QSO Display
diff --git a/application/language/italian/qso_lang.php b/application/language/italian/qso_lang.php
index cb6d3653..375951cf 100644
--- a/application/language/italian/qso_lang.php
+++ b/application/language/italian/qso_lang.php
@@ -5,7 +5,7 @@ defined('BASEPATH') OR exit('Non è permesso l\'accesso diretto allo script');
// Tiles
$lang['qso_title_qso_map'] = 'Mappa QSO';
$lang['qso_title_suggestions'] = 'Suggerimenti';
-$lang['qso_title_pervious_contacts'] = 'Contatti Precedenti';
+$lang['qso_title_previous_contacts'] = 'Contatti Precedenti';
$lang['qso_title_image'] = 'Immagine Profilo';
// Input Help Text on the /QSO Display
diff --git a/application/language/polish/qso_lang.php b/application/language/polish/qso_lang.php
index ea1f4087..9c34a6fe 100644
--- a/application/language/polish/qso_lang.php
+++ b/application/language/polish/qso_lang.php
@@ -5,7 +5,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
// Tiles
$lang['qso_title_qso_map'] = 'Mapa łączności';
$lang['qso_title_suggestions'] = 'Sugestie';
-$lang['qso_title_pervious_contacts'] = 'Poprzednie łączności';
+$lang['qso_title_previous_contacts'] = 'Poprzednie łączności';
// Input Help Text on the /QSO Display
$lang['qso_transmit_power_helptext'] = 'Wpisz wartość mocy w watach. W polu podaj same cyfry.';
diff --git a/application/language/russian/qso_lang.php b/application/language/russian/qso_lang.php
index 423dcb6b..26d64f3b 100644
--- a/application/language/russian/qso_lang.php
+++ b/application/language/russian/qso_lang.php
@@ -5,7 +5,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
// Tiles
$lang['qso_title_qso_map'] = 'Карта QSO';
$lang['qso_title_suggestions'] = 'Предложения';
-$lang['qso_title_pervious_contacts'] = 'Предыдущие контакты';
+$lang['qso_title_previous_contacts'] = 'Предыдущие контакты';
$lang['qso_title_image'] = 'Profile Picture';
// Input Help Text on the /QSO Display
diff --git a/application/language/spanish/qso_lang.php b/application/language/spanish/qso_lang.php
index fb95d38a..027f71d9 100644
--- a/application/language/spanish/qso_lang.php
+++ b/application/language/spanish/qso_lang.php
@@ -5,7 +5,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
// Tiles
$lang['qso_title_qso_map'] = 'Mapa de QSO';
$lang['qso_title_suggestions'] = 'Sugerencias';
-$lang['qso_title_pervious_contacts'] = 'Contactos previos';
+$lang['qso_title_previous_contacts'] = 'Contactos previos';
// Input Help Text on the /QSO Display
$lang['qso_transmit_power_helptext'] = 'Especifique el valor de potencia en Watios (W). Incluya solo números.';
diff --git a/application/language/swedish/qso_lang.php b/application/language/swedish/qso_lang.php
index f822d7e5..bac7b921 100644
--- a/application/language/swedish/qso_lang.php
+++ b/application/language/swedish/qso_lang.php
@@ -5,7 +5,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
// Tiles
$lang['qso_title_qso_map'] = 'QSO-karta';
$lang['qso_title_suggestions'] = 'Förslag';
-$lang['qso_title_pervious_contacts'] = 'Föregående QSOn';
+$lang['qso_title_previous_contacts'] = 'Föregående QSOn';
$lang['qso_title_image'] = 'Profilbild';
// Input Help Text on the /QSO Display
diff --git a/application/language/turkish/qso_lang.php b/application/language/turkish/qso_lang.php
index 3295d5a3..fee94083 100644
--- a/application/language/turkish/qso_lang.php
+++ b/application/language/turkish/qso_lang.php
@@ -5,7 +5,7 @@ defined('BASEPATH') OR exit('Doğrudan komut dosyası erişimine izin verilmez')
// Tiles
$lang['qso_title_qso_map'] = 'QSO Haritası';
$lang['qso_title_suggestions'] = 'Öneriler';
-$lang['qso_title_pervious_contacts'] = 'Önceki Görüşmeler';
+$lang['qso_title_previous_contacts'] = 'Önceki Görüşmeler';
$lang['qso_title_image'] = 'Profil Resmi';
// Input Help Text on the /QSO Display
diff --git a/application/migrations/106_add_user_previous_qsl_type.php b/application/migrations/106_add_user_previous_qsl_type.php
new file mode 100644
index 00000000..2574753c
--- /dev/null
+++ b/application/migrations/106_add_user_previous_qsl_type.php
@@ -0,0 +1,28 @@
+db->field_exists('user_previous_qsl_type', 'users')) {
+ $fields = array(
+ 'user_previous_qsl_type integer DEFAULT 0',
+ );
+
+ $this->dbforge->add_column('users', $fields);
+ }
+ }
+
+ public function down()
+ {
+ if ($this->db->field_exists('user_previous_qsl_type', 'users')) {
+ $this->dbforge->drop_column('users', 'user_previous_qsl_type');
+ }
+ }
+}
diff --git a/application/models/Stations.php b/application/models/Stations.php
index 07bd4b7a..53d1ab0c 100644
--- a/application/models/Stations.php
+++ b/application/models/Stations.php
@@ -182,7 +182,6 @@ class Stations extends CI_Model {
'station_active' => null,
);
$this->db->where('user_id', $this->session->userdata('user_id'));
- $this->db->where('station_id', $clean_current);
$this->db->update('station_profile', $current_default);
// Deselect current default
diff --git a/application/models/User_model.php b/application/models/User_model.php
index ae8053a9..384a42b0 100644
--- a/application/models/User_model.php
+++ b/application/models/User_model.php
@@ -114,7 +114,7 @@ class User_Model extends CI_Model {
function add($username, $password, $email, $type, $firstname, $lastname, $callsign, $locator, $timezone,
$measurement, $user_date_format, $user_stylesheet, $user_qth_lookup, $user_sota_lookup, $user_wwff_lookup,
$user_show_notes, $user_column1, $user_column2, $user_column3, $user_column4, $user_column5,
- $user_show_profile_image) {
+ $user_show_profile_image, $user_previous_qsl_type) {
// Check that the user isn't already used
if(!$this->exists($username)) {
$data = array(
@@ -140,6 +140,7 @@ class User_Model extends CI_Model {
'user_column4' => xss_clean($user_column4),
'user_column5' => xss_clean($user_column5),
'user_show_profile_image' => xss_clean($user_show_profile_image),
+ 'user_previous_qsl_type' => xss_clean($user_previous_qsl_type),
);
// Check the password is valid
@@ -193,6 +194,7 @@ class User_Model extends CI_Model {
'user_column4' => xss_clean($fields['user_column4']),
'user_column5' => xss_clean($fields['user_column5']),
'user_show_profile_image' => xss_clean($fields['user_show_profile_image']),
+ 'user_previous_qsl_type' => xss_clean($fields['user_previous_qsl_type']),
);
// Check to see if the user is allowed to change user levels
@@ -310,6 +312,7 @@ class User_Model extends CI_Model {
'user_column3' => isset($u->row()->user_column3) ? $u->row()->user_column3: 'RSTR',
'user_column4' => isset($u->row()->user_column4) ? $u->row()->user_column4: 'Band',
'user_column5' => isset($u->row()->user_column5) ? $u->row()->user_column5: 'Country',
+ 'user_previous_qsl_type' => isset($u->row()->user_previous_qsl_type) ? $u->row()->user_previous_qsl_type: 0,
'active_station_logbook' => $u->row()->active_station_logbook,
);
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index f849b1c3..42dc5070 100755
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -503,7 +503,7 @@
-
+
diff --git a/application/views/user/add.php b/application/views/user/add.php
index 3c8b3570..4ca651b5 100644
--- a/application/views/user/add.php
+++ b/application/views/user/add.php
@@ -247,6 +247,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/application/views/view_log/partial/log.php b/application/views/view_log/partial/log.php
index f1d4fbc0..aec0283e 100644
--- a/application/views/view_log/partial/log.php
+++ b/application/views/view_log/partial/log.php
@@ -94,14 +94,14 @@
session->userdata('user_eqsl_name') != ""){ ?>
- ▲
-
- COL_EQSL_QSL_RCVD =='Y') { ?>
- COL_PRIMARY_KEY); ?>" data-fancybox="images" data-width="528" data-height="336">▼
-
- ▼
-
-
+ ▲
+
+ COL_EQSL_QSL_RCVD =='Y') { ?>
+ COL_PRIMARY_KEY); ?>" data-fancybox="images" data-width="528" data-height="336">▼
+
+ ▼
+
+
|
diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php
index ae0959f8..c61585ee 100644
--- a/application/views/view_log/partial/log_ajax.php
+++ b/application/views/view_log/partial/log_ajax.php
@@ -180,7 +180,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
COL_EQSL_QSL_SENT == "Y") { $timestamp = strtotime($row->COL_EQSL_QSLSDATE); echo "data-original-title=\"".$this->lang->line('eqsl_short')." ".$this->lang->line('general_word_sent')." ".($timestamp!=''?date($custom_date_format, $timestamp):'')."\" data-toggle=\"tooltip\""; } ?> class="eqsl-COL_EQSL_QSL_SENT=='Y')?'green':'red'?>">▲
COL_EQSL_QSL_RCVD == "Y") { $timestamp = strtotime($row->COL_EQSL_QSLRDATE); echo "data-original-title=\"".$this->lang->line('eqsl_short')." ".$this->lang->line('general_word_received')." ".($timestamp!=''?date($custom_date_format, $timestamp):'')."\" data-toggle=\"tooltip\""; } ?> class="eqsl-COL_EQSL_QSL_RCVD=='Y')?'green':'red'?>">
COL_EQSL_QSL_RCVD =='Y') { ?>
- COL_PRIMARY_KEY); ?>" data-fancybox="images" data-width="528" data-height="336">▼
+ COL_PRIMARY_KEY); ?>" data-fancybox="images" data-width="528" data-height="336">▼
▼
diff --git a/assets/css/blue/overrides.css b/assets/css/blue/overrides.css
index 9d7ee9a1..07bd5095 100644
--- a/assets/css/blue/overrides.css
+++ b/assets/css/blue/overrides.css
@@ -13,46 +13,6 @@ thead>tr>td {
border-width: 2px;
}
-.eqsl-green {
- color: #00A000;
- font-size: 1.1em;
-}
-
-.eqsl-red {
- color: #F00;
- font-size: 1.1em;
-}
-
-.qsl-green {
- color: #00A000;
- font-size: 1.1em;
-}
-
-.qsl-red {
- color: #F00;
- font-size: 1.1em;
-}
-
-.qsl-yellow {
- color: #d39e00;
- font-size: 1.1em;
-}
-
-.qsl-grey {
- color: #dddddd;
- font-size: 1.1em;
-}
-
-.lotw-green {
- color: #00A000;
- font-size: 1.1em;
-}
-
-.lotw-red {
- color: #F00;
- font-size: 1.1em;
-}
-
.settings-nav {
margin-bottom: 15px;
list-style: none;
@@ -125,4 +85,4 @@ div.alert-danger {
.selectize-dropdown, .selectize-dropdown.form-control {
border-radius: 0;
-}
\ No newline at end of file
+}
diff --git a/assets/css/general.css b/assets/css/general.css
index ee7e5706..e2ee3495 100644
--- a/assets/css/general.css
+++ b/assets/css/general.css
@@ -146,38 +146,39 @@ TD.eqsl{
}
.eqsl-green{
- color: #00A000;
+ color: #00A000 !important;
font-size: 1.1em;
+ text-decoration: none !important;
}
.eqsl-red{
- color: #F00;
+ color: #F00 !important;
font-size: 1.1em;
}
.qsl-green{
- color: #00A000;
+ color: #00A000 !important;
font-size: 1.1em;
}
.qsl-red{
- color: #F00;
+ color: #F00 !important;
font-size: 1.1em;
}
.qsl-yellow{
- color: #d39e00;
+ color: #d39e00 !important;
font-size: 1.1em;
}
.qsl-grey{
- color: #dddddd;
+ color: #dddddd !important;
font-size: 1.1em;
}
TD.lotw{
width: 33px;
}
.lotw-green{
- color: #00A000;
+ color: #00A000 !important;
font-size: 1.1em;
}
.lotw-red{
- color: #F00;
+ color: #F00 !important;
font-size: 1.1em;
}
diff --git a/assets/js/sections/contesting.js b/assets/js/sections/contesting.js
index 6f9af9fb..ca546a0a 100644
--- a/assets/js/sections/contesting.js
+++ b/assets/js/sections/contesting.js
@@ -490,6 +490,7 @@ function restoreContestSession() {
});
if (!$.fn.DataTable.isDataTable('.qsotable')) {
$('.qsotable').DataTable({
+ "stateSave": true,
"pageLength": 25,
responsive: false,
"scrollY": "400px",
diff --git a/assets/js/sections/station_locations.js b/assets/js/sections/station_locations.js
index 508a57ad..b1798657 100644
--- a/assets/js/sections/station_locations.js
+++ b/assets/js/sections/station_locations.js
@@ -1,3 +1,5 @@
$(document).ready( function () {
- $('#station_locations_table').DataTable();
-} );
\ No newline at end of file
+ $('#station_locations_table').DataTable({
+ "stateSave": true
+ });
+} );
diff --git a/assets/js/sections/station_logbooks.js b/assets/js/sections/station_logbooks.js
index 90294868..04de1df9 100644
--- a/assets/js/sections/station_logbooks.js
+++ b/assets/js/sections/station_logbooks.js
@@ -1,7 +1,11 @@
$(document).ready( function () {
- $('#station_logbooks_table').DataTable();
+ $('#station_logbooks_table').DataTable({
+ "stateSave": true
+ });
} );
$(document).ready( function () {
- $('#station_logbooks_linked_table').DataTable();
-} );
\ No newline at end of file
+ $('#station_logbooks_linked_table').DataTable({
+ "stateSave": true
+ });
+} );