Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-27 22:49:56 -05:00
Code Issues Activity

Updated comment activity feed text and styles

Browse source 
refs https://github.com/TryGhost/Team/issues/1731
This commit is contained in:
Simon Backx 2022-08-03 13:35:01 +02:00
parent 90a080e0b8
commit 235ede719c
5 changed files with 25 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ghost/admin/app/components/dashboard/charts/recents.hbs
View file

@ -100,11 +100,12 @@
{{svg-jar parsedEvent.icon}}
<span class="gh-dashboard-list-subtext">
{{capitalize-first-letter parsedEvent.action}}
{{parsedEvent.object}}
{{parsedEvent.info}}
{{#if parsedEvent.subtitle}}
"<a class="ghost-memebrs-activity-subtitle" href="{{parsedEvent.url}}" target="_blank" rel="noopener noreferrer">{{parsedEvent.subtitle}}</a>"
{{#if parsedEvent.url}}
"<a class="ghost-members-activity-object-link" href="{{parsedEvent.url}}" target="_blank" rel="noopener noreferrer">{{parsedEvent.object}}</a>"
{{else}}
{{parsedEvent.object}}
{{/if}}
{{parsedEvent.info}}
</span>
</div>
<div class="gh-dashboard-list-item-sub">

10
ghost/admin/app/components/member/activity-feed.hbs
View file

@ -26,15 +26,17 @@
<span class="gh-member-feed-event-inner">
<span class="gh-members-activity-description">
{{capitalize-first-letter event.action}}
{{event.object}}
{{#if event.url}}
"<a class="ghost-members-activity-object-link" href="{{event.url}}" target="_blank" rel="noopener noreferrer">{{event.object}}</a>"
{{else}}
{{event.object}}
{{/if}}
</span>
{{#if event.email}}
"<GhEmailPreviewLink @data={{event.email}} />"
{{/if}}
{{event.info}}
{{#if event.subtitle}}
"<a class="ghost-memebrs-activity-subtitle" href="{{event.url}}" target="_blank" rel="noopener noreferrer">{{event.subtitle}}</a>"
{{/if}}
</span>
</div>
<div class="gh-member-feed-time">

9
ghost/admin/app/components/members-activity/table-row.hbs
View file

@ -21,15 +21,16 @@
<div class="gh-members-activity-event">
<span class="gh-members-activity-description">
{{capitalize-first-letter event.action}}
{{event.object}}
{{#if event.url}}
"<a class="ghost-members-activity-object-link" href="{{event.url}}" target="_blank" rel="noopener noreferrer">{{event.object}}</a>"
{{else}}
{{event.object}}
{{/if}}
</span>
{{#if event.email}}
"<GhEmailPreviewLink @data={{event.email}} />"
{{/if}}
<span class="highlight">{{event.info}}</span>
{{#if event.subtitle}}
"<a class="ghost-memebrs-activity-subtitle" href="{{event.url}}" target="_blank" rel="noopener noreferrer">{{event.subtitle}}</a>"
{{/if}}
</div>
</div>
</div>

26
ghost/admin/app/helpers/parse-member-event.js
View file

@ -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') {

4
ghost/admin/app/styles/layouts/member-activity.css
View file

@ -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 {