From 42ced25e10e6193361345836e13fa39084fb80da Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Wed, 3 Jan 2024 15:05:44 +0100
Subject: [PATCH] improved settings override message

---
 vue/src/apps/SpaceManageView/SpaceManageView.vue          | 2 +-
 vue/src/components/Settings/CosmeticSettingsComponent.vue | 3 +++
 vue/src/locales/en.json                                   | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/vue/src/apps/SpaceManageView/SpaceManageView.vue b/vue/src/apps/SpaceManageView/SpaceManageView.vue
index f6af3040..3dab190a 100644
--- a/vue/src/apps/SpaceManageView/SpaceManageView.vue
+++ b/vue/src/apps/SpaceManageView/SpaceManageView.vue
@@ -137,7 +137,7 @@
         <b-row class="mt-4" v-if="space !== undefined">
             <b-col cols="12">
                 <h4>{{ $t('Cosmetic') }}</h4>
-                <b-alert variant="warning" show>{{ $t('Space_Cosmetic_Settings') }}</b-alert>
+                <b-alert variant="warning" show><i class="fas fa-exclamation-triangle"></i> {{ $t('Space_Cosmetic_Settings') }}</b-alert>
 
                 <b-form-group :label="$t('Image')" :description="$t('CustomImageHelp')">
                     <generic-multiselect :initial_single_selection="space.image"
diff --git a/vue/src/components/Settings/CosmeticSettingsComponent.vue b/vue/src/components/Settings/CosmeticSettingsComponent.vue
index 077b8e54..b3786654 100644
--- a/vue/src/components/Settings/CosmeticSettingsComponent.vue
+++ b/vue/src/components/Settings/CosmeticSettingsComponent.vue
@@ -49,6 +49,9 @@
             </b-form-select>
 
         </b-form-group>
+
+        <b-alert variant="warning" show><i class="fas fa-exclamation-triangle"></i> {{ $t('Space_Cosmetic_Settings') }}</b-alert>
+
         <b-form-group :label="$t('Theme')">
             <b-form-select v-model="user_preferences.theme" @change="updateSettings(true);">
                 <b-form-select-option value="TANDOOR">Tandoor</b-form-select-option>
diff --git a/vue/src/locales/en.json b/vue/src/locales/en.json
index 79e697cc..5dc72049 100644
--- a/vue/src/locales/en.json
+++ b/vue/src/locales/en.json
@@ -425,7 +425,7 @@
 	"Nav_Text_Mode": "Navigation Text Mode",
 	"Nav_Text_Mode_Help": "Behaves differently for every theme.",
 	"Nav_Color_Help": "Change navigation color.",
-	"Space_Cosmetic_Settings": "All cosmetic space settings override users individual settings.",
+	"Space_Cosmetic_Settings": "Some cosmetic settings can be changed by space administrators and will override client settings for that space.",
 	"Use_Kj": "Use kJ instead of kcal",
 	"Comments_setting": "Show Comments",
 	"click_image_import": "Click the image you want to import for this recipe",