From a82838982e4957e8d2f742bb107e0092853521bb Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Mon, 13 Jun 2022 21:00:15 +0200
Subject: [PATCH] #696 - show reload warning after savin personalization
 settings

---
 .../main/resources/languages/base_de.properties |  3 ++-
 .../main/resources/languages/base_en.properties |  3 ++-
 .../containers/settingsPersonalization.ftl      | 17 +++++++++++++++--
 .../resources/templates/settings/settings.ftl   |  4 ++--
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/BudgetMasterServer/src/main/resources/languages/base_de.properties b/BudgetMasterServer/src/main/resources/languages/base_de.properties
index fda2f2b71..9cde9d2e9 100644
--- a/BudgetMasterServer/src/main/resources/languages/base_de.properties
+++ b/BudgetMasterServer/src/main/resources/languages/base_de.properties
@@ -312,7 +312,8 @@ settings.category.circle.style=Kategorien anzeigen als
 settings.category.circle.style.description=Legt die Darstellung von Kategorien in der Buchungsübersicht fest
 settings.category.circle.style.deactivated=Quadrate
 settings.category.circle.style.activated=Kreise
-settings.appearance=Personalisierung
+settings.personalization=Personalisierung
+settings.personalization.reload.page=Zum Anwenden visueller Änderungen <a href="">Seite neu laden</a>
 
 settings.database.import=Importieren
 settings.database.export=Exportieren
diff --git a/BudgetMasterServer/src/main/resources/languages/base_en.properties b/BudgetMasterServer/src/main/resources/languages/base_en.properties
index ddb208bb4..b2e64859d 100644
--- a/BudgetMasterServer/src/main/resources/languages/base_en.properties
+++ b/BudgetMasterServer/src/main/resources/languages/base_en.properties
@@ -313,7 +313,8 @@ settings.category.circle.style=Show categories as
 settings.category.circle.style.description=Defines how categories are displayed in the transaction overview
 settings.category.circle.style.deactivated=Squares
 settings.category.circle.style.activated=Circles
-settings.appearance=Personalization
+settings.personalization=Personalization
+settings.personalization.reload.page=<a href="">Reload</a> page to apply visual changes
 
 settings.database.import=Import
 settings.database.export=Export
diff --git a/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsPersonalization.ftl b/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsPersonalization.ftl
index 5d930720a..3686a492b 100644
--- a/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsPersonalization.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsPersonalization.ftl
@@ -6,7 +6,7 @@
 <#import "settingsContainer.ftl" as settingsContainerMacros>
 <#import "../settingsMacros.ftl" as settingsMacros>
 
-<#macro personalizationSettingsContainer settings>
+<#macro personalizationSettingsContainer settings showReloadWarning>
     <@settingsContainerMacros.settingsContainer 'PersonalizationSettingsContainer' 'personalizationSettingsContainer'>
         <#-- language -->
         <div class="row">
@@ -59,7 +59,20 @@
                 <@header.buttonSubmit name='action' icon='save' localizationKey='save' color='background-green' formaction='/settings/save/personalization'/>
             </div>
         </div>
+
+        <#if showReloadWarning>
+            <div class="row notification-row">
+                <div class="col s12 center-align">
+                    <div class="notification-wrapper">
+                        <div class="notification background-yellow text-black">
+                            <i class="fas fa-exclamation-triangle notification-item"></i>
+                            <span class="notification-item left-align">${locale.getString('settings.personalization.reload.page')}</span>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </#if>
     </@settingsContainerMacros.settingsContainer>
 </#macro>
 
-<@personalizationSettingsContainer settings/>
\ No newline at end of file
+<@personalizationSettingsContainer settings=settings showReloadWarning=true/>
diff --git a/BudgetMasterServer/src/main/resources/templates/settings/settings.ftl b/BudgetMasterServer/src/main/resources/templates/settings/settings.ftl
index 667380853..3f2166342 100644
--- a/BudgetMasterServer/src/main/resources/templates/settings/settings.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/settings/settings.ftl
@@ -36,8 +36,8 @@
                                         <@settingsSecurityMacros.securitySettingsContainer/>
                                     </@settingsMacros.settingsCollapsibleItem>
 
-                                    <@settingsMacros.settingsCollapsibleItem "personalizationSettingsContainer" "format_paint" locale.getString("settings.appearance")>
-                                        <@settingsPersonalizationMacros.personalizationSettingsContainer settings/>
+                                    <@settingsMacros.settingsCollapsibleItem "personalizationSettingsContainer" "format_paint" locale.getString("settings.personalization")>
+                                        <@settingsPersonalizationMacros.personalizationSettingsContainer settings=settings showReloadWarning=false/>
                                     </@settingsMacros.settingsCollapsibleItem>
 
                                     <@settingsMacros.settingsCollapsibleItem "" "list" "Transactions">
-- 
GitLab