Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-24 23:48:13 -05:00
Code Issues Activity

Updated email error design in PSM

Browse source
This commit is contained in:
Peter Zimon 2019-11-25 17:03:54 +01:00
parent a3c17c2757
commit 1d78b9a903
2 changed files with 33 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ghost/admin/app/styles/patterns/boxes.css
View file

@ -56,3 +56,7 @@
.gh-box-error a { .gh-box-error a {
color: var(--red); color: var(--red);
} }
.gh-box-error-border {
border-left: 5px solid var(--red);
}

57
ghost/admin/app/templates/components/gh-post-settings-menu/email.hbs
View file

@ -21,12 +21,12 @@
<table class="ma0" style="table-layout: fixed"> <table class="ma0" style="table-layout: fixed">
<tbody> <tbody>
<tr> <tr>
<td class="pa2 pl0 fw7 f8 w16">Subject:</td> <td class="pa1 pl0 fw7 f8 w16 v-top lh-copy">Subject:</td>
<td class="pa0 truncate midgrey">{{this.post.email.subject}}</td> <td class="pa1 pa0 word-wrap midgrey v-top lh-copy">{{this.post.email.subject}}</td>
</tr> </tr>
<tr> <tr>
<td class="pa2 pl0 fw7 f8 w16 nowrap">Sent on:</td> <td class="pa1 pl0 fw7 f8 w16 nowrap v-top lh-copy">Sent on:</td>
<td class="pa0 truncate midgrey">{{gh-format-post-time this.post.email.createdAtUTC}}</td> <td class="pa1 pa0 word-wrap midgrey v-top lh-copy">{{gh-format-post-time this.post.email.createdAtUTC}}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -37,27 +37,11 @@
</div> </div>
{{else if (or this.retryEmail.isRunning this.post.email.isFailure)}} {{else if (or this.retryEmail.isRunning this.post.email.isFailure)}}
{{!-- Mail failed to send --}} {{!-- Mail failed to send --}}
<p>Email failed to send when publishing this post. Please check your <LinkTo @route="settings.labs">Mailgun configuration</LinkTo> under Labs → Members if the error persists.</p>
<p class="gh-box gh-box-error settings-menu-mailgun-warning">
{{svg-jar "warning"}}
{{this.post.email.error}}
</p>
<div class="flex">
<GhTaskButton
@buttonText="Retry email"
@runningText="Sending..."
@task={{this.retryEmail}}
@class="gh-btn gh-btn-icon flex-grow-1"
data-test-button="retry-email"
/>
</div>
<hr> <div class="ba b--whitegrey bg-white br3 gh-box-error-border">
<div class="ba b--whitegrey bg-white br3">
<div class="flex pa5 pt4 pb4 items-center bb b--whitegrey"> <div class="flex pa5 pt4 pb4 items-center bb b--whitegrey">
<div class="w16 flex flex-column items-center"> <div class="w16 flex flex-column items-center">
<span class="db mr4 mt3">{{svg-jar "send-email" class="w7 h7 stroke-darkgrey"}}</span> <span class="db mr4 mt3">{{svg-jar "warning" class="w7 h7 fill-red"}}</span>
</div> </div>
<div class="flex flex-column justify-center"> <div class="flex flex-column justify-center">
<p class="ma0 pa0 midgrey">Post failed to send to</p> <p class="ma0 pa0 midgrey">Post failed to send to</p>
@ -65,21 +49,38 @@
</div> </div>
</div> </div>
<div class="pa5 pt3 pb3 f7 bb b--whitegrey"> <div class="pa5 pt3 pb3 f7 bb b--whitegrey">
<p class="mb2 lh-copy">
Email failed to send when publishing this post. Please check your <LinkTo @route="settings.labs">Mailgun configuration</LinkTo> under Labs → Members if the error persists.
</p>
<p class="ma0 pa0">
<table class="ma0" style="table-layout: fixed"> <table class="ma0" style="table-layout: fixed">
<tbody> <tbody>
<tr> <tr>
<td class="pa2 pl0 fw7 f8 w16">Subject:</td> <td class="pa1 pl0 fw7 f8 w16 v-top lh-copy">Error:</td>
<td class="pa0 truncate midgrey">{{this.post.email.subject}}</td> <td class="pa1 pl0 word-wrap midgrey v-top lh-copy">{{this.post.email.error}}</td>
</tr>
</tbody>
</table>
</p>
</div>
<div class="pa5 pt3 pb3 f7 bb b--whitegrey">
<table class="ma0" style="table-layout: fixed">
<tbody>
<tr>
<td class="pa1 pl0 fw7 f8 w16 v-top lh-copy">Subject:</td>
<td class="pa1 pl0 truncate midgrey v-top lh-copy">{{this.post.email.subject}}</td>
</tr> </tr>
<tr> <tr>
<td class="pa2 pl0 fw7 f8 w16 nowrap">Tried:</td> <td class="pa1 pl0 fw7 f8 w16 nowrap v-top lh-copy">Tried:</td>
<td class="pa0 truncate midgrey">{{gh-format-post-time this.post.email.createdAtUTC}}</td> <td class="pa1 pl0 truncate midgrey v-top lh-copy">{{gh-format-post-time this.post.email.createdAtUTC}}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="pa5 pt3 pb3"> <div class="pa5 pt3 pb3 flex justify-between items center">
<p class="ma0 pa0"><button {{on "click" this.toggleEmailPreview}} class="blue">View saved email</button></p> <button {{on "click" this.toggleEmailPreview}} class="blue">View email</button>
<GhTaskButton @buttonText="Retry send" @runningText="Sending..." @task={{this.retryEmail}}
@class="gh-btn gh-btn-icon" data-test-button="retry-email" />
</div> </div>
</div> </div>
{{else}} {{else}}