diff --git a/ghost/admin/app/components/dashboard/charts/recents.hbs b/ghost/admin/app/components/dashboard/charts/recents.hbs index 758a4877b9..716df66370 100644 --- a/ghost/admin/app/components/dashboard/charts/recents.hbs +++ b/ghost/admin/app/components/dashboard/charts/recents.hbs @@ -107,7 +107,7 @@ {{else}} {{parsedEvent.object}} {{/if}} - {{parsedEvent.info}} + {{parsedEvent.info}} diff --git a/ghost/admin/app/components/members-activity/table-row.hbs b/ghost/admin/app/components/members-activity/table-row.hbs index 92123a6ef3..a843656ac7 100644 --- a/ghost/admin/app/components/members-activity/table-row.hbs +++ b/ghost/admin/app/components/members-activity/table-row.hbs @@ -21,19 +21,32 @@
{{capitalize-first-letter event.action}} - {{#if event.url}} - {{event.object}} - {{else}} - {{event.object}} - {{/if}} - {{#if event.email}} - - {{/if}} - {{event.info}} + + {{#if event.url}} + {{event.object}} + {{else}} + {{event.object}} + {{/if}} + {{#if event.email}} + + {{/if}} + {{event.info}} +
+ {{#if (feature "memberAttribution")}} +
+ {{#if event.url}} + {{event.object}} + {{else if event.email}} + + {{else}} + + {{/if}} +
+ {{/if}}
{{moment-format event.timestamp "DD MMM YYYY HH:mm"}}
{{/let}} diff --git a/ghost/admin/app/components/members-activity/table.hbs b/ghost/admin/app/components/members-activity/table.hbs index 6633cbb935..4184c3be89 100644 --- a/ghost/admin/app/components/members-activity/table.hbs +++ b/ghost/admin/app/components/members-activity/table.hbs @@ -5,6 +5,9 @@ Member {{/unless}} Event + {{#if (feature "memberAttribution")}} + Attribution + {{/if}} Time diff --git a/ghost/admin/app/styles/components/lists.css b/ghost/admin/app/styles/components/lists.css index a3f46c144e..77378d1dd6 100644 --- a/ghost/admin/app/styles/components/lists.css +++ b/ghost/admin/app/styles/components/lists.css @@ -112,6 +112,17 @@ ul.nostyle li { background: var(--whitegrey-l2); } +.gh-list-data-attribution { + font-weight: 500; + font-size: 1.4rem; + color: var(--midgrey); +} + +.gh-list-data-attribution > a { + font-weight: 600; + color: var(--darkgrey); +} + .gh-list-data-date { font-weight: 500; font-size: 1.3rem; diff --git a/ghost/admin/app/styles/layouts/member-activity.css b/ghost/admin/app/styles/layouts/member-activity.css index 26efe3867b..347f3726b0 100644 --- a/ghost/admin/app/styles/layouts/member-activity.css +++ b/ghost/admin/app/styles/layouts/member-activity.css @@ -31,6 +31,11 @@ margin: 0 -4px; } +.gh-member-details-activity .gh-list-data { + font-weight: 600; + color: var(--darkgrey); +} + .no-posts .gh-members-placeholder { fill: var(--lightgrey); width: 60px; @@ -92,6 +97,22 @@ width: 18%; } +.gh-members-activity.feature-memberAttribution .gh-list-scrolling thead th:nth-child(1) { + width: 25%; +} + +.gh-members-activity.feature-memberAttribution .gh-list-scrolling thead th:nth-child(2) { + width: 25%; +} + +.gh-members-activity.feature-memberAttribution .gh-list-scrolling thead th:nth-child(3) { + width: 35%; +} + +.gh-members-activity.feature-memberAttribution .gh-list-scrolling thead th:last-child { + width: 15%; +} + .gh-members-activity .gh-list-scrolling tbody .gh-list-data:last-child { white-space: nowrap; } diff --git a/ghost/admin/app/templates/members-activity.hbs b/ghost/admin/app/templates/members-activity.hbs index c6b5886ac1..e66abccb7a 100644 --- a/ghost/admin/app/templates/members-activity.hbs +++ b/ghost/admin/app/templates/members-activity.hbs @@ -1,4 +1,4 @@ -
+

Activity