mirror of
https://github.com/discourse/discourse.git
synced 2024-11-24 01:22:36 +08:00
FIX: If local logins are disabled, sign up button should not show the
form.
This commit is contained in:
Robin Ward
parent
a0d0f859ba
commit
2850ce46b8
|
|
@ -16,6 +16,8 @@ export default DiscourseController.extend(ModalFunctionality, {
|
|||
prefilledUsername: null,
|
||||
tosAccepted: false,
|
||||
|
||||
canCreateLocal: Discourse.computed.setting('enable_local_logins'),
|
||||
|
||||
resetForm: function() {
|
||||
this.setProperties({
|
||||
accountName: '',
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@ export default DiscourseController.extend(ModalFunctionality, {
|
|||
loggingIn: false,
|
||||
loggedIn: false,
|
||||
|
||||
canLoginLocal: Discourse.computed.setting('enable_local_logins'),
|
||||
|
||||
resetForm: function() {
|
||||
this.set('authenticate', null);
|
||||
this.set('loggingIn', false);
|
||||
|
|
|
|||
|
|
@ -2,89 +2,91 @@
|
|||
<div class="modal-body">
|
||||
{{login-buttons action="externalLogin"}}
|
||||
|
||||
<div>
|
||||
<form>
|
||||
<table>
|
||||
<tr class="input">
|
||||
<td style="width:80px" class="label"><label for='new-account-name'>{{i18n user.name.title}}</label></td>
|
||||
<td style="width:496px">
|
||||
{{text-field value=accountName id="new-account-name" autofocus="autofocus"}}
|
||||
{{input-tip validation=nameValidation}}
|
||||
</td>
|
||||
</tr>
|
||||
<tr class="instructions">
|
||||
<td></td>
|
||||
<td><label>{{i18n user.name.instructions}}</label></td>
|
||||
</tr>
|
||||
|
||||
<tr class="input">
|
||||
<td class="label"><label for='new-account-email'>{{i18n user.email.title}}</label></td>
|
||||
<td>
|
||||
{{input type="email" value=accountEmail id="new-account-email" disabled=emailValidated}}
|
||||
{{input-tip validation=emailValidation}}
|
||||
{{#if canCreateLocal}}
|
||||
<div>
|
||||
<form>
|
||||
<table>
|
||||
<tr class="input">
|
||||
<td style="width:80px" class="label"><label for='new-account-name'>{{i18n user.name.title}}</label></td>
|
||||
<td style="width:496px">
|
||||
{{text-field value=accountName id="new-account-name" autofocus="autofocus"}}
|
||||
{{input-tip validation=nameValidation}}
|
||||
</td>
|
||||
</tr>
|
||||
<tr class="instructions">
|
||||
<td></td>
|
||||
<td><label>{{i18n user.email.instructions}}</label></td>
|
||||
</tr>
|
||||
</tr>
|
||||
<tr class="instructions">
|
||||
<td></td>
|
||||
<td><label>{{i18n user.name.instructions}}</label></td>
|
||||
</tr>
|
||||
|
||||
<tr class="input">
|
||||
<td class="label"><label for='new-account-username'>{{i18n user.username.title}}</label></td>
|
||||
<tr class="input">
|
||||
<td class="label"><label for='new-account-email'>{{i18n user.email.title}}</label></td>
|
||||
<td>
|
||||
{{input type="email" value=accountEmail id="new-account-email" disabled=emailValidated}}
|
||||
{{input-tip validation=emailValidation}}
|
||||
</td>
|
||||
</tr>
|
||||
<tr class="instructions">
|
||||
<td></td>
|
||||
<td><label>{{i18n user.email.instructions}}</label></td>
|
||||
</tr>
|
||||
|
||||
<tr class="input">
|
||||
<td class="label"><label for='new-account-username'>{{i18n user.username.title}}</label></td>
|
||||
<td>
|
||||
{{input value=accountUsername id="new-account-username" maxlength=Discourse.SiteSettings.max_username_length}}
|
||||
{{input-tip validation=usernameValidation id="username-validation"}}
|
||||
</td>
|
||||
</tr>
|
||||
<tr class="instructions">
|
||||
<td></td>
|
||||
<td><label>{{i18n user.username.instructions}}</label></td>
|
||||
</tr>
|
||||
|
||||
{{#if passwordRequired}}
|
||||
<tr class="input">
|
||||
<td class="label"><label for='new-account-password'>{{i18n user.password.title}}</label></td>
|
||||
<td>
|
||||
{{input value=accountUsername id="new-account-username" maxlength=Discourse.SiteSettings.max_username_length}}
|
||||
{{input-tip validation=usernameValidation id="username-validation"}}
|
||||
{{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn}}
|
||||
{{input-tip validation=passwordValidation}}
|
||||
</td>
|
||||
</tr>
|
||||
<tr class="instructions">
|
||||
<td></td>
|
||||
<td><label>{{i18n user.username.instructions}}</label></td>
|
||||
</tr>
|
||||
|
||||
{{#if passwordRequired}}
|
||||
<tr class="input">
|
||||
<td class="label"><label for='new-account-password'>{{i18n user.password.title}}</label></td>
|
||||
</tr>
|
||||
<tr class="instructions">
|
||||
<td></td>
|
||||
<td>
|
||||
{{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn}}
|
||||
{{input-tip validation=passwordValidation}}
|
||||
<label>{{passwordInstructions}}</label>
|
||||
<div {{bind-attr class=":caps-lock-warning capsLockOn::invisible"}}><i class="fa fa-exclamation-triangle"></i> {{i18n login.caps_lock_warning}}</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr class="instructions">
|
||||
<td></td>
|
||||
<td>
|
||||
<label>{{passwordInstructions}}</label>
|
||||
<div {{bind-attr class=":caps-lock-warning capsLockOn::invisible"}}><i class="fa fa-exclamation-triangle"></i> {{i18n login.caps_lock_warning}}</div>
|
||||
</td>
|
||||
</tr>
|
||||
{{/if}}
|
||||
</tr>
|
||||
{{/if}}
|
||||
|
||||
<tr class="password-confirmation">
|
||||
<td><label for='new-account-password-confirmation'>{{i18n user.password_confirmation.title}}</label></td>
|
||||
<td>
|
||||
{{input type="password" value=accountPasswordConfirm id="new-account-confirmation"}}
|
||||
{{input value=accountChallenge id="new-account-challenge"}}
|
||||
</td>
|
||||
</tr>
|
||||
<tr class="password-confirmation">
|
||||
<td><label for='new-account-password-confirmation'>{{i18n user.password_confirmation.title}}</label></td>
|
||||
<td>
|
||||
{{input type="password" value=accountPasswordConfirm id="new-account-confirmation"}}
|
||||
{{input value=accountChallenge id="new-account-challenge"}}
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
</table>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="modal-footer">
|
||||
{{#if tosAcceptRequired}}
|
||||
<div class="tos-agree">
|
||||
{{input type="checkbox" checked=tosAccepted}}
|
||||
{{custom-html "tos_signup_form_message"}}
|
||||
</table>
|
||||
</form>
|
||||
</div>
|
||||
{{/if}}
|
||||
<button class='btn btn-large btn-primary' {{bind-attr disabled="submitDisabled"}} {{action createAccount}}>{{i18n create_account.title}}</button>
|
||||
{{#if formSubmitted}}
|
||||
<i class='fa fa-spinner fa-spin'></i>
|
||||
{{else}}
|
||||
<button class="btn btn-large" id="login-link" {{action showLogin}}>
|
||||
{{i18n log_in}}
|
||||
</button>
|
||||
{{/if}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="modal-footer">
|
||||
{{#if tosAcceptRequired}}
|
||||
<div class="tos-agree">
|
||||
{{input type="checkbox" checked=tosAccepted}}
|
||||
{{custom-html "tos_signup_form_message"}}
|
||||
</div>
|
||||
{{/if}}
|
||||
<button class='btn btn-large btn-primary' {{bind-attr disabled="submitDisabled"}} {{action createAccount}}>{{i18n create_account.title}}</button>
|
||||
{{#if formSubmitted}}
|
||||
<i class='fa fa-spinner fa-spin'></i>
|
||||
{{else}}
|
||||
<button class="btn btn-large" id="login-link" {{action showLogin}}>
|
||||
{{i18n log_in}}
|
||||
</button>
|
||||
{{/if}}
|
||||
</div>
|
||||
{{/if}}
|
||||
{{/unless}}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<div class="modal-body">
|
||||
{{login-buttons action="externalLogin"}}
|
||||
{{#if Discourse.SiteSettings.enable_local_logins}}
|
||||
{{#if canLoginLocal}}
|
||||
{{#if hasAtLeastOneLoginButton}}
|
||||
<h3 style="text-align:center; margin-bottom:10px;">{{i18n login.or}}</h3>
|
||||
{{/if}}
|
||||
|
|
@ -40,7 +40,7 @@
|
|||
<div id='login-alert' {{bind-attr class="alertClass"}}>{{alert}}</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
{{#if Discourse.SiteSettings.enable_local_logins}}
|
||||
{{#if canLoginLocal}}
|
||||
<button class="btn btn-large btn-primary"
|
||||
{{bind-attr disabled="loginDisabled"}}
|
||||
{{action login}}>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user