diff --git a/ghost/admin/app/components/dashboard/charts/recents.hbs b/ghost/admin/app/components/dashboard/charts/recents.hbs
index eb7d77d3e6..b5487eff85 100644
--- a/ghost/admin/app/components/dashboard/charts/recents.hbs
+++ b/ghost/admin/app/components/dashboard/charts/recents.hbs
@@ -100,11 +100,12 @@
{{svg-jar parsedEvent.icon}}
{{capitalize-first-letter parsedEvent.action}}
- {{parsedEvent.object}}
- {{parsedEvent.info}}
- {{#if parsedEvent.subtitle}}
- "{{parsedEvent.subtitle}}"
+ {{#if parsedEvent.url}}
+ "{{parsedEvent.object}}"
+ {{else}}
+ {{parsedEvent.object}}
{{/if}}
+ {{parsedEvent.info}}
diff --git a/ghost/admin/app/components/member/activity-feed.hbs b/ghost/admin/app/components/member/activity-feed.hbs
index 0473afdbd3..26dc68a04b 100644
--- a/ghost/admin/app/components/member/activity-feed.hbs
+++ b/ghost/admin/app/components/member/activity-feed.hbs
@@ -26,15 +26,17 @@
{{capitalize-first-letter event.action}}
- {{event.object}}
+ {{#if event.url}}
+ "{{event.object}}"
+ {{else}}
+ {{event.object}}
+ {{/if}}
{{#if event.email}}
""
{{/if}}
{{event.info}}
- {{#if event.subtitle}}
- "{{event.subtitle}}"
- {{/if}}
+
diff --git a/ghost/admin/app/components/members-activity/table-row.hbs b/ghost/admin/app/components/members-activity/table-row.hbs
index 8a890dea19..e8a701e747 100644
--- a/ghost/admin/app/components/members-activity/table-row.hbs
+++ b/ghost/admin/app/components/members-activity/table-row.hbs
@@ -21,15 +21,16 @@
{{capitalize-first-letter event.action}}
- {{event.object}}
+ {{#if event.url}}
+ "{{event.object}}"
+ {{else}}
+ {{event.object}}
+ {{/if}}
{{#if event.email}}
"
"
{{/if}}
{{event.info}}
- {{#if event.subtitle}}
- "
{{event.subtitle}}"
- {{/if}}
diff --git a/ghost/admin/app/helpers/parse-member-event.js b/ghost/admin/app/helpers/parse-member-event.js
index ac9fd95541..3475cfd02e 100644
--- a/ghost/admin/app/helpers/parse-member-event.js
+++ b/ghost/admin/app/helpers/parse-member-event.js
@@ -7,7 +7,6 @@ export default function parseMemberEvent(event, hasMultipleNewsletters) {
let action = getAction(event);
let object = getObject(event, hasMultipleNewsletters);
let info = getInfo(event);
- const subtitle = getSubtitle(event);
const url = getURL(event);
let timestamp = moment(event.data.created_at);
@@ -21,7 +20,6 @@ export default function parseMemberEvent(event, hasMultipleNewsletters) {
action,
object,
info,
- subtitle,
url,
timestamp
};
@@ -134,7 +132,7 @@ function getAction(event) {
if (event.type === 'comment_event') {
if (event.data.parent) {
- return 'replied on';
+ return 'replied to a comment on';
}
return 'commented on';
}
@@ -161,11 +159,11 @@ function getObject(event, hasMultipleNewsletters) {
}
if (event.type === 'comment_event') {
- if (event.data.parent) {
- return 'a comment';
+ if (event.type === 'comment_event') {
+ if (event.data.post) {
+ return event.data.post.title;
+ }
}
-
- return 'a post';
}
return '';
@@ -192,19 +190,7 @@ function getInfo(event) {
}
/**
- * subtitle with an optional url property that is shown in gray and can be clickable
- */
-function getSubtitle(event) {
- if (event.type === 'comment_event') {
- if (event.data.post) {
- return event.data.post.title;
- }
- }
- return;
-}
-
-/**
- * Make the event clickable
+ * Make the object clickable
*/
function getURL(event) {
if (event.type === 'comment_event') {
diff --git a/ghost/admin/app/styles/layouts/member-activity.css b/ghost/admin/app/styles/layouts/member-activity.css
index 87d2d02103..af3256ace2 100644
--- a/ghost/admin/app/styles/layouts/member-activity.css
+++ b/ghost/admin/app/styles/layouts/member-activity.css
@@ -124,9 +124,11 @@
}
.gh-members-activity-description {
- display: inline-block;
+ display: block;
color: var(--middarkgrey);
font-weight: 500;
+ text-overflow: ellipsis;
+ overflow: hidden;
}
.gh-members-activity-icon {