diff --git a/ghost/admin/app/components/dashboard/latest-member-activity.hbs b/ghost/admin/app/components/dashboard/latest-member-activity.hbs index cc7bccc0b7..d8e9252c14 100644 --- a/ghost/admin/app/components/dashboard/latest-member-activity.hbs +++ b/ghost/admin/app/components/dashboard/latest-member-activity.hbs @@ -37,7 +37,7 @@
{{parsedEvent.action}} {{parsedEvent.object}} - {{parsedEvent.info}} + {{parsedEvent.info}}
diff --git a/ghost/admin/app/components/member/activity-feed.hbs b/ghost/admin/app/components/member/activity-feed.hbs index 1338e84c20..0455c999ec 100644 --- a/ghost/admin/app/components/member/activity-feed.hbs +++ b/ghost/admin/app/components/member/activity-feed.hbs @@ -30,6 +30,7 @@ {{#if event.email}} "" {{/if}} + {{event.info}}
{{moment-from-now event.timestamp}} diff --git a/ghost/admin/app/helpers/parse-member-event.js b/ghost/admin/app/helpers/parse-member-event.js index 2f239f892a..e2a1828783 100644 --- a/ghost/admin/app/helpers/parse-member-event.js +++ b/ghost/admin/app/helpers/parse-member-event.js @@ -51,11 +51,7 @@ function getIcon(event) { if (event.type === 'subscription_event') { icon = 'subscriptions'; - if (event.data.from_plan === null) { - icon = 'subscriptions'; - } - - if (event.data.to_plan === null) { + if (event.data.type === 'canceled') { icon = 'canceled-subscription'; } } @@ -97,12 +93,20 @@ function getAction(event) { } if (event.type === 'subscription_event') { - if (event.data.from_plan === null) { + if (event.data.type === 'created') { return 'started'; } - - if (event.data.to_plan === null) { - return 'cancelled'; + if (event.data.type === 'updated') { + return 'changed'; + } + if (event.data.type === 'canceled') { + return 'canceled'; + } + if (event.data.type === 'reactivated') { + return 'reactivated'; + } + if (event.data.type === 'expired') { + return 'ended'; } return 'changed'; diff --git a/ghost/admin/app/styles/layouts/member-activity.css b/ghost/admin/app/styles/layouts/member-activity.css index 0d7e47ee01..4fe1d7a878 100644 --- a/ghost/admin/app/styles/layouts/member-activity.css +++ b/ghost/admin/app/styles/layouts/member-activity.css @@ -150,12 +150,17 @@ } .gh-members-activity-event { - font-weight: 400; - font-size: 13px; - color: var(--middarkgrey); + display: inline-block; + color: var(--middarkgrey); + font-weight: 500; white-space: nowrap; } +.gh-members-activity-event > a { + font-weight: 500; + color: var(--black); +} + .gh-member-activity-actions-menu { top: auto; left: auto; diff --git a/ghost/admin/app/styles/layouts/members.css b/ghost/admin/app/styles/layouts/members.css index 63e08800f0..6a3de33359 100644 --- a/ghost/admin/app/styles/layouts/members.css +++ b/ghost/admin/app/styles/layouts/members.css @@ -1109,10 +1109,9 @@ textarea.gh-member-details-textarea { .gh-member-feed-event { display: inline-block; - text-transform: lowercase; + color: var(--middarkgrey); font-weight: 500; - font-size: 14px; - color: var(--black); + white-space: nowrap; } .gh-member-feed-event:first-letter {