Merge pull request wavelog#217 from wavelog/dev

HB9HIL · web-flow · commit af842be3f073 · 2024-03-11T12:23:57.000+01:00
Hotfix Release 1.3.1
diff --git a/application/config/migration.php b/application/config/migration.php
@@ -22,7 +22,7 @@
 |
 */
 
-$config['migration_version'] = 187;
+$config['migration_version'] = 188;
 
 /*
 |--------------------------------------------------------------------------
diff --git a/application/language/bulgarian/account_lang.php b/application/language/bulgarian/account_lang.php
@@ -131,3 +131,4 @@
 $lang['account_hamsat_private_feed_key'] = "Private Feed Key";
 $lang['account_hamsat_hint'] = "See your profile at <a href='https://hams.at/users/settings' target='_blank'>https://hams.at/users/settings</a>.";
 $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
@@ -131,3 +131,4 @@
 $lang['account_hamsat_private_feed_key'] = "Private Feed Key";
 $lang['account_hamsat_hint'] = "See your profile at <a href='https://hams.at/users/settings' target='_blank'>https://hams.at/users/settings</a>.";
 $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
@@ -131,3 +131,4 @@
 $lang['account_hamsat_private_feed_key'] = "Private Feed Key";
 $lang['account_hamsat_hint'] = "See your profile at <a href='https://hams.at/users/settings' target='_blank'>https://hams.at/users/settings</a>.";
 $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
@@ -131,3 +131,4 @@
 $lang['account_hamsat_private_feed_key'] = "Private Feed Key";
 $lang['account_hamsat_hint'] = "See your profile at <a href='https://hams.at/users/settings' target='_blank'>https://hams.at/users/settings</a>.";
 $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
@@ -131,3 +131,4 @@
 $lang['account_hamsat_private_feed_key'] = "Private Feed Key";
 $lang['account_hamsat_hint'] = "See your profile at <a href='https://hams.at/users/settings' target='_blank'>https://hams.at/users/settings</a>.";
 $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
@@ -129,3 +129,4 @@
 $lang['account_hamsat_private_feed_key'] = "Private Feed Key";
 $lang['account_hamsat_hint'] = "See your profile at <a href='https://hams.at/users/settings' target='_blank'>https://hams.at/users/settings</a>.";
 $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
@@ -131,3 +131,4 @@
 $lang['account_hamsat_private_feed_key'] = "Private Feed Key";
 $lang['account_hamsat_hint'] = "Siehe dein Profil unter <a href='https://hams.at/users/settings' target='_blank'>https://hams.at/users/settings</a>.";
 $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
@@ -131,3 +131,4 @@
 $lang['account_hamsat_private_feed_key'] = "Private Feed Key";
 $lang['account_hamsat_hint'] = "See your profile at <a href='https://hams.at/users/settings' target='_blank'>https://hams.at/users/settings</a>.";
 $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
@@ -131,3 +131,4 @@
 $lang['account_hamsat_private_feed_key'] = "Private Feed Key";
 $lang['account_hamsat_hint'] = "See your profile at <a href='https://hams.at/users/settings' target='_blank'>https://hams.at/users/settings</a>.";
 $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
@@ -131,3 +131,4 @@
 $lang['account_hamsat_private_feed_key'] = "Private Feed Key";
 $lang['account_hamsat_hint'] = "See your profile at <a href='https://hams.at/users/settings' target='_blank'>https://hams.at/users/settings</a>.";
 $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
@@ -131,3 +131,4 @@
 $lang['account_hamsat_private_feed_key'] = "Private Feed Key";
 $lang['account_hamsat_hint'] = "See your profile at <a href='https://hams.at/users/settings' target='_blank'>https://hams.at/users/settings</a>.";
 $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
@@ -131,3 +131,4 @@
 $lang['account_hamsat_private_feed_key'] = "Private Feed Key";
 $lang['account_hamsat_hint'] = "See your profile at <a href='https://hams.at/users/settings' target='_blank'>https://hams.at/users/settings</a>.";
 $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
@@ -131,3 +131,4 @@
 $lang['account_hamsat_private_feed_key'] = "Private Feed Key";
 $lang['account_hamsat_hint'] = "See your profile at <a href='https://hams.at/users/settings' target='_blank'>https://hams.at/users/settings</a>.";
 $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
@@ -131,3 +131,4 @@
 $lang['account_hamsat_private_feed_key'] = "Private Feed Key";
 $lang['account_hamsat_hint'] = "See your profile at <a href='https://hams.at/users/settings' target='_blank'>https://hams.at/users/settings</a>.";
 $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/migrations/188_tag_1_3_1.php b/application/migrations/188_tag_1_3_1.php
@@ -0,0 +1,36 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+/*
+        Tag Wavelog as Version 1.3.1
+*/
+
+class Migration_tag_1_3_1 extends CI_Migration {      
+
+    public function up()
+    {
+    
+        // Tag Wavelog New Version                           
+        $this->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'));  
+    }
+}
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
@@ -377,7 +377,7 @@
                 <small id="sotaRefHelp" class="form-text text-muted"><?php echo lang('qso_sota_ref_helptext'); ?></small>
               </div>
               <div class="mb-3 col-md-3 align-self-center">
-                <button id="sota_info" class="btn btn-secondary spw-buttons"></button>
+                <small id="sota_info" class="btn btn-secondary spw-buttons"></small>
               </div>
             </div>
 
@@ -388,7 +388,7 @@
                 <small id="wwffRefHelp" class="form-text text-muted"><?php echo lang('qso_wwff_ref_helptext'); ?></small>
               </div>
               <div class="mb-3 col-md-3 align-self-center">
-                <button id="wwff_info" class="btn btn-secondary spw-buttons"></button>
+                <small id="wwff_info" class="btn btn-secondary spw-buttons"></small>
               </div>
             </div>
 
@@ -399,7 +399,7 @@
                 <small id="potaRefHelp" class="form-text text-muted"><?php echo lang('qso_pota_ref_helptext'); ?></small>
               </div>
               <div class="mb-3 col-md-3 align-self-center">
-                <button id="pota_info" class="btn btn-secondary spw-buttons"></button>
+                <small id="pota_info" class="btn btn-secondary spw-buttons"></small>
               </div>
             </div>
 
diff --git 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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`\|`
`23`	`23`	`*/`
`24`	`24`
`25`		`-$config['migration_version'] = 187;`
	`25`	`+$config['migration_version'] = 188;`
`26`	`26`
`27`	`27`	`/*`
`28`	`28`	`\|--------------------------------------------------------------------------`