From 8e9520815654b40782c28c7c4a0015d622ff3220 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 8 Oct 2023 22:08:31 +0200 Subject: [PATCH 01/26] Quicklog Feature --- application/language/bulgarian/qso_lang.php | 3 +++ .../language/chinese_simplified/qso_lang.php | 3 +++ application/language/czech/qso_lang.php | 3 +++ application/language/dutch/qso_lang.php | 3 +++ application/language/english/qso_lang.php | 3 +++ application/language/finnish/qso_lang.php | 3 +++ application/language/french/qso_lang.php | 3 +++ application/language/german/qso_lang.php | 3 +++ application/language/greek/qso_lang.php | 3 +++ application/language/italian/qso_lang.php | 3 +++ application/language/polish/qso_lang.php | 3 +++ application/language/russian/qso_lang.php | 3 +++ application/language/spanish/qso_lang.php | 3 +++ application/language/swedish/qso_lang.php | 3 +++ application/language/turkish/qso_lang.php | 3 +++ application/views/dashboard/index.php | 13 +++++++++++++ application/views/qso/index.php | 2 +- 17 files changed, 59 insertions(+), 1 deletion(-) diff --git a/application/language/bulgarian/qso_lang.php b/application/language/bulgarian/qso_lang.php index 34aab035..a840821c 100644 --- a/application/language/bulgarian/qso_lang.php +++ b/application/language/bulgarian/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Предложения'; $lang['qso_title_previous_contacts'] = 'Предишни контакти'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // 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 37399d7a..02009698 100644 --- a/application/language/chinese_simplified/qso_lang.php +++ b/application/language/chinese_simplified/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = '建议'; $lang['qso_title_previous_contacts'] = '先前通联'; $lang['qso_title_image'] = '操作员照片'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // 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 68d29fe9..9d62916e 100644 --- a/application/language/czech/qso_lang.php +++ b/application/language/czech/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Návrhy'; $lang['qso_title_previous_contacts'] = 'Předchozí spojení'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // 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 9c4655c5..8592720e 100644 --- a/application/language/dutch/qso_lang.php +++ b/application/language/dutch/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Suggesties'; $lang['qso_title_previous_contacts'] = 'Eerdere verbindingen'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Geef vermogen in Watt. Vermeld alleen cijfers.'; diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index f8bf8203..1fe5f9ea 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Suggestions'; $lang['qso_title_previous_contacts'] = 'Previous Contacts'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Give power value in Watts. Include only numbers in the input.'; diff --git a/application/language/finnish/qso_lang.php b/application/language/finnish/qso_lang.php index 9207145f..71fcc003 100644 --- a/application/language/finnish/qso_lang.php +++ b/application/language/finnish/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Kutsumerkkiehdotukset'; $lang['qso_title_previous_contacts'] = 'Edelliset yhteydet'; $lang['qso_title_image'] = 'Profiilikuva'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // 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 b64ac41d..79bb8678 100644 --- a/application/language/french/qso_lang.php +++ b/application/language/french/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Suggestions'; $lang['qso_title_previous_contacts'] = 'Contacts précédents'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // 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 229d2bc2..998c57e6 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Vorschläge'; $lang['qso_title_previous_contacts'] = 'Vorherige Kontakte'; $lang['qso_title_image'] = 'Profilbild'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Gib die Ausgangsleistung in Watt an. Erfasse nur Zahlen bei der Eingabe.'; diff --git a/application/language/greek/qso_lang.php b/application/language/greek/qso_lang.php index 1a398b3f..2ae3ff19 100644 --- a/application/language/greek/qso_lang.php +++ b/application/language/greek/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Εισήγησης'; $lang['qso_title_previous_contacts'] = 'Προηγούμενες Επαφές'; $lang['qso_title_image'] = 'Εικόνα προφίλ'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Δώστε τιμή ισχύος σε Watts. Συμπεριλάβετε μόνο αριθμούς στην εισαγωγή.'; diff --git a/application/language/italian/qso_lang.php b/application/language/italian/qso_lang.php index 9f7618ec..f64db612 100644 --- a/application/language/italian/qso_lang.php +++ b/application/language/italian/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Suggerimenti'; $lang['qso_title_previous_contacts'] = 'Contatti Precedenti'; $lang['qso_title_image'] = 'Immagine Profilo'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Dare valore di potenza in Watt. Includere solo numeri nell input.'; diff --git a/application/language/polish/qso_lang.php b/application/language/polish/qso_lang.php index 42804a26..c471e832 100644 --- a/application/language/polish/qso_lang.php +++ b/application/language/polish/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Sugestie'; $lang['qso_title_previous_contacts'] = 'Poprzednie łączności'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // 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 c6d1f084..8b28d263 100644 --- a/application/language/russian/qso_lang.php +++ b/application/language/russian/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Предложения'; $lang['qso_title_previous_contacts'] = 'Предыдущие контакты'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Укажите мощность в Ваттах (только цифры).'; diff --git a/application/language/spanish/qso_lang.php b/application/language/spanish/qso_lang.php index fdd4967c..002686c2 100644 --- a/application/language/spanish/qso_lang.php +++ b/application/language/spanish/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Sugerencias'; $lang['qso_title_previous_contacts'] = 'Contactos previos'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // 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 673be8bd..78b45b84 100644 --- a/application/language/swedish/qso_lang.php +++ b/application/language/swedish/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Förslag'; $lang['qso_title_previous_contacts'] = 'Föregående QSOn'; $lang['qso_title_image'] = 'Profilbild'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Ange effekt i watt, enbart med siffror.'; diff --git a/application/language/turkish/qso_lang.php b/application/language/turkish/qso_lang.php index 9b9f8253..e3561d5d 100644 --- a/application/language/turkish/qso_lang.php +++ b/application/language/turkish/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Öneriler'; $lang['qso_title_previous_contacts'] = 'Önceki Görüşmeler'; $lang['qso_title_image'] = 'Profil Resmi'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Gücü Watt olarak veriniz. Sadece rakamları giriniz.'; diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index 38ad16c9..8e43dbd8 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -165,6 +165,19 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
+
+

