Skip to content

Commit

Permalink
Tweak structure of mail settings page
Browse files Browse the repository at this point in the history 
Refs #258 and #933.
  • Loading branch information
@franzliedke
franzliedke committed May 15, 2016
1 parent 9637d27 commit a884a35
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 20 deletions.
41 changes: 29 additions & 12 deletions js/admin/dist/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18993,14 +18993,15 @@ System.register('flarum/components/MailPage', ['flarum/components/Page', 'flarum
m(
'form',
{ onsubmit: this.onsubmit.bind(this) },
m(
'div',
{ className: 'helpText' },
app.translator.trans('core.admin.email.text')
),
FieldSet.component({
label: app.translator.trans('core.admin.email.heading'),
label: app.translator.trans('core.admin.email.server_heading'),
className: 'MailPage-MailSettings',
children: [m(
'div',
{ className: 'helpText' },
app.translator.trans('core.admin.email.text')
), m(
'div',
{ className: 'MailPage-MailSettings-input' },
m(
Expand All @@ -19018,15 +19019,23 @@ System.register('flarum/components/MailPage', ['flarum/components/Page', 'flarum
m(
'label',
null,
app.translator.trans('core.admin.email.from_label')
app.translator.trans('core.admin.email.port_label')
),
m('input', { className: 'FormControl', value: this.values.mail_from() || '', oninput: m.withAttr('value', this.values.mail_from) }),
m('input', { className: 'FormControl', value: this.values.mail_port() || '', oninput: m.withAttr('value', this.values.mail_port) }),
m(
'label',
null,
app.translator.trans('core.admin.email.port_label')
app.translator.trans('core.admin.email.encryption_label')
),
m('input', { className: 'FormControl', value: this.values.mail_port() || '', oninput: m.withAttr('value', this.values.mail_port) }),
m('input', { className: 'FormControl', value: this.values.mail_encryption() || '', oninput: m.withAttr('value', this.values.mail_encryption) })
)]
}),
FieldSet.component({
label: app.translator.trans('core.admin.email.account_heading'),
className: 'MailPage-MailSettings',
children: [m(
'div',
{ className: 'MailPage-MailSettings-input' },
m(
'label',
null,
Expand All @@ -19038,13 +19047,21 @@ System.register('flarum/components/MailPage', ['flarum/components/Page', 'flarum
null,
app.translator.trans('core.admin.email.password_label')
),
m('input', { className: 'FormControl', value: this.values.mail_password() || '', oninput: m.withAttr('value', this.values.mail_password) }),
m('input', { className: 'FormControl', value: this.values.mail_password() || '', oninput: m.withAttr('value', this.values.mail_password) })
)]
}),
FieldSet.component({
label: app.translator.trans('core.admin.email.addresses_heading'),
className: 'MailPage-MailSettings',
children: [m(
'div',
{ className: 'MailPage-MailSettings-input' },
m(
'label',
null,
app.translator.trans('core.admin.email.encryption_label')
app.translator.trans('core.admin.email.from_label')
),
m('input', { className: 'FormControl', value: this.values.mail_encryption() || '', oninput: m.withAttr('value', this.values.mail_encryption) })
m('input', { className: 'FormControl', value: this.values.mail_from() || '', oninput: m.withAttr('value', this.values.mail_from) })
)]
}),
Button.component({
Expand Down
35 changes: 27 additions & 8 deletions js/admin/src/components/MailPage.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,28 +36,47 @@ export default class MailPage extends Page {
<div className="MailPage">
<div className="container">
<form onsubmit={this.onsubmit.bind(this)}>
<div className="helpText">
{app.translator.trans('core.admin.email.text')}
</div>

{FieldSet.component({
label: app.translator.trans('core.admin.email.heading'),
label: app.translator.trans('core.admin.email.server_heading'),
className: 'MailPage-MailSettings',
children: [
<div className="helpText">
{app.translator.trans('core.admin.email.text')}
</div>,
<div className="MailPage-MailSettings-input">
<label>{app.translator.trans('core.admin.email.driver_label')}</label>
<input className="FormControl" value={this.values.mail_driver() || ''} oninput={m.withAttr('value', this.values.mail_driver)} />
<label>{app.translator.trans('core.admin.email.host_label')}</label>
<input className="FormControl" value={this.values.mail_host() || ''} oninput={m.withAttr('value', this.values.mail_host)} />
<label>{app.translator.trans('core.admin.email.from_label')}</label>
<input className="FormControl" value={this.values.mail_from() || ''} oninput={m.withAttr('value', this.values.mail_from)} />
<label>{app.translator.trans('core.admin.email.port_label')}</label>
<input className="FormControl" value={this.values.mail_port() || ''} oninput={m.withAttr('value', this.values.mail_port)} />
<label>{app.translator.trans('core.admin.email.encryption_label')}</label>
<input className="FormControl" value={this.values.mail_encryption() || ''} oninput={m.withAttr('value', this.values.mail_encryption)} />
</div>
]
})}

{FieldSet.component({
label: app.translator.trans('core.admin.email.account_heading'),
className: 'MailPage-MailSettings',
children: [
<div className="MailPage-MailSettings-input">
<label>{app.translator.trans('core.admin.email.username_label')}</label>
<input className="FormControl" value={this.values.mail_username() || ''} oninput={m.withAttr('value', this.values.mail_username)} />
<label>{app.translator.trans('core.admin.email.password_label')}</label>
<input className="FormControl" value={this.values.mail_password() || ''} oninput={m.withAttr('value', this.values.mail_password)} />
<label>{app.translator.trans('core.admin.email.encryption_label')}</label>
<input className="FormControl" value={this.values.mail_encryption() || ''} oninput={m.withAttr('value', this.values.mail_encryption)} />
</div>
]
})}

{FieldSet.component({
label: app.translator.trans('core.admin.email.addresses_heading'),
className: 'MailPage-MailSettings',
children: [
<div className="MailPage-MailSettings-input">
<label>{app.translator.trans('core.admin.email.from_label')}</label>
<input className="FormControl" value={this.values.mail_from() || ''} oninput={m.withAttr('value', this.values.mail_from)} />
</div>
]
})}
Expand Down

0 comments on commit a884a35

Please sign in to comment.