github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-03-01 23:11:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tweak structure of mail settings page

Browse Source 
Refs #258 and #933.
This commit is contained in:
Franz Liedke 2016-05-15 20:28:05 +09:00
parent 57989e32a2
commit 65dfb749c0
2 changed files with 58 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
framework/core/js/admin/dist/app.js vendored
View File

@ -18993,14 +18993,15 @@ System.register('flarum/components/MailPage', ['flarum/components/Page', 'flarum
m( m(
'form', 'form',
{ onsubmit: this.onsubmit.bind(this) }, { onsubmit: this.onsubmit.bind(this) },
m(
'div',
{ className: 'helpText' },
app.translator.trans('core.admin.email.text')
),
FieldSet.component({ FieldSet.component({
label: app.translator.trans('core.admin.email.heading'), label: app.translator.trans('core.admin.email.server_heading'),
className: 'MailPage-MailSettings', className: 'MailPage-MailSettings',
children: [m( children: [m(
'div',
{ className: 'helpText' },
app.translator.trans('core.admin.email.text')
), m(
'div', 'div',
{ className: 'MailPage-MailSettings-input' }, { className: 'MailPage-MailSettings-input' },
m( m(
@ -19015,18 +19016,26 @@ System.register('flarum/components/MailPage', ['flarum/components/Page', 'flarum
app.translator.trans('core.admin.email.host_label') app.translator.trans('core.admin.email.host_label')
), ),
m('input', { className: 'FormControl', value: this.values.mail_host() || '', oninput: m.withAttr('value', this.values.mail_host) }), m('input', { className: 'FormControl', value: this.values.mail_host() || '', oninput: m.withAttr('value', this.values.mail_host) }),
m(
'label',
null,
app.translator.trans('core.admin.email.from_label')
),
m('input', { className: 'FormControl', value: this.values.mail_from() || '', oninput: m.withAttr('value', this.values.mail_from) }),
m( m(
'label', 'label',
null, null,
app.translator.trans('core.admin.email.port_label') app.translator.trans('core.admin.email.port_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_port() || '', oninput: m.withAttr('value', this.values.mail_port) }),
m(
'label',
null,
app.translator.trans('core.admin.email.encryption_label')
),
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( m(
'label', 'label',
null, null,
@ -19038,13 +19047,21 @@ System.register('flarum/components/MailPage', ['flarum/components/Page', 'flarum
null, null,
app.translator.trans('core.admin.email.password_label') 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( m(
'label', 'label',
null, 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({ Button.component({

35
framework/core/js/admin/src/components/MailPage.js
View File

@ -36,28 +36,47 @@ export default class MailPage extends Page {
<div className="MailPage"> <div className="MailPage">
<div className="container"> <div className="container">
<form onsubmit={this.onsubmit.bind(this)}> <form onsubmit={this.onsubmit.bind(this)}>
<div className="helpText">
{app.translator.trans('core.admin.email.text')}
</div>
{FieldSet.component({ {FieldSet.component({
label: app.translator.trans('core.admin.email.heading'), label: app.translator.trans('core.admin.email.server_heading'),
className: 'MailPage-MailSettings', className: 'MailPage-MailSettings',
children: [ children: [
<div className="helpText">
{app.translator.trans('core.admin.email.text')}
</div>,
<div className="MailPage-MailSettings-input"> <div className="MailPage-MailSettings-input">
<label>{app.translator.trans('core.admin.email.driver_label')}</label> <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)} /> <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> <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)} /> <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> <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)} /> <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> <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)} /> <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> <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)} /> <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> </div>
<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.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> </div>
] ]
})} })}