diff --git a/ghost/admin/app/components/settings/audit-log/table.hbs b/ghost/admin/app/components/settings/audit-log/table.hbs index cf141f5cf7..a56cbf7904 100644 --- a/ghost/admin/app/components/settings/audit-log/table.hbs +++ b/ghost/admin/app/components/settings/audit-log/table.hbs @@ -1,59 +1,51 @@ - - - - + {{#each @events as |event|}} {{#let (parse-audit-log-event event) as |ev|}} -
-
- - - -

{{ev.actor.name}}

-
-
-
-
+
+
{{svg-jar ev.actionIcon}}
-
- - {{capitalize-first-letter ev.action}} - +
+
+ + {{capitalize-first-letter ev.action}}: + + {{#if ev.contextResource}} + + {{capitalize-first-letter ev.contextResource.first}} + {{#if (not (eq ev.contextResource.first ev.contextResource.second))}} + ({{ev.contextResource.second}}) + {{/if}} + + {{else if (or ev.original.resource.title ev.original.resource.name ev.original.context.primary_name)}} + {{#if ev.linkTarget}} + + {{or ev.original.resource.title ev.original.resource.name}} + + {{else}} + {{or ev.original.resource.title ev.original.resource.name ev.original.context.primary_name}} + {{/if}} + {{else}} + (unknown) + {{/if}} + + + – by + + {{ev.actor.name}} + + +
+
{{moment-format ev.original.created_at "DD MMM YYYY HH:mm:ss"}}
-
-
- {{#if ev.contextResource}} - - {{capitalize-first-letter ev.contextResource.first}} - {{#if (not (eq ev.contextResource.first ev.contextResource.second))}} - ({{ev.contextResource.second}}) - {{/if}} - - {{else if (or ev.original.resource.title ev.original.resource.name ev.original.context.primary_name)}} - {{#if ev.linkTarget}} - - {{or ev.original.resource.title ev.original.resource.name}} - - {{else}} - - {{or ev.original.resource.title ev.original.resource.name ev.original.context.primary_name}} - - {{/if}} - {{else}} - (unknown) - {{/if}} -
-
-
{{moment-format ev.original.created_at "DD MMM YYYY HH:mm:ss"}}
{{/let}} {{/each}} diff --git a/ghost/admin/app/helpers/parse-audit-log-event.js b/ghost/admin/app/helpers/parse-audit-log-event.js index ef3b396346..1549268669 100644 --- a/ghost/admin/app/helpers/parse-audit-log-event.js +++ b/ghost/admin/app/helpers/parse-audit-log-event.js @@ -117,7 +117,7 @@ function getAction(ev) { } } - return `${ev.event} ${resourceType}`; + return `${resourceType} ${ev.event}`; } function getContextResource(ev) { diff --git a/ghost/admin/app/styles/layouts/settings.css b/ghost/admin/app/styles/layouts/settings.css index f183589ac1..b9d676ddfa 100644 --- a/ghost/admin/app/styles/layouts/settings.css +++ b/ghost/admin/app/styles/layouts/settings.css @@ -2870,7 +2870,6 @@ p.theme-validation-details { .gh-audit-log-container { display: flex; align-items: center; - padding: 7px 0; } .gh-audit-log-container strong { @@ -2888,7 +2887,7 @@ p.theme-validation-details { .gh-audit-log-object code { background: none; border: none; - color: var(--middarkgrey); + color: var(--midgrey); } .gh-audit-log-dash { @@ -2898,19 +2897,46 @@ p.theme-validation-details { } .gh-audit-log-icon { - width: 16px; - height: 16px; - margin-right: 8px; + width: 18px; + height: 18px; + margin: 0 20px 0 4px; } .gh-audit-log-icon svg path { - fill: var(--middarkgrey); + fill: var(--midgrey-l1); } .gh-audit-log-description { - font-size: 1.3rem; - color: var(--middarkgrey); + font-size: 1.4rem; + color: var(--darkgrey); white-space: nowrap; + margin-top: 2px; + font-weight: 500; +} + +.gh-audit-log-description a { + font-weight: 700; +} + +.gh-audit-log-name { + font-size: 1.35rem; + font-weight: 400; + margin-bottom: 0 !important; + color: var(--midgrey); +} + +.gh-audit-log-name a { + color: var(--midgrey) !important; + font-weight: 400; +} + +.gh-audit-log-name a:hover { + color: var(--darkgrey) !important; +} + +.gh-audit-log-datetime { + font-size: 1.2rem; + color: var(--midlightgrey); } .gh-audit-log-table .user-list-item-figure { @@ -2918,11 +2944,6 @@ p.theme-validation-details { width: 30px; } -.gh-audit-log-name { - margin-bottom: 0 !important; - min-width: 160px; -} - @media (max-width: 620px) { .gh-audit-log-table .user-list-item-figure { display: none;
UserEventTime