From 752e8847ebcafd1290e5608bf2b7521b156ec1e2 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Tue, 30 Jun 2020 02:24:46 +0300
Subject: [PATCH] Remove repetitive labels of setting groups

---
 src/lang/en.js                                           | 4 ----
 src/views/settings/components/Frontend.vue               | 9 ---------
 src/views/settings/components/Http.vue                   | 3 ---
 src/views/settings/components/Upload.vue                 | 3 ---
 .../settings/components/inputComponents/PruneInput.vue   | 4 ++--
 5 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/src/lang/en.js b/src/lang/en.js
index 16ff35f2..3bf90458 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -387,10 +387,6 @@ export default {
     files: 'files',
     successfullyRemoved: 'Setting removed successfully!',
     seeDocs: 'See Documentation',
-    assets: 'Assets',
-    emoji: 'Emoji',
-    markup: 'Markup settings',
-    corsPlug: 'CORS plug config',
     instanceReboot: 'Reboot Instance',
     restartApp: 'You must restart the instance to apply settings',
     restartSuccess: 'Instance rebooted successfully!',
diff --git a/src/views/settings/components/Frontend.vue b/src/views/settings/components/Frontend.vue
index 69f7a4b6..2bbb906c 100644
--- a/src/views/settings/components/Frontend.vue
+++ b/src/views/settings/components/Frontend.vue
@@ -8,16 +8,10 @@
     </el-form>
     <el-divider v-if="staticFe" class="divider thick-line"/>
     <el-form ref="assetsData" :model="assetsData" :label-position="labelPosition" :label-width="labelWidth">
-      <el-form-item v-if="assets" class="grouped-settings-header">
-        <span class="label-font label-with-margin">{{ $t('settings.assets') }}</span>
-      </el-form-item>
       <setting :setting-group="assets" :data="assetsData"/>
     </el-form>
     <el-divider v-if="assets" class="divider thick-line"/>
     <el-form ref="emojiData" :model="emojiData" :label-position="labelPosition" :label-width="labelWidth">
-      <el-form-item v-if="emoji" data-search=":emoji" class="grouped-settings-header">
-        <span class="label-font label-with-margin">{{ $t('settings.emoji') }}</span>
-      </el-form-item>
       <setting :setting-group="emoji" :data="emojiData"/>
     </el-form>
     <el-divider v-if="emoji" class="divider thick-line"/>
@@ -26,9 +20,6 @@
     </el-form>
     <el-divider v-if="chat" class="divider thick-line"/>
     <el-form ref="markupData" :model="markupData" :label-position="labelPosition" :label-width="labelWidth">
-      <el-form-item v-if="markup" data-search=":markup" class="grouped-settings-header">
-        <span class="label-font label-with-margin">{{ $t('settings.markup') }}</span>
-      </el-form-item>
       <setting :setting-group="markup" :data="markupData"/>
     </el-form>
     <div class="submit-button-container">
diff --git a/src/views/settings/components/Http.vue b/src/views/settings/components/Http.vue
index d6954336..b8d62775 100644
--- a/src/views/settings/components/Http.vue
+++ b/src/views/settings/components/Http.vue
@@ -4,9 +4,6 @@
       <setting :setting-group="http" :data="httpData"/>
     </el-form>
     <el-form ref="corsPlugData" :model="corsPlugData" :label-position="labelPosition" :label-width="labelWidth">
-      <el-form-item v-if="corsPlug" data-search=":cors_plug" class="grouped-settings-header">
-        <span class="label-font label-with-margin">{{ $t('settings.corsPlug') }}</span>
-      </el-form-item>
       <setting :setting-group="corsPlug" :data="corsPlugData"/>
     </el-form>
     <el-divider v-if="corsPlug" class="divider thick-line"/>
diff --git a/src/views/settings/components/Upload.vue b/src/views/settings/components/Upload.vue
index 97860d75..1003ab08 100644
--- a/src/views/settings/components/Upload.vue
+++ b/src/views/settings/components/Upload.vue
@@ -4,9 +4,6 @@
       <setting :setting-group="upload" :data="uploadData"/>
     </el-form>
     <el-form v-if="showUploadersLocal" ref="uploadersLocal" :model="uploadersLocalData" :label-position="labelPosition" :label-width="labelWidth">
-      <el-form-item v-if="uploadersLocal" class="grouped-settings-header">
-        <span class="label-font label-with-margin">Pleroma.Uploaders.Local</span>
-      </el-form-item>
       <setting :setting-group="uploadersLocal" :data="uploadersLocalData"/>
       <el-divider v-if="uploadersLocal" class="divider thick-line"/>
     </el-form>
diff --git a/src/views/settings/components/inputComponents/PruneInput.vue b/src/views/settings/components/inputComponents/PruneInput.vue
index 7c17415d..7864a156 100644
--- a/src/views/settings/components/inputComponents/PruneInput.vue
+++ b/src/views/settings/components/inputComponents/PruneInput.vue
@@ -5,7 +5,7 @@
       <el-radio label=":maxlen">Limit-based</el-radio>
       <el-radio label=":maxage">Time-based</el-radio>
     </el-radio-group>
-    <el-form-item v-if="prune === ':maxlen'" label="max length" label-width="100" label-position="left">
+    <el-form-item v-if="prune === ':maxlen'" label="Max length" label-width="100" label-position="left">
       <el-input-number
         :value="data[1]"
         :min="0"
@@ -14,7 +14,7 @@
         class="top-margin"
         @change="updateIntInput($event, ':maxlen')"/>
     </el-form-item>
-    <el-form-item v-if="prune === ':maxage'" label="max age" label-width="100" label-position="left">
+    <el-form-item v-if="prune === ':maxage'" label="Max age" label-width="100" label-position="left">
       <el-input-number
         :value="data[1]"
         :min="0"