From 2fe5720da99cbfcf7f9ace7341e99f6e2cbe1a5f Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 14 Oct 2023 20:12:48 +0200 Subject: [PATCH 1/8] Station DXCC Deleted Warning --- .../language/bulgarian/station_lang.php | 1 + .../chinese_simplified/station_lang.php | 1 + application/language/czech/station_lang.php | 1 + application/language/dutch/station_lang.php | 1 + application/language/english/station_lang.php | 1 + application/language/finnish/station_lang.php | 1 + application/language/french/station_lang.php | 1 + application/language/german/station_lang.php | 1 + application/language/greek/station_lang.php | 1 + application/language/italian/station_lang.php | 1 + application/language/polish/station_lang.php | 1 + application/language/russian/station_lang.php | 1 + application/language/spanish/station_lang.php | 1 + application/language/swedish/station_lang.php | 1 + application/language/turkish/station_lang.php | 1 + application/views/station_profile/create.php | 19 ++++++++ application/views/station_profile/edit.php | 48 ++++++++++++++----- 17 files changed, 71 insertions(+), 11 deletions(-) diff --git a/application/language/bulgarian/station_lang.php b/application/language/bulgarian/station_lang.php index 5d8e037a..ce5d2c0f 100644 --- a/application/language/bulgarian/station_lang.php +++ b/application/language/bulgarian/station_lang.php @@ -31,6 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/chinese_simplified/station_lang.php b/application/language/chinese_simplified/station_lang.php index 5d8e037a..ce5d2c0f 100644 --- a/application/language/chinese_simplified/station_lang.php +++ b/application/language/chinese_simplified/station_lang.php @@ -31,6 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/czech/station_lang.php b/application/language/czech/station_lang.php index 5d8e037a..ce5d2c0f 100644 --- a/application/language/czech/station_lang.php +++ b/application/language/czech/station_lang.php @@ -31,6 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/dutch/station_lang.php b/application/language/dutch/station_lang.php index 5d8e037a..ce5d2c0f 100644 --- a/application/language/dutch/station_lang.php +++ b/application/language/dutch/station_lang.php @@ -31,6 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/english/station_lang.php b/application/language/english/station_lang.php index 8ab12cb4..be785f8f 100644 --- a/application/language/english/station_lang.php +++ b/application/language/english/station_lang.php @@ -31,6 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/finnish/station_lang.php b/application/language/finnish/station_lang.php index 5d8e037a..ce5d2c0f 100644 --- a/application/language/finnish/station_lang.php +++ b/application/language/finnish/station_lang.php @@ -31,6 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/french/station_lang.php b/application/language/french/station_lang.php index 5d8e037a..ce5d2c0f 100644 --- a/application/language/french/station_lang.php +++ b/application/language/french/station_lang.php @@ -31,6 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/german/station_lang.php b/application/language/german/station_lang.php index db0f3b10..fad5b242 100644 --- a/application/language/german/station_lang.php +++ b/application/language/german/station_lang.php @@ -31,6 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Bist du sicher, dass du $lang['station_location_confirm_del_stationlocation_qso'] = 'Es werden alle QSO an diesem Stationsstandort gelöscht!'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = "Station DXCC Einteilung. Zum Beispiel: 'Federal Republic of Germany'"; +$lang['station_location_dxcc_warning'] = "Stoppe hier für einen Moment. Das von dir gewählte DXCC ist abgelaufen und nicht mehr gültig. Überprüfe, welches das richtige DXCC für den Standort der Station ist. Als Beispiel: Deutschland ist nicht mehr \'Germany\' sondern \'Federal Republic of Germany\'"; $lang['station_location_city'] = 'Station Stadt'; $lang['station_location_city_hint'] = 'Station Stadt. Zum Beispiel: Berlin'; $lang['station_location_state'] = 'Station Staat'; diff --git a/application/language/greek/station_lang.php b/application/language/greek/station_lang.php index 5d8e037a..ce5d2c0f 100644 --- a/application/language/greek/station_lang.php +++ b/application/language/greek/station_lang.php @@ -31,6 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/italian/station_lang.php b/application/language/italian/station_lang.php index 5d8e037a..ce5d2c0f 100644 --- a/application/language/italian/station_lang.php +++ b/application/language/italian/station_lang.php @@ -31,6 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/polish/station_lang.php b/application/language/polish/station_lang.php index 5d8e037a..ce5d2c0f 100644 --- a/application/language/polish/station_lang.php +++ b/application/language/polish/station_lang.php @@ -31,6 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/russian/station_lang.php b/application/language/russian/station_lang.php index 5d8e037a..ce5d2c0f 100644 --- a/application/language/russian/station_lang.php +++ b/application/language/russian/station_lang.php @@ -31,6 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/spanish/station_lang.php b/application/language/spanish/station_lang.php index 5d8e037a..ce5d2c0f 100644 --- a/application/language/spanish/station_lang.php +++ b/application/language/spanish/station_lang.php @@ -31,6 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/swedish/station_lang.php b/application/language/swedish/station_lang.php index 5d8e037a..ce5d2c0f 100644 --- a/application/language/swedish/station_lang.php +++ b/application/language/swedish/station_lang.php @@ -31,6 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/turkish/station_lang.php b/application/language/turkish/station_lang.php index 5d8e037a..ce5d2c0f 100644 --- a/application/language/turkish/station_lang.php +++ b/application/language/turkish/station_lang.php @@ -31,6 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php index 30d7a112..bf73dcf3 100644 --- a/application/views/station_profile/create.php +++ b/application/views/station_profile/create.php @@ -58,7 +58,26 @@ +
+ + +
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index e13deff4..2eda1248 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -64,20 +64,46 @@
+
- - num_rows() > 0) { ?> - - - + + num_rows() > 0) { ?> + + + +
+ + +
From 262c0ea888ef93cc7fe8a7acd9a3b305d661bae5 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 14 Oct 2023 20:16:44 +0200 Subject: [PATCH 2/8] Pretty Code --- application/views/station_profile/create.php | 26 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php index bf73dcf3..e8bebb6e 100644 --- a/application/views/station_profile/create.php +++ b/application/views/station_profile/create.php @@ -62,20 +62,20 @@
- + From 4b0f32fd6a70c0c6c5c4dddaf3cec5e6e0906293 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 14 Oct 2023 21:05:33 +0200 Subject: [PATCH 3/8] js snippet of dxcc warning in footer --- application/views/interface_assets/footer.php | 15 ++++++++++++ application/views/station_profile/create.php | 24 ++++--------------- application/views/station_profile/edit.php | 24 ++++--------------- 3 files changed, 25 insertions(+), 38 deletions(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index d5ac95d3..ccf684fc 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -541,6 +541,21 @@ $(document).ready(function() { }); + +
num_rows() > 0) { ?> @@ -60,24 +64,6 @@
- - -
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index 2eda1248..46b2d23d 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -64,7 +64,11 @@
- + +
@@ -86,24 +90,6 @@
- - -
From 983ad2c233a9b9d5f5178bec98012d44a3d7dfc2 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 16 Oct 2023 10:42:26 +0200 Subject: [PATCH 4/8] Updated Lang --- 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/finnish/station_lang.php | 2 +- application/language/french/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 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/application/language/bulgarian/station_lang.php b/application/language/bulgarian/station_lang.php index ce5d2c0f..471a2f4b 100644 --- a/application/language/bulgarian/station_lang.php +++ b/application/language/bulgarian/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/chinese_simplified/station_lang.php b/application/language/chinese_simplified/station_lang.php index ce5d2c0f..471a2f4b 100644 --- a/application/language/chinese_simplified/station_lang.php +++ b/application/language/chinese_simplified/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/czech/station_lang.php b/application/language/czech/station_lang.php index ce5d2c0f..471a2f4b 100644 --- a/application/language/czech/station_lang.php +++ b/application/language/czech/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/dutch/station_lang.php b/application/language/dutch/station_lang.php index ce5d2c0f..471a2f4b 100644 --- a/application/language/dutch/station_lang.php +++ b/application/language/dutch/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/finnish/station_lang.php b/application/language/finnish/station_lang.php index ce5d2c0f..471a2f4b 100644 --- a/application/language/finnish/station_lang.php +++ b/application/language/finnish/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/french/station_lang.php b/application/language/french/station_lang.php index ce5d2c0f..471a2f4b 100644 --- a/application/language/french/station_lang.php +++ b/application/language/french/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/greek/station_lang.php b/application/language/greek/station_lang.php index ce5d2c0f..471a2f4b 100644 --- a/application/language/greek/station_lang.php +++ b/application/language/greek/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/italian/station_lang.php b/application/language/italian/station_lang.php index ce5d2c0f..471a2f4b 100644 --- a/application/language/italian/station_lang.php +++ b/application/language/italian/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/polish/station_lang.php b/application/language/polish/station_lang.php index ce5d2c0f..471a2f4b 100644 --- a/application/language/polish/station_lang.php +++ b/application/language/polish/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/russian/station_lang.php b/application/language/russian/station_lang.php index ce5d2c0f..471a2f4b 100644 --- a/application/language/russian/station_lang.php +++ b/application/language/russian/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/spanish/station_lang.php b/application/language/spanish/station_lang.php index ce5d2c0f..471a2f4b 100644 --- a/application/language/spanish/station_lang.php +++ b/application/language/spanish/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/swedish/station_lang.php b/application/language/swedish/station_lang.php index ce5d2c0f..471a2f4b 100644 --- a/application/language/swedish/station_lang.php +++ b/application/language/swedish/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/turkish/station_lang.php b/application/language/turkish/station_lang.php index ce5d2c0f..471a2f4b 100644 --- a/application/language/turkish/station_lang.php +++ b/application/language/turkish/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. A updated list of all DXCC you can find href='https://www.arrl.org/files/file/DXCC/2022_Current_Deleted.txt'>here"; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; From cf540407c87d6b934ab02330db1394cc5d81bf6f Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 16 Oct 2023 10:51:04 +0200 Subject: [PATCH 5/8] Changed Warning Color --- application/views/interface_assets/footer.php | 2 +- application/views/station_profile/create.php | 2 +- application/views/station_profile/edit.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index ccf684fc..57cf9b53 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -547,7 +547,7 @@ document.getElementById('dxcc_select').addEventListener('change', function() { var isDeleted = selectedOption.textContent.includes(""); if (isDeleted) { - this.style.border = '2px solid red'; + this.style.border = '2px solid rgb(217, 83, 79)'; warningMessage.innerText = lang_station_location_dxcc_warning; } else { this.style.border = ''; diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php index c48b853d..a5874581 100644 --- a/application/views/station_profile/create.php +++ b/application/views/station_profile/create.php @@ -62,7 +62,7 @@ -
+
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index 46b2d23d..d42f9702 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -88,7 +88,7 @@ -
+
From 9b2c4b713fc82fe37124bec2544d679e3bfac8d4 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 16 Oct 2023 11:22:26 +0200 Subject: [PATCH 6/8] Changed Style and added a sentence --- 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 +- application/views/station_profile/create.php | 2 +- application/views/station_profile/edit.php | 2 +- assets/css/general.css | 5 +++++ 18 files changed, 22 insertions(+), 17 deletions(-) diff --git a/application/language/bulgarian/station_lang.php b/application/language/bulgarian/station_lang.php index 471a2f4b..eb8bd0be 100644 --- a/application/language/bulgarian/station_lang.php +++ b/application/language/bulgarian/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/chinese_simplified/station_lang.php b/application/language/chinese_simplified/station_lang.php index 471a2f4b..eb8bd0be 100644 --- a/application/language/chinese_simplified/station_lang.php +++ b/application/language/chinese_simplified/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/czech/station_lang.php b/application/language/czech/station_lang.php index 471a2f4b..eb8bd0be 100644 --- a/application/language/czech/station_lang.php +++ b/application/language/czech/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/dutch/station_lang.php b/application/language/dutch/station_lang.php index 471a2f4b..eb8bd0be 100644 --- a/application/language/dutch/station_lang.php +++ b/application/language/dutch/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/english/station_lang.php b/application/language/english/station_lang.php index be785f8f..53b7fc39 100644 --- a/application/language/english/station_lang.php +++ b/application/language/english/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/finnish/station_lang.php b/application/language/finnish/station_lang.php index 471a2f4b..eb8bd0be 100644 --- a/application/language/finnish/station_lang.php +++ b/application/language/finnish/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/french/station_lang.php b/application/language/french/station_lang.php index 471a2f4b..eb8bd0be 100644 --- a/application/language/french/station_lang.php +++ b/application/language/french/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/german/station_lang.php b/application/language/german/station_lang.php index fad5b242..2d9df402 100644 --- a/application/language/german/station_lang.php +++ b/application/language/german/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Bist du sicher, dass du $lang['station_location_confirm_del_stationlocation_qso'] = 'Es werden alle QSO an diesem Stationsstandort gelöscht!'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = "Station DXCC Einteilung. Zum Beispiel: 'Federal Republic of Germany'"; -$lang['station_location_dxcc_warning'] = "Stoppe hier für einen Moment. Das von dir gewählte DXCC ist abgelaufen und nicht mehr gültig. Überprüfe, welches das richtige DXCC für den Standort der Station ist. Als Beispiel: Deutschland ist nicht mehr \'Germany\' sondern \'Federal Republic of Germany\'"; +$lang['station_location_dxcc_warning'] = "Stoppe hier für einen Moment. Das von dir gewählte DXCC ist abgelaufen und nicht mehr gültig. Überprüfe, welches das richtige DXCC für den Standort der Station ist. Als Beispiel: Deutschland ist nicht mehr \'Germany\' sondern \'Federal Republic of Germany\'. Wenn du dir sicher bist, ignoriere diese Warnung."; $lang['station_location_city'] = 'Station Stadt'; $lang['station_location_city_hint'] = 'Station Stadt. Zum Beispiel: Berlin'; $lang['station_location_state'] = 'Station Staat'; diff --git a/application/language/greek/station_lang.php b/application/language/greek/station_lang.php index 471a2f4b..eb8bd0be 100644 --- a/application/language/greek/station_lang.php +++ b/application/language/greek/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/italian/station_lang.php b/application/language/italian/station_lang.php index 471a2f4b..eb8bd0be 100644 --- a/application/language/italian/station_lang.php +++ b/application/language/italian/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/polish/station_lang.php b/application/language/polish/station_lang.php index 471a2f4b..eb8bd0be 100644 --- a/application/language/polish/station_lang.php +++ b/application/language/polish/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/russian/station_lang.php b/application/language/russian/station_lang.php index 471a2f4b..eb8bd0be 100644 --- a/application/language/russian/station_lang.php +++ b/application/language/russian/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/spanish/station_lang.php b/application/language/spanish/station_lang.php index 471a2f4b..eb8bd0be 100644 --- a/application/language/spanish/station_lang.php +++ b/application/language/spanish/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/swedish/station_lang.php b/application/language/swedish/station_lang.php index 471a2f4b..eb8bd0be 100644 --- a/application/language/swedish/station_lang.php +++ b/application/language/swedish/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/language/turkish/station_lang.php b/application/language/turkish/station_lang.php index 471a2f4b..eb8bd0be 100644 --- a/application/language/turkish/station_lang.php +++ b/application/language/turkish/station_lang.php @@ -31,7 +31,7 @@ $lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want d $lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?'; $lang['station_location_dxcc'] = 'Station DXCC'; $lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland'; -$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one."; +$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning."; $lang['station_location_city'] = 'Station City'; $lang['station_location_city_hint'] = 'Station city. For example: Inverness'; $lang['station_location_state'] = 'Station State'; diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php index a5874581..1a41eef1 100644 --- a/application/views/station_profile/create.php +++ b/application/views/station_profile/create.php @@ -62,7 +62,7 @@ -
+
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index d42f9702..37c6d45e 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -88,7 +88,7 @@ -
+
diff --git a/assets/css/general.css b/assets/css/general.css index 6a9794d7..9664f88e 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -537,3 +537,8 @@ div#station_logbooks_linked_table_paginate { #dx, #state, #gridsquare, #sota, #wwff, #pota { text-transform: uppercase; } + +#warningMessage { + color: white !Important; + background-color: rgb(217, 83, 79) !Important; +} From d01813730837d6d4760461fa353af07e70605a79 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 16 Oct 2023 17:04:48 +0200 Subject: [PATCH 7/8] changed to jquery, used bootstrap alerts --- application/views/interface_assets/footer.php | 23 +++++++++++-------- application/views/station_profile/create.php | 7 ++---- application/views/station_profile/edit.php | 7 ++---- assets/css/general.css | 5 ---- 4 files changed, 18 insertions(+), 24 deletions(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 57cf9b53..30f1cea4 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -542,17 +542,22 @@ $(document).ready(function() { diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php index 1a41eef1..6408889e 100644 --- a/application/views/station_profile/create.php +++ b/application/views/station_profile/create.php @@ -46,10 +46,7 @@
- +
num_rows() > 0) { ?> @@ -62,7 +59,7 @@ -
+
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index 37c6d45e..f8a24a0f 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -65,10 +65,7 @@
- +
@@ -88,7 +85,7 @@ -
+
diff --git a/assets/css/general.css b/assets/css/general.css index 9664f88e..6a9794d7 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -537,8 +537,3 @@ div#station_logbooks_linked_table_paginate { #dx, #state, #gridsquare, #sota, #wwff, #pota { text-transform: uppercase; } - -#warningMessage { - color: white !Important; - background-color: rgb(217, 83, 79) !Important; -} From 4ab1200c56c91641d5deb658a1df7152ede4aa7e Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 16 Oct 2023 17:06:07 +0200 Subject: [PATCH 8/8] Removed unnecessary comments --- application/views/station_profile/create.php | 2 -- application/views/station_profile/edit.php | 2 -- 2 files changed, 4 deletions(-) diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php index 6408889e..6c187ad2 100644 --- a/application/views/station_profile/create.php +++ b/application/views/station_profile/create.php @@ -45,8 +45,6 @@
- -
num_rows() > 0) { ?> diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index f8a24a0f..5da5c6c2 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -64,8 +64,6 @@
- -