From 460fa5db7a3d1143dc275513e2292a10bbcc64ba Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 25 May 2024 16:08:00 +0200 Subject: [PATCH 1/5] public maps language --- application/language/bulgarian/options_lang.php | 2 ++ application/language/chinese_simplified/options_lang.php | 2 ++ application/language/czech/options_lang.php | 2 ++ application/language/dutch/options_lang.php | 2 ++ application/language/english/options_lang.php | 2 ++ application/language/finnish/options_lang.php | 2 ++ application/language/french/options_lang.php | 2 ++ application/language/german/options_lang.php | 2 ++ application/language/greek/options_lang.php | 2 ++ application/language/italian/options_lang.php | 2 ++ application/language/polish/options_lang.php | 2 ++ application/language/russian/options_lang.php | 2 ++ application/language/spanish/options_lang.php | 2 ++ application/language/swedish/options_lang.php | 2 ++ application/language/turkish/options_lang.php | 2 ++ 15 files changed, 30 insertions(+) diff --git a/application/language/bulgarian/options_lang.php b/application/language/bulgarian/options_lang.php index f6b7091a5..259393713 100644 --- a/application/language/bulgarian/options_lang.php +++ b/application/language/bulgarian/options_lang.php @@ -16,6 +16,8 @@ $lang['options_dashboard_map'] = 'Dashboard Map'; $lang['options_this_allows_the_map_on_the_dashboard_to_be_disabled_or_placed_on_the_right'] = 'This allows the map on the dashboard to be disabled or placed on the right.'; $lang['options_logbook_map'] = 'Logbook Map'; $lang['options_this_allows_to_disable_the_map_in_the_logbook'] = 'This allows to disable the map in the logbook.'; +$lang['options_public_maps'] = "Public Maps"; +$lang['options_this_allows_to_disable_all_maps_in_the_public_view'] = "This allows to disable all maps in the public view. This affects the main map and the gridsquares map."; $lang['options_theme_changed_to'] = 'Theme changed to '; $lang['options_global_search_changed_to'] = 'Global Search changed to '; $lang['options_dashboard_banner_changed_to'] = 'Dashboard banner changed to '; diff --git a/application/language/chinese_simplified/options_lang.php b/application/language/chinese_simplified/options_lang.php index 9014eca83..50f96980a 100644 --- a/application/language/chinese_simplified/options_lang.php +++ b/application/language/chinese_simplified/options_lang.php @@ -16,6 +16,8 @@ $lang['options_dashboard_map'] = '仪表盘的地图'; $lang['options_this_allows_the_map_on_the_dashboard_to_be_disabled_or_placed_on_the_right'] = '允许禁用仪表板上的地图或将其放置在右侧。'; $lang['options_logbook_map'] = '日志地图'; $lang['options_this_allows_to_disable_the_map_in_the_logbook'] = '允许禁用日志中的地图。'; +$lang['options_public_maps'] = "Public Maps"; +$lang['options_this_allows_to_disable_all_maps_in_the_public_view'] = "This allows to disable all maps in the public view. This affects the main map and the gridsquares map."; $lang['options_theme_changed_to'] = '主题更改为 '; $lang['options_global_search_changed_to'] = '全局搜索更改为 '; $lang['options_dashboard_banner_changed_to'] = '仪表板横幅更改为 '; diff --git a/application/language/czech/options_lang.php b/application/language/czech/options_lang.php index 29062629a..114c11793 100644 --- a/application/language/czech/options_lang.php +++ b/application/language/czech/options_lang.php @@ -16,6 +16,8 @@ $lang['options_dashboard_map'] = 'Mapa na palubní desce'; $lang['options_this_allows_the_map_on_the_dashboard_to_be_disabled_or_placed_on_the_right'] = 'Toto umožňuje zakázat mapu na palubní desce nebo ji umístit na pravou stranu.'; $lang['options_logbook_map'] = 'Mapa v logbooku'; $lang['options_this_allows_to_disable_the_map_in_the_logbook'] = 'Toto umožňuje zakázat mapu v logbooku.'; +$lang['options_public_maps'] = "Public Maps"; +$lang['options_this_allows_to_disable_all_maps_in_the_public_view'] = "This allows to disable all maps in the public view. This affects the main map and the gridsquares map."; $lang['options_theme_changed_to'] = 'Téma změněno na '; $lang['options_global_search_changed_to'] = 'Globální vyhledávání změněno na '; $lang['options_dashboard_banner_changed_to'] = 'Banner na palubní desce změněn na '; diff --git a/application/language/dutch/options_lang.php b/application/language/dutch/options_lang.php index 0bb4a7818..9de9db57b 100644 --- a/application/language/dutch/options_lang.php +++ b/application/language/dutch/options_lang.php @@ -16,6 +16,8 @@ $lang['options_dashboard_map'] = 'Dashboard Map'; $lang['options_this_allows_the_map_on_the_dashboard_to_be_disabled_or_placed_on_the_right'] = 'This allows the map on the dashboard to be disabled or placed on the right.'; $lang['options_logbook_map'] = 'Logbook Map'; $lang['options_this_allows_to_disable_the_map_in_the_logbook'] = 'This allows to disable the map in the logbook.'; +$lang['options_public_maps'] = "Public Maps"; +$lang['options_this_allows_to_disable_all_maps_in_the_public_view'] = "This allows to disable all maps in the public view. This affects the main map and the gridsquares map."; $lang['options_theme_changed_to'] = 'Theme changed to '; $lang['options_global_search_changed_to'] = 'Global Search changed to '; $lang['options_dashboard_banner_changed_to'] = 'Dashboard banner changed to '; diff --git a/application/language/english/options_lang.php b/application/language/english/options_lang.php index c72f036d7..9ff4f1f5e 100644 --- a/application/language/english/options_lang.php +++ b/application/language/english/options_lang.php @@ -16,6 +16,8 @@ $lang['options_dashboard_map'] = 'Dashboard Map'; $lang['options_this_allows_the_map_on_the_dashboard_to_be_disabled_or_placed_on_the_right'] = 'This allows the map on the dashboard to be disabled or placed on the right.'; $lang['options_logbook_map'] = 'Logbook Map'; $lang['options_this_allows_to_disable_the_map_in_the_logbook'] = 'This allows to disable the map in the logbook.'; +$lang['options_public_maps'] = "Public Maps"; +$lang['options_this_allows_to_disable_all_maps_in_the_public_view'] = "This allows to disable all maps in the public view. This affects the main map and the gridsquares map."; $lang['options_theme_changed_to'] = 'Theme changed to '; $lang['options_global_search_changed_to'] = 'Global Search changed to '; $lang['options_dashboard_banner_changed_to'] = 'Dashboard banner changed to '; diff --git a/application/language/finnish/options_lang.php b/application/language/finnish/options_lang.php index e87cbdb08..81670123d 100644 --- a/application/language/finnish/options_lang.php +++ b/application/language/finnish/options_lang.php @@ -16,6 +16,8 @@ $lang['options_dashboard_map'] = 'Dashboard Map'; $lang['options_this_allows_the_map_on_the_dashboard_to_be_disabled_or_placed_on_the_right'] = 'This allows the map on the dashboard to be disabled or placed on the right.'; $lang['options_logbook_map'] = 'Logbook Map'; $lang['options_this_allows_to_disable_the_map_in_the_logbook'] = 'This allows to disable the map in the logbook.'; +$lang['options_public_maps'] = "Public Maps"; +$lang['options_this_allows_to_disable_all_maps_in_the_public_view'] = "This allows to disable all maps in the public view. This affects the main map and the gridsquares map."; $lang['options_theme_changed_to'] = 'Vaihdettu teema on '; $lang['options_global_search_changed_to'] = 'Julkinen haku on vaihdettu: '; $lang['options_dashboard_banner_changed_to'] = 'Dashboard banner changed to '; diff --git a/application/language/french/options_lang.php b/application/language/french/options_lang.php index c72f036d7..9ff4f1f5e 100644 --- a/application/language/french/options_lang.php +++ b/application/language/french/options_lang.php @@ -16,6 +16,8 @@ $lang['options_dashboard_map'] = 'Dashboard Map'; $lang['options_this_allows_the_map_on_the_dashboard_to_be_disabled_or_placed_on_the_right'] = 'This allows the map on the dashboard to be disabled or placed on the right.'; $lang['options_logbook_map'] = 'Logbook Map'; $lang['options_this_allows_to_disable_the_map_in_the_logbook'] = 'This allows to disable the map in the logbook.'; +$lang['options_public_maps'] = "Public Maps"; +$lang['options_this_allows_to_disable_all_maps_in_the_public_view'] = "This allows to disable all maps in the public view. This affects the main map and the gridsquares map."; $lang['options_theme_changed_to'] = 'Theme changed to '; $lang['options_global_search_changed_to'] = 'Global Search changed to '; $lang['options_dashboard_banner_changed_to'] = 'Dashboard banner changed to '; diff --git a/application/language/german/options_lang.php b/application/language/german/options_lang.php index 3ccc84e55..7a61c955e 100644 --- a/application/language/german/options_lang.php +++ b/application/language/german/options_lang.php @@ -16,6 +16,8 @@ $lang['options_dashboard_map'] = 'Dashboard Karte'; $lang['options_this_allows_the_map_on_the_dashboard_to_be_disabled_or_placed_on_the_right'] = 'Dies erlaubt es, die Karte auf dem Dashboard rechts anzuzeigen oder zu deaktivieren.'; $lang['options_logbook_map'] = 'Logbook Karte'; $lang['options_this_allows_to_disable_the_map_in_the_logbook'] = 'Dies erlaubt, die Karte im Logbuch zu deaktivieren.'; +$lang['options_public_maps'] = "Öffentliche Karten"; +$lang['options_this_allows_to_disable_all_maps_in_the_public_view'] = "Dies erlaubt die Karten auf der öffentlichen Seite zu deaktivieren. Dies betrifft die Haupt-Karte, als auch die Planquadrat-Karte."; $lang['options_theme_changed_to'] = 'Thema geändert zu '; $lang['options_global_search_changed_to'] = 'Globale Suche geändert zu '; $lang['options_dashboard_banner_changed_to'] = 'Dashboard Benachrichtigungsbanner geändert zu '; diff --git a/application/language/greek/options_lang.php b/application/language/greek/options_lang.php index c72f036d7..9ff4f1f5e 100644 --- a/application/language/greek/options_lang.php +++ b/application/language/greek/options_lang.php @@ -16,6 +16,8 @@ $lang['options_dashboard_map'] = 'Dashboard Map'; $lang['options_this_allows_the_map_on_the_dashboard_to_be_disabled_or_placed_on_the_right'] = 'This allows the map on the dashboard to be disabled or placed on the right.'; $lang['options_logbook_map'] = 'Logbook Map'; $lang['options_this_allows_to_disable_the_map_in_the_logbook'] = 'This allows to disable the map in the logbook.'; +$lang['options_public_maps'] = "Public Maps"; +$lang['options_this_allows_to_disable_all_maps_in_the_public_view'] = "This allows to disable all maps in the public view. This affects the main map and the gridsquares map."; $lang['options_theme_changed_to'] = 'Theme changed to '; $lang['options_global_search_changed_to'] = 'Global Search changed to '; $lang['options_dashboard_banner_changed_to'] = 'Dashboard banner changed to '; diff --git a/application/language/italian/options_lang.php b/application/language/italian/options_lang.php index c72f036d7..9ff4f1f5e 100644 --- a/application/language/italian/options_lang.php +++ b/application/language/italian/options_lang.php @@ -16,6 +16,8 @@ $lang['options_dashboard_map'] = 'Dashboard Map'; $lang['options_this_allows_the_map_on_the_dashboard_to_be_disabled_or_placed_on_the_right'] = 'This allows the map on the dashboard to be disabled or placed on the right.'; $lang['options_logbook_map'] = 'Logbook Map'; $lang['options_this_allows_to_disable_the_map_in_the_logbook'] = 'This allows to disable the map in the logbook.'; +$lang['options_public_maps'] = "Public Maps"; +$lang['options_this_allows_to_disable_all_maps_in_the_public_view'] = "This allows to disable all maps in the public view. This affects the main map and the gridsquares map."; $lang['options_theme_changed_to'] = 'Theme changed to '; $lang['options_global_search_changed_to'] = 'Global Search changed to '; $lang['options_dashboard_banner_changed_to'] = 'Dashboard banner changed to '; diff --git a/application/language/polish/options_lang.php b/application/language/polish/options_lang.php index c72f036d7..9ff4f1f5e 100644 --- a/application/language/polish/options_lang.php +++ b/application/language/polish/options_lang.php @@ -16,6 +16,8 @@ $lang['options_dashboard_map'] = 'Dashboard Map'; $lang['options_this_allows_the_map_on_the_dashboard_to_be_disabled_or_placed_on_the_right'] = 'This allows the map on the dashboard to be disabled or placed on the right.'; $lang['options_logbook_map'] = 'Logbook Map'; $lang['options_this_allows_to_disable_the_map_in_the_logbook'] = 'This allows to disable the map in the logbook.'; +$lang['options_public_maps'] = "Public Maps"; +$lang['options_this_allows_to_disable_all_maps_in_the_public_view'] = "This allows to disable all maps in the public view. This affects the main map and the gridsquares map."; $lang['options_theme_changed_to'] = 'Theme changed to '; $lang['options_global_search_changed_to'] = 'Global Search changed to '; $lang['options_dashboard_banner_changed_to'] = 'Dashboard banner changed to '; diff --git a/application/language/russian/options_lang.php b/application/language/russian/options_lang.php index ee978f533..07b2826c3 100644 --- a/application/language/russian/options_lang.php +++ b/application/language/russian/options_lang.php @@ -16,6 +16,8 @@ $lang['options_dashboard_map'] = 'Карта на экране сводных д $lang['options_this_allows_the_map_on_the_dashboard_to_be_disabled_or_placed_on_the_right'] = 'Включение отображения карты на экране сводных данных во всю ширину или справа'; $lang['options_logbook_map'] = 'Карта на экране обычного вида журнала '; $lang['options_this_allows_to_disable_the_map_in_the_logbook'] = 'Включение отображения карты на экране обычного вида журнала.'; +$lang['options_public_maps'] = "Public Maps"; +$lang['options_this_allows_to_disable_all_maps_in_the_public_view'] = "This allows to disable all maps in the public view. This affects the main map and the gridsquares map."; $lang['options_theme_changed_to'] = 'Тема оформления переключена на '; $lang['options_global_search_changed_to'] = 'Публично доступный поиск переключен в состояние '; $lang['options_dashboard_banner_changed_to'] = 'Баннер на экране сводных данных переключен в состояние '; diff --git a/application/language/spanish/options_lang.php b/application/language/spanish/options_lang.php index 6b7f9e410..5f8c19333 100644 --- a/application/language/spanish/options_lang.php +++ b/application/language/spanish/options_lang.php @@ -16,6 +16,8 @@ $lang['options_dashboard_map'] = 'Mapa en la Vista General'; $lang['options_this_allows_the_map_on_the_dashboard_to_be_disabled_or_placed_on_the_right'] = 'Esto permite que el mapa de la vsita general no aparezca o se muestre a la derecha.'; $lang['options_logbook_map'] = 'Mapa en Libro de Guardia'; $lang['options_this_allows_to_disable_the_map_in_the_logbook'] = 'Esto pemrite deshabilitar el mapa en el libro de guardia.'; +$lang['options_public_maps'] = "Public Maps"; +$lang['options_this_allows_to_disable_all_maps_in_the_public_view'] = "This allows to disable all maps in the public view. This affects the main map and the gridsquares map."; $lang['options_theme_changed_to'] = 'Tema cambiado a '; $lang['options_global_search_changed_to'] = 'Búsqueda Global cambiado a '; $lang['options_dashboard_banner_changed_to'] = 'Marquesina en la Vista General cambiada a '; diff --git a/application/language/swedish/options_lang.php b/application/language/swedish/options_lang.php index b77bc074d..2eaac73e6 100644 --- a/application/language/swedish/options_lang.php +++ b/application/language/swedish/options_lang.php @@ -16,6 +16,8 @@ $lang['options_dashboard_map'] = 'Dashboard karta'; $lang['options_this_allows_the_map_on_the_dashboard_to_be_disabled_or_placed_on_the_right'] = 'This allows the map on the dashboard to be disabled or placed on the right.'; $lang['options_logbook_map'] = 'Loggbok Karta'; $lang['options_this_allows_to_disable_the_map_in_the_logbook'] = 'Detta gör det möjligt att inaktivera kartan i loggboken.'; +$lang['options_public_maps'] = "Public Maps"; +$lang['options_this_allows_to_disable_all_maps_in_the_public_view'] = "This allows to disable all maps in the public view. This affects the main map and the gridsquares map."; $lang['options_theme_changed_to'] = 'Temat ändrades till '; $lang['options_global_search_changed_to'] = 'Global sökning ändrad till '; $lang['options_dashboard_banner_changed_to'] = 'Dashboard banner ändrad till '; diff --git a/application/language/turkish/options_lang.php b/application/language/turkish/options_lang.php index c72f036d7..9ff4f1f5e 100644 --- a/application/language/turkish/options_lang.php +++ b/application/language/turkish/options_lang.php @@ -16,6 +16,8 @@ $lang['options_dashboard_map'] = 'Dashboard Map'; $lang['options_this_allows_the_map_on_the_dashboard_to_be_disabled_or_placed_on_the_right'] = 'This allows the map on the dashboard to be disabled or placed on the right.'; $lang['options_logbook_map'] = 'Logbook Map'; $lang['options_this_allows_to_disable_the_map_in_the_logbook'] = 'This allows to disable the map in the logbook.'; +$lang['options_public_maps'] = "Public Maps"; +$lang['options_this_allows_to_disable_all_maps_in_the_public_view'] = "This allows to disable all maps in the public view. This affects the main map and the gridsquares map."; $lang['options_theme_changed_to'] = 'Theme changed to '; $lang['options_global_search_changed_to'] = 'Global Search changed to '; $lang['options_dashboard_banner_changed_to'] = 'Dashboard banner changed to '; From 623202c4b5df3063bd7e2ca8c537d70b0c7bcd07 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 25 May 2024 16:08:57 +0200 Subject: [PATCH 2/5] global option to disable maps in public view (index and gridsquares) --- application/controllers/Options.php | 10 ++++++++++ application/views/options/appearance.php | 9 +++++++++ 2 files changed, 19 insertions(+) diff --git a/application/controllers/Options.php b/application/controllers/Options.php index 233a2644a..5e901e36e 100644 --- a/application/controllers/Options.php +++ b/application/controllers/Options.php @@ -123,8 +123,18 @@ class Options extends CI_Controller { $this->session->set_flashdata('success', $this->lang->line('options_logbook_map_changed_to').$this->input->post('logbookMap')); } + // Update public maps within the options system + $public_maps_update_status = $this->optionslib->update('public_maps', $this->input->post('publicMaps'), 'yes'); + + // If the option was saved successfully set a flashsession with success note + if($public_maps_update_status == TRUE) { + $this->session->set_flashdata('success', 'Public Maps are now ' . $this->input->post('publicMaps')); + } + + // Update public github button within the options system $public_github_button_update_status = $this->optionslib->update('public_github_button', $this->input->post('publicGithubButton'), 'yes'); + // If the option was saved successfully set a flashsession with success note if($public_github_button_update_status == TRUE) { $this->session->set_flashdata('success', 'Public Github Button is now ' . $this->input->post('publicGithubButton')); } diff --git a/application/views/options/appearance.php b/application/views/options/appearance.php index 7f78c2bc1..40efca628 100644 --- a/application/views/options/appearance.php +++ b/application/views/options/appearance.php @@ -94,6 +94,15 @@ +
+ + + +
+