diff --git a/ghost/admin/app/components/dashboard/latest-member-activity.hbs b/ghost/admin/app/components/dashboard/latest-member-activity.hbs index d8e9252c14..092764f1a6 100644 --- a/ghost/admin/app/components/dashboard/latest-member-activity.hbs +++ b/ghost/admin/app/components/dashboard/latest-member-activity.hbs @@ -35,7 +35,7 @@ {{parsedEvent.subject}}
- {{parsedEvent.action}} + {{capitalize-first-letter parsedEvent.action}} {{parsedEvent.object}} {{parsedEvent.info}}
diff --git a/ghost/admin/app/components/dashboard/v5/charts/recent-activity.hbs b/ghost/admin/app/components/dashboard/v5/charts/recent-activity.hbs index f2f245c8c1..4837fa4773 100644 --- a/ghost/admin/app/components/dashboard/v5/charts/recent-activity.hbs +++ b/ghost/admin/app/components/dashboard/v5/charts/recent-activity.hbs @@ -27,7 +27,7 @@ {{parsedEvent.subject}} - {{parsedEvent.action}} + {{capitalize-first-letter parsedEvent.action}} {{parsedEvent.object}} {{parsedEvent.info}} diff --git a/ghost/admin/app/components/dashboard/v5/charts/recents.hbs b/ghost/admin/app/components/dashboard/v5/charts/recents.hbs index 8647510d2a..8150fc2a0a 100644 --- a/ghost/admin/app/components/dashboard/v5/charts/recents.hbs +++ b/ghost/admin/app/components/dashboard/v5/charts/recents.hbs @@ -86,7 +86,7 @@
{{!-- ICON {{svg-jar parsedEvent.icon}} --}} - {{parsedEvent.action}} + {{capitalize-first-letter parsedEvent.action}} {{parsedEvent.object}} {{parsedEvent.info}} diff --git a/ghost/admin/app/components/member/activity-feed.hbs b/ghost/admin/app/components/member/activity-feed.hbs index 1c0e4a23cb..d90ddb4c15 100644 --- a/ghost/admin/app/components/member/activity-feed.hbs +++ b/ghost/admin/app/components/member/activity-feed.hbs @@ -24,7 +24,7 @@
- {{event.action}} + {{capitalize-first-letter event.action}} {{event.object}} {{#if event.email}} @@ -52,4 +52,4 @@
{{/let}} -{{/if}} \ No newline at end of file +{{/if}} diff --git a/ghost/admin/app/components/members-activity/table-row.hbs b/ghost/admin/app/components/members-activity/table-row.hbs index bca9c62ac7..b8c1474699 100644 --- a/ghost/admin/app/components/members-activity/table-row.hbs +++ b/ghost/admin/app/components/members-activity/table-row.hbs @@ -20,7 +20,7 @@
{{svg-jar event.icon}}
- {{event.action}} + {{capitalize-first-letter event.action}} {{event.object}} {{#if event.email}} diff --git a/ghost/admin/app/helpers/capitalize-first-letter.js b/ghost/admin/app/helpers/capitalize-first-letter.js new file mode 100644 index 0000000000..4aece41c2c --- /dev/null +++ b/ghost/admin/app/helpers/capitalize-first-letter.js @@ -0,0 +1,10 @@ +import {helper} from '@ember/component/helper'; + +export function capitalizeFirstLetter(string) { + if (typeof string !== 'string' || string.length === 0) { + return string; + } + return string.charAt(0).toUpperCase() + string.slice(1); +} + +export default helper(([string]) => capitalizeFirstLetter(string)); diff --git a/ghost/admin/app/helpers/parse-member-event.js b/ghost/admin/app/helpers/parse-member-event.js index e2a1828783..11016d2be2 100644 --- a/ghost/admin/app/helpers/parse-member-event.js +++ b/ghost/admin/app/helpers/parse-member-event.js @@ -127,6 +127,9 @@ function getAction(event) { function getObject(event) { if (event.type === 'newsletter_event') { + if (event.data.newsletter && event.data.newsletter.name) { + return 'emails from '+event.data.newsletter.name; + } return 'emails'; } diff --git a/ghost/admin/app/styles/layouts/dashboard-v5.css b/ghost/admin/app/styles/layouts/dashboard-v5.css index d6cedddcf6..ae4cefab9d 100644 --- a/ghost/admin/app/styles/layouts/dashboard-v5.css +++ b/ghost/admin/app/styles/layouts/dashboard-v5.css @@ -1060,16 +1060,10 @@ Dashboard v5 Recents */ } .gh-dashboard5-recents-activity .gh-dashboard5-list-item-sub:nth-child(2) > span { - text-transform: lowercase; color: #626d79; font-weight: 500; } -.gh-dashboard5-recents-activity .gh-dashboard5-list-item-sub:nth-child(2) > span:first-letter { - text-transform: uppercase; -} - - /* --------------------------------- Dashboard v5 What's New */ diff --git a/ghost/admin/app/styles/layouts/member-activity.css b/ghost/admin/app/styles/layouts/member-activity.css index 4fe1d7a878..4b63a634b1 100644 --- a/ghost/admin/app/styles/layouts/member-activity.css +++ b/ghost/admin/app/styles/layouts/member-activity.css @@ -119,15 +119,10 @@ .gh-members-activity-description { display: inline-block; - text-transform: lowercase; color: var(--middarkgrey); font-weight: 500; } -.gh-members-activity-description:first-letter { - text-transform: uppercase; -} - .gh-members-activity-icon { width: 24px; height: 24px;