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

Fix sign up modal

Browse Source
This commit is contained in:
Toby Zerner
2015-07-23 14:30:55 +09:30
parent b699bbadbc
commit 497b65289e
4 changed files with 39 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/forum/src/components/ChangeEmailModal.js
View File

@ -38,7 +38,7 @@ export default class ChangeEmailModal extends Modal {
return (
<div className="Modal-body">
<div class="Form Form--centered">
<p class="helpText">{m.trust(app.trans('core.confirmation_email_sent', {email: this.email()}))}</p>
<p class="helpText">{m.trust(app.trans('core.confirmation_email_sent', {email: <strong>{this.email()}</strong>}))}</p>
<div class="Form-group">
<a href={'http://' + emailProviderName} className="Button Button--primary Button--block">
{app.trans('core.go_to', {location: emailProviderName})}

39
js/forum/src/components/SignUpModal.js
View File

@ -69,7 +69,7 @@ export default class SignUpModal extends Modal {
<div className="Form-group">
<input className="FormControl" name="username" placeholder={app.trans('core.username')}
value={this.username()}
onchange={m.withAttr('value', this.email)}
onchange={m.withAttr('value', this.username)}
disabled={this.loading} />
</div>
@ -108,25 +108,26 @@ export default class SignUpModal extends Modal {
body.push(
<div className="SignUpModal-welcome" style={{background: user.color()}} config={fadeIn}>
<div className="darkenBackground"/>
<div className="container">
{avatar(user)}
<h3>{app.trans('core.welcome_user', {user})}</h3>
<div className="darkenBackground">
<div className="container">
{avatar(user)}
<h3>{app.trans('core.welcome_user', {user})}</h3>
{user.isConfirmed() ? [
<p>{app.trans('core.confirmation_email_sent', {email: user.email()})}</p>,
<p>
<a href={`http://${emailProviderName}`} className="Button Button--primary">
{app.trans('core.go_to', {location: emailProviderName})}
</a>
</p>
] : (
<p>
<button className="Button Button--primary" onclick={this.hide.bind(this)}>
{app.trans('core.dismiss')}
</button>
</p>
)}
{!user.isConfirmed() ? [
<p>{app.trans('core.confirmation_email_sent', {email: <strong>{user.email()}</strong>})}</p>,
<p>
<a href={`http://${emailProviderName}`} className="Button Button--primary">
{app.trans('core.go_to', {location: emailProviderName})}
</a>
</p>
] : (
<p>
<button className="Button Button--primary" onclick={this.hide.bind(this)}>
{app.trans('core.dismiss')}
</button>
</p>
)}
</div>
</div>
</div>
);