From 5a681f649813dc388747a08b52d1e5904d4c5557 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 10 Mar 2024 16:48:02 +0100 Subject: [PATCH 1/3] fix ref buttons --- application/views/qso/index.php | 6 +++--- assets/css/general.css | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 3001bd49d..38d525b8d 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -377,7 +377,7 @@
- +
@@ -388,7 +388,7 @@
- +
@@ -399,7 +399,7 @@
- +
diff --git a/assets/css/general.css b/assets/css/general.css index e68763db1..a1e9f894c 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -859,7 +859,7 @@ label { .spw-buttons { --bs-btn-padding-x: 0.3rem; - --bs-btn-padding-y: 0.1rem; + --bs-btn-padding-y: 0.6rem; display: none; } From aa1cc16119539f150050ff2ac60fd4f380488389 Mon Sep 17 00:00:00 2001 From: phl0 Date: Sun, 10 Mar 2024 17:06:01 +0100 Subject: [PATCH 2/3] Add missing lang tag --- application/language/bulgarian/account_lang.php | 1 + application/language/chinese_simplified/account_lang.php | 1 + application/language/czech/account_lang.php | 1 + application/language/dutch/account_lang.php | 1 + application/language/finnish/account_lang.php | 1 + application/language/french/account_lang.php | 1 + application/language/german/account_lang.php | 1 + application/language/greek/account_lang.php | 1 + application/language/italian/account_lang.php | 1 + application/language/polish/account_lang.php | 1 + application/language/russian/account_lang.php | 1 + application/language/spanish/account_lang.php | 1 + application/language/swedish/account_lang.php | 1 + application/language/turkish/account_lang.php | 1 + 14 files changed, 14 insertions(+) diff --git a/application/language/bulgarian/account_lang.php b/application/language/bulgarian/account_lang.php index a23783919..835c6d96d 100644 --- a/application/language/bulgarian/account_lang.php +++ b/application/language/bulgarian/account_lang.php @@ -131,3 +131,4 @@ $lang['account_hamsat'] = "Hams.at"; $lang['account_hamsat_private_feed_key'] = "Private Feed Key"; $lang['account_hamsat_hint'] = "See your profile at https://hams.at/users/settings."; $lang['account_hamsat_workable_only'] = "Show Workable Passes Only"; +$lang['account_hamsat_workable_only_hint'] = "If enabled shows only workable passes based on the gridsquare set in your hams.at account. Requires private feed key to be set."; diff --git a/application/language/chinese_simplified/account_lang.php b/application/language/chinese_simplified/account_lang.php index 8259578c4..63ede7841 100644 --- a/application/language/chinese_simplified/account_lang.php +++ b/application/language/chinese_simplified/account_lang.php @@ -131,3 +131,4 @@ $lang['account_hamsat'] = "Hams.at"; $lang['account_hamsat_private_feed_key'] = "Private Feed Key"; $lang['account_hamsat_hint'] = "See your profile at https://hams.at/users/settings."; $lang['account_hamsat_workable_only'] = "Show Workable Passes Only"; +$lang['account_hamsat_workable_only_hint'] = "If enabled shows only workable passes based on the gridsquare set in your hams.at account. Requires private feed key to be set."; diff --git a/application/language/czech/account_lang.php b/application/language/czech/account_lang.php index b853b8a84..d253d5429 100644 --- a/application/language/czech/account_lang.php +++ b/application/language/czech/account_lang.php @@ -131,3 +131,4 @@ $lang['account_hamsat'] = "Hams.at"; $lang['account_hamsat_private_feed_key'] = "Private Feed Key"; $lang['account_hamsat_hint'] = "See your profile at https://hams.at/users/settings."; $lang['account_hamsat_workable_only'] = "Show Workable Passes Only"; +$lang['account_hamsat_workable_only_hint'] = "If enabled shows only workable passes based on the gridsquare set in your hams.at account. Requires private feed key to be set."; diff --git a/application/language/dutch/account_lang.php b/application/language/dutch/account_lang.php index c8462a507..4bf02b0e6 100644 --- a/application/language/dutch/account_lang.php +++ b/application/language/dutch/account_lang.php @@ -131,3 +131,4 @@ $lang['account_hamsat'] = "Hams.at"; $lang['account_hamsat_private_feed_key'] = "Private Feed Key"; $lang['account_hamsat_hint'] = "See your profile at https://hams.at/users/settings."; $lang['account_hamsat_workable_only'] = "Show Workable Passes Only"; +$lang['account_hamsat_workable_only_hint'] = "If enabled shows only workable passes based on the gridsquare set in your hams.at account. Requires private feed key to be set."; diff --git a/application/language/finnish/account_lang.php b/application/language/finnish/account_lang.php index 5c7606d41..c2fb66d7f 100644 --- a/application/language/finnish/account_lang.php +++ b/application/language/finnish/account_lang.php @@ -131,3 +131,4 @@ $lang['account_hamsat'] = "Hams.at"; $lang['account_hamsat_private_feed_key'] = "Private Feed Key"; $lang['account_hamsat_hint'] = "See your profile at https://hams.at/users/settings."; $lang['account_hamsat_workable_only'] = "Show Workable Passes Only"; +$lang['account_hamsat_workable_only_hint'] = "If enabled shows only workable passes based on the gridsquare set in your hams.at account. Requires private feed key to be set."; diff --git a/application/language/french/account_lang.php b/application/language/french/account_lang.php index 911db147a..6a15b5a0c 100644 --- a/application/language/french/account_lang.php +++ b/application/language/french/account_lang.php @@ -129,3 +129,4 @@ $lang['account_hamsat'] = "Hams.at"; $lang['account_hamsat_private_feed_key'] = "Private Feed Key"; $lang['account_hamsat_hint'] = "See your profile at https://hams.at/users/settings."; $lang['account_hamsat_workable_only'] = "Show Workable Passes Only"; +$lang['account_hamsat_workable_only_hint'] = "If enabled shows only workable passes based on the gridsquare set in your hams.at account. Requires private feed key to be set."; diff --git a/application/language/german/account_lang.php b/application/language/german/account_lang.php index 378fd7ead..2785b6df5 100644 --- a/application/language/german/account_lang.php +++ b/application/language/german/account_lang.php @@ -131,3 +131,4 @@ $lang['account_hamsat'] = "Hams.at"; $lang['account_hamsat_private_feed_key'] = "Private Feed Key"; $lang['account_hamsat_hint'] = "Siehe dein Profil unter https://hams.at/users/settings."; $lang['account_hamsat_workable_only'] = "Zeige nur Überflüge an, die gearbeitet werden können"; +$lang['account_hamsat_workable_only_hint'] = "Wenn aktiviert, werden nur sichtbare Überflüge basierend auf dem Locator des hams.at Profils angezeigt. Dazu muss der Private Feed Key konfiguriert sein."; diff --git a/application/language/greek/account_lang.php b/application/language/greek/account_lang.php index f056a5c67..dbfa62fa5 100644 --- a/application/language/greek/account_lang.php +++ b/application/language/greek/account_lang.php @@ -131,3 +131,4 @@ $lang['account_hamsat'] = "Hams.at"; $lang['account_hamsat_private_feed_key'] = "Private Feed Key"; $lang['account_hamsat_hint'] = "See your profile at https://hams.at/users/settings."; $lang['account_hamsat_workable_only'] = "Show Workable Passes Only"; +$lang['account_hamsat_workable_only_hint'] = "If enabled shows only workable passes based on the gridsquare set in your hams.at account. Requires private feed key to be set."; diff --git a/application/language/italian/account_lang.php b/application/language/italian/account_lang.php index 232071863..d45fc59d8 100644 --- a/application/language/italian/account_lang.php +++ b/application/language/italian/account_lang.php @@ -131,3 +131,4 @@ $lang['account_hamsat'] = "Hams.at"; $lang['account_hamsat_private_feed_key'] = "Private Feed Key"; $lang['account_hamsat_hint'] = "See your profile at https://hams.at/users/settings."; $lang['account_hamsat_workable_only'] = "Show Workable Passes Only"; +$lang['account_hamsat_workable_only_hint'] = "If enabled shows only workable passes based on the gridsquare set in your hams.at account. Requires private feed key to be set."; diff --git a/application/language/polish/account_lang.php b/application/language/polish/account_lang.php index 5170137c5..5ebc81d24 100644 --- a/application/language/polish/account_lang.php +++ b/application/language/polish/account_lang.php @@ -131,3 +131,4 @@ $lang['account_hamsat'] = "Hams.at"; $lang['account_hamsat_private_feed_key'] = "Private Feed Key"; $lang['account_hamsat_hint'] = "See your profile at https://hams.at/users/settings."; $lang['account_hamsat_workable_only'] = "Show Workable Passes Only"; +$lang['account_hamsat_workable_only_hint'] = "If enabled shows only workable passes based on the gridsquare set in your hams.at account. Requires private feed key to be set."; diff --git a/application/language/russian/account_lang.php b/application/language/russian/account_lang.php index c8c78f5c8..93c1d3e35 100644 --- a/application/language/russian/account_lang.php +++ b/application/language/russian/account_lang.php @@ -131,3 +131,4 @@ $lang['account_hamsat'] = "Hams.at"; $lang['account_hamsat_private_feed_key'] = "Private Feed Key"; $lang['account_hamsat_hint'] = "See your profile at https://hams.at/users/settings."; $lang['account_hamsat_workable_only'] = "Show Workable Passes Only"; +$lang['account_hamsat_workable_only_hint'] = "If enabled shows only workable passes based on the gridsquare set in your hams.at account. Requires private feed key to be set."; diff --git a/application/language/spanish/account_lang.php b/application/language/spanish/account_lang.php index c9ba99e7f..118cc49a9 100644 --- a/application/language/spanish/account_lang.php +++ b/application/language/spanish/account_lang.php @@ -131,3 +131,4 @@ $lang['account_hamsat'] = "Hams.at"; $lang['account_hamsat_private_feed_key'] = "Private Feed Key"; $lang['account_hamsat_hint'] = "See your profile at https://hams.at/users/settings."; $lang['account_hamsat_workable_only'] = "Show Workable Passes Only"; +$lang['account_hamsat_workable_only_hint'] = "If enabled shows only workable passes based on the gridsquare set in your hams.at account. Requires private feed key to be set."; diff --git a/application/language/swedish/account_lang.php b/application/language/swedish/account_lang.php index ded47463f..bdedbfdaf 100644 --- a/application/language/swedish/account_lang.php +++ b/application/language/swedish/account_lang.php @@ -131,3 +131,4 @@ $lang['account_hamsat'] = "Hams.at"; $lang['account_hamsat_private_feed_key'] = "Private Feed Key"; $lang['account_hamsat_hint'] = "See your profile at https://hams.at/users/settings."; $lang['account_hamsat_workable_only'] = "Show Workable Passes Only"; +$lang['account_hamsat_workable_only_hint'] = "If enabled shows only workable passes based on the gridsquare set in your hams.at account. Requires private feed key to be set."; diff --git a/application/language/turkish/account_lang.php b/application/language/turkish/account_lang.php index 4919ff513..4880575ef 100644 --- a/application/language/turkish/account_lang.php +++ b/application/language/turkish/account_lang.php @@ -131,3 +131,4 @@ $lang['account_hamsat'] = "Hams.at"; $lang['account_hamsat_private_feed_key'] = "Private Feed Key"; $lang['account_hamsat_hint'] = "See your profile at https://hams.at/users/settings."; $lang['account_hamsat_workable_only'] = "Show Workable Passes Only"; +$lang['account_hamsat_workable_only_hint'] = "If enabled shows only workable passes based on the gridsquare set in your hams.at account. Requires private feed key to be set."; From 1314302d566e509c02b165772c3748420ed860fd Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 11 Mar 2024 12:18:34 +0100 Subject: [PATCH 3/3] mig tag 1.3.1 --- application/config/migration.php | 2 +- application/migrations/188_tag_1_3_1.php | 36 ++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 application/migrations/188_tag_1_3_1.php diff --git a/application/config/migration.php b/application/config/migration.php index 4e802368f..6e6072fac 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE; | */ -$config['migration_version'] = 187; +$config['migration_version'] = 188; /* |-------------------------------------------------------------------------- diff --git a/application/migrations/188_tag_1_3_1.php b/application/migrations/188_tag_1_3_1.php new file mode 100644 index 000000000..499505000 --- /dev/null +++ b/application/migrations/188_tag_1_3_1.php @@ -0,0 +1,36 @@ +db->where('option_name', 'version'); + $this->db->update('options', array('option_value' => '1.3.1')); + + // Trigger Version Info Dialog + $this->db->where('option_type', 'version_dialog'); + $this->db->where('option_name', 'confirmed'); + $this->db->update('user_options', array('option_value' => 'false')); + + // Also set Version Dialog to "both" if only custom text is applied + $this->db->where('option_name', 'version_dialog'); + $this->db->where('option_value', 'custom_text'); + $this->db->update('options', array('option_value' => 'both')); + + + } + + public function down() + { + $this->db->where('option_name', 'version'); + $this->db->update('options', array('option_value' => '1.3')); + } +} \ No newline at end of file