Improve text settings form

Closes #242
VedaWebProject · Jun 14, 2024 · ec2dea5 · ec2dea5
1 parent 12717db
commit ec2dea5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 20 deletions.
diff --git a/Tekst-Web/src/views/admin/AdminTextsSettingsView.vue b/Tekst-Web/src/views/admin/AdminTextsSettingsView.vue
@@ -193,6 +193,18 @@ async function handleDelete() {
         />
       </n-form-item>
 
+      <n-form-item :show-label="false">
+        <n-flex vertical>
+          <!-- LABELLED LOCATION -->
+          <labelled-switch
+            v-model="model.labeledLocation"
+            :label="$t('models.text.labeledLocation')"
+          />
+          <!-- ACTIVE -->
+          <labelled-switch v-model="model.isActive" :label="$t('models.text.isActive')" />
+        </n-flex>
+      </n-form-item>
+
       <!-- ACCENT COLOR -->
       <n-form-item path="accentColor" :label="$t('models.text.accentColor')">
         <n-color-picker
@@ -212,18 +224,6 @@ async function handleDelete() {
         />
       </n-form-item>
 
-      <n-form-item :label="$t('general.flags')">
-        <n-flex vertical>
-          <!-- LABELLED LOCATION -->
-          <labelled-switch
-            v-model="model.labeledLocation"
-            :label="$t('models.text.labeledLocation')"
-          />
-          <!-- ACTIVE -->
-          <labelled-switch v-model="model.isActive" :label="$t('models.text.isActive')" />
-        </n-flex>
-      </n-form-item>
-
       <!-- RESOURCE CATEGORIES-->
       <n-form-item v-if="model.resourceCategories" :label="$t('models.text.resourceCategories')">
         <n-dynamic-input

diff --git a/Tekst-Web/translations/ui/deDE.yml b/Tekst-Web/translations/ui/deDE.yml
@@ -28,7 +28,6 @@ general:
   important: Wichtig
   filters: Filter
   selected: ausgewählt
-  flags: Merkmale
   language: Sprache
   platform: Plattform
   not: nicht
@@ -260,13 +259,13 @@ models:
     levelLabel: Bezeichnung
     defaultLevel: Standardebene
     locDelim: Fundstellentrennzeichen
-    labeledLocation: Beschriftete Fundstelle
+    labeledLocation: Ebene in Bezeichnung der Fundstellen einschließen
     accentColor: Akzentfarbe
     resourceCategories: Ressourcen-Kategorien
     resourceCategoryKey: Schlüssel
     resourceCategoryTranslation: Beschriftung
-    isActive: Aktiv, öffentlich gelistet
-    isInactive: Inaktiv, nicht öffentlich gelistet
+    isActive: Öffentlich gelistet
+    isInactive: Nicht öffentlich gelistet
     formRulesFeedback:
       slugChars: 'Erlaubte Zeichen: a-z und 0-9'
       defaultLevelRange: 0 oder höher

diff --git a/Tekst-Web/translations/ui/enUS.yml b/Tekst-Web/translations/ui/enUS.yml
@@ -27,7 +27,6 @@ general:
   important: Important
   filters: Filters
   selected: selected
-  flags: Flags
   language: Language
   platform: Platform
   not: not
@@ -257,13 +256,13 @@ models:
     levelLabel: Label
     defaultLevel: Default level
     locDelim: Location delimiter
-    labeledLocation: Labelled location
+    labeledLocation: Include level in location labels
     accentColor: Accent color
     resourceCategories: Resource Categories
     resourceCategoryKey: Key
     resourceCategoryTranslation: Label
-    isActive: Active, publicly listed
-    isInactive: Inactive, not publicly listed
+    isActive: Publicly listed
+    isInactive: Not publicly listed
     formRulesFeedback:
       slugChars: 'Allowed characters: a-z and 0-9'
       defaultLevelRange: 0 or greater