diff --git a/ghost/admin/app/components/dashboard/charts/recents.hbs b/ghost/admin/app/components/dashboard/charts/recents.hbs index 9f89c55ca1..5079a2795d 100644 --- a/ghost/admin/app/components/dashboard/charts/recents.hbs +++ b/ghost/admin/app/components/dashboard/charts/recents.hbs @@ -102,11 +102,14 @@ {{capitalize-first-letter parsedEvent.action}} {{#if parsedEvent.info}} - {{parsedEvent.info}} + ({{parsedEvent.info}}) {{/if}} {{#if parsedEvent.url}} {{parsedEvent.join}} {{parsedEvent.object}} + {{else if parsedEvent.email}} + {{parsedEvent.join}} + {{/if}} diff --git a/ghost/admin/app/components/member/activity-feed.hbs b/ghost/admin/app/components/member/activity-feed.hbs index 95d7d54747..4786014d78 100644 --- a/ghost/admin/app/components/member/activity-feed.hbs +++ b/ghost/admin/app/components/member/activity-feed.hbs @@ -27,15 +27,13 @@ {{capitalize-first-letter event.action}} {{#if event.info}} - {{event.info}} + ({{event.info}}) {{/if}} {{#if event.url}} {{event.join}} - {{event.object}} - {{/if}} - {{#if event.email}} - + {{else if event.email}} + {{event.join}} {{/if}} diff --git a/ghost/admin/app/components/members-activity/table-row.hbs b/ghost/admin/app/components/members-activity/table-row.hbs index d5a4aea3b8..f8a2bf5d33 100644 --- a/ghost/admin/app/components/members-activity/table-row.hbs +++ b/ghost/admin/app/components/members-activity/table-row.hbs @@ -22,14 +22,12 @@ {{capitalize-first-letter event.action}} {{#if event.info}} - {{event.info}} + ({{event.info}}) {{/if}} {{#if event.url}} {{event.join}} - {{event.object}} - {{/if}} - {{#if event.email}} + {{else if event.email}} {{/if}} diff --git a/ghost/admin/app/helpers/parse-member-event.js b/ghost/admin/app/helpers/parse-member-event.js index 11b1c05757..9c30484662 100644 --- a/ghost/admin/app/helpers/parse-member-event.js +++ b/ghost/admin/app/helpers/parse-member-event.js @@ -196,20 +196,8 @@ export default class ParseMemberEventHelper extends Helper { * -> do this by returning 'on' in getJoin() * This string is not added when action and object are in a separete table column, or when the getObject/getURL is empty */ - getJoin(event) { - if (event.type === 'signup_event' || event.type === 'subscription_event') { - if (event.data.attribution?.title) { - return 'on'; - } - } - - if (event.type === 'comment_event') { - if (event.data.post) { - return 'on'; - } - } - - return ''; + getJoin() { + return '–'; } /** @@ -261,11 +249,11 @@ export default class ParseMemberEventHelper extends Helper { if (event.data.type === 'created') { const sign = mrrDelta > 0 ? '' : '-'; - const tierName = this.membersUtils.hasMultipleTiers ? (event.data.tierName ?? 'paid') : 'paid'; - return `${tierName} - ${sign}${symbol}${Math.abs(mrrDelta)}/month`; + const tierName = this.membersUtils.hasMultipleTiers ? (event.data.tierName ?? 'Paid') : 'Paid'; + return `${tierName} ${sign}${symbol}${Math.abs(mrrDelta)}/month`; } const sign = mrrDelta > 0 ? '+' : '-'; - return `MRR - ${sign}${symbol}${Math.abs(mrrDelta)}`; + return `MRR ${sign}${symbol}${Math.abs(mrrDelta)}`; } if (event.type === 'signup_event' && this.membersUtils.paidMembersEnabled) { diff --git a/ghost/admin/app/styles/layouts/content.css b/ghost/admin/app/styles/layouts/content.css index 2d2add4260..442fcabbde 100644 --- a/ghost/admin/app/styles/layouts/content.css +++ b/ghost/admin/app/styles/layouts/content.css @@ -1255,20 +1255,20 @@ } } -.gh-dashboard-list-item-sub .gh-members-activity-description { +.gh-post-activity-feed .gh-dashboard-list-item-sub .gh-members-activity-description { display: flex; flex-direction: row; align-items: center; } -.gh-dashboard-list-item-sub .gh-members-activity-description svg { +.gh-post-activity-feed .gh-dashboard-list-item-sub .gh-members-activity-description svg { width: 18px; min-width: 18px; height: 16px; margin: 0 0.4em 0 0; } -.gh-dashboard-list-item-sub .gh-members-activity-description svg path { +.gh-post-activity-feed .gh-dashboard-list-item-sub .gh-members-activity-description svg path { stroke: var(--midgrey); }