From 78d16fb441c357747071fa4ba09377f170ff0bd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 24 Oct 2019 10:17:31 +0200
Subject: [PATCH] Change appearance of moderators reports list again

---
 webapp/locales/de.json            | 11 ++++---
 webapp/locales/en.json            | 11 ++++---
 webapp/pages/moderation/index.vue | 50 +++++++++++++++----------------
 3 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 6dc8b2b78..d70783f4c 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -446,13 +446,16 @@
     "reports": {
       "empty": "Glückwunsch, es gibt nichts zu moderieren.",
       "name": "Meldungen",
+      "type": "Typ",
+      "content": "Inhalt",
+      "author": "Autor",
+      "decision": "Entscheidung",
+      "noDecision": "Keine Entscheidung!",
+      "disabledBy": "Deaktiviert von",
       "reasonCategory": "Kategorie",
       "reasonDescription": "Beschreibung",
       "createdAt": "Datum",
-      "submitter": "Gemeldet von",
-      "disabledBy": "Deaktiviert von",
-      "decision": "Entscheidung",
-      "noDecision": "Keine Entscheidung!"
+      "submitter": "Gemeldet von"
     }
   },
   "disable": {
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 816815142..31d2c2a20 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -447,13 +447,16 @@
     "reports": {
       "empty": "Congratulations, nothing to moderate.",
       "name": "Reports",
+      "type": "Type",
+      "content": "Content",
+      "author": "Author",
+      "decision": "Decision",
+      "noDecision": "No decision!",
+      "disabledBy": "Disabled by",
       "reasonCategory": "Category",
       "reasonDescription": "Description",
       "createdAt": "Date",
-      "submitter": "Reported by",
-      "disabledBy": "Disabled by",
-      "decision": "Decision",
-      "noDecision": "No decision!"
+      "submitter": "Reported by"
     }
   },
   "disable": {
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 1d485cc2c..19da03099 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -9,11 +9,27 @@
     >
       <colgroup><col width="" /></colgroup>
       <template v-for="content in reportedContentStructure">
-        <tbody :key="content.resource.id">
+        <thead :key="'thead-' + content.resource.id">
+          <tr valign="top">
+            <th class="ds-table-col ds-table-head-col ds-table-head-col-border">
+              {{ $t('moderation.reports.type') }}
+            </th>
+            <th class="ds-table-col ds-table-head-col ds-table-head-col-border">
+              {{ $t('moderation.reports.content') }}
+            </th>
+            <th class="ds-table-col ds-table-head-col ds-table-head-col-border">
+              {{ $t('moderation.reports.author') }}
+            </th>
+            <th class="ds-table-col ds-table-head-col ds-table-head-col-border">
+              {{ $t('moderation.reports.decision') }}
+            </th>
+          </tr>
+        </thead>
+        <tbody :key="'tbody-' + content.resource.id">
           <tr valign="top">
             <td class="ds-table-col ds-table-head-col ds-table-head-col-border">
               <!-- Icon -->
-              <ds-text color="soft">
+              <ds-text :class="[!content.resource.disabledBy && 'no-decision']" color="soft">
                 <ds-icon
                   v-if="content.type === 'Post'"
                   v-tooltip="{ content: $t('report.contribution.type'), placement: 'right' }"
@@ -62,28 +78,17 @@
                   />
                 </ds-flex-item>
                 <ds-flex-item>
-                  <hc-user :user="content.contentBelongsToUser" :showAvatar="false" :trunc="25" />
+                  <hc-user :user="content.contentBelongsToUser" :showAvatar="false" :trunc="30" />
                 </ds-flex-item>
               </ds-flex>
+              <span v-else>—</span>
             </td>
             <td class="ds-table-col ds-table-head-col-border">
-              <b>{{ $t('moderation.reports.decision') }}:</b>
-              <br />
               <!-- disabledBy -->
               <div v-if="content.resource.disabledBy">
                 {{ $t('moderation.reports.disabledBy') }}
                 <br />
-                <nuxt-link
-                  :to="{
-                    name: 'profile-id-slug',
-                    params: {
-                      id: content.resource.disabledBy.id,
-                      slug: content.resource.disabledBy.slug,
-                    },
-                  }"
-                >
-                  <b>{{ content.resource.disabledBy.name | truncate(50) }}</b>
-                </nuxt-link>
+                <hc-user :user="content.resource.disabledBy" :showAvatar="false" :trunc="30" />
               </div>
               <span v-else class="no-decision">{{ $t('moderation.reports.noDecision') }}</span>
             </td>
@@ -137,13 +142,6 @@ export default {
     }
   },
   computed: {
-    contentFields() {
-      return {
-        type: ' ',
-        reportedUserContent: ' ',
-        disabledBy: this.$t('moderation.reports.disabledBy'),
-      }
-    },
     reportFields() {
       return {
         submitter: this.$t('moderation.reports.submitter'),
@@ -152,6 +150,7 @@ export default {
         // Wolle createdAt: this.$t('moderation.reports.createdAt'),
       }
     },
+    // Wolle delete + language
     fields() {
       return {
         type: ' ',
@@ -182,7 +181,7 @@ export default {
           let idx = newReportedContentStructure.findIndex(
             content => content.resource.id === resource.id,
           )
-          // if content not in content list, then push
+          // if content not in content list, then add it
           if (idx === -1) {
             idx = newReportedContentStructure.length
             newReportedContentStructure.push({
@@ -197,7 +196,6 @@ export default {
           }
           newReportedContentStructure[idx].reports.push(report)
         })
-        // Wolle !!! Sortieren !!!
         this.reportedContentStructure = newReportedContentStructure
       },
     },
@@ -212,7 +210,7 @@ export default {
 </script>
 
 <style lang="scss">
-// Wolle
+// Wolle delete?
 .ds-table-head-col-border {
   border-bottom: $border-color-softer dotted $border-size-base;
 }