From 99108e7dd92e57178f8f2f52dbf57b2b651b6346 Mon Sep 17 00:00:00 2001 From: HB9HIL <80885850+HB9HIL@users.noreply.github.com> Date: Wed, 4 Oct 2023 01:17:48 +0200 Subject: [PATCH 01/29] Add new Filter --- application/views/logbookadvanced/index.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index f9575753..4e65cc9b 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -234,6 +234,17 @@ $options = json_decode($options); +
+ + + + + + + + + +
- - + + -
From 863a0870e6a932eb70f4b9b56b80f4dc9c0e7858 Mon Sep 17 00:00:00 2001 From: HB9HIL <80885850+HB9HIL@users.noreply.github.com> Date: Wed, 4 Oct 2023 08:29:35 +0200 Subject: [PATCH 05/29] Add new Filter --- application/controllers/Logbookadvanced.php | 2 ++ application/views/logbookadvanced/index.php | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php index a43d3a17..888a0a52 100644 --- a/application/controllers/Logbookadvanced.php +++ b/application/controllers/Logbookadvanced.php @@ -254,6 +254,7 @@ class Logbookadvanced extends CI_Controller { 'band' => '', 'qslSent' => '', 'qslReceived' => '', + 'qslMethod' => '', 'iota' => '', 'dxcc' => '', 'propmode' => '', @@ -291,6 +292,7 @@ class Logbookadvanced extends CI_Controller { 'band' => xss_clean($this->input->post('band')), 'qslSent' => xss_clean($this->input->post('qslSent')), 'qslReceived' => xss_clean($this->input->post('qslReceived')), + 'qslMethod' => xss_clean($this->input->post('qslMethod')), 'iota' => xss_clean($this->input->post('iota')), 'dxcc' => xss_clean($this->input->post('dxcc')), 'propmode' => xss_clean($this->input->post('propmode')), diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index 3ac40e0c..3f55d67f 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -236,13 +236,13 @@ $options = json_decode($options);
- +
From 7a4836291dfc469c7628e709c847f83d518a05c9 Mon Sep 17 00:00:00 2001 From: HB9HIL <80885850+HB9HIL@users.noreply.github.com> Date: Wed, 4 Oct 2023 08:35:46 +0200 Subject: [PATCH 06/29] Add new Filter --- application/views/logbookadvanced/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index 3f55d67f..6843a8c2 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -236,7 +236,7 @@ $options = json_decode($options);
- From fa3d024720c7bfc83e99e8a61d8203c4b422fd4e Mon Sep 17 00:00:00 2001 From: HB9HIL <80885850+HB9HIL@users.noreply.github.com> Date: Wed, 4 Oct 2023 09:27:28 +0200 Subject: [PATCH 07/29] Add new Filter --- application/controllers/Logbookadvanced.php | 6 ++++-- application/language/bulgarian/filter_lang.php | 3 ++- .../language/chinese_simplified/filter_lang.php | 3 ++- application/language/czech/filter_lang.php | 3 ++- application/language/dutch/filter_lang.php | 3 ++- application/language/english/filter_lang.php | 3 ++- application/language/finnish/filter_lang.php | 3 ++- application/language/french/filter_lang.php | 3 ++- application/language/german/filter_lang.php | 3 ++- application/language/greek/filter_lang.php | 3 ++- application/language/italian/filter_lang.php | 3 ++- application/language/polish/filter_lang.php | 3 ++- application/language/russian/filter_lang.php | 3 ++- application/language/spanish/filter_lang.php | 3 ++- application/language/swedish/filter_lang.php | 3 ++- application/language/turkish/filter_lang.php | 3 ++- application/models/Logbookadvanced_model.php | 15 ++++++++------- application/views/logbookadvanced/index.php | 14 ++++++++++++-- 18 files changed, 54 insertions(+), 26 deletions(-) diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php index 888a0a52..dacd9175 100644 --- a/application/controllers/Logbookadvanced.php +++ b/application/controllers/Logbookadvanced.php @@ -105,7 +105,8 @@ class Logbookadvanced extends CI_Controller { 'band' => xss_clean($this->input->post('band')), 'qslSent' => xss_clean($this->input->post('qslSent')), 'qslReceived' => xss_clean($this->input->post('qslReceived')), - 'qslMethod' => xss_clean($this->input->post('qslMethod')), + 'qslSentMethod' => xss_clean($this->input->post('qslSentMethod')), + 'qslReceivedMethod' => xss_clean($this->input->post('qslReceivedMethod')), 'iota' => xss_clean($this->input->post('iota')), 'dxcc' => xss_clean($this->input->post('dxcc')), 'propmode' => xss_clean($this->input->post('propmode')), @@ -292,7 +293,8 @@ class Logbookadvanced extends CI_Controller { 'band' => xss_clean($this->input->post('band')), 'qslSent' => xss_clean($this->input->post('qslSent')), 'qslReceived' => xss_clean($this->input->post('qslReceived')), - 'qslMethod' => xss_clean($this->input->post('qslMethod')), + 'qslSentMethod' => xss_clean($this->input->post('qslSentMethod')), + 'qslReceivedMethod' => xss_clean($this->input->post('qslReceivedMethod')), 'iota' => xss_clean($this->input->post('iota')), 'dxcc' => xss_clean($this->input->post('dxcc')), 'propmode' => xss_clean($this->input->post('propmode')), diff --git a/application/language/bulgarian/filter_lang.php b/application/language/bulgarian/filter_lang.php index 793893c7..869278f7 100644 --- a/application/language/bulgarian/filter_lang.php +++ b/application/language/bulgarian/filter_lang.php @@ -46,7 +46,8 @@ ________________________________________________________________________________ $lang['filter_qsl_sent'] = 'QSL sent'; $lang['filter_qsl_recv'] = 'QSL received'; -$lang['filter_qsl_method'] = 'QSL Method'; +$lang['filter_qsl_sent_method'] = 'QSL Sending Method'; +$lang['filter_qsl_recv_method'] = 'QSL Receiving Method'; $lang['filter_lotw_sent'] = 'LoTW sent'; $lang['filter_lotw_recv'] = 'LoTW received'; $lang['filter_eqsl_sent'] = 'eQSL sent'; diff --git a/application/language/chinese_simplified/filter_lang.php b/application/language/chinese_simplified/filter_lang.php index 793893c7..869278f7 100644 --- a/application/language/chinese_simplified/filter_lang.php +++ b/application/language/chinese_simplified/filter_lang.php @@ -46,7 +46,8 @@ ________________________________________________________________________________ $lang['filter_qsl_sent'] = 'QSL sent'; $lang['filter_qsl_recv'] = 'QSL received'; -$lang['filter_qsl_method'] = 'QSL Method'; +$lang['filter_qsl_sent_method'] = 'QSL Sending Method'; +$lang['filter_qsl_recv_method'] = 'QSL Receiving Method'; $lang['filter_lotw_sent'] = 'LoTW sent'; $lang['filter_lotw_recv'] = 'LoTW received'; $lang['filter_eqsl_sent'] = 'eQSL sent'; diff --git a/application/language/czech/filter_lang.php b/application/language/czech/filter_lang.php index 793893c7..869278f7 100644 --- a/application/language/czech/filter_lang.php +++ b/application/language/czech/filter_lang.php @@ -46,7 +46,8 @@ ________________________________________________________________________________ $lang['filter_qsl_sent'] = 'QSL sent'; $lang['filter_qsl_recv'] = 'QSL received'; -$lang['filter_qsl_method'] = 'QSL Method'; +$lang['filter_qsl_sent_method'] = 'QSL Sending Method'; +$lang['filter_qsl_recv_method'] = 'QSL Receiving Method'; $lang['filter_lotw_sent'] = 'LoTW sent'; $lang['filter_lotw_recv'] = 'LoTW received'; $lang['filter_eqsl_sent'] = 'eQSL sent'; diff --git a/application/language/dutch/filter_lang.php b/application/language/dutch/filter_lang.php index 793893c7..869278f7 100644 --- a/application/language/dutch/filter_lang.php +++ b/application/language/dutch/filter_lang.php @@ -46,7 +46,8 @@ ________________________________________________________________________________ $lang['filter_qsl_sent'] = 'QSL sent'; $lang['filter_qsl_recv'] = 'QSL received'; -$lang['filter_qsl_method'] = 'QSL Method'; +$lang['filter_qsl_sent_method'] = 'QSL Sending Method'; +$lang['filter_qsl_recv_method'] = 'QSL Receiving Method'; $lang['filter_lotw_sent'] = 'LoTW sent'; $lang['filter_lotw_recv'] = 'LoTW received'; $lang['filter_eqsl_sent'] = 'eQSL sent'; diff --git a/application/language/english/filter_lang.php b/application/language/english/filter_lang.php index 793893c7..869278f7 100644 --- a/application/language/english/filter_lang.php +++ b/application/language/english/filter_lang.php @@ -46,7 +46,8 @@ ________________________________________________________________________________ $lang['filter_qsl_sent'] = 'QSL sent'; $lang['filter_qsl_recv'] = 'QSL received'; -$lang['filter_qsl_method'] = 'QSL Method'; +$lang['filter_qsl_sent_method'] = 'QSL Sending Method'; +$lang['filter_qsl_recv_method'] = 'QSL Receiving Method'; $lang['filter_lotw_sent'] = 'LoTW sent'; $lang['filter_lotw_recv'] = 'LoTW received'; $lang['filter_eqsl_sent'] = 'eQSL sent'; diff --git a/application/language/finnish/filter_lang.php b/application/language/finnish/filter_lang.php index 793893c7..869278f7 100644 --- a/application/language/finnish/filter_lang.php +++ b/application/language/finnish/filter_lang.php @@ -46,7 +46,8 @@ ________________________________________________________________________________ $lang['filter_qsl_sent'] = 'QSL sent'; $lang['filter_qsl_recv'] = 'QSL received'; -$lang['filter_qsl_method'] = 'QSL Method'; +$lang['filter_qsl_sent_method'] = 'QSL Sending Method'; +$lang['filter_qsl_recv_method'] = 'QSL Receiving Method'; $lang['filter_lotw_sent'] = 'LoTW sent'; $lang['filter_lotw_recv'] = 'LoTW received'; $lang['filter_eqsl_sent'] = 'eQSL sent'; diff --git a/application/language/french/filter_lang.php b/application/language/french/filter_lang.php index 6024ae20..6421792c 100644 --- a/application/language/french/filter_lang.php +++ b/application/language/french/filter_lang.php @@ -46,7 +46,8 @@ ________________________________________________________________________________ $lang['filter_qsl_sent'] = 'QSL sent'; $lang['filter_qsl_recv'] = 'QSL received'; -$lang['filter_qsl_method'] = 'QSL Method'; +$lang['filter_qsl_sent_method'] = 'QSL Sending Method'; +$lang['filter_qsl_recv_method'] = 'QSL Receiving Method'; $lang['filter_lotw_sent'] = 'LoTW sent'; $lang['filter_lotw_recv'] = 'LoTW received'; $lang['filter_eqsl_sent'] = 'eQSL sent'; diff --git a/application/language/german/filter_lang.php b/application/language/german/filter_lang.php index c95f0adc..37470ed9 100644 --- a/application/language/german/filter_lang.php +++ b/application/language/german/filter_lang.php @@ -46,7 +46,8 @@ ________________________________________________________________________________ $lang['filter_qsl_sent'] = 'QSL gesendet'; $lang['filter_qsl_recv'] = 'QSL erhalten'; -$lang['filter_qsl_method'] = 'QSL Methode'; +$lang['filter_qsl_sent_method'] = 'QSL-Sende Methode'; +$lang['filter_qsl_recv_method'] = 'QSL-Empfangs Methode'; $lang['filter_lotw_sent'] = 'LoTW gesendet'; $lang['filter_lotw_recv'] = 'LoTW erhalten'; $lang['filter_eqsl_sent'] = 'eQSL gesendet'; diff --git a/application/language/greek/filter_lang.php b/application/language/greek/filter_lang.php index 793893c7..869278f7 100644 --- a/application/language/greek/filter_lang.php +++ b/application/language/greek/filter_lang.php @@ -46,7 +46,8 @@ ________________________________________________________________________________ $lang['filter_qsl_sent'] = 'QSL sent'; $lang['filter_qsl_recv'] = 'QSL received'; -$lang['filter_qsl_method'] = 'QSL Method'; +$lang['filter_qsl_sent_method'] = 'QSL Sending Method'; +$lang['filter_qsl_recv_method'] = 'QSL Receiving Method'; $lang['filter_lotw_sent'] = 'LoTW sent'; $lang['filter_lotw_recv'] = 'LoTW received'; $lang['filter_eqsl_sent'] = 'eQSL sent'; diff --git a/application/language/italian/filter_lang.php b/application/language/italian/filter_lang.php index 793893c7..869278f7 100644 --- a/application/language/italian/filter_lang.php +++ b/application/language/italian/filter_lang.php @@ -46,7 +46,8 @@ ________________________________________________________________________________ $lang['filter_qsl_sent'] = 'QSL sent'; $lang['filter_qsl_recv'] = 'QSL received'; -$lang['filter_qsl_method'] = 'QSL Method'; +$lang['filter_qsl_sent_method'] = 'QSL Sending Method'; +$lang['filter_qsl_recv_method'] = 'QSL Receiving Method'; $lang['filter_lotw_sent'] = 'LoTW sent'; $lang['filter_lotw_recv'] = 'LoTW received'; $lang['filter_eqsl_sent'] = 'eQSL sent'; diff --git a/application/language/polish/filter_lang.php b/application/language/polish/filter_lang.php index 793893c7..869278f7 100644 --- a/application/language/polish/filter_lang.php +++ b/application/language/polish/filter_lang.php @@ -46,7 +46,8 @@ ________________________________________________________________________________ $lang['filter_qsl_sent'] = 'QSL sent'; $lang['filter_qsl_recv'] = 'QSL received'; -$lang['filter_qsl_method'] = 'QSL Method'; +$lang['filter_qsl_sent_method'] = 'QSL Sending Method'; +$lang['filter_qsl_recv_method'] = 'QSL Receiving Method'; $lang['filter_lotw_sent'] = 'LoTW sent'; $lang['filter_lotw_recv'] = 'LoTW received'; $lang['filter_eqsl_sent'] = 'eQSL sent'; diff --git a/application/language/russian/filter_lang.php b/application/language/russian/filter_lang.php index 793893c7..869278f7 100644 --- a/application/language/russian/filter_lang.php +++ b/application/language/russian/filter_lang.php @@ -46,7 +46,8 @@ ________________________________________________________________________________ $lang['filter_qsl_sent'] = 'QSL sent'; $lang['filter_qsl_recv'] = 'QSL received'; -$lang['filter_qsl_method'] = 'QSL Method'; +$lang['filter_qsl_sent_method'] = 'QSL Sending Method'; +$lang['filter_qsl_recv_method'] = 'QSL Receiving Method'; $lang['filter_lotw_sent'] = 'LoTW sent'; $lang['filter_lotw_recv'] = 'LoTW received'; $lang['filter_eqsl_sent'] = 'eQSL sent'; diff --git a/application/language/spanish/filter_lang.php b/application/language/spanish/filter_lang.php index 793893c7..869278f7 100644 --- a/application/language/spanish/filter_lang.php +++ b/application/language/spanish/filter_lang.php @@ -46,7 +46,8 @@ ________________________________________________________________________________ $lang['filter_qsl_sent'] = 'QSL sent'; $lang['filter_qsl_recv'] = 'QSL received'; -$lang['filter_qsl_method'] = 'QSL Method'; +$lang['filter_qsl_sent_method'] = 'QSL Sending Method'; +$lang['filter_qsl_recv_method'] = 'QSL Receiving Method'; $lang['filter_lotw_sent'] = 'LoTW sent'; $lang['filter_lotw_recv'] = 'LoTW received'; $lang['filter_eqsl_sent'] = 'eQSL sent'; diff --git a/application/language/swedish/filter_lang.php b/application/language/swedish/filter_lang.php index 793893c7..869278f7 100644 --- a/application/language/swedish/filter_lang.php +++ b/application/language/swedish/filter_lang.php @@ -46,7 +46,8 @@ ________________________________________________________________________________ $lang['filter_qsl_sent'] = 'QSL sent'; $lang['filter_qsl_recv'] = 'QSL received'; -$lang['filter_qsl_method'] = 'QSL Method'; +$lang['filter_qsl_sent_method'] = 'QSL Sending Method'; +$lang['filter_qsl_recv_method'] = 'QSL Receiving Method'; $lang['filter_lotw_sent'] = 'LoTW sent'; $lang['filter_lotw_recv'] = 'LoTW received'; $lang['filter_eqsl_sent'] = 'eQSL sent'; diff --git a/application/language/turkish/filter_lang.php b/application/language/turkish/filter_lang.php index 793893c7..869278f7 100644 --- a/application/language/turkish/filter_lang.php +++ b/application/language/turkish/filter_lang.php @@ -46,7 +46,8 @@ ________________________________________________________________________________ $lang['filter_qsl_sent'] = 'QSL sent'; $lang['filter_qsl_recv'] = 'QSL received'; -$lang['filter_qsl_method'] = 'QSL Method'; +$lang['filter_qsl_sent_method'] = 'QSL Sending Method'; +$lang['filter_qsl_recv_method'] = 'QSL Receiving Method'; $lang['filter_lotw_sent'] = 'LoTW sent'; $lang['filter_lotw_recv'] = 'LoTW received'; $lang['filter_eqsl_sent'] = 'eQSL sent'; diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index b1a7bc92..1b892e77 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -62,14 +62,15 @@ class Logbookadvanced_model extends CI_Model { $conditions[] = $condition; $binding[] = $searchCriteria['qslReceived']; } - if ($searchCriteria['qslMethod'] !== '') { - $condition = "COL_QSL_RCVD = ?"; - if ($searchCriteria['qslMethod'] == 'N') { - $condition = '('.$condition; - $condition .= " OR COL_QSL_RCVD IS NULL OR COL_QSL_RCVD = '')"; - } + if ($searchCriteria['qslSentMethod'] !== '') { + $condition = "COL_QSL_SENT_VIA = ?"; $conditions[] = $condition; - $binding[] = $searchCriteria['qslReceived']; + $binding[] = $searchCriteria['qslSentMethod']; + } + if ($searchCriteria['qslReceivedMethod'] !== '') { + $condition = "COL_QSL_RECV_VIA = ?"; + $conditions[] = $condition; + $binding[] = $searchCriteria['qslReceivedMethod']; } if ($searchCriteria['lotwSent'] !== '') { $condition = "COL_LOTW_QSL_SENT = ?"; diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index 6843a8c2..8b68b98e 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -235,8 +235,18 @@ $options = json_decode($options);
- - + + + + + + +
+
+ +
From 711c5592095fedbac87d0eec6a416e0786921743 Mon Sep 17 00:00:00 2001 From: HB9HIL <80885850+HB9HIL@users.noreply.github.com> Date: Wed, 4 Oct 2023 10:49:55 +0200 Subject: [PATCH 13/29] Add new Filter --- application/views/logbookadvanced/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index f81a02ed..65f753f3 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -300,7 +300,7 @@ $options = json_decode($options);
- +
From 76e9d210ef2ba8107f493886d04723687853e77d Mon Sep 17 00:00:00 2001 From: HB9HIL <80885850+HB9HIL@users.noreply.github.com> Date: Wed, 4 Oct 2023 13:40:02 +0200 Subject: [PATCH 14/29] Changed QSL via to plain textbox insteadt of select box --- application/views/logbookadvanced/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index 65f753f3..c9749e99 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -300,7 +300,7 @@ $options = json_decode($options);
- +
From ff9f925c08489d2a83d3c96ac3e0dc10368dfa54 Mon Sep 17 00:00:00 2001 From: HB9HIL <80885850+HB9HIL@users.noreply.github.com> Date: Wed, 4 Oct 2023 13:40:43 +0200 Subject: [PATCH 15/29] searchCriteria QSL Sent/Received Method --- application/models/Logbookadvanced_model.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index 06bb7f84..8e83bb8b 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -71,15 +71,15 @@ class Logbookadvanced_model extends CI_Model { } if ($searchCriteria['qslSentMethod'] !== '') { - $condition = "COL_QSL_SENT_VIA like ?"; + $condition = "COL_QSL_SENT_VIA = ?"; $conditions[] = $condition; - $binding[] = $searchCriteria['qslSentMethod'].'%'; + $binding[] = $searchCriteria['qslSentMethod']; } if ($searchCriteria['qslReceivedMethod'] !== '') { - $condition = "COL_QSL_RECV_VIA like ?"; + $condition = "COL_QSL_RECV_VIA = ?"; $conditions[] = $condition; - $binding[] = $searchCriteria['qslReceivedMethod'].'%'; + $binding[] = $searchCriteria['qslReceivedMethod']; } if ($searchCriteria['lotwSent'] !== '') { From 8831a0c9f0066d1ff72c46a703122b6e178a5abc Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 4 Oct 2023 14:46:18 +0200 Subject: [PATCH 16/29] Removed unnecessary changes --- application/controllers/Logbookadvanced.php | 2 +- application/models/Logbookadvanced_model.php | 9 +-------- application/views/logbookadvanced/index.php | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php index b099ab13..617b8bbc 100644 --- a/application/controllers/Logbookadvanced.php +++ b/application/controllers/Logbookadvanced.php @@ -454,4 +454,4 @@ class Logbookadvanced extends CI_Controller { $this->load->model('user_options_model'); $this->user_options_model->set_option('LogbookAdvanced', 'LogbookAdvanced', $obj); } -} \ No newline at end of file +} diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index 8e83bb8b..32c63c6c 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -13,30 +13,25 @@ class Logbookadvanced_model extends CI_Model { $conditions[] = "date(COL_TIME_ON) >= ?"; $binding[] = $from; } - if ($searchCriteria['dateTo'] !== '') { $to = DateTime::createFromFormat('d/m/Y', $searchCriteria['dateTo']); $to = $to->format('Y-m-d'); $conditions[] = "date(COL_TIME_ON) <= ?"; $binding[] = $to; } - if ($searchCriteria['de'] !== '') { $conditions[] = "COL_STATION_CALLSIGN = ?"; $binding[] = trim($searchCriteria['de']); } - if ($searchCriteria['dx'] !== '') { $conditions[] = "COL_CALL LIKE ?"; $binding[] = '%' . trim($searchCriteria['dx']) . '%'; } - if ($searchCriteria['mode'] !== '') { $conditions[] = "(COL_MODE = ? or COL_SUBMODE = ?)"; $binding[] = $searchCriteria['mode']; $binding[] = $searchCriteria['mode']; } - if ($searchCriteria['band'] !== '') { if($searchCriteria['band'] != "SAT") { $conditions[] = "COL_BAND = ? and COL_PROP_MODE != 'SAT'"; @@ -49,7 +44,6 @@ class Logbookadvanced_model extends CI_Model { } } } - if ($searchCriteria['qslSent'] !== '') { $condition = "COL_QSL_SENT = ?"; if ($searchCriteria['qslSent'] == 'N') { @@ -59,7 +53,6 @@ class Logbookadvanced_model extends CI_Model { $conditions[] = $condition; $binding[] = $searchCriteria['qslSent']; } - if ($searchCriteria['qslReceived'] !== '') { $condition = "COL_QSL_RCVD = ?"; if ($searchCriteria['qslReceived'] == 'N') { @@ -448,4 +441,4 @@ class Logbookadvanced_model extends CI_Model { return $this->db->get()->result(); } -} \ No newline at end of file +} diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index c9749e99..7020de76 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -464,4 +464,4 @@ $options = json_decode($options); -
\ No newline at end of file + From 44631e64b359acdd4c8a1126836fa395b7492910 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 4 Oct 2023 16:01:45 +0200 Subject: [PATCH 17/29] Typo --- application/models/Logbookadvanced_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index 32c63c6c..20fa1a3b 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -70,7 +70,7 @@ class Logbookadvanced_model extends CI_Model { } if ($searchCriteria['qslReceivedMethod'] !== '') { - $condition = "COL_QSL_RECV_VIA = ?"; + $condition = "COL_QSL_RCVD_VIA = ?"; $conditions[] = $condition; $binding[] = $searchCriteria['qslReceivedMethod']; } From abbc56befcc7f8611f927235b3773dd04e4c486b Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 4 Oct 2023 16:02:07 +0200 Subject: [PATCH 18/29] Added new Filter to js function --- assets/js/sections/logbookadvanced.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index c23287fe..0bf1d713 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -264,6 +264,8 @@ $(document).ready(function () { band: this.band.value, qslSent: this.qslSent.value, qslReceived: this.qslReceived.value, + qslSentMethod: this.qslSentMethod.value, + qslReceivedMethod: this.qslReceivedMethod.value, iota: this.iota.value, dxcc: this.dxcc.value, propmode: this.selectPropagation.value, From be7f0959ae388451d771156f496664aedb220d62 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 4 Oct 2023 17:58:00 +0200 Subject: [PATCH 19/29] Prepared lang for additional action button --- application/language/bulgarian/filter_lang.php | 1 + application/language/chinese_simplified/filter_lang.php | 1 + application/language/czech/filter_lang.php | 1 + application/language/dutch/filter_lang.php | 1 + application/language/english/filter_lang.php | 1 + application/language/finnish/filter_lang.php | 1 + application/language/french/filter_lang.php | 1 + application/language/german/filter_lang.php | 1 + application/language/greek/filter_lang.php | 1 + application/language/italian/filter_lang.php | 1 + application/language/polish/filter_lang.php | 1 + application/language/russian/filter_lang.php | 1 + application/language/spanish/filter_lang.php | 1 + application/language/swedish/filter_lang.php | 1 + application/language/turkish/filter_lang.php | 1 + 15 files changed, 15 insertions(+) diff --git a/application/language/bulgarian/filter_lang.php b/application/language/bulgarian/filter_lang.php index 869278f7..332e796d 100644 --- a/application/language/bulgarian/filter_lang.php +++ b/application/language/bulgarian/filter_lang.php @@ -110,6 +110,7 @@ $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_direct'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/chinese_simplified/filter_lang.php b/application/language/chinese_simplified/filter_lang.php index 869278f7..332e796d 100644 --- a/application/language/chinese_simplified/filter_lang.php +++ b/application/language/chinese_simplified/filter_lang.php @@ -110,6 +110,7 @@ $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_direct'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/czech/filter_lang.php b/application/language/czech/filter_lang.php index 869278f7..332e796d 100644 --- a/application/language/czech/filter_lang.php +++ b/application/language/czech/filter_lang.php @@ -110,6 +110,7 @@ $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_direct'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/dutch/filter_lang.php b/application/language/dutch/filter_lang.php index 869278f7..332e796d 100644 --- a/application/language/dutch/filter_lang.php +++ b/application/language/dutch/filter_lang.php @@ -110,6 +110,7 @@ $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_direct'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/english/filter_lang.php b/application/language/english/filter_lang.php index 869278f7..332e796d 100644 --- a/application/language/english/filter_lang.php +++ b/application/language/english/filter_lang.php @@ -110,6 +110,7 @@ $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_direct'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/finnish/filter_lang.php b/application/language/finnish/filter_lang.php index 869278f7..332e796d 100644 --- a/application/language/finnish/filter_lang.php +++ b/application/language/finnish/filter_lang.php @@ -110,6 +110,7 @@ $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_direct'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/french/filter_lang.php b/application/language/french/filter_lang.php index 6421792c..18810f82 100644 --- a/application/language/french/filter_lang.php +++ b/application/language/french/filter_lang.php @@ -110,6 +110,7 @@ $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_direct'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/german/filter_lang.php b/application/language/german/filter_lang.php index 37470ed9..e194ff46 100644 --- a/application/language/german/filter_lang.php +++ b/application/language/german/filter_lang.php @@ -110,6 +110,7 @@ $lang['filter_actions_not_sent'] = 'Nicht gesendet'; $lang['filter_actions_qsl_n_required'] = 'QSL nicht erforderlich'; $lang['filter_actions_recv_bureau'] = 'Erhalten (Büro)'; $lang['filter_actions_recv_direct'] = 'Erhalten (Direkt)'; +$lang['filter_actions_recv_direct'] = 'Erhalten (Elektronisch)'; $lang['filter_actions_create_adif'] = 'Erstelle ADIF'; $lang['filter_actions_print_label'] = 'Label drucken'; $lang['filter_actions_start_print_title'] = 'Label Drucken'; diff --git a/application/language/greek/filter_lang.php b/application/language/greek/filter_lang.php index 869278f7..332e796d 100644 --- a/application/language/greek/filter_lang.php +++ b/application/language/greek/filter_lang.php @@ -110,6 +110,7 @@ $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_direct'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/italian/filter_lang.php b/application/language/italian/filter_lang.php index 869278f7..332e796d 100644 --- a/application/language/italian/filter_lang.php +++ b/application/language/italian/filter_lang.php @@ -110,6 +110,7 @@ $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_direct'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/polish/filter_lang.php b/application/language/polish/filter_lang.php index 869278f7..332e796d 100644 --- a/application/language/polish/filter_lang.php +++ b/application/language/polish/filter_lang.php @@ -110,6 +110,7 @@ $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_direct'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/russian/filter_lang.php b/application/language/russian/filter_lang.php index 869278f7..332e796d 100644 --- a/application/language/russian/filter_lang.php +++ b/application/language/russian/filter_lang.php @@ -110,6 +110,7 @@ $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_direct'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/spanish/filter_lang.php b/application/language/spanish/filter_lang.php index 869278f7..332e796d 100644 --- a/application/language/spanish/filter_lang.php +++ b/application/language/spanish/filter_lang.php @@ -110,6 +110,7 @@ $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_direct'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/swedish/filter_lang.php b/application/language/swedish/filter_lang.php index 869278f7..332e796d 100644 --- a/application/language/swedish/filter_lang.php +++ b/application/language/swedish/filter_lang.php @@ -110,6 +110,7 @@ $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_direct'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/turkish/filter_lang.php b/application/language/turkish/filter_lang.php index 869278f7..332e796d 100644 --- a/application/language/turkish/filter_lang.php +++ b/application/language/turkish/filter_lang.php @@ -110,6 +110,7 @@ $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_direct'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; From c04bdf1164aaabbb093f9a3ef18b7bcc6153f49d Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 4 Oct 2023 18:01:03 +0200 Subject: [PATCH 20/29] Added new filter to mapqsos --- assets/js/sections/logbookadvanced.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index 0bf1d713..abcfa9d4 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -852,6 +852,8 @@ function mapQsos(form) { band: form.band.value, qslSent: form.qslSent.value, qslReceived: form.qslReceived.value, + qslSentMethod: this.qslSentMethod.value, + qslReceivedMethod: this.qslReceivedMethod.value, iota: form.iota.value, dxcc: form.dxcc.value, propmode: form.selectPropagation.value, From fdd71365be54e53235eaa512ad5631976419eb31 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 4 Oct 2023 18:13:20 +0200 Subject: [PATCH 21/29] Typo --- application/language/bulgarian/filter_lang.php | 2 +- application/language/chinese_simplified/filter_lang.php | 2 +- application/language/czech/filter_lang.php | 2 +- application/language/dutch/filter_lang.php | 2 +- application/language/english/filter_lang.php | 2 +- application/language/finnish/filter_lang.php | 2 +- application/language/french/filter_lang.php | 2 +- application/language/german/filter_lang.php | 2 +- application/language/greek/filter_lang.php | 2 +- application/language/italian/filter_lang.php | 2 +- application/language/polish/filter_lang.php | 2 +- application/language/russian/filter_lang.php | 2 +- application/language/spanish/filter_lang.php | 2 +- application/language/swedish/filter_lang.php | 2 +- application/language/turkish/filter_lang.php | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/application/language/bulgarian/filter_lang.php b/application/language/bulgarian/filter_lang.php index 332e796d..779238e4 100644 --- a/application/language/bulgarian/filter_lang.php +++ b/application/language/bulgarian/filter_lang.php @@ -110,7 +110,7 @@ $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; -$lang['filter_actions_recv_direct'] = 'Received (Electronic)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/chinese_simplified/filter_lang.php b/application/language/chinese_simplified/filter_lang.php index 332e796d..779238e4 100644 --- a/application/language/chinese_simplified/filter_lang.php +++ b/application/language/chinese_simplified/filter_lang.php @@ -110,7 +110,7 @@ $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; -$lang['filter_actions_recv_direct'] = 'Received (Electronic)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/czech/filter_lang.php b/application/language/czech/filter_lang.php index 332e796d..779238e4 100644 --- a/application/language/czech/filter_lang.php +++ b/application/language/czech/filter_lang.php @@ -110,7 +110,7 @@ $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; -$lang['filter_actions_recv_direct'] = 'Received (Electronic)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/dutch/filter_lang.php b/application/language/dutch/filter_lang.php index 332e796d..779238e4 100644 --- a/application/language/dutch/filter_lang.php +++ b/application/language/dutch/filter_lang.php @@ -110,7 +110,7 @@ $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; -$lang['filter_actions_recv_direct'] = 'Received (Electronic)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/english/filter_lang.php b/application/language/english/filter_lang.php index 332e796d..779238e4 100644 --- a/application/language/english/filter_lang.php +++ b/application/language/english/filter_lang.php @@ -110,7 +110,7 @@ $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; -$lang['filter_actions_recv_direct'] = 'Received (Electronic)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/finnish/filter_lang.php b/application/language/finnish/filter_lang.php index 332e796d..779238e4 100644 --- a/application/language/finnish/filter_lang.php +++ b/application/language/finnish/filter_lang.php @@ -110,7 +110,7 @@ $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; -$lang['filter_actions_recv_direct'] = 'Received (Electronic)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/french/filter_lang.php b/application/language/french/filter_lang.php index 18810f82..b4a75d2d 100644 --- a/application/language/french/filter_lang.php +++ b/application/language/french/filter_lang.php @@ -110,7 +110,7 @@ $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; -$lang['filter_actions_recv_direct'] = 'Received (Electronic)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/german/filter_lang.php b/application/language/german/filter_lang.php index e194ff46..416937c9 100644 --- a/application/language/german/filter_lang.php +++ b/application/language/german/filter_lang.php @@ -110,7 +110,7 @@ $lang['filter_actions_not_sent'] = 'Nicht gesendet'; $lang['filter_actions_qsl_n_required'] = 'QSL nicht erforderlich'; $lang['filter_actions_recv_bureau'] = 'Erhalten (Büro)'; $lang['filter_actions_recv_direct'] = 'Erhalten (Direkt)'; -$lang['filter_actions_recv_direct'] = 'Erhalten (Elektronisch)'; +$lang['filter_actions_recv_electronic'] = 'Erhalten (Elektronisch)'; $lang['filter_actions_create_adif'] = 'Erstelle ADIF'; $lang['filter_actions_print_label'] = 'Label drucken'; $lang['filter_actions_start_print_title'] = 'Label Drucken'; diff --git a/application/language/greek/filter_lang.php b/application/language/greek/filter_lang.php index 332e796d..779238e4 100644 --- a/application/language/greek/filter_lang.php +++ b/application/language/greek/filter_lang.php @@ -110,7 +110,7 @@ $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; -$lang['filter_actions_recv_direct'] = 'Received (Electronic)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/italian/filter_lang.php b/application/language/italian/filter_lang.php index 332e796d..779238e4 100644 --- a/application/language/italian/filter_lang.php +++ b/application/language/italian/filter_lang.php @@ -110,7 +110,7 @@ $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; -$lang['filter_actions_recv_direct'] = 'Received (Electronic)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/polish/filter_lang.php b/application/language/polish/filter_lang.php index 332e796d..779238e4 100644 --- a/application/language/polish/filter_lang.php +++ b/application/language/polish/filter_lang.php @@ -110,7 +110,7 @@ $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; -$lang['filter_actions_recv_direct'] = 'Received (Electronic)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/russian/filter_lang.php b/application/language/russian/filter_lang.php index 332e796d..779238e4 100644 --- a/application/language/russian/filter_lang.php +++ b/application/language/russian/filter_lang.php @@ -110,7 +110,7 @@ $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; -$lang['filter_actions_recv_direct'] = 'Received (Electronic)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/spanish/filter_lang.php b/application/language/spanish/filter_lang.php index 332e796d..779238e4 100644 --- a/application/language/spanish/filter_lang.php +++ b/application/language/spanish/filter_lang.php @@ -110,7 +110,7 @@ $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; -$lang['filter_actions_recv_direct'] = 'Received (Electronic)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/swedish/filter_lang.php b/application/language/swedish/filter_lang.php index 332e796d..779238e4 100644 --- a/application/language/swedish/filter_lang.php +++ b/application/language/swedish/filter_lang.php @@ -110,7 +110,7 @@ $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; -$lang['filter_actions_recv_direct'] = 'Received (Electronic)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/turkish/filter_lang.php b/application/language/turkish/filter_lang.php index 332e796d..779238e4 100644 --- a/application/language/turkish/filter_lang.php +++ b/application/language/turkish/filter_lang.php @@ -110,7 +110,7 @@ $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; -$lang['filter_actions_recv_direct'] = 'Received (Electronic)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; From df57a23a5795f8d9643c2931d3215a609fbdfd53 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 4 Oct 2023 19:38:38 +0200 Subject: [PATCH 22/29] Added Action Button "Recv. Electronic" --- application/views/logbookadvanced/index.php | 1 + assets/js/sections/logbookadvanced.js | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index 7020de76..cf67e3b1 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -327,6 +327,7 @@ $options = json_decode($options); + diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index abcfa9d4..e386c14d 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -449,10 +449,15 @@ $(document).ready(function () { $('#receivedBureau').click(function (event) { handleQslReceived('Y','B', 'receivedBureau'); }); + $('#receivedDirect').click(function (event) { handleQslReceived('Y','D', 'receivedDirect'); }); + $('#receivedElectronic').click(function (event) { + handleQslReceived('Y','E', 'receivedElectronic'); + }); + $('#searchGridsquare').click(function (event) { quickSearch('gridsquare'); }); From 68b746db1f4cbae1272a347836f1f29c76075173 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 4 Oct 2023 19:39:11 +0200 Subject: [PATCH 23/29] Added Newline to make the Action Body thinner --- application/language/english/filter_lang.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/application/language/english/filter_lang.php b/application/language/english/filter_lang.php index 779238e4..c6a5e094 100644 --- a/application/language/english/filter_lang.php +++ b/application/language/english/filter_lang.php @@ -100,17 +100,17 @@ ________________________________________________________________________________ $lang['filter_actions_w_selected'] = 'With selected: '; $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; -$lang['filter_actions_queue_bureau'] = 'Queue Bureau'; -$lang['filter_actions_queue_direct'] = 'Queue Direct'; -$lang['filter_actions_queue_electronic'] = 'Queue Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent Bureau'; -$lang['filter_actions_sent_direct'] = 'Sent Direct'; -$lang['filter_actions_sent_electronic'] = 'Sent Electronic'; +$lang['filter_actions_queue_bureau'] = 'Queue
Bureau'; +$lang['filter_actions_queue_direct'] = 'Queue
Direct'; +$lang['filter_actions_queue_electronic'] = 'Queue
Electronic'; +$lang['filter_actions_sent_bureau'] = 'QSL Sent
(Bureau)'; +$lang['filter_actions_sent_direct'] = 'QSL Sent
(Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent
Electronic'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; -$lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; -$lang['filter_actions_recv_direct'] = 'Received (Direct)'; -$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; +$lang['filter_actions_recv_bureau'] = 'Received
(Bureau)'; +$lang['filter_actions_recv_direct'] = 'Received
(Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received
(Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; From 9a197f50778190c072afb90d33baedc550d90afb Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 4 Oct 2023 19:49:24 +0200 Subject: [PATCH 24/29] Added Newline to make the Action Body thinner --- application/language/bulgarian/filter_lang.php | 18 +++++++++--------- .../chinese_simplified/filter_lang.php | 18 +++++++++--------- application/language/czech/filter_lang.php | 18 +++++++++--------- application/language/dutch/filter_lang.php | 18 +++++++++--------- application/language/english/filter_lang.php | 6 +++--- application/language/finnish/filter_lang.php | 18 +++++++++--------- application/language/french/filter_lang.php | 18 +++++++++--------- application/language/greek/filter_lang.php | 18 +++++++++--------- application/language/italian/filter_lang.php | 18 +++++++++--------- application/language/polish/filter_lang.php | 18 +++++++++--------- application/language/russian/filter_lang.php | 18 +++++++++--------- application/language/spanish/filter_lang.php | 18 +++++++++--------- application/language/swedish/filter_lang.php | 18 +++++++++--------- application/language/turkish/filter_lang.php | 18 +++++++++--------- 14 files changed, 120 insertions(+), 120 deletions(-) diff --git a/application/language/bulgarian/filter_lang.php b/application/language/bulgarian/filter_lang.php index 779238e4..59f13268 100644 --- a/application/language/bulgarian/filter_lang.php +++ b/application/language/bulgarian/filter_lang.php @@ -100,17 +100,17 @@ ________________________________________________________________________________ $lang['filter_actions_w_selected'] = 'With selected: '; $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; -$lang['filter_actions_queue_bureau'] = 'Queue Bureau'; -$lang['filter_actions_queue_direct'] = 'Queue Direct'; -$lang['filter_actions_queue_electronic'] = 'Queue Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent Bureau'; -$lang['filter_actions_sent_direct'] = 'Sent Direct'; -$lang['filter_actions_sent_electronic'] = 'Sent Electronic'; +$lang['filter_actions_queue_bureau'] = 'Queue
Bureau'; +$lang['filter_actions_queue_direct'] = 'Queue
Direct'; +$lang['filter_actions_queue_electronic'] = 'Queue
Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent
(Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent
(Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent
(Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; -$lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; -$lang['filter_actions_recv_direct'] = 'Received (Direct)'; -$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; +$lang['filter_actions_recv_bureau'] = 'Received
(Bureau)'; +$lang['filter_actions_recv_direct'] = 'Received
(Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received
(Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/chinese_simplified/filter_lang.php b/application/language/chinese_simplified/filter_lang.php index 779238e4..59f13268 100644 --- a/application/language/chinese_simplified/filter_lang.php +++ b/application/language/chinese_simplified/filter_lang.php @@ -100,17 +100,17 @@ ________________________________________________________________________________ $lang['filter_actions_w_selected'] = 'With selected: '; $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; -$lang['filter_actions_queue_bureau'] = 'Queue Bureau'; -$lang['filter_actions_queue_direct'] = 'Queue Direct'; -$lang['filter_actions_queue_electronic'] = 'Queue Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent Bureau'; -$lang['filter_actions_sent_direct'] = 'Sent Direct'; -$lang['filter_actions_sent_electronic'] = 'Sent Electronic'; +$lang['filter_actions_queue_bureau'] = 'Queue
Bureau'; +$lang['filter_actions_queue_direct'] = 'Queue
Direct'; +$lang['filter_actions_queue_electronic'] = 'Queue
Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent
(Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent
(Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent
(Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; -$lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; -$lang['filter_actions_recv_direct'] = 'Received (Direct)'; -$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; +$lang['filter_actions_recv_bureau'] = 'Received
(Bureau)'; +$lang['filter_actions_recv_direct'] = 'Received
(Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received
(Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/czech/filter_lang.php b/application/language/czech/filter_lang.php index 779238e4..59f13268 100644 --- a/application/language/czech/filter_lang.php +++ b/application/language/czech/filter_lang.php @@ -100,17 +100,17 @@ ________________________________________________________________________________ $lang['filter_actions_w_selected'] = 'With selected: '; $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; -$lang['filter_actions_queue_bureau'] = 'Queue Bureau'; -$lang['filter_actions_queue_direct'] = 'Queue Direct'; -$lang['filter_actions_queue_electronic'] = 'Queue Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent Bureau'; -$lang['filter_actions_sent_direct'] = 'Sent Direct'; -$lang['filter_actions_sent_electronic'] = 'Sent Electronic'; +$lang['filter_actions_queue_bureau'] = 'Queue
Bureau'; +$lang['filter_actions_queue_direct'] = 'Queue
Direct'; +$lang['filter_actions_queue_electronic'] = 'Queue
Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent
(Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent
(Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent
(Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; -$lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; -$lang['filter_actions_recv_direct'] = 'Received (Direct)'; -$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; +$lang['filter_actions_recv_bureau'] = 'Received
(Bureau)'; +$lang['filter_actions_recv_direct'] = 'Received
(Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received
(Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/dutch/filter_lang.php b/application/language/dutch/filter_lang.php index 779238e4..59f13268 100644 --- a/application/language/dutch/filter_lang.php +++ b/application/language/dutch/filter_lang.php @@ -100,17 +100,17 @@ ________________________________________________________________________________ $lang['filter_actions_w_selected'] = 'With selected: '; $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; -$lang['filter_actions_queue_bureau'] = 'Queue Bureau'; -$lang['filter_actions_queue_direct'] = 'Queue Direct'; -$lang['filter_actions_queue_electronic'] = 'Queue Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent Bureau'; -$lang['filter_actions_sent_direct'] = 'Sent Direct'; -$lang['filter_actions_sent_electronic'] = 'Sent Electronic'; +$lang['filter_actions_queue_bureau'] = 'Queue
Bureau'; +$lang['filter_actions_queue_direct'] = 'Queue
Direct'; +$lang['filter_actions_queue_electronic'] = 'Queue
Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent
(Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent
(Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent
(Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; -$lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; -$lang['filter_actions_recv_direct'] = 'Received (Direct)'; -$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; +$lang['filter_actions_recv_bureau'] = 'Received
(Bureau)'; +$lang['filter_actions_recv_direct'] = 'Received
(Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received
(Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/english/filter_lang.php b/application/language/english/filter_lang.php index c6a5e094..f5c1b5de 100644 --- a/application/language/english/filter_lang.php +++ b/application/language/english/filter_lang.php @@ -103,9 +103,9 @@ $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; $lang['filter_actions_queue_bureau'] = 'Queue
Bureau'; $lang['filter_actions_queue_direct'] = 'Queue
Direct'; $lang['filter_actions_queue_electronic'] = 'Queue
Electronic'; -$lang['filter_actions_sent_bureau'] = 'QSL Sent
(Bureau)'; -$lang['filter_actions_sent_direct'] = 'QSL Sent
(Direct)'; -$lang['filter_actions_sent_electronic'] = 'Sent
Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent
(Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent
(Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent
(Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received
(Bureau)'; diff --git a/application/language/finnish/filter_lang.php b/application/language/finnish/filter_lang.php index 779238e4..59f13268 100644 --- a/application/language/finnish/filter_lang.php +++ b/application/language/finnish/filter_lang.php @@ -100,17 +100,17 @@ ________________________________________________________________________________ $lang['filter_actions_w_selected'] = 'With selected: '; $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; -$lang['filter_actions_queue_bureau'] = 'Queue Bureau'; -$lang['filter_actions_queue_direct'] = 'Queue Direct'; -$lang['filter_actions_queue_electronic'] = 'Queue Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent Bureau'; -$lang['filter_actions_sent_direct'] = 'Sent Direct'; -$lang['filter_actions_sent_electronic'] = 'Sent Electronic'; +$lang['filter_actions_queue_bureau'] = 'Queue
Bureau'; +$lang['filter_actions_queue_direct'] = 'Queue
Direct'; +$lang['filter_actions_queue_electronic'] = 'Queue
Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent
(Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent
(Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent
(Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; -$lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; -$lang['filter_actions_recv_direct'] = 'Received (Direct)'; -$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; +$lang['filter_actions_recv_bureau'] = 'Received
(Bureau)'; +$lang['filter_actions_recv_direct'] = 'Received
(Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received
(Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/french/filter_lang.php b/application/language/french/filter_lang.php index b4a75d2d..d81ce377 100644 --- a/application/language/french/filter_lang.php +++ b/application/language/french/filter_lang.php @@ -100,17 +100,17 @@ ________________________________________________________________________________ $lang['filter_actions_w_selected'] = 'With selected: '; $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; -$lang['filter_actions_queue_bureau'] = 'Queue Bureau'; -$lang['filter_actions_queue_direct'] = 'Queue Direct'; -$lang['filter_actions_queue_electronic'] = 'Queue Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent Bureau'; -$lang['filter_actions_sent_direct'] = 'Sent Direct'; -$lang['filter_actions_sent_electronic'] = 'Sent Electronic'; +$lang['filter_actions_queue_bureau'] = 'Queue
Bureau'; +$lang['filter_actions_queue_direct'] = 'Queue
Direct'; +$lang['filter_actions_queue_electronic'] = 'Queue
Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent
(Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent
(Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent
(Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; -$lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; -$lang['filter_actions_recv_direct'] = 'Received (Direct)'; -$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; +$lang['filter_actions_recv_bureau'] = 'Received
(Bureau)'; +$lang['filter_actions_recv_direct'] = 'Received
(Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received
(Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/greek/filter_lang.php b/application/language/greek/filter_lang.php index 779238e4..59f13268 100644 --- a/application/language/greek/filter_lang.php +++ b/application/language/greek/filter_lang.php @@ -100,17 +100,17 @@ ________________________________________________________________________________ $lang['filter_actions_w_selected'] = 'With selected: '; $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; -$lang['filter_actions_queue_bureau'] = 'Queue Bureau'; -$lang['filter_actions_queue_direct'] = 'Queue Direct'; -$lang['filter_actions_queue_electronic'] = 'Queue Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent Bureau'; -$lang['filter_actions_sent_direct'] = 'Sent Direct'; -$lang['filter_actions_sent_electronic'] = 'Sent Electronic'; +$lang['filter_actions_queue_bureau'] = 'Queue
Bureau'; +$lang['filter_actions_queue_direct'] = 'Queue
Direct'; +$lang['filter_actions_queue_electronic'] = 'Queue
Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent
(Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent
(Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent
(Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; -$lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; -$lang['filter_actions_recv_direct'] = 'Received (Direct)'; -$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; +$lang['filter_actions_recv_bureau'] = 'Received
(Bureau)'; +$lang['filter_actions_recv_direct'] = 'Received
(Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received
(Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/italian/filter_lang.php b/application/language/italian/filter_lang.php index 779238e4..59f13268 100644 --- a/application/language/italian/filter_lang.php +++ b/application/language/italian/filter_lang.php @@ -100,17 +100,17 @@ ________________________________________________________________________________ $lang['filter_actions_w_selected'] = 'With selected: '; $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; -$lang['filter_actions_queue_bureau'] = 'Queue Bureau'; -$lang['filter_actions_queue_direct'] = 'Queue Direct'; -$lang['filter_actions_queue_electronic'] = 'Queue Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent Bureau'; -$lang['filter_actions_sent_direct'] = 'Sent Direct'; -$lang['filter_actions_sent_electronic'] = 'Sent Electronic'; +$lang['filter_actions_queue_bureau'] = 'Queue
Bureau'; +$lang['filter_actions_queue_direct'] = 'Queue
Direct'; +$lang['filter_actions_queue_electronic'] = 'Queue
Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent
(Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent
(Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent
(Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; -$lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; -$lang['filter_actions_recv_direct'] = 'Received (Direct)'; -$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; +$lang['filter_actions_recv_bureau'] = 'Received
(Bureau)'; +$lang['filter_actions_recv_direct'] = 'Received
(Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received
(Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/polish/filter_lang.php b/application/language/polish/filter_lang.php index 779238e4..59f13268 100644 --- a/application/language/polish/filter_lang.php +++ b/application/language/polish/filter_lang.php @@ -100,17 +100,17 @@ ________________________________________________________________________________ $lang['filter_actions_w_selected'] = 'With selected: '; $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; -$lang['filter_actions_queue_bureau'] = 'Queue Bureau'; -$lang['filter_actions_queue_direct'] = 'Queue Direct'; -$lang['filter_actions_queue_electronic'] = 'Queue Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent Bureau'; -$lang['filter_actions_sent_direct'] = 'Sent Direct'; -$lang['filter_actions_sent_electronic'] = 'Sent Electronic'; +$lang['filter_actions_queue_bureau'] = 'Queue
Bureau'; +$lang['filter_actions_queue_direct'] = 'Queue
Direct'; +$lang['filter_actions_queue_electronic'] = 'Queue
Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent
(Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent
(Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent
(Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; -$lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; -$lang['filter_actions_recv_direct'] = 'Received (Direct)'; -$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; +$lang['filter_actions_recv_bureau'] = 'Received
(Bureau)'; +$lang['filter_actions_recv_direct'] = 'Received
(Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received
(Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/russian/filter_lang.php b/application/language/russian/filter_lang.php index 779238e4..59f13268 100644 --- a/application/language/russian/filter_lang.php +++ b/application/language/russian/filter_lang.php @@ -100,17 +100,17 @@ ________________________________________________________________________________ $lang['filter_actions_w_selected'] = 'With selected: '; $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; -$lang['filter_actions_queue_bureau'] = 'Queue Bureau'; -$lang['filter_actions_queue_direct'] = 'Queue Direct'; -$lang['filter_actions_queue_electronic'] = 'Queue Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent Bureau'; -$lang['filter_actions_sent_direct'] = 'Sent Direct'; -$lang['filter_actions_sent_electronic'] = 'Sent Electronic'; +$lang['filter_actions_queue_bureau'] = 'Queue
Bureau'; +$lang['filter_actions_queue_direct'] = 'Queue
Direct'; +$lang['filter_actions_queue_electronic'] = 'Queue
Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent
(Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent
(Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent
(Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; -$lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; -$lang['filter_actions_recv_direct'] = 'Received (Direct)'; -$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; +$lang['filter_actions_recv_bureau'] = 'Received
(Bureau)'; +$lang['filter_actions_recv_direct'] = 'Received
(Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received
(Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/spanish/filter_lang.php b/application/language/spanish/filter_lang.php index 779238e4..59f13268 100644 --- a/application/language/spanish/filter_lang.php +++ b/application/language/spanish/filter_lang.php @@ -100,17 +100,17 @@ ________________________________________________________________________________ $lang['filter_actions_w_selected'] = 'With selected: '; $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; -$lang['filter_actions_queue_bureau'] = 'Queue Bureau'; -$lang['filter_actions_queue_direct'] = 'Queue Direct'; -$lang['filter_actions_queue_electronic'] = 'Queue Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent Bureau'; -$lang['filter_actions_sent_direct'] = 'Sent Direct'; -$lang['filter_actions_sent_electronic'] = 'Sent Electronic'; +$lang['filter_actions_queue_bureau'] = 'Queue
Bureau'; +$lang['filter_actions_queue_direct'] = 'Queue
Direct'; +$lang['filter_actions_queue_electronic'] = 'Queue
Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent
(Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent
(Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent
(Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; -$lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; -$lang['filter_actions_recv_direct'] = 'Received (Direct)'; -$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; +$lang['filter_actions_recv_bureau'] = 'Received
(Bureau)'; +$lang['filter_actions_recv_direct'] = 'Received
(Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received
(Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/swedish/filter_lang.php b/application/language/swedish/filter_lang.php index 779238e4..59f13268 100644 --- a/application/language/swedish/filter_lang.php +++ b/application/language/swedish/filter_lang.php @@ -100,17 +100,17 @@ ________________________________________________________________________________ $lang['filter_actions_w_selected'] = 'With selected: '; $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; -$lang['filter_actions_queue_bureau'] = 'Queue Bureau'; -$lang['filter_actions_queue_direct'] = 'Queue Direct'; -$lang['filter_actions_queue_electronic'] = 'Queue Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent Bureau'; -$lang['filter_actions_sent_direct'] = 'Sent Direct'; -$lang['filter_actions_sent_electronic'] = 'Sent Electronic'; +$lang['filter_actions_queue_bureau'] = 'Queue
Bureau'; +$lang['filter_actions_queue_direct'] = 'Queue
Direct'; +$lang['filter_actions_queue_electronic'] = 'Queue
Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent
(Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent
(Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent
(Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; -$lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; -$lang['filter_actions_recv_direct'] = 'Received (Direct)'; -$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; +$lang['filter_actions_recv_bureau'] = 'Received
(Bureau)'; +$lang['filter_actions_recv_direct'] = 'Received
(Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received
(Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/turkish/filter_lang.php b/application/language/turkish/filter_lang.php index 779238e4..59f13268 100644 --- a/application/language/turkish/filter_lang.php +++ b/application/language/turkish/filter_lang.php @@ -100,17 +100,17 @@ ________________________________________________________________________________ $lang['filter_actions_w_selected'] = 'With selected: '; $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; -$lang['filter_actions_queue_bureau'] = 'Queue Bureau'; -$lang['filter_actions_queue_direct'] = 'Queue Direct'; -$lang['filter_actions_queue_electronic'] = 'Queue Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent Bureau'; -$lang['filter_actions_sent_direct'] = 'Sent Direct'; -$lang['filter_actions_sent_electronic'] = 'Sent Electronic'; +$lang['filter_actions_queue_bureau'] = 'Queue
Bureau'; +$lang['filter_actions_queue_direct'] = 'Queue
Direct'; +$lang['filter_actions_queue_electronic'] = 'Queue
Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent
(Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent
(Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent
(Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; -$lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; -$lang['filter_actions_recv_direct'] = 'Received (Direct)'; -$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; +$lang['filter_actions_recv_bureau'] = 'Received
(Bureau)'; +$lang['filter_actions_recv_direct'] = 'Received
(Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received
(Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; From e6d1fe6d97cc6cb69bfdaae06759f9bdd9cf3c3d Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 4 Oct 2023 19:51:05 +0200 Subject: [PATCH 25/29] Added Newline to make the Action Body thinner --- application/language/german/filter_lang.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/application/language/german/filter_lang.php b/application/language/german/filter_lang.php index 416937c9..c9b96ee1 100644 --- a/application/language/german/filter_lang.php +++ b/application/language/german/filter_lang.php @@ -99,18 +99,18 @@ ________________________________________________________________________________ */ $lang['filter_actions_w_selected'] = 'Bei Markierten: '; -$lang['filter_actions_update_f_callbook'] = 'Aktualisieren aus dem Callbook'; -$lang['filter_actions_queue_bureau'] = 'Angefordert (Büro)'; -$lang['filter_actions_queue_direct'] = 'Angefordert (Direkt)'; -$lang['filter_actions_queue_electronic'] = 'Angefordert (Elektronisch)'; -$lang['filter_actions_sent_bureau'] = 'Gesendet (Büro)'; -$lang['filter_actions_sent_direct'] = 'Gesendet (Direkt)'; -$lang['filter_actions_sent_electronic'] = 'Gesendet (Elektronisch)'; +$lang['filter_actions_update_f_callbook'] = 'Aktualisieren
aus dem Callbook'; +$lang['filter_actions_queue_bureau'] = 'Angefordert
(Büro)'; +$lang['filter_actions_queue_direct'] = 'Angefordert
(Direkt)'; +$lang['filter_actions_queue_electronic'] = 'Angefordert
(Elektronisch)'; +$lang['filter_actions_sent_bureau'] = 'Gesendet
(Büro)'; +$lang['filter_actions_sent_direct'] = 'Gesendet
(Direkt)'; +$lang['filter_actions_sent_electronic'] = 'Gesendet
(Elektronisch)'; $lang['filter_actions_not_sent'] = 'Nicht gesendet'; $lang['filter_actions_qsl_n_required'] = 'QSL nicht erforderlich'; -$lang['filter_actions_recv_bureau'] = 'Erhalten (Büro)'; -$lang['filter_actions_recv_direct'] = 'Erhalten (Direkt)'; -$lang['filter_actions_recv_electronic'] = 'Erhalten (Elektronisch)'; +$lang['filter_actions_recv_bureau'] = 'Erhalten
(Büro)'; +$lang['filter_actions_recv_direct'] = 'Erhalten
(Direkt)'; +$lang['filter_actions_recv_electronic'] = 'Erhalten
(Elektronisch)'; $lang['filter_actions_create_adif'] = 'Erstelle ADIF'; $lang['filter_actions_print_label'] = 'Label drucken'; $lang['filter_actions_start_print_title'] = 'Label Drucken'; From 35057ef5564f2c2dfa19f7f1f87fac4891a497b7 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 4 Oct 2023 22:04:59 +0200 Subject: [PATCH 26/29] Removed break tags --- .../language/bulgarian/filter_lang.php | 18 ++++++++--------- .../chinese_simplified/filter_lang.php | 18 ++++++++--------- application/language/czech/filter_lang.php | 18 ++++++++--------- application/language/dutch/filter_lang.php | 18 ++++++++--------- application/language/english/filter_lang.php | 18 ++++++++--------- application/language/finnish/filter_lang.php | 18 ++++++++--------- application/language/french/filter_lang.php | 18 ++++++++--------- application/language/german/filter_lang.php | 20 +++++++++---------- application/language/greek/filter_lang.php | 18 ++++++++--------- application/language/italian/filter_lang.php | 18 ++++++++--------- application/language/polish/filter_lang.php | 18 ++++++++--------- application/language/russian/filter_lang.php | 18 ++++++++--------- application/language/spanish/filter_lang.php | 18 ++++++++--------- application/language/swedish/filter_lang.php | 18 ++++++++--------- application/language/turkish/filter_lang.php | 18 ++++++++--------- 15 files changed, 136 insertions(+), 136 deletions(-) diff --git a/application/language/bulgarian/filter_lang.php b/application/language/bulgarian/filter_lang.php index 59f13268..288364a3 100644 --- a/application/language/bulgarian/filter_lang.php +++ b/application/language/bulgarian/filter_lang.php @@ -100,17 +100,17 @@ ________________________________________________________________________________ $lang['filter_actions_w_selected'] = 'With selected: '; $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; -$lang['filter_actions_queue_bureau'] = 'Queue
Bureau'; -$lang['filter_actions_queue_direct'] = 'Queue
Direct'; -$lang['filter_actions_queue_electronic'] = 'Queue
Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent
(Bureau)'; -$lang['filter_actions_sent_direct'] = 'Sent
(Direct)'; -$lang['filter_actions_sent_electronic'] = 'Sent
(Electronic)'; +$lang['filter_actions_queue_bureau'] = 'Queue Bureau'; +$lang['filter_actions_queue_direct'] = 'Queue Direct'; +$lang['filter_actions_queue_electronic'] = 'Queue Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent (Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; -$lang['filter_actions_recv_bureau'] = 'Received
(Bureau)'; -$lang['filter_actions_recv_direct'] = 'Received
(Direct)'; -$lang['filter_actions_recv_electronic'] = 'Received
(Electronic)'; +$lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; +$lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/chinese_simplified/filter_lang.php b/application/language/chinese_simplified/filter_lang.php index 59f13268..288364a3 100644 --- a/application/language/chinese_simplified/filter_lang.php +++ b/application/language/chinese_simplified/filter_lang.php @@ -100,17 +100,17 @@ ________________________________________________________________________________ $lang['filter_actions_w_selected'] = 'With selected: '; $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; -$lang['filter_actions_queue_bureau'] = 'Queue
Bureau'; -$lang['filter_actions_queue_direct'] = 'Queue
Direct'; -$lang['filter_actions_queue_electronic'] = 'Queue
Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent
(Bureau)'; -$lang['filter_actions_sent_direct'] = 'Sent
(Direct)'; -$lang['filter_actions_sent_electronic'] = 'Sent
(Electronic)'; +$lang['filter_actions_queue_bureau'] = 'Queue Bureau'; +$lang['filter_actions_queue_direct'] = 'Queue Direct'; +$lang['filter_actions_queue_electronic'] = 'Queue Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent (Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; -$lang['filter_actions_recv_bureau'] = 'Received
(Bureau)'; -$lang['filter_actions_recv_direct'] = 'Received
(Direct)'; -$lang['filter_actions_recv_electronic'] = 'Received
(Electronic)'; +$lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; +$lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/czech/filter_lang.php b/application/language/czech/filter_lang.php index 59f13268..288364a3 100644 --- a/application/language/czech/filter_lang.php +++ b/application/language/czech/filter_lang.php @@ -100,17 +100,17 @@ ________________________________________________________________________________ $lang['filter_actions_w_selected'] = 'With selected: '; $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; -$lang['filter_actions_queue_bureau'] = 'Queue
Bureau'; -$lang['filter_actions_queue_direct'] = 'Queue
Direct'; -$lang['filter_actions_queue_electronic'] = 'Queue
Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent
(Bureau)'; -$lang['filter_actions_sent_direct'] = 'Sent
(Direct)'; -$lang['filter_actions_sent_electronic'] = 'Sent
(Electronic)'; +$lang['filter_actions_queue_bureau'] = 'Queue Bureau'; +$lang['filter_actions_queue_direct'] = 'Queue Direct'; +$lang['filter_actions_queue_electronic'] = 'Queue Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent (Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; -$lang['filter_actions_recv_bureau'] = 'Received
(Bureau)'; -$lang['filter_actions_recv_direct'] = 'Received
(Direct)'; -$lang['filter_actions_recv_electronic'] = 'Received
(Electronic)'; +$lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; +$lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/dutch/filter_lang.php b/application/language/dutch/filter_lang.php index 59f13268..288364a3 100644 --- a/application/language/dutch/filter_lang.php +++ b/application/language/dutch/filter_lang.php @@ -100,17 +100,17 @@ ________________________________________________________________________________ $lang['filter_actions_w_selected'] = 'With selected: '; $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; -$lang['filter_actions_queue_bureau'] = 'Queue
Bureau'; -$lang['filter_actions_queue_direct'] = 'Queue
Direct'; -$lang['filter_actions_queue_electronic'] = 'Queue
Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent
(Bureau)'; -$lang['filter_actions_sent_direct'] = 'Sent
(Direct)'; -$lang['filter_actions_sent_electronic'] = 'Sent
(Electronic)'; +$lang['filter_actions_queue_bureau'] = 'Queue Bureau'; +$lang['filter_actions_queue_direct'] = 'Queue Direct'; +$lang['filter_actions_queue_electronic'] = 'Queue Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent (Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; -$lang['filter_actions_recv_bureau'] = 'Received
(Bureau)'; -$lang['filter_actions_recv_direct'] = 'Received
(Direct)'; -$lang['filter_actions_recv_electronic'] = 'Received
(Electronic)'; +$lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; +$lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/english/filter_lang.php b/application/language/english/filter_lang.php index f5c1b5de..288364a3 100644 --- a/application/language/english/filter_lang.php +++ b/application/language/english/filter_lang.php @@ -100,17 +100,17 @@ ________________________________________________________________________________ $lang['filter_actions_w_selected'] = 'With selected: '; $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; -$lang['filter_actions_queue_bureau'] = 'Queue
Bureau'; -$lang['filter_actions_queue_direct'] = 'Queue
Direct'; -$lang['filter_actions_queue_electronic'] = 'Queue
Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent
(Bureau)'; -$lang['filter_actions_sent_direct'] = 'Sent
(Direct)'; -$lang['filter_actions_sent_electronic'] = 'Sent
(Electronic)'; +$lang['filter_actions_queue_bureau'] = 'Queue Bureau'; +$lang['filter_actions_queue_direct'] = 'Queue Direct'; +$lang['filter_actions_queue_electronic'] = 'Queue Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent (Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; -$lang['filter_actions_recv_bureau'] = 'Received
(Bureau)'; -$lang['filter_actions_recv_direct'] = 'Received
(Direct)'; -$lang['filter_actions_recv_electronic'] = 'Received
(Electronic)'; +$lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; +$lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/finnish/filter_lang.php b/application/language/finnish/filter_lang.php index 59f13268..288364a3 100644 --- a/application/language/finnish/filter_lang.php +++ b/application/language/finnish/filter_lang.php @@ -100,17 +100,17 @@ ________________________________________________________________________________ $lang['filter_actions_w_selected'] = 'With selected: '; $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; -$lang['filter_actions_queue_bureau'] = 'Queue
Bureau'; -$lang['filter_actions_queue_direct'] = 'Queue
Direct'; -$lang['filter_actions_queue_electronic'] = 'Queue
Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent
(Bureau)'; -$lang['filter_actions_sent_direct'] = 'Sent
(Direct)'; -$lang['filter_actions_sent_electronic'] = 'Sent
(Electronic)'; +$lang['filter_actions_queue_bureau'] = 'Queue Bureau'; +$lang['filter_actions_queue_direct'] = 'Queue Direct'; +$lang['filter_actions_queue_electronic'] = 'Queue Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent (Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; -$lang['filter_actions_recv_bureau'] = 'Received
(Bureau)'; -$lang['filter_actions_recv_direct'] = 'Received
(Direct)'; -$lang['filter_actions_recv_electronic'] = 'Received
(Electronic)'; +$lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; +$lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/french/filter_lang.php b/application/language/french/filter_lang.php index d81ce377..cea415fc 100644 --- a/application/language/french/filter_lang.php +++ b/application/language/french/filter_lang.php @@ -100,17 +100,17 @@ ________________________________________________________________________________ $lang['filter_actions_w_selected'] = 'With selected: '; $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; -$lang['filter_actions_queue_bureau'] = 'Queue
Bureau'; -$lang['filter_actions_queue_direct'] = 'Queue
Direct'; -$lang['filter_actions_queue_electronic'] = 'Queue
Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent
(Bureau)'; -$lang['filter_actions_sent_direct'] = 'Sent
(Direct)'; -$lang['filter_actions_sent_electronic'] = 'Sent
(Electronic)'; +$lang['filter_actions_queue_bureau'] = 'Queue Bureau'; +$lang['filter_actions_queue_direct'] = 'Queue Direct'; +$lang['filter_actions_queue_electronic'] = 'Queue Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent (Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; -$lang['filter_actions_recv_bureau'] = 'Received
(Bureau)'; -$lang['filter_actions_recv_direct'] = 'Received
(Direct)'; -$lang['filter_actions_recv_electronic'] = 'Received
(Electronic)'; +$lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; +$lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/german/filter_lang.php b/application/language/german/filter_lang.php index c9b96ee1..416937c9 100644 --- a/application/language/german/filter_lang.php +++ b/application/language/german/filter_lang.php @@ -99,18 +99,18 @@ ________________________________________________________________________________ */ $lang['filter_actions_w_selected'] = 'Bei Markierten: '; -$lang['filter_actions_update_f_callbook'] = 'Aktualisieren
aus dem Callbook'; -$lang['filter_actions_queue_bureau'] = 'Angefordert
(Büro)'; -$lang['filter_actions_queue_direct'] = 'Angefordert
(Direkt)'; -$lang['filter_actions_queue_electronic'] = 'Angefordert
(Elektronisch)'; -$lang['filter_actions_sent_bureau'] = 'Gesendet
(Büro)'; -$lang['filter_actions_sent_direct'] = 'Gesendet
(Direkt)'; -$lang['filter_actions_sent_electronic'] = 'Gesendet
(Elektronisch)'; +$lang['filter_actions_update_f_callbook'] = 'Aktualisieren aus dem Callbook'; +$lang['filter_actions_queue_bureau'] = 'Angefordert (Büro)'; +$lang['filter_actions_queue_direct'] = 'Angefordert (Direkt)'; +$lang['filter_actions_queue_electronic'] = 'Angefordert (Elektronisch)'; +$lang['filter_actions_sent_bureau'] = 'Gesendet (Büro)'; +$lang['filter_actions_sent_direct'] = 'Gesendet (Direkt)'; +$lang['filter_actions_sent_electronic'] = 'Gesendet (Elektronisch)'; $lang['filter_actions_not_sent'] = 'Nicht gesendet'; $lang['filter_actions_qsl_n_required'] = 'QSL nicht erforderlich'; -$lang['filter_actions_recv_bureau'] = 'Erhalten
(Büro)'; -$lang['filter_actions_recv_direct'] = 'Erhalten
(Direkt)'; -$lang['filter_actions_recv_electronic'] = 'Erhalten
(Elektronisch)'; +$lang['filter_actions_recv_bureau'] = 'Erhalten (Büro)'; +$lang['filter_actions_recv_direct'] = 'Erhalten (Direkt)'; +$lang['filter_actions_recv_electronic'] = 'Erhalten (Elektronisch)'; $lang['filter_actions_create_adif'] = 'Erstelle ADIF'; $lang['filter_actions_print_label'] = 'Label drucken'; $lang['filter_actions_start_print_title'] = 'Label Drucken'; diff --git a/application/language/greek/filter_lang.php b/application/language/greek/filter_lang.php index 59f13268..288364a3 100644 --- a/application/language/greek/filter_lang.php +++ b/application/language/greek/filter_lang.php @@ -100,17 +100,17 @@ ________________________________________________________________________________ $lang['filter_actions_w_selected'] = 'With selected: '; $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; -$lang['filter_actions_queue_bureau'] = 'Queue
Bureau'; -$lang['filter_actions_queue_direct'] = 'Queue
Direct'; -$lang['filter_actions_queue_electronic'] = 'Queue
Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent
(Bureau)'; -$lang['filter_actions_sent_direct'] = 'Sent
(Direct)'; -$lang['filter_actions_sent_electronic'] = 'Sent
(Electronic)'; +$lang['filter_actions_queue_bureau'] = 'Queue Bureau'; +$lang['filter_actions_queue_direct'] = 'Queue Direct'; +$lang['filter_actions_queue_electronic'] = 'Queue Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent (Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; -$lang['filter_actions_recv_bureau'] = 'Received
(Bureau)'; -$lang['filter_actions_recv_direct'] = 'Received
(Direct)'; -$lang['filter_actions_recv_electronic'] = 'Received
(Electronic)'; +$lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; +$lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/italian/filter_lang.php b/application/language/italian/filter_lang.php index 59f13268..288364a3 100644 --- a/application/language/italian/filter_lang.php +++ b/application/language/italian/filter_lang.php @@ -100,17 +100,17 @@ ________________________________________________________________________________ $lang['filter_actions_w_selected'] = 'With selected: '; $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; -$lang['filter_actions_queue_bureau'] = 'Queue
Bureau'; -$lang['filter_actions_queue_direct'] = 'Queue
Direct'; -$lang['filter_actions_queue_electronic'] = 'Queue
Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent
(Bureau)'; -$lang['filter_actions_sent_direct'] = 'Sent
(Direct)'; -$lang['filter_actions_sent_electronic'] = 'Sent
(Electronic)'; +$lang['filter_actions_queue_bureau'] = 'Queue Bureau'; +$lang['filter_actions_queue_direct'] = 'Queue Direct'; +$lang['filter_actions_queue_electronic'] = 'Queue Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent (Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; -$lang['filter_actions_recv_bureau'] = 'Received
(Bureau)'; -$lang['filter_actions_recv_direct'] = 'Received
(Direct)'; -$lang['filter_actions_recv_electronic'] = 'Received
(Electronic)'; +$lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; +$lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/polish/filter_lang.php b/application/language/polish/filter_lang.php index 59f13268..288364a3 100644 --- a/application/language/polish/filter_lang.php +++ b/application/language/polish/filter_lang.php @@ -100,17 +100,17 @@ ________________________________________________________________________________ $lang['filter_actions_w_selected'] = 'With selected: '; $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; -$lang['filter_actions_queue_bureau'] = 'Queue
Bureau'; -$lang['filter_actions_queue_direct'] = 'Queue
Direct'; -$lang['filter_actions_queue_electronic'] = 'Queue
Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent
(Bureau)'; -$lang['filter_actions_sent_direct'] = 'Sent
(Direct)'; -$lang['filter_actions_sent_electronic'] = 'Sent
(Electronic)'; +$lang['filter_actions_queue_bureau'] = 'Queue Bureau'; +$lang['filter_actions_queue_direct'] = 'Queue Direct'; +$lang['filter_actions_queue_electronic'] = 'Queue Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent (Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; -$lang['filter_actions_recv_bureau'] = 'Received
(Bureau)'; -$lang['filter_actions_recv_direct'] = 'Received
(Direct)'; -$lang['filter_actions_recv_electronic'] = 'Received
(Electronic)'; +$lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; +$lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/russian/filter_lang.php b/application/language/russian/filter_lang.php index 59f13268..288364a3 100644 --- a/application/language/russian/filter_lang.php +++ b/application/language/russian/filter_lang.php @@ -100,17 +100,17 @@ ________________________________________________________________________________ $lang['filter_actions_w_selected'] = 'With selected: '; $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; -$lang['filter_actions_queue_bureau'] = 'Queue
Bureau'; -$lang['filter_actions_queue_direct'] = 'Queue
Direct'; -$lang['filter_actions_queue_electronic'] = 'Queue
Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent
(Bureau)'; -$lang['filter_actions_sent_direct'] = 'Sent
(Direct)'; -$lang['filter_actions_sent_electronic'] = 'Sent
(Electronic)'; +$lang['filter_actions_queue_bureau'] = 'Queue Bureau'; +$lang['filter_actions_queue_direct'] = 'Queue Direct'; +$lang['filter_actions_queue_electronic'] = 'Queue Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent (Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; -$lang['filter_actions_recv_bureau'] = 'Received
(Bureau)'; -$lang['filter_actions_recv_direct'] = 'Received
(Direct)'; -$lang['filter_actions_recv_electronic'] = 'Received
(Electronic)'; +$lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; +$lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/spanish/filter_lang.php b/application/language/spanish/filter_lang.php index 59f13268..288364a3 100644 --- a/application/language/spanish/filter_lang.php +++ b/application/language/spanish/filter_lang.php @@ -100,17 +100,17 @@ ________________________________________________________________________________ $lang['filter_actions_w_selected'] = 'With selected: '; $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; -$lang['filter_actions_queue_bureau'] = 'Queue
Bureau'; -$lang['filter_actions_queue_direct'] = 'Queue
Direct'; -$lang['filter_actions_queue_electronic'] = 'Queue
Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent
(Bureau)'; -$lang['filter_actions_sent_direct'] = 'Sent
(Direct)'; -$lang['filter_actions_sent_electronic'] = 'Sent
(Electronic)'; +$lang['filter_actions_queue_bureau'] = 'Queue Bureau'; +$lang['filter_actions_queue_direct'] = 'Queue Direct'; +$lang['filter_actions_queue_electronic'] = 'Queue Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent (Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; -$lang['filter_actions_recv_bureau'] = 'Received
(Bureau)'; -$lang['filter_actions_recv_direct'] = 'Received
(Direct)'; -$lang['filter_actions_recv_electronic'] = 'Received
(Electronic)'; +$lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; +$lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/swedish/filter_lang.php b/application/language/swedish/filter_lang.php index 59f13268..288364a3 100644 --- a/application/language/swedish/filter_lang.php +++ b/application/language/swedish/filter_lang.php @@ -100,17 +100,17 @@ ________________________________________________________________________________ $lang['filter_actions_w_selected'] = 'With selected: '; $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; -$lang['filter_actions_queue_bureau'] = 'Queue
Bureau'; -$lang['filter_actions_queue_direct'] = 'Queue
Direct'; -$lang['filter_actions_queue_electronic'] = 'Queue
Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent
(Bureau)'; -$lang['filter_actions_sent_direct'] = 'Sent
(Direct)'; -$lang['filter_actions_sent_electronic'] = 'Sent
(Electronic)'; +$lang['filter_actions_queue_bureau'] = 'Queue Bureau'; +$lang['filter_actions_queue_direct'] = 'Queue Direct'; +$lang['filter_actions_queue_electronic'] = 'Queue Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent (Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; -$lang['filter_actions_recv_bureau'] = 'Received
(Bureau)'; -$lang['filter_actions_recv_direct'] = 'Received
(Direct)'; -$lang['filter_actions_recv_electronic'] = 'Received
(Electronic)'; +$lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; +$lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/turkish/filter_lang.php b/application/language/turkish/filter_lang.php index 59f13268..288364a3 100644 --- a/application/language/turkish/filter_lang.php +++ b/application/language/turkish/filter_lang.php @@ -100,17 +100,17 @@ ________________________________________________________________________________ $lang['filter_actions_w_selected'] = 'With selected: '; $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; -$lang['filter_actions_queue_bureau'] = 'Queue
Bureau'; -$lang['filter_actions_queue_direct'] = 'Queue
Direct'; -$lang['filter_actions_queue_electronic'] = 'Queue
Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent
(Bureau)'; -$lang['filter_actions_sent_direct'] = 'Sent
(Direct)'; -$lang['filter_actions_sent_electronic'] = 'Sent
(Electronic)'; +$lang['filter_actions_queue_bureau'] = 'Queue Bureau'; +$lang['filter_actions_queue_direct'] = 'Queue Direct'; +$lang['filter_actions_queue_electronic'] = 'Queue Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent (Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; -$lang['filter_actions_recv_bureau'] = 'Received
(Bureau)'; -$lang['filter_actions_recv_direct'] = 'Received
(Direct)'; -$lang['filter_actions_recv_electronic'] = 'Received
(Electronic)'; +$lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; +$lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; From 7d09f2e0f50db81e3eea4138156f1b87779ae46e Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 4 Oct 2023 22:33:31 +0200 Subject: [PATCH 27/29] Made Action Buttons responsive --- application/views/logbookadvanced/index.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index cf67e3b1..62df9948 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -38,6 +38,9 @@ echo "var user_options = $options;"; float: left; margin: 0 8px 0 0; } +.btn { + white-space: normal; +} Date: Wed, 4 Oct 2023 22:34:14 +0200 Subject: [PATCH 28/29] Table Wrap for Name Column --- application/views/logbookadvanced/index.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index 62df9948..98eac8fa 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -41,6 +41,9 @@ echo "var user_options = $options;"; .btn { white-space: normal; } +#qsoList td:nth-child(11) { + white-space: normal; +} Date: Thu, 5 Oct 2023 08:00:37 +0200 Subject: [PATCH 29/29] Button Style --- application/views/logbookadvanced/index.php | 6 ------ assets/css/default/overrides.css | 4 ++++ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index 98eac8fa..cf67e3b1 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -38,12 +38,6 @@ echo "var user_options = $options;"; float: left; margin: 0 8px 0 0; } -.btn { - white-space: normal; -} -#qsoList td:nth-child(11) { - white-space: normal; -} tr>td { float:right; } +.btn { + white-space: normal; +} + #qsoList_wrapper th { text-align: left !important; white-space: nowrap;} #qsoList_wrapper td { text-align: left !important; white-space: nowrap;}