From aff522334a16a779f11505d238bb47e194e08fcc Mon Sep 17 00:00:00 2001
From: phl0 <github@florian-wolters.de>
Date: Fri, 5 Apr 2024 10:56:03 +0200
Subject: [PATCH 1/4] Fix WWFF award info

---
 application/views/awards/wwff/index.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/views/awards/wwff/index.php b/application/views/awards/wwff/index.php
index 885ce735..300a5ab1 100644
--- a/application/views/awards/wwff/index.php
+++ b/application/views/awards/wwff/index.php
@@ -4,10 +4,10 @@
         <div id="awardInfoButton">
             <script>
             var lang_awards_info_button = "<?php echo lang('awards_info_button'); ?>";
-            var lang_award_info_ln1 = "<?php echo lang('awards_dok_description_ln1'); ?>";
-            var lang_award_info_ln2 = "<?php echo lang('awards_dok_description_ln2'); ?>";
-            var lang_award_info_ln3 = "<?php echo lang('awards_dok_description_ln3'); ?>";
-            var lang_award_info_ln4 = "<?php echo lang('awards_dok_description_ln4'); ?>";
+            var lang_award_info_ln1 = "<?php echo lang('awards_wwff_description_ln1'); ?>";
+            var lang_award_info_ln2 = "<?php echo lang('awards_wwff_description_ln2'); ?>";
+            var lang_award_info_ln3 = "<?php echo lang('awards_wwff_description_ln3'); ?>";
+            var lang_award_info_ln4 = "<?php echo lang('awards_wwff_description_ln4'); ?>";
             </script>
             <h2><?php echo $page_title; ?></h2>
             <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>

From bb64d68be1f7e86aacadb10b66233d4f2ab27c2f Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Fri, 5 Apr 2024 22:12:00 +0100
Subject: [PATCH 2/4] 2.6.8 tag

---
 application/config/migration.php         |  2 +-
 application/migrations/176_tag_2_6_8.php | 30 ++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 application/migrations/176_tag_2_6_8.php

diff --git a/application/config/migration.php b/application/config/migration.php
index 086fb9a7..f176f248 100644
--- a/application/config/migration.php
+++ b/application/config/migration.php
@@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE;
 |
 */
 
-$config['migration_version'] = 175;
+$config['migration_version'] = 176;
 
 /*
 |--------------------------------------------------------------------------
diff --git a/application/migrations/176_tag_2_6_8.php b/application/migrations/176_tag_2_6_8.php
new file mode 100644
index 00000000..08750991
--- /dev/null
+++ b/application/migrations/176_tag_2_6_8.php
@@ -0,0 +1,30 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+/*
+*   Tag Cloudlog as 2.6.8
+*/
+
+class Migration_tag_2_6_8 extends CI_Migration {
+
+    public function up()
+    {
+    
+        // Tag Cloudlog 2.6.3
+        $this->db->where('option_name', 'version');
+        $this->db->update('options', array('option_value' => '2.6.8'));
+
+        // 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'));
+
+    }
+
+    public function down()
+    {
+        $this->db->where('option_name', 'version');
+        $this->db->update('options', array('option_value' => '2.6.7'));
+    }
+}
\ No newline at end of file

From 02aa35f06d0b8672fb1a5cdaf3a8b0bad882442a Mon Sep 17 00:00:00 2001
From: phl0 <github@florian-wolters.de>
Date: Sun, 7 Apr 2024 08:46:35 +0200
Subject: [PATCH 3/4] Add missing German translations for SSTV stuff

---
 application/language/german/general_words_lang.php | 4 ++++
 application/language/german/menu_lang.php          | 1 +
 application/language/german/sstv_lang.php          | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/application/language/german/general_words_lang.php b/application/language/german/general_words_lang.php
index 44c55561..cc0fdf74 100644
--- a/application/language/german/general_words_lang.php
+++ b/application/language/german/general_words_lang.php
@@ -74,6 +74,10 @@ $lang['general_word_invalid_ignore'] = 'Ungültig (Ignorieren)';
 $lang['general_word_qslcard'] = 'QSL Karte';
 $lang['general_word_qslcard_management'] = 'QSL Verwaltung';
 $lang['general_word_qslcards'] = 'QSL Karten';
+$lang['general_word_sstv_management'] = 'SSTV Management';
+$lang['general_word_sstvimages'] = 'SSTV Bilder';
+$lang['general_sstv_upload'] = 'Hochgeladene SSTV Bilder';
+$lang['general_sstv_upload_button'] = 'Lade SSTV Bild(er) hoch';
 $lang['general_word_qslcard_direct'] = 'Direkt';
 $lang['general_word_qslcard_bureau'] = 'Büro';
 $lang['general_word_qslcard_electronic'] = 'Elektronisch';
diff --git a/application/language/german/menu_lang.php b/application/language/german/menu_lang.php
index 26535894..67176103 100644
--- a/application/language/german/menu_lang.php
+++ b/application/language/german/menu_lang.php
@@ -17,6 +17,7 @@ $lang['menu_post_contest_logging'] = 'Zeitversetztes Contest Logging';
 $lang['menu_bandmap'] = 'Bandmap';
 $lang['menu_view_qsl'] = 'QSL Ansicht';
 $lang['menu_view_eqsl'] = 'eQSL Ansicht';
+$lang['menu_view_sstv'] = 'SSTV Bilder';
 
 $lang['menu_notes'] = 'Notizen';
 
diff --git a/application/language/german/sstv_lang.php b/application/language/german/sstv_lang.php
index 72c4c7d0..bf3caa49 100644
--- a/application/language/german/sstv_lang.php
+++ b/application/language/german/sstv_lang.php
@@ -2,4 +2,4 @@
 
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['sstv_string_disk_space'] = 'of disk space to store SSTV image assets';
\ No newline at end of file
+$lang['sstv_string_disk_space'] = 'an Speicherplatz, um SSTV-Bilder zu speichern';

From c1c39c90214167d5d2521d10fcc84bd85be2380e Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Sun, 7 Apr 2024 14:42:13 +0100
Subject: [PATCH 4/4] [Custom Map] Increase map size

---
 application/views/map/custom_date.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/map/custom_date.php b/application/views/map/custom_date.php
index ecc255df..365fe1f2 100644
--- a/application/views/map/custom_date.php
+++ b/application/views/map/custom_date.php
@@ -94,6 +94,6 @@
 </div>
 
 <!-- Map -->
-<div id="custommap" class="map-leaflet mt-2" style="width: 100%; height: calc(100vh - 390px); max-height: 900px;"></div>
+<div id="custommap" class="map-leaflet mt-2" style="width: 100%; height: 1000px;"></div>
 
 <div class="alert alert-success" role="alert">Showing QSOs for Custom Date for Active Logbook <?php echo $logbook_name ?></div>
\ No newline at end of file