From c3f6ad0e44c714226a9d5875b0c377aa4f23b10b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 11 Nov 2019 16:38:48 +0100
Subject: [PATCH] Implement always show resource status

- Rename buttons after Roberts suggestion.
---
 webapp/locales/de.json            | 10 ++++++----
 webapp/locales/en.json            | 10 ++++++----
 webapp/pages/moderation/index.vue | 21 ++++++++++++++++++++-
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index fabf3fc5d..f364647fe 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -455,18 +455,20 @@
       "contentRowHeadline": "Inhalt",
       "authorRowHeadline": "Autor",
       "decisionRowHeadline": "Entscheidung",
+      "enabled": "Status: Entsperrt",
+      "disabled": "Status: Gesperrt",
       "decided": "Entschieden",
       "noDecision": "Keine Entscheidung!",
-      "decideButton": "Entscheide",
+      "decideButton": "Bestätige",
       "DecisionSuccess": "Erfolgreich entschieden!",
-      "enabledBy": "Aktiviert von",
-      "disabledBy": "Deaktiviert von",
+      "enabledBy": "Status: Entsperrt von",
+      "disabledBy": "Status: Gesperrt von",
       "reasonCategory": "Kategorie",
       "reasonDescription": "Beschreibung",
       "createdAt": "Datum",
       "submitter": "Gemeldet von",
       "decideModal": {
-        "submit": "Abschließende Entscheidung",
+        "submit": "Bestätige Entscheidung",
         "cancel": "Abbruch",
         "User": {
           "disable": {
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 3ebe8104b..e8cb43070 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -456,18 +456,20 @@
       "contentRowHeadline": "Content",
       "authorRowHeadline": "Author",
       "decisionRowHeadline": "Decision",
+      "enabled": "State: Enabled",
+      "disabled": "State: Disabled",
       "decided": "Decided",
       "noDecision": "No decision!",
-      "decideButton": "Decide",
+      "decideButton": "Confirm",
       "DecisionSuccess": "Decided successfully!",
-      "enabledBy": "Enabled by",
-      "disabledBy": "Disabled by",
+      "enabledBy": "State: Enabled by",
+      "disabledBy": "State: Disabled by",
       "reasonCategory": "Category",
       "reasonDescription": "Description",
       "createdAt": "Date",
       "submitter": "Reported by",
       "decideModal": {
-        "submit": "Final decision",
+        "submit": "Confirm decision",
         "cancel": "Cancel",
         "User": {
           "disable": {
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 39ac245c6..414d73679 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -37,7 +37,7 @@
           <tr valign="top">
             <td class="ds-table-col ds-table-head-col ds-table-head-col-border">
               <!-- Icon -->
-              <ds-text :class="[!content.closed && 'no-decision']" color="soft">
+              <ds-text color="soft">
                 <ds-icon
                   v-if="content.type === 'Post'"
                   v-tooltip="{ content: $t('report.contribution.type'), placement: 'right' }"
@@ -105,9 +105,11 @@
               <div v-if="content.resource.decidedByModerator">
                 <br />
                 <div v-if="content.decisionDisable">
+                  <ds-icon name="eye-slash" class="ban" />
                   {{ $t('moderation.reports.disabledBy') }}
                 </div>
                 <div v-else>
+                  <ds-icon name="eye" class="no-ban" />
                   {{ $t('moderation.reports.enabledBy') }}
                 </div>
                 <hc-user
@@ -118,6 +120,17 @@
                   positionDatetime="below"
                 />
               </div>
+              <div v-else>
+                <br />
+                <div v-if="content.resource.disabled">
+                  <ds-icon name="eye-slash" class="ban" />
+                  {{ $t('moderation.reports.disabled') }}
+                </div>
+                <div v-else>
+                  <ds-icon name="eye" class="no-ban" />
+                  {{ $t('moderation.reports.enabled') }}
+                </div>
+              </div>
             </td>
           </tr>
           <tr>
@@ -322,4 +335,10 @@ export default {
 .no-decision {
   color: $color-warning;
 }
+.ban {
+  color: $color-danger;
+}
+.no-ban {
+  color: $color-success;
+}
 </style>