codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2025-02-17 12:11:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add spinners to login and signup forms

Browse source
This commit is contained in:
Neil Lalonde 2014-01-03 15:19:59 -05:00
parent 25caec0e62
commit 17f23adb78
5 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/discourse/controllers/login_controller.js
View file

@ -31,6 +31,9 @@ Discourse.LoginController = Discourse.Controller.extend(Discourse.ModalFunctiona
return this.get('loggingIn') || this.blank('loginName') || this.blank('loginPassword'); return this.get('loggingIn') || this.blank('loginName') || this.blank('loginPassword');
}.property('loginName', 'loginPassword', 'loggingIn'), }.property('loginName', 'loginPassword', 'loggingIn'),
showSignupLink: function() {
return !Discourse.SiteSettings.invite_only && !this.get('loggingIn');
}.property('loggingIn'),
actions: { actions: {
login: function() { login: function() {

3
app/assets/javascripts/discourse/templates/modal/create_account.js.handlebars
View file

@ -68,5 +68,8 @@
<div class="modal-footer"> <div class="modal-footer">
<button class='btn btn-large btn-primary' {{bindAttr disabled="submitDisabled"}} {{action createAccount}}>{{i18n create_account.title}}</button> <button class='btn btn-large btn-primary' {{bindAttr disabled="submitDisabled"}} {{action createAccount}}>{{i18n create_account.title}}</button>
{{#if formSubmitted}}
&nbsp; <i class='fa fa-spinner fa-spin'></i>
{{/if}}
</div> </div>
{{/unless}} {{/unless}}

8
app/assets/javascripts/discourse/templates/modal/login.js.handlebars
View file

@ -51,11 +51,15 @@
<i class="fa fa-unlock"></i>&nbsp;{{loginButtonText}} <i class="fa fa-unlock"></i>&nbsp;{{loginButtonText}}
</button> </button>
{{#unless Discourse.SiteSettings.invite_only}} {{#if showSignupLink}}
&nbsp; {{i18n create_account.invite}} &nbsp; {{i18n create_account.invite}}
<a id="new-account-link" {{action showCreateAccount}}> <a id="new-account-link" {{action showCreateAccount}}>
{{i18n create_account.action}} {{i18n create_account.action}}
</a> </a>
{{/unless}} {{/if}}
{{#if loggingIn}}
&nbsp; <i class='fa fa-spinner fa-spin'></i>
{{/if}}
{{/if}} {{/if}}
</div> </div>

1
app/assets/javascripts/discourse/views/modal/login_view.js
View file

@ -9,6 +9,7 @@
Discourse.LoginView = Discourse.ModalBodyView.extend({ Discourse.LoginView = Discourse.ModalBodyView.extend({
templateName: 'modal/login', templateName: 'modal/login',
title: I18n.t('login.title'), title: I18n.t('login.title'),
classNames: ['login-modal'],
mouseMove: function(e) { mouseMove: function(e) {

10
app/assets/stylesheets/desktop/login.scss
View file

@ -19,6 +19,12 @@
} }
} }
.login-modal {
.fa-spinner {
font-size: 18px;
}
}
// Create account // Create account
#new-account-link { #new-account-link {
@ -46,4 +52,8 @@
color: #888; color: #888;
} }
} }
.fa-spinner {
font-size: 18px;
}
} }