From 727d0f42763d48a5e0f65b77134a245efbb5ce32 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 2 Dec 2023 09:25:33 +0100 Subject: [PATCH 01/11] made eqsl msg language a bit shorter --- application/language/bulgarian/station_lang.php | 2 +- application/language/chinese_simplified/station_lang.php | 2 +- application/language/czech/station_lang.php | 2 +- application/language/dutch/station_lang.php | 2 +- application/language/english/station_lang.php | 2 +- application/language/finnish/station_lang.php | 2 +- application/language/french/station_lang.php | 2 +- application/language/german/station_lang.php | 2 +- application/language/greek/station_lang.php | 2 +- application/language/italian/station_lang.php | 2 +- application/language/polish/station_lang.php | 2 +- application/language/russian/station_lang.php | 2 +- application/language/spanish/station_lang.php | 2 +- application/language/swedish/station_lang.php | 2 +- application/language/turkish/station_lang.php | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/application/language/bulgarian/station_lang.php b/application/language/bulgarian/station_lang.php index 44ad31fde..172d9af23 100644 --- a/application/language/bulgarian/station_lang.php +++ b/application/language/bulgarian/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/chinese_simplified/station_lang.php b/application/language/chinese_simplified/station_lang.php index 44ad31fde..172d9af23 100644 --- a/application/language/chinese_simplified/station_lang.php +++ b/application/language/chinese_simplified/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/czech/station_lang.php b/application/language/czech/station_lang.php index 44ad31fde..172d9af23 100644 --- a/application/language/czech/station_lang.php +++ b/application/language/czech/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/dutch/station_lang.php b/application/language/dutch/station_lang.php index 44ad31fde..172d9af23 100644 --- a/application/language/dutch/station_lang.php +++ b/application/language/dutch/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/english/station_lang.php b/application/language/english/station_lang.php index e6ab31889..d3206d8aa 100644 --- a/application/language/english/station_lang.php +++ b/application/language/english/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/finnish/station_lang.php b/application/language/finnish/station_lang.php index 44ad31fde..172d9af23 100644 --- a/application/language/finnish/station_lang.php +++ b/application/language/finnish/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/french/station_lang.php b/application/language/french/station_lang.php index abb6e2171..da43bc0d7 100644 --- a/application/language/french/station_lang.php +++ b/application/language/french/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Message (QSLMSG) par défaut"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "Vous pouvez définir un message par défaut qui sera renseigné et envoyé pour chaque QSO pour ce lieu station. Taille max:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Vous pouvez définir un message par défaut qui sera renseigné et envoyé pour chaque QSO pour ce lieu station."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/german/station_lang.php b/application/language/german/station_lang.php index 4705aea41..fe2091241 100644 --- a/application/language/german/station_lang.php +++ b/application/language/german/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info_hint'] = "Signatur/Referenz Information der Station (z.B. DA/NW-357)."; $lang['station_location_eqsl_hint'] = "Der 'QTH Nickname' wie er in deinem eQSL Profil konfiguriert ist."; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Abonnement erforderlich'; $lang['station_location_qrz_hint'] = "Finde deinen 'QRZ Logbook API Key' in den QRZ.com Logbuch Einstellungen"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbuch Echtzeit Upload'; diff --git a/application/language/greek/station_lang.php b/application/language/greek/station_lang.php index 44ad31fde..172d9af23 100644 --- a/application/language/greek/station_lang.php +++ b/application/language/greek/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/italian/station_lang.php b/application/language/italian/station_lang.php index 44ad31fde..172d9af23 100644 --- a/application/language/italian/station_lang.php +++ b/application/language/italian/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/polish/station_lang.php b/application/language/polish/station_lang.php index 44ad31fde..172d9af23 100644 --- a/application/language/polish/station_lang.php +++ b/application/language/polish/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/russian/station_lang.php b/application/language/russian/station_lang.php index 7e8cdf467..6726851ef 100644 --- a/application/language/russian/station_lang.php +++ b/application/language/russian/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info_hint'] = "Информация о подписис станции (т.е. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'Название профиля, который сконфигурирован в eQSL для данного QTH'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Требуется подписка'; $lang['station_location_qrz_hint'] = "Ваш ключ API находится на странице настроек журнала QRZ.com"; $lang['station_location_qrz_realtime_upload'] = 'Загрузка в журнал QRZ.com в реальном времени'; diff --git a/application/language/spanish/station_lang.php b/application/language/spanish/station_lang.php index 44ad31fde..172d9af23 100644 --- a/application/language/spanish/station_lang.php +++ b/application/language/spanish/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/swedish/station_lang.php b/application/language/swedish/station_lang.php index 44ad31fde..172d9af23 100644 --- a/application/language/swedish/station_lang.php +++ b/application/language/swedish/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/turkish/station_lang.php b/application/language/turkish/station_lang.php index 44ad31fde..172d9af23 100644 --- a/application/language/turkish/station_lang.php +++ b/application/language/turkish/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; From e403e8e55cc4bca9132d78a29d9bc6a9fc9ede2e Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 2 Dec 2023 09:25:46 +0100 Subject: [PATCH 02/11] char counter for eqsl msg --- application/views/interface_assets/footer.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index d013da679..bf29d5233 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -82,6 +82,20 @@ function load_was_map() { +uri->segment(1) == "station") { ?> + + + uri->segment(1) == "awards" && ($this->uri->segment(2) == "cq") ) { ?> From 75f052e830b804d066817669487967cffed91edc Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 2 Dec 2023 09:25:58 +0100 Subject: [PATCH 03/11] char counter for eqsl msg --- application/views/station_profile/create.php | 23 ++++++++++---------- application/views/station_profile/edit.php | 3 ++- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php index bcd2ff0b5..e5ee9c3b2 100644 --- a/application/views/station_profile/create.php +++ b/application/views/station_profile/create.php @@ -251,17 +251,18 @@
- - 240. -
- -
- - -
+ + + + + +
+ + +
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index e3192ad6b..9c9bcfeed 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -354,9 +354,10 @@
+ - 240. +
From def874c1a2174e480e4b6d11431dac6af2e7a68f Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 2 Dec 2023 09:39:33 +0100 Subject: [PATCH 04/11] eqsl language translation german --- application/language/german/qso_lang.php | 2 +- application/language/german/station_lang.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/language/german/qso_lang.php b/application/language/german/qso_lang.php index b4defe32f..38d20e146 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -26,7 +26,7 @@ $lang['qso_notes_helptext'] = 'Notizeninhalt wird nur innerhalb von Cloudlog genutzt und nicht an andere Dienste weitergegeben.'; $lang['qsl_notes_helptext'] = 'Dieser Notizeninhalt wird an QSL Services wie eqsl.cc exportiert.'; -$lang['qso_eqsl_qslmsg_helptext'] = "Get the default message for eQSL, for this station."; +$lang['qso_eqsl_qslmsg_helptext'] = "Setze die eQSL Nachricht auf den Standardtext zurück."; // Button Text on /qso Display diff --git a/application/language/german/station_lang.php b/application/language/german/station_lang.php index fe2091241..597c95bf4 100644 --- a/application/language/german/station_lang.php +++ b/application/language/german/station_lang.php @@ -94,8 +94,8 @@ $lang['station_location_signature_info'] = "Signatur Information"; $lang['station_location_signature_info_hint'] = "Signatur/Referenz Information der Station (z.B. DA/NW-357)."; $lang['station_location_eqsl_hint'] = "Der 'QTH Nickname' wie er in deinem eQSL Profil konfiguriert ist."; -$lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; +$lang['station_location_eqsl_defaultqslmsg'] = "Standard QSLMSG"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Definiere eine Standard-Nachricht, welche für jedes QSO in diesem Stationsstandort an eQSL übertragen wird."; $lang['station_location_qrz_subscription'] = 'Abonnement erforderlich'; $lang['station_location_qrz_hint'] = "Finde deinen 'QRZ Logbook API Key' in den QRZ.com Logbuch Einstellungen"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbuch Echtzeit Upload'; From 262d6831d81a751eff910f0594eeef303ad6a8aa Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 2 Dec 2023 09:39:45 +0100 Subject: [PATCH 05/11] layout fix eqsl msg --- application/views/qso/edit_ajax.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/application/views/qso/edit_ajax.php b/application/views/qso/edit_ajax.php index 3efde2b18..bcc2772e6 100644 --- a/application/views/qso/edit_ajax.php +++ b/application/views/qso/edit_ajax.php @@ -510,16 +510,16 @@
-
- - -
-
+
+ +
+
+ -
+
From 3d70bde94d9f87ffd233227363c1b0c3a1d4c6ab Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 2 Dec 2023 11:07:59 +0100 Subject: [PATCH 06/11] charcounter --- assets/js/sections/eqslcharcounter.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 assets/js/sections/eqslcharcounter.js diff --git a/assets/js/sections/eqslcharcounter.js b/assets/js/sections/eqslcharcounter.js new file mode 100644 index 000000000..92ba23229 --- /dev/null +++ b/assets/js/sections/eqslcharcounter.js @@ -0,0 +1,18 @@ +$('#eqslDefaultQSLMsg').keyup(function(event) { + calcRemainingChars(event); +}); + +$('#qslmsg').keyup(function(event) { + calcRemainingChars(event); +}); + +function calcRemainingChars(event) { + var remainingChars = 240 - $(event.target).val().length; + $('#charsLeft').text(remainingChars + "/240"); + + if (remainingChars < 5) { + $('#charsLeft').css('color', 'red'); + } else { + $('#charsLeft').css('color', ''); + } +} \ No newline at end of file From 0567bfed19bff3cc855f45a44a4930514a21a84d Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 2 Dec 2023 11:08:46 +0100 Subject: [PATCH 07/11] replaced charcounter js --- application/views/interface_assets/footer.php | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index bf29d5233..7725b668b 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -45,6 +45,7 @@ + @@ -82,20 +83,6 @@ function load_was_map() { -uri->segment(1) == "station") { ?> - - - uri->segment(1) == "awards" && ($this->uri->segment(2) == "cq") ) { ?> From 229a76041669b943f52c946c3209af78e9b44a81 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 2 Dec 2023 11:08:59 +0100 Subject: [PATCH 08/11] eqsl charcounter --- application/views/qso/edit_ajax.php | 6 ++++-- application/views/qso/index.php | 7 ++++--- application/views/station_profile/create.php | 2 +- application/views/station_profile/edit.php | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/application/views/qso/edit_ajax.php b/application/views/qso/edit_ajax.php index bcc2772e6..03120e53d 100644 --- a/application/views/qso/edit_ajax.php +++ b/application/views/qso/edit_ajax.php @@ -22,6 +22,7 @@ + @@ -510,13 +511,14 @@
-
+
-
+
+
diff --git a/application/views/qso/index.php b/application/views/qso/index.php index b6cbed4bc..ba10812f3 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -532,9 +532,10 @@
- - - + + + +
diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php index e5ee9c3b2..833ab867f 100644 --- a/application/views/station_profile/create.php +++ b/application/views/station_profile/create.php @@ -251,7 +251,7 @@
- +
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index 9c9bcfeed..f41c48bbe 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -354,7 +354,7 @@
- + From 779ba26b28670a2c4c5685c231c3cd26eb12f3eb Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 2 Dec 2023 13:00:56 +0100 Subject: [PATCH 09/11] adjustment for charcoiunt in qso edit --- application/views/qso/edit_ajax.php | 2 -- assets/js/sections/common.js | 3 +++ assets/js/sections/eqslcharcounter.js | 12 ++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/application/views/qso/edit_ajax.php b/application/views/qso/edit_ajax.php index 03120e53d..91d5f8bfe 100644 --- a/application/views/qso/edit_ajax.php +++ b/application/views/qso/edit_ajax.php @@ -22,8 +22,6 @@ - - diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js index 123cb4a06..e8f3c8ddb 100644 --- a/assets/js/sections/common.js +++ b/assets/js/sections/common.js @@ -297,6 +297,9 @@ function qso_edit(id) { // [eQSL default msg] change value (for qso edit page) // $('.modal-content #stationProfile').change(function() { qso_set_eqsl_qslmsg($('.modal-content #stationProfile').val(),false,'.modal-content'); }); $('.modal-content .qso_eqsl_qslmsg_update').off('click').on('click',function() { qso_set_eqsl_qslmsg($('.modal-content #stationProfile').val(),true,'.modal-content'); }); + $('.modal-content #qslmsg').keyup(function(event) { + calcRemainingChars(event, '.modal-content'); + }); }, }); } diff --git a/assets/js/sections/eqslcharcounter.js b/assets/js/sections/eqslcharcounter.js index 92ba23229..0f1e68266 100644 --- a/assets/js/sections/eqslcharcounter.js +++ b/assets/js/sections/eqslcharcounter.js @@ -2,17 +2,17 @@ $('#eqslDefaultQSLMsg').keyup(function(event) { calcRemainingChars(event); }); -$('#qslmsg').keyup(function(event) { - calcRemainingChars(event); +$('.qso_panel #qslmsg').keyup(function(event) { + calcRemainingChars(event, '.qso_panel'); }); -function calcRemainingChars(event) { +function calcRemainingChars(event, object = '') { var remainingChars = 240 - $(event.target).val().length; - $('#charsLeft').text(remainingChars + "/240"); + $(object + ' #charsLeft').text(remainingChars + "/240"); if (remainingChars < 5) { - $('#charsLeft').css('color', 'red'); + $(object + ' #charsLeft').css('color', 'red'); } else { - $('#charsLeft').css('color', ''); + $(object + ' #charsLeft').css('color', ''); } } \ No newline at end of file From 59d0ad2597dfe09786174ea848bb4282a11919bd Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 2 Dec 2023 15:02:58 +0100 Subject: [PATCH 10/11] readability --- assets/js/sections/common.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js index e8f3c8ddb..4f031fb73 100644 --- a/assets/js/sections/common.js +++ b/assets/js/sections/common.js @@ -295,8 +295,12 @@ function qso_edit(id) { } }); // [eQSL default msg] change value (for qso edit page) // - $('.modal-content #stationProfile').change(function() { qso_set_eqsl_qslmsg($('.modal-content #stationProfile').val(),false,'.modal-content'); }); - $('.modal-content .qso_eqsl_qslmsg_update').off('click').on('click',function() { qso_set_eqsl_qslmsg($('.modal-content #stationProfile').val(),true,'.modal-content'); }); + $('.modal-content #stationProfile').change(function() { + qso_set_eqsl_qslmsg($('.modal-content #stationProfile').val(),false,'.modal-content'); + }); + $('.modal-content .qso_eqsl_qslmsg_update').off('click').on('click',function() { + qso_set_eqsl_qslmsg($('.modal-content #stationProfile').val(),true,'.modal-content'); + }); $('.modal-content #qslmsg').keyup(function(event) { calcRemainingChars(event, '.modal-content'); }); From b7014de6577df152dfc466618365434518a437c0 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 2 Dec 2023 15:10:02 +0100 Subject: [PATCH 11/11] let charcounter disappear if reset qslmsg --- application/views/interface_assets/footer.php | 5 ++++- assets/js/sections/common.js | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 7725b668b..5d5fe1e95 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -1243,7 +1243,10 @@ function(dxspot) { qso_set_eqsl_qslmsg(stationProfile,false,'.qso_panel'); }); // [eQSL default msg] change value on clic // - $('.qso_panel .qso_eqsl_qslmsg_update').off('click').on('click',function() { qso_set_eqsl_qslmsg($('.qso_panel #stationProfile').val(),true,'.qso_panel'); }); + $('.qso_panel .qso_eqsl_qslmsg_update').off('click').on('click',function() { + qso_set_eqsl_qslmsg($('.qso_panel #stationProfile').val(),true,'.qso_panel'); + $('#charsLeft').text(" "); + }); session->userdata('user_qth_lookup') == 1) { ?> $('#qth').focusout(function() { diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js index 4f031fb73..2c557560a 100644 --- a/assets/js/sections/common.js +++ b/assets/js/sections/common.js @@ -300,6 +300,7 @@ function qso_edit(id) { }); $('.modal-content .qso_eqsl_qslmsg_update').off('click').on('click',function() { qso_set_eqsl_qslmsg($('.modal-content #stationProfile').val(),true,'.modal-content'); + $('.modal-content #charsLeft').text(" "); }); $('.modal-content #qslmsg').keyup(function(event) { calcRemainingChars(event, '.modal-content');