-
+
{{ $t('profile.userAnonym') }}
@@ -9,11 +9,12 @@
-
+
- {{ userName | truncate(18) }}
-
+ {{ userName | truncate(trunc) }}
+
+
@@ -22,9 +23,17 @@
-
+
{{ userSlug }}
+
+
+
+
+
+
+
+
@@ -110,8 +119,10 @@ export default {
},
props: {
user: { type: Object, default: null },
- trunc: { type: Number, default: null },
+ showAvatar: { type: Boolean, default: true },
+ trunc: { type: Number, default: 18 }, // "-1" is no trunc
dateTime: { type: [Date, String], default: null },
+ positionDatetime: { type: String, default: 'sideward' }, // 'below' is the otherone
},
computed: {
...mapGetters({
@@ -172,4 +183,8 @@ export default {
z-index: 999;
}
}
+
+.user-slug {
+ margin-bottom: $space-xx-small;
+}
diff --git a/webapp/graphql/Moderation.js b/webapp/graphql/Moderation.js
index 1a5bdb367..04ac11076 100644
--- a/webapp/graphql/Moderation.js
+++ b/webapp/graphql/Moderation.js
@@ -15,6 +15,9 @@ export const reportListQuery = () => {
name
disabled
deleted
+ followedByCount
+ contributionsCount
+ commentedCount
}
user {
id
@@ -29,6 +32,9 @@ export const reportListQuery = () => {
disabled
deleted
}
+ followedByCount
+ contributionsCount
+ commentedCount
}
comment {
id
@@ -39,6 +45,9 @@ export const reportListQuery = () => {
name
disabled
deleted
+ followedByCount
+ contributionsCount
+ commentedCount
}
post {
id
@@ -67,6 +76,9 @@ export const reportListQuery = () => {
name
disabled
deleted
+ followedByCount
+ contributionsCount
+ commentedCount
}
disabledBy {
id
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 9f10d929d..188f9e67d 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -435,7 +435,7 @@
"reasonCategory": "Kategorie",
"reasonDescription": "Beschreibung",
"createdAt": "Datum",
- "submitter": "Gemeldet von",
+ "submitter": "Gemeldet von / am",
"disabledBy": "Deaktiviert von"
}
},
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 9860aa457..d2927ee38 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -436,7 +436,7 @@
"reasonCategory": "Category",
"reasonDescription": "Description",
"createdAt": "Date",
- "submitter": "Reported by",
+ "submitter": "Reported by / at",
"disabledBy": "Disabled by"
}
},
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index ab72c0588..3149e2e98 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -33,8 +33,19 @@
>
{{ scope.row.post.title | truncate(50) }}
-
-
{{ scope.row.post.author.name }}
+
+
+
+
+
+
+
+
+
+