Skip to content
This repository has been archived by the owner on Oct 21, 2021. It is now read-only.

Commit

Permalink
Formatting updates
Browse files Browse the repository at this point in the history
  • Loading branch information
askvortsov1 committed May 15, 2020
1 parent f659234 commit 230a73e
Showing 1 changed file with 17 additions and 11 deletions.
28 changes: 17 additions & 11 deletions js/src/admin/components/MailPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,14 @@ export default class MailPage extends Page {
</div>
</FieldSet>

{this.status.sending ? '' :
Alert.component({
children: app.translator.trans('core.admin.email.not_sending_message'),
dismissible: false,
})}

{fieldKeys.length > 0 ?
{this.status.sending
? ''
: Alert.component({
children: app.translator.trans('core.admin.email.not_sending_message'),
dismissible: false,
})}

{fieldKeys.length > 0 ? (
<FieldSet label={app.translator.trans(`core.admin.email.${this.values.mail_driver()}_heading`)} className="MailPage-MailSettings">
<div className="MailPage-MailSettings-input">
{fieldKeys.map((field) => [
Expand All @@ -108,7 +109,10 @@ export default class MailPage extends Page {
this.status.errors[field] && <p className="ValidationError">{this.status.errors[field]}</p>,
])}
</div>
</FieldSet> : ''}
</FieldSet>
) : (
''
)}

<FieldSet>
{Button.component({
Expand All @@ -120,8 +124,10 @@ export default class MailPage extends Page {
</FieldSet>

<FieldSet label={app.translator.trans('core.admin.email.send_test_mail_heading')} className="MailPage-MailSettings">
<div className="helpText">{app.translator.trans('core.admin.email.send_test_mail_text', { email: app.session.user.email() })}</div>,
{Button.component({
<div className="helpText">
{app.translator.trans('core.admin.email.send_test_mail_text', { email: app.session.user.email() })}
</div>
{Button.component({
className: 'Button Button--primary',
children: app.translator.trans('core.admin.email.send_test_mail_button'),
disabled: this.sendingTest || this.changed(),
Expand Down Expand Up @@ -192,7 +198,7 @@ export default class MailPage extends Page {
.then(() => {
app.alerts.show((this.successAlert = new Alert({ type: 'success', children: app.translator.trans('core.admin.basics.saved_message') })));
})
.catch(() => { })
.catch(() => {})
.then(() => {
this.saving = false;
this.refresh();
Expand Down

0 comments on commit 230a73e

Please sign in to comment.