+
+ +
+ + + +
+ + diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 3f9a6850..14ac7b42 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -74,7 +74,7 @@
optionslib->get_option('dxcache_url') != '') { ?>  - +
From dc66ebbb87ad91bb8d78a6d635a42c29c105f286 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 8 Oct 2023 22:12:46 +0200 Subject: [PATCH 02/26] German Translation --- application/language/german/qso_lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/language/german/qso_lang.php b/application/language/german/qso_lang.php index 998c57e6..52fec3eb 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -9,7 +9,7 @@ $lang['qso_title_previous_contacts'] = 'Vorherige Kontakte'; $lang['qso_title_image'] = 'Profilbild'; // Quicklog on Dashboard -$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Rufzeichen'; // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Gib die Ausgangsleistung in Watt an. Erfasse nur Zahlen bei der Eingabe.'; From 0f75d83fb6c880fe8bfe01523435c328dd2cbf0c Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 8 Oct 2023 22:33:16 +0200 Subject: [PATCH 03/26] Corrected PHP Error callsign value --- application/views/qso/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 14ac7b42..30ea8085 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -74,7 +74,7 @@
optionslib->get_option('dxcache_url') != '') { ?>  - +
From 8dcf30e257f3d661d99d75ffc326b43c70c4ba29 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 16 Oct 2023 22:17:19 +0200 Subject: [PATCH 04/26] correction of not needed element --- application/views/dashboard/index.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index 8e43dbd8..3986aa30 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -165,10 +165,6 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
-
-

-
-
From 139668fcc81468b0755f23dd5e1fe822d59792fa Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 18:31:07 +0100 Subject: [PATCH 05/26] created migration for quicklog user option --- application/migrations/151_user_quicklog.php | 29 ++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 application/migrations/151_user_quicklog.php diff --git a/application/migrations/151_user_quicklog.php b/application/migrations/151_user_quicklog.php new file mode 100644 index 00000000..f55fb23c --- /dev/null +++ b/application/migrations/151_user_quicklog.php @@ -0,0 +1,29 @@ +db->field_exists('user_quicklog', 'users')) { + $fields = array( + 'user_quicklog integer DEFAULT 0 AFTER user_default_confirmation', + ); + + $this->dbforge->add_column('users', $fields); + } + } + + public function down() + { + if ($this->db->field_exists('user_quicklog', 'users')) { + $this->dbforge->drop_column('users', 'user_quicklog'); + } + } +} \ No newline at end of file From a160663009d0b1b1c0b3851ac8c3834803ba7c99 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 18:31:23 +0100 Subject: [PATCH 06/26] updated migration config --- application/config/migration.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/config/migration.php b/application/config/migration.php index 7756a324..f855e92f 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE; | */ -$config['migration_version'] = 150; +$config['migration_version'] = 151; /* |-------------------------------------------------------------------------- From 6be6309d0f515c0819b3cc66799c857c991a8990 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 18:31:46 +0100 Subject: [PATCH 07/26] added quicklog to User Controller --- application/controllers/User.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/application/controllers/User.php b/application/controllers/User.php index 7bb77a03..4ce09fc7 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -91,6 +91,7 @@ class User extends CI_Controller { $data['user_default_band'] = $this->input->post('user_default_band'); $data['user_default_confirmation'] = ($this->input->post('user_default_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_default_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_default_confirmation_eqsl') !== null ? 'E' : ''); $data['user_qso_end_times'] = $this->input->post('user_qso_end_times'); + $data['user_quicklog'] = $this->input->post('user_quicklog'); $data['language'] = $this->input->post('language'); $this->load->view('user/add', $data); } else { @@ -127,6 +128,7 @@ class User extends CI_Controller { $this->input->post('user_default_band'), ($this->input->post('user_default_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_default_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_default_confirmation_eqsl') !== null ? 'E' : ''), $this->input->post('user_qso_end_times'), + $this->input->post('user_quicklog'), $this->input->post('language'), )) { // Check for errors @@ -175,6 +177,7 @@ class User extends CI_Controller { $data['user_default_band'] = $this->input->post('user_default_band'); $data['user_default_confirmation'] = ($this->input->post('user_default_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_default_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_default_confirmation_eqsl') !== null ? 'E' : ''); $data['user_qso_end_times'] = $this->input->post('user_qso_end_times'); + $data['user_quicklog'] = $this->input->post('user_quicklog'); $data['language'] = $this->input->post('language'); $this->load->view('user/add', $data); $this->load->view('interface_assets/footer'); @@ -398,6 +401,12 @@ class User extends CI_Controller { $data['user_qso_end_times'] = $q->user_qso_end_times; } + if($this->input->post('user_quicklog')) { + $data['user_quicklog'] = $this->input->post('user_quicklog', true); + } else { + $data['user_quicklog'] = $q->user_quicklog; + } + if($this->input->post('user_show_profile_image')) { $data['user_show_profile_image'] = $this->input->post('user_show_profile_image', false); } else { @@ -539,6 +548,7 @@ class User extends CI_Controller { $data['user_default_band'] = $this->input->post('user_default_band'); $data['user_default_confirmation'] = ($this->input->post('user_default_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_default_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_default_confirmation_eqsl') !== null ? 'E' : ''); $data['user_qso_end_times'] = $this->input->post('user_qso_end_times'); + $data['user_quicklog'] = $this->input->post('user_quicklog'); $data['language'] = $this->input->post('language'); $data['user_winkey'] = $this->input->post('user_winkey'); $this->load->view('user/edit'); From 802c4ab2e6c971bd3566a9cb0de12fe91a94b38b Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 18:31:59 +0100 Subject: [PATCH 08/26] added quicklog to User Model --- application/models/User_model.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/application/models/User_model.php b/application/models/User_model.php index 46eb03da..b43e25db 100644 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -124,7 +124,7 @@ class User_Model extends CI_Model { $measurement, $user_date_format, $user_stylesheet, $user_qth_lookup, $user_sota_lookup, $user_wwff_lookup, $user_pota_lookup, $user_show_notes, $user_column1, $user_column2, $user_column3, $user_column4, $user_column5, $user_show_profile_image, $user_previous_qsl_type, $user_amsat_status_upload, $user_mastodon_url, - $user_default_band, $user_default_confirmation, $user_qso_end_times, $language) { + $user_default_band, $user_default_confirmation, $user_qso_end_times, $user_quicklog, $language) { // Check that the user isn't already used if(!$this->exists($username)) { $data = array( @@ -157,6 +157,7 @@ class User_Model extends CI_Model { 'user_default_band' => xss_clean($user_default_band), 'user_default_confirmation' => xss_clean($user_default_confirmation), 'user_qso_end_times' => xss_clean($user_qso_end_times), + 'user_quicklog' => xss_clean($user_quicklog), 'language' => xss_clean($language), ); @@ -219,6 +220,7 @@ class User_Model extends CI_Model { 'user_default_band' => xss_clean($fields['user_default_band']), 'user_default_confirmation' => (isset($fields['user_default_confirmation_qsl']) ? 'Q' : '').(isset($fields['user_default_confirmation_lotw']) ? 'L' : '').(isset($fields['user_default_confirmation_eqsl']) ? 'E' : ''), 'user_qso_end_times' => xss_clean($fields['user_qso_end_times']), + 'user_quicklog' => xss_clean($field['user_quicklog']), 'language' => xss_clean($fields['language']), 'winkey' => xss_clean($fields['user_winkey']), ); @@ -346,6 +348,7 @@ class User_Model extends CI_Model { 'user_default_band' => $u->row()->user_default_band, 'user_default_confirmation' => $u->row()->user_default_confirmation, 'user_qso_end_times' => isset($u->row()->user_qso_end_times) ? $u->row()->user_qso_end_times : 1, + 'user_quicklog' => isset($u->row()->user_quicklog) ? $u->row()->user_quicklog : 1, 'active_station_logbook' => $u->row()->active_station_logbook, 'language' => isset($u->row()->language) ? $u->row()->language: 'english', 'isWinkeyEnabled' => $u->row()->winkey, From 08fd2bc992db7d249502a15af304fd38945fc707 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 18:32:16 +0100 Subject: [PATCH 09/26] added Quicklog User Option --- application/views/user/add.php | 9 +++++++++ application/views/user/edit.php | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/application/views/user/add.php b/application/views/user/add.php index 58f0fb97..86c26097 100644 --- a/application/views/user/add.php +++ b/application/views/user/add.php @@ -165,6 +165,15 @@
+
+ + + Quicklog Feature Description +
+
+ + + + Quicklog Feature Description +
+
+ + + +
From e6238dbf66352de91bf9666cda1365fe2650a3f8 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 18:36:08 +0100 Subject: [PATCH 11/26] fixed typo --- application/models/User_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/models/User_model.php b/application/models/User_model.php index b43e25db..776eb3b0 100644 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -220,7 +220,7 @@ class User_Model extends CI_Model { 'user_default_band' => xss_clean($fields['user_default_band']), 'user_default_confirmation' => (isset($fields['user_default_confirmation_qsl']) ? 'Q' : '').(isset($fields['user_default_confirmation_lotw']) ? 'L' : '').(isset($fields['user_default_confirmation_eqsl']) ? 'E' : ''), 'user_qso_end_times' => xss_clean($fields['user_qso_end_times']), - 'user_quicklog' => xss_clean($field['user_quicklog']), + 'user_quicklog' => xss_clean($fields['user_quicklog']), 'language' => xss_clean($fields['language']), 'winkey' => xss_clean($fields['user_winkey']), ); From 9fd7c5c8b4971a89a5d7ebcc9d42b646e091e9ad Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 18:43:38 +0100 Subject: [PATCH 12/26] corrected migration --- application/migrations/151_user_quicklog.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/migrations/151_user_quicklog.php b/application/migrations/151_user_quicklog.php index f55fb23c..3d47d853 100644 --- a/application/migrations/151_user_quicklog.php +++ b/application/migrations/151_user_quicklog.php @@ -7,7 +7,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); * QUICKLOG Feature */ -class Migration_quicklog extends CI_Migration { +class Migration_user_quicklog extends CI_Migration { public function up() { From 6503787f26bd2830500d6e15d8efb26578f63785 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 18:57:09 +0100 Subject: [PATCH 13/26] added Translations --- application/language/bulgarian/account_lang.php | 2 ++ .../language/chinese_simplified/account_lang.php | 2 ++ application/language/czech/account_lang.php | 2 ++ application/language/dutch/account_lang.php | 2 ++ application/language/english/account_lang.php | 2 ++ application/language/finnish/account_lang.php | 2 ++ application/language/french/account_lang.php | 2 ++ application/language/german/account_lang.php | 2 ++ application/language/greek/account_lang.php | 2 ++ application/language/italian/account_lang.php | 2 ++ application/language/polish/account_lang.php | 2 ++ application/language/russian/account_lang.php | 2 ++ application/language/spanish/account_lang.php | 2 ++ application/language/swedish/account_lang.php | 6 ++++-- application/language/turkish/account_lang.php | 2 ++ application/views/user/add.php | 10 +++++----- application/views/user/edit.php | 4 ++-- 17 files changed, 39 insertions(+), 9 deletions(-) diff --git a/application/language/bulgarian/account_lang.php b/application/language/bulgarian/account_lang.php index 71f8718b..c0f3bbe6 100644 --- a/application/language/bulgarian/account_lang.php +++ b/application/language/bulgarian/account_lang.php @@ -37,6 +37,8 @@ $lang['account_timezone'] = 'Timezone'; $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; diff --git a/application/language/chinese_simplified/account_lang.php b/application/language/chinese_simplified/account_lang.php index 069c0a14..a6a1bf46 100644 --- a/application/language/chinese_simplified/account_lang.php +++ b/application/language/chinese_simplified/account_lang.php @@ -37,6 +37,8 @@ $lang['account_timezone'] = '时区'; $lang['account_date_format'] = '日期格式'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = '距离单位偏好'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = '选择您登录账户时要显示的日期格式'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = '选择距离单位'; diff --git a/application/language/czech/account_lang.php b/application/language/czech/account_lang.php index c295f5d1..5c84ec43 100644 --- a/application/language/czech/account_lang.php +++ b/application/language/czech/account_lang.php @@ -37,6 +37,8 @@ $lang['account_timezone'] = 'Časové pásmo'; $lang['account_date_format'] = 'Formát data'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Nastavení měření'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Vyberte, jak chcete, aby byla data zobrazena při přihlášení do vašeho účtu.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Vyberte, v jakých jednotkách se budou zobrazovat vzdálenosti.'; diff --git a/application/language/dutch/account_lang.php b/application/language/dutch/account_lang.php index 32280eb6..eb7cebd5 100644 --- a/application/language/dutch/account_lang.php +++ b/application/language/dutch/account_lang.php @@ -37,6 +37,8 @@ $lang['account_timezone'] = 'Timezone'; $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; diff --git a/application/language/english/account_lang.php b/application/language/english/account_lang.php index 753a3165..439277aa 100644 --- a/application/language/english/account_lang.php +++ b/application/language/english/account_lang.php @@ -37,6 +37,8 @@ $lang['account_timezone'] = 'Timezone'; $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; diff --git a/application/language/finnish/account_lang.php b/application/language/finnish/account_lang.php index c680f524..baafb9be 100644 --- a/application/language/finnish/account_lang.php +++ b/application/language/finnish/account_lang.php @@ -37,6 +37,8 @@ $lang['account_timezone'] = 'Aikavyöhyke'; $lang['account_date_format'] = 'Päivämäärämuoto'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Mittayksikkömuoto'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Valitse, miten haluat päivämäärät näkyvän, kun olet kirjautunut tilillesi.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Valitse, mitä mittayksikkömuotoa käytetään'; diff --git a/application/language/french/account_lang.php b/application/language/french/account_lang.php index db4d2c02..149f9255 100644 --- a/application/language/french/account_lang.php +++ b/application/language/french/account_lang.php @@ -37,6 +37,8 @@ $lang['account_timezone'] = 'Timezone'; $lang['account_date_format'] = 'Format de la date'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Unité de mesure'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = '(Sélectionnez le format de date à afficher)'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = '(Choisiez l\'unité de mesure à afficher)'; diff --git a/application/language/german/account_lang.php b/application/language/german/account_lang.php index 10e65ccf..4339ce5a 100644 --- a/application/language/german/account_lang.php +++ b/application/language/german/account_lang.php @@ -37,6 +37,8 @@ $lang['account_timezone'] = 'Zeitzone'; $lang['account_date_format'] = 'Datumsformat'; $lang['account_log_end_time'] = 'Logge Endzeiten für QSOs separat'; $lang['account_log_end_time_hint'] = 'Wenn aktiviert, werden QSO Endzeiten separat erfasst. Falls nicht, ist die QSO Endzeit gleich der Startzeit.'; +$lang['account_quicklog_feature'] = "Quicklog Feld"; +$lang['account_quicklog_feature_hint'] = "Mit dieser Option kannst du Rufzeichen auch direkt aus dem Suchfeld in der Menüleiste heraus loggen."; $lang['account_measurement_preferences'] = 'Entfernungsformat'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Wähle, wie Datumsfelder angezeigt werden sollen, wenn du eingeloggt bist.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Wähle, in welcher Einheit Entfernungen angezeigt werden sollen.'; diff --git a/application/language/greek/account_lang.php b/application/language/greek/account_lang.php index a4f5d22b..f4d6c614 100644 --- a/application/language/greek/account_lang.php +++ b/application/language/greek/account_lang.php @@ -37,6 +37,8 @@ $lang['account_timezone'] = 'Timezone'; $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; diff --git a/application/language/italian/account_lang.php b/application/language/italian/account_lang.php index 65cad6b6..70cdffd0 100644 --- a/application/language/italian/account_lang.php +++ b/application/language/italian/account_lang.php @@ -37,6 +37,8 @@ $lang['account_timezone'] = 'Timezone'; $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; diff --git a/application/language/polish/account_lang.php b/application/language/polish/account_lang.php index 873da71e..4be7683a 100644 --- a/application/language/polish/account_lang.php +++ b/application/language/polish/account_lang.php @@ -37,6 +37,8 @@ $lang['account_timezone'] = 'Timezone'; $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; diff --git a/application/language/russian/account_lang.php b/application/language/russian/account_lang.php index 51497241..23aee7c4 100644 --- a/application/language/russian/account_lang.php +++ b/application/language/russian/account_lang.php @@ -37,6 +37,8 @@ $lang['account_timezone'] = 'Часовой пояс'; $lang['account_date_format'] = 'Формат даты'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Единицы измерения'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Выберите представление даты для отображения в вашем аккаунте.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Выберите единицы измерения расстояния'; diff --git a/application/language/spanish/account_lang.php b/application/language/spanish/account_lang.php index f5d04adf..f08f063e 100644 --- a/application/language/spanish/account_lang.php +++ b/application/language/spanish/account_lang.php @@ -37,6 +37,8 @@ $lang['account_timezone'] = 'Timezone'; $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; diff --git a/application/language/swedish/account_lang.php b/application/language/swedish/account_lang.php index b9e40395..8546e8cf 100644 --- a/application/language/swedish/account_lang.php +++ b/application/language/swedish/account_lang.php @@ -13,8 +13,8 @@ $lang['account_create_user_account'] = 'Skapa användarkonto'; $lang['account_edit_account'] = 'Redigera användarkonto'; $lang['account_account_information'] = 'Användarkontoinformation'; -$lang['account_user'] = "User"; -$lang['account_word_edited'] = "edited"; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Användarnamn'; $lang['account_email_address'] = 'E-postadress'; $lang['account_password'] = 'Lösenord'; @@ -37,6 +37,8 @@ $lang['account_timezone'] = 'Tidszon'; $lang['account_date_format'] = 'Datumformat'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Välj hur du vill att datum ska visas när du är inloggad på ditt konto.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Välj i vilken enhetsavstånd som ska visas'; diff --git a/application/language/turkish/account_lang.php b/application/language/turkish/account_lang.php index 8dbffce2..ca11e715 100644 --- a/application/language/turkish/account_lang.php +++ b/application/language/turkish/account_lang.php @@ -37,6 +37,8 @@ $lang['account_timezone'] = 'Timezone'; $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; diff --git a/application/views/user/add.php b/application/views/user/add.php index 86c26097..843ad5dd 100644 --- a/application/views/user/add.php +++ b/application/views/user/add.php @@ -166,13 +166,13 @@
- + - Quicklog Feature Description -
+ +
diff --git a/application/views/user/edit.php b/application/views/user/edit.php index 45bbf73f..b036c46d 100644 --- a/application/views/user/edit.php +++ b/application/views/user/edit.php @@ -175,12 +175,12 @@
- + - Quicklog Feature Description +
From 605119f92fb79c1af07255cd630e2d0d22c52847 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 19:06:35 +0100 Subject: [PATCH 14/26] added translations --- application/language/bulgarian/menu_lang.php | 8 +++++--- application/language/chinese_simplified/menu_lang.php | 2 ++ application/language/czech/menu_lang.php | 2 ++ application/language/dutch/menu_lang.php | 2 ++ application/language/english/menu_lang.php | 2 ++ application/language/finnish/menu_lang.php | 2 ++ application/language/french/menu_lang.php | 2 ++ application/language/german/menu_lang.php | 2 ++ application/language/greek/menu_lang.php | 2 ++ application/language/italian/menu_lang.php | 2 ++ application/language/polish/menu_lang.php | 2 ++ application/language/russian/menu_lang.php | 2 ++ application/language/spanish/menu_lang.php | 2 ++ application/language/swedish/menu_lang.php | 2 ++ application/language/turkish/menu_lang.php | 2 ++ application/views/interface_assets/header.php | 4 ++-- 16 files changed, 35 insertions(+), 5 deletions(-) diff --git a/application/language/bulgarian/menu_lang.php b/application/language/bulgarian/menu_lang.php index e7c8a468..805cdfb2 100644 --- a/application/language/bulgarian/menu_lang.php +++ b/application/language/bulgarian/menu_lang.php @@ -11,7 +11,7 @@ $lang['menu_advanced'] = 'Advanced'; $lang['menu_qso'] = 'QSO'; $lang['menu_live_qso'] = 'Live QSO'; $lang['menu_post_qso'] = 'Post QSO'; -$lang['menu_fast_log_entry'] = "Simple Fast Log Entry"; +$lang['menu_fast_log_entry'] = "Simple Fast Log Entry"; $lang['menu_live_contest_logging'] = 'Live Contest Logging'; $lang['menu_post_contest_logging'] = 'Post Contest Logging'; $lang['menu_bandmap'] = 'Bandmap'; @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Update Country Files'; $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Search'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Account'; @@ -86,6 +88,6 @@ $lang['menu_help'] = 'Help'; $lang['menu_forum'] = 'Forum'; $lang['menu_logout'] = 'Logout'; -$lang['menu_ffma'] = "Fred Fish Memorial Award"; -$lang['menu_ja_gridmaster'] = 'JA Gridmaster'; +$lang['menu_ffma'] = "Fred Fish Memorial Award"; +$lang['menu_ja_gridmaster'] = 'JA Gridmaster'; $lang['menu_maintenance']='Maintenance'; diff --git a/application/language/chinese_simplified/menu_lang.php b/application/language/chinese_simplified/menu_lang.php index 24c7b816..e2816873 100644 --- a/application/language/chinese_simplified/menu_lang.php +++ b/application/language/chinese_simplified/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = '更新国家文件'; $lang['menu_debug_information'] = '调试信息'; $lang['menu_search_text'] = '搜索呼号'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = '搜索'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = '登录'; $lang['menu_account'] = '账户'; diff --git a/application/language/czech/menu_lang.php b/application/language/czech/menu_lang.php index 0281ab9d..3c2a0056 100644 --- a/application/language/czech/menu_lang.php +++ b/application/language/czech/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Aktualizace souborů'; $lang['menu_debug_information'] = 'Informace pro ladění'; $lang['menu_search_text'] = 'Hledat značku'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Hledat'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Přihlásit se'; $lang['menu_account'] = 'Účet'; diff --git a/application/language/dutch/menu_lang.php b/application/language/dutch/menu_lang.php index b2abb354..e863dfe3 100644 --- a/application/language/dutch/menu_lang.php +++ b/application/language/dutch/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Update Country Files'; $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Search'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Account'; diff --git a/application/language/english/menu_lang.php b/application/language/english/menu_lang.php index 56561034..46a39937 100644 --- a/application/language/english/menu_lang.php +++ b/application/language/english/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_themes'] = 'Themes'; $lang['menu_backup'] = 'Backup'; $lang['menu_update_country_files'] = 'Update Country Files'; $lang['menu_debug_information'] = 'Debug Information'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_search_button'] = 'Search'; $lang['menu_login_button'] = 'Login'; diff --git a/application/language/finnish/menu_lang.php b/application/language/finnish/menu_lang.php index 2cf11dcc..17041bb7 100644 --- a/application/language/finnish/menu_lang.php +++ b/application/language/finnish/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Päivitä Country Files'; $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Etsi kutsulla'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Etsi'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Kirjaudu'; $lang['menu_account'] = 'Käyttäjätili'; diff --git a/application/language/french/menu_lang.php b/application/language/french/menu_lang.php index 56561034..46a39937 100644 --- a/application/language/french/menu_lang.php +++ b/application/language/french/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_themes'] = 'Themes'; $lang['menu_backup'] = 'Backup'; $lang['menu_update_country_files'] = 'Update Country Files'; $lang['menu_debug_information'] = 'Debug Information'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_search_button'] = 'Search'; $lang['menu_login_button'] = 'Login'; diff --git a/application/language/german/menu_lang.php b/application/language/german/menu_lang.php index 8a0c244e..7bf9d0e1 100644 --- a/application/language/german/menu_lang.php +++ b/application/language/german/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Update Länderinformationen'; $lang['menu_debug_information'] = 'Debug Informationen'; $lang['menu_search_text'] = 'Rufzeichensuche'; +$lang['menu_search_text_quicklog'] = "Logge/Suche Call"; //"Rufzeichen" wäre zu lang, daher nur "Call". Das wird verstanden. $lang['menu_search_button'] = 'Suche'; +$lang['menu_search_button_qicksearch_log'] = "Logge"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Konto'; diff --git a/application/language/greek/menu_lang.php b/application/language/greek/menu_lang.php index ef9418a1..c511cf4b 100644 --- a/application/language/greek/menu_lang.php +++ b/application/language/greek/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Update Country Files'; $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Search'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Account'; diff --git a/application/language/italian/menu_lang.php b/application/language/italian/menu_lang.php index ef9418a1..c511cf4b 100644 --- a/application/language/italian/menu_lang.php +++ b/application/language/italian/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Update Country Files'; $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Search'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Account'; diff --git a/application/language/polish/menu_lang.php b/application/language/polish/menu_lang.php index ef9418a1..c511cf4b 100644 --- a/application/language/polish/menu_lang.php +++ b/application/language/polish/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Update Country Files'; $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Search'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Account'; diff --git a/application/language/russian/menu_lang.php b/application/language/russian/menu_lang.php index f812cc5e..e773f528 100644 --- a/application/language/russian/menu_lang.php +++ b/application/language/russian/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Обновить файлы стран'; $lang['menu_debug_information'] = 'Отладочная информация'; $lang['menu_search_text'] = 'Поиск позывного'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Поиск'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Вход'; $lang['menu_account'] = 'Аккаунт'; diff --git a/application/language/spanish/menu_lang.php b/application/language/spanish/menu_lang.php index ef9418a1..c511cf4b 100644 --- a/application/language/spanish/menu_lang.php +++ b/application/language/spanish/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Update Country Files'; $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Search'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Account'; diff --git a/application/language/swedish/menu_lang.php b/application/language/swedish/menu_lang.php index 786d8e1a..95e2a6d6 100644 --- a/application/language/swedish/menu_lang.php +++ b/application/language/swedish/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Uppdatera landsfiler'; $lang['menu_debug_information'] = 'Debug Info'; $lang['menu_search_text'] = 'Sök Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Sök'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Logga in'; $lang['menu_account'] = 'Konto'; diff --git a/application/language/turkish/menu_lang.php b/application/language/turkish/menu_lang.php index ef9418a1..c511cf4b 100644 --- a/application/language/turkish/menu_lang.php +++ b/application/language/turkish/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Update Country Files'; $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Search'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Account'; diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 4866a32d..2e462032 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -224,8 +224,8 @@ session->userdata('user_quicklog') == 1) { ?> - - + + From 04ff8d7434330e98e06704f8e37582de407cf1c8 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 21:15:36 +0100 Subject: [PATCH 15/26] implemented search and qso redirect --- application/views/interface_assets/header.php | 41 +++++++++++++++---- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 2e462032..54273669 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -171,7 +171,7 @@
-
+
SAT Timers
@@ -221,17 +221,42 @@ - + + session->userdata('user_quicklog') == 1) { ?> -
+ - - + + + + + - +
- + @@ -366,4 +391,4 @@
- + \ No newline at end of file From 171dabec1810095083a31344f0d4f802973099c3 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 21:34:08 +0100 Subject: [PATCH 16/26] replaced js to save ressources if ql. is disabled --- application/views/interface_assets/header.php | 41 ++++++++++--------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 54273669..7680a1eb 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -164,7 +164,9 @@
  • - +
    Hams.at optionslib->get_option('dxcache_url') != '') { ?> @@ -178,7 +180,9 @@ config->item('use_auth')) && ($this->session->userdata('user_type') == 99)) { ?>
  • - +
    @@ -221,24 +225,23 @@ - - session->userdata('user_quicklog') == 1) { ?> +
    From 1902bf1fb2ede7cf0fb39044c994fd8ab6a75616 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 21:36:54 +0100 Subject: [PATCH 17/26] removed 1st quicklog draft from dashboard --- application/views/dashboard/index.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index 52e41a82..2e66e543 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -188,15 +188,6 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
    - - - - - - -
    • From c9a9ebe7edd410a70149823ee688fe4687061682 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 21:39:48 +0100 Subject: [PATCH 18/26] set quicklog to live qso mode --- application/views/interface_assets/header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 7680a1eb..d070f543 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -237,7 +237,7 @@ form.action = ""; form.method = "get"; input.name = "manual"; - input.value = "1"; + input.value = "0"; // Set to 1 if go to "Post-QSO" logging } form.submit(); } From 3c1d08f4cbfb3e0049a21e3854f4584fce232317 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 23:05:24 +0100 Subject: [PATCH 19/26] added handlekeyPress --- application/views/interface_assets/header.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index d070f543..c95c364f 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -241,9 +241,14 @@ } form.submit(); } + function handleKeyPress(event) { + if (event.key === 'Enter') { + submitForm('qso'); // Treat Enter key press as clicking the 'quicksearch-log' button + } + }
    - +