Merge pull request #3182 from gradido/contribution-hashtag-update-ui

feat(admin): update hashtag ui

admin/src/locales/de.json

@@ -89,7 +89,6 @@
     "submit": "Senden"
   },
   "GDD": "GDD",
-  "hashtag_symbol": "#",
   "help": {
     "help": "Hilfe",
     "transactionlist": {
@@ -125,10 +124,8 @@
     "user_search": "Nutzersuche"
   },
   "not_open_creations": "Keine offenen Schöpfungen",
-  "no_filter": "Keine Filterung",
-  "no_filter_tooltip": "Es wird nicht nach Hashtags gefiltert",
-  "no_hashtag": "Ohne Hashtag",
-  "no_hashtag_tooltip": "Zeigt nur Schöpfungen ohne Hashtag im Kommentar an",
+  "no_hashtag": "#Hashtags verbergen",
+  "no_hashtag_tooltip": "Zeigt nur Beiträge ohne Hashtag im Text",
   "open": "offen",
   "open_creations": "Offene Schöpfungen",
   "overlay": {
@@ -221,7 +218,7 @@
     "tabTitle": "Nutzer-Rolle"
   },
   "user_deleted": "Nutzer ist gelöscht.",
-  "user_memo_search": "Nutzer-Kommentar-Suche",
+  "user_memo_search": "Benutzer- und Text-Suche",
   "user_recovered": "Nutzer ist wiederhergestellt.",
   "user_search": "Nutzer-Suche"
 }

admin/src/locales/en.json

@@ -89,7 +89,6 @@
     "submit": "Send"
   },
   "GDD": "GDD",
-  "hashtag_symbol": "#",
   "help": {
     "help": "Help",
     "transactionlist": {
@@ -125,10 +124,8 @@
     "user_search": "User search"
   },
   "not_open_creations": "No open creations",
-  "no_filter": "No Filter",
-  "no_filter_tooltip": "It is not filtered by hashtags",
-  "no_hashtag": "No Hashtag",
-  "no_hashtag_tooltip": "Displays only contributions without hashtag in comment",
+  "no_hashtag": "Hide #hashtags",
+  "no_hashtag_tooltip": "Shows only contributions without hashtag in text",
   "open": "open",
   "open_creations": "Open creations",
   "overlay": {
@@ -221,7 +218,7 @@
     "tabTitle": "User Role"
   },
   "user_deleted": "User is deleted.",
-  "user_memo_search": "User and Memo search",
+  "user_memo_search": "User and text search",
   "user_recovered": "User is recovered.",
   "user_search": "User search"
 }

admin/src/pages/CreationConfirm.vue

@@ -2,12 +2,10 @@
 <template>
   <div class="creation-confirm">
     <user-query class="mb-2 mt-2" v-model="query" :placeholder="$t('user_memo_search')" />
-    <div class="mb-4">
-      <b-button class="noHashtag" variant="light" @click="swapNoHashtag" v-b-tooltip="tooltipText">
-        <span :style="hashtagColor">{{ $t('hashtag_symbol') }}</span>
-        {{ noHashtag ? $t('no_hashtag') : $t('no_filter') }}
-      </b-button>
-    </div>
+    <label class="mb-4">
+      <input type="checkbox" class="noHashtag" v-model="noHashtag" @change="swapNoHashtag" />
+      <span class="ml-2" v-b-tooltip="$t('no_hashtag_tooltip')">{{ $t('no_hashtag') }}</span>
+    </label>
     <div>
       <b-tabs v-model="tabIndex" content-class="mt-3" fill>
         <b-tab active :title-link-attributes="{ 'data-test': 'open' }">
@@ -134,7 +132,6 @@ export default {
   },
   methods: {
     swapNoHashtag() {
-      this.noHashtag = !!(this.noHashtag === null || this.noHashtag === false)
       this.query()
     },
     deleteCreation() {
@@ -209,12 +206,6 @@ export default {
     },
   },
   computed: {
-    hashtagColor() {
-      return this.noHashtag ? 'color: red' : 'color: black'
-    },
-    tooltipText() {
-      return this.noHashtag ? this.$t('no_hashtag_tooltip') : this.$t('no_filter_tooltip')
-    },
     fields() {
       return [
         [