From 528a33d9f3bf29f629e3a9e6dc1b16c6cb9dc51e Mon Sep 17 00:00:00 2001
From: Davide Aprea <davide@suma-ev.de>
Date: Mon, 26 Oct 2020 11:22:54 +0100
Subject: [PATCH] added settings to sidebar
---
resources/lang/de/index.php | 2 +-
resources/lang/de/settings.php | 1 +
resources/lang/de/sidebar.php | 1 +
resources/lang/en/index.php | 2 +-
resources/lang/en/settings.php | 1 +
resources/lang/en/sidebar.php | 1 +
resources/lang/es/index.php | 2 +-
resources/lang/fr/index.php | 2 +-
resources/views/parts/sidebar.blade.php | 25 ++++++++++++++++++++++++
resources/views/settings/index.blade.php | 1 +
10 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/resources/lang/de/index.php b/resources/lang/de/index.php
index e2193a8b0..ed588f411 100644
--- a/resources/lang/de/index.php
+++ b/resources/lang/de/index.php
@@ -4,7 +4,7 @@ return [
'foki.web' => 'Web',
'foki.bilder' => 'Bilder',
'foki.nachrichten' => 'News/Politik',
- 'foki.wissenschaft' => 'Wissenschaft',
+ 'foki.science' => 'Wissenschaft',
'foki.produkte' => 'Produkte',
'foki.angepasst' => 'Angepasst',
'foki.maps' => 'Maps.metager.de',
diff --git a/resources/lang/de/settings.php b/resources/lang/de/settings.php
index fd04c613f..a1b23f6e1 100644
--- a/resources/lang/de/settings.php
+++ b/resources/lang/de/settings.php
@@ -27,6 +27,7 @@ return [
'copy' => 'Kopieren',
'darkmode' => 'Dunklen Modus umschalten',
+ 'darkmode-hint' => 'Die Einstellung für den dunklen Modus betrifft alle Fokusse und Unterseiten übergreifend!',
'system' => 'Systemstandard',
'dark' => 'Dunkel',
'light' => 'Hell',
diff --git a/resources/lang/de/sidebar.php b/resources/lang/de/sidebar.php
index 5ecbe718f..04b457ced 100644
--- a/resources/lang/de/sidebar.php
+++ b/resources/lang/de/sidebar.php
@@ -25,6 +25,7 @@ return [
'nav25' => 'MetaGer App',
'nav26' => 'MetaGer-Fanshop',
'nav27' => 'MetaGer Maps',
+ 'nav28' => 'Einstellungen',
'navigationToggle' => 'Navigation anzeigen',
'titles.tips' => 'Tips',
'plugin' => 'MetaGer Plugin',
diff --git a/resources/lang/en/index.php b/resources/lang/en/index.php
index d1fbd753c..24be41b87 100644
--- a/resources/lang/en/index.php
+++ b/resources/lang/en/index.php
@@ -4,7 +4,7 @@ return [
"foki.web" => "Web",
"foki.bilder" => "Pictures",
"foki.nachrichten" => "News/Politics",
- "foki.wissenschaft" => "Science",
+ "foki.science" => "Science",
"foki.produkte" => "Shopping",
"foki.angepasst" => "Customized",
"foki.maps" => "maps.metager.de",
diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php
index fe734139b..5bc3590ea 100644
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@@ -27,6 +27,7 @@ return [
'copy' => 'Copy',
'darkmode' => 'Toggle dark mode',
+ 'darkmode-hint' => 'The setting for dark mode affects all foci and sub-pages!',
'system' => 'System Default',
'dark' => 'Dark',
'light' => 'Light',
diff --git a/resources/lang/en/sidebar.php b/resources/lang/en/sidebar.php
index 97d099900..656d1a924 100644
--- a/resources/lang/en/sidebar.php
+++ b/resources/lang/en/sidebar.php
@@ -25,6 +25,7 @@ return [
"nav25" => "MetaGer App",
'nav26' => 'MetaGer-Fanshop',
'nav27' => 'MetaGer Maps',
+ 'nav28' => 'Settings',
"navigationToggle" => "show navigation",
'titles.tips' => 'Tips',
'plugin' => 'MetaGer Plugin',
diff --git a/resources/lang/es/index.php b/resources/lang/es/index.php
index 0ed4438a3..dc3830e9f 100644
--- a/resources/lang/es/index.php
+++ b/resources/lang/es/index.php
@@ -2,7 +2,7 @@
"foki.web" => "Web",
"foki.bilder" => "Imágenes",
"foki.nachrichten" => "Informativos/PolÃtica",
- "foki.wissenschaft" => "Ciencia",
+ "foki.science" => "Ciencia",
"foki.produkte" => "Productos",
"foki.angepasst" => "ajustado",
"foki.maps" => "Maps.metager.de",
diff --git a/resources/lang/fr/index.php b/resources/lang/fr/index.php
index 52c991bf5..1d4da057e 100644
--- a/resources/lang/fr/index.php
+++ b/resources/lang/fr/index.php
@@ -4,7 +4,7 @@ return [
"foki.web" => "Web",
"foki.bilder" => "Images",
"foki.nachrichten" => "News/Politique",
- "foki.wissenschaft" => "Sciènces",
+ "foki.science" => "Sciènces",
"foki.produkte" => "Produits",
"foki.angepasst" => "ajusté(e)",
"foki.maps" => "Maps.metager.de",
diff --git a/resources/views/parts/sidebar.blade.php b/resources/views/parts/sidebar.blade.php
index 6f85855e6..d51b392d6 100644
--- a/resources/views/parts/sidebar.blade.php
+++ b/resources/views/parts/sidebar.blade.php
@@ -114,6 +114,31 @@
</li>
</ul>
</li>
+ <li class="metager-dropdown">
+ <input id="settingsToggle" class="sidebarCheckbox" type="checkbox">
+ <label for="settingsToggle" class="metager-dropdown-toggle navigation-element" aria-haspopup="true" id="navigationEinstellung" tabindex=0>
+ <img src="/img/icon-settings.svg"alt="" aria-hidden="true" id="sidebar-img-language">
+ <span>{{ trans('sidebar.nav28') }}</span>
+ <span class="caret"></span>
+ </label>
+ <ul class="metager-dropdown-content">
+ <li>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/meta/settings?fokus=web") }}" >{{ trans('index.foki.web') }}</a>
+ </li>
+ <li>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/meta/settings?fokus=bilder") }}" >{{ trans('index.foki.bilder') }}</a>
+ </li>
+ <li>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/meta/settings?fokus=produkte") }}" >{{ trans('index.foki.produkte') }}</a>
+ </li>
+ <li>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale()), "/meta/settings?fokus=nachrichten" }}" >{{ trans('index.foki.nachrichten') }}</a>
+ </li>
+ <li>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale()), "/meta/settings?fokus=science" }}" >{{ trans('index.foki.science') }}</a>
+ </li>
+ </ul>
+ </li>
<li class="metager-dropdown">
<input id="languagesToggle" class="sidebarCheckbox" type="checkbox">
<label for="languagesToggle" class="metager-dropdown-toggle navigation-element" aria-haspopup="true" id="navigationSprache" tabindex=0>
diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php
index a33037dfe..28b15877d 100644
--- a/resources/views/settings/index.blade.php
+++ b/resources/views/settings/index.blade.php
@@ -135,6 +135,7 @@
<option value="off" {{ Cookie::get('dark_mode') === "1" ? "disabled selected" : "" }}>@lang('settings.light')</option>
<option value="on" {{ Cookie::get('dark_mode') === "2" ? "disabled selected" : "" }}>@lang('settings.dark')</option>
</select>
+ <small>@lang('settings.darkmode-hint')</small>
</div>
@if(LaravelLocalization::getCurrentLocale() === "de")
<div class="form-group">
--
GitLab