mirror of
https://github.com/discourse/discourse.git
synced 2025-05-22 19:32:43 +08:00
Add login buttons to create account template.
This commit is contained in:
@ -0,0 +1,16 @@
|
|||||||
|
export default Ember.Component.extend({
|
||||||
|
elementId: 'login-buttons',
|
||||||
|
classNameBindings: ['hidden'],
|
||||||
|
|
||||||
|
hidden: Em.computed.equal('buttons.length', 0),
|
||||||
|
|
||||||
|
buttons: function() {
|
||||||
|
return Em.get('Discourse.LoginMethod.all');
|
||||||
|
}.property(),
|
||||||
|
|
||||||
|
actions: {
|
||||||
|
externalLogin: function(provider) {
|
||||||
|
this.sendAction('action', provider);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
@ -3,6 +3,8 @@ import ModalFunctionality from 'discourse/mixins/modal-functionality';
|
|||||||
import DiscourseController from 'discourse/controllers/controller';
|
import DiscourseController from 'discourse/controllers/controller';
|
||||||
|
|
||||||
export default DiscourseController.extend(ModalFunctionality, {
|
export default DiscourseController.extend(ModalFunctionality, {
|
||||||
|
needs: ['login'],
|
||||||
|
|
||||||
uniqueUsernameValidation: null,
|
uniqueUsernameValidation: null,
|
||||||
globalNicknameExists: false,
|
globalNicknameExists: false,
|
||||||
complete: false,
|
complete: false,
|
||||||
@ -323,6 +325,10 @@ export default DiscourseController.extend(ModalFunctionality, {
|
|||||||
tosAcceptRequired: Discourse.computed.setting('tos_accept_required'),
|
tosAcceptRequired: Discourse.computed.setting('tos_accept_required'),
|
||||||
|
|
||||||
actions: {
|
actions: {
|
||||||
|
externalLogin: function(provider) {
|
||||||
|
this.get('controllers.login').send('externalLogin', provider);
|
||||||
|
},
|
||||||
|
|
||||||
createAccount: function() {
|
createAccount: function() {
|
||||||
var self = this;
|
var self = this;
|
||||||
this.set('formSubmitted', true);
|
this.set('formSubmitted', true);
|
||||||
|
@ -0,0 +1,3 @@
|
|||||||
|
{{#each buttons}}
|
||||||
|
<button {{bind-attr class=":btn :btn-social name"}} {{action externalLogin this}}>{{title}}</button>
|
||||||
|
{{/each}}
|
@ -1,5 +1,7 @@
|
|||||||
{{#unless complete}}
|
{{#unless complete}}
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
|
{{login-buttons action="externalLogin"}}
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<form>
|
<form>
|
||||||
<table>
|
<table>
|
||||||
|
@ -1,11 +1,5 @@
|
|||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
{{#if hasAtLeastOneLoginButton}}
|
{{login-buttons action="externalLogin"}}
|
||||||
<div id="login-buttons">
|
|
||||||
{{#each Discourse.LoginMethod.all}}
|
|
||||||
<button class="btn btn-social {{unbound name}}" {{action externalLogin this}}>{{unbound title}}</button>
|
|
||||||
{{/each}}
|
|
||||||
</div>
|
|
||||||
{{/if}}
|
|
||||||
{{#if Discourse.SiteSettings.enable_local_logins}}
|
{{#if Discourse.SiteSettings.enable_local_logins}}
|
||||||
{{#if hasAtLeastOneLoginButton}}
|
{{#if hasAtLeastOneLoginButton}}
|
||||||
<h3 style="text-align:center; margin-bottom:10px;">{{i18n login.or}}</h3>
|
<h3 style="text-align:center; margin-bottom:10px;">{{i18n login.or}}</h3>
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
//= require ./discourse/models/composer
|
//= require ./discourse/models/composer
|
||||||
//= require ./discourse/models/topic
|
//= require ./discourse/models/topic
|
||||||
//= require ./discourse/controllers/controller
|
//= require ./discourse/controllers/controller
|
||||||
|
//= require ./discourse/controllers/discovery-sortable
|
||||||
//= require ./discourse/controllers/object
|
//= require ./discourse/controllers/object
|
||||||
//= require ./discourse/controllers/navigation/default
|
//= require ./discourse/controllers/navigation/default
|
||||||
//= require ./discourse/views/modal_body_view
|
//= require ./discourse/views/modal_body_view
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
moduleFor("controller:create-account", "controller:create-account", {
|
moduleFor("controller:create-account", "controller:create-account", {
|
||||||
needs: ['controller:modal']
|
needs: ['controller:modal', 'controller:login']
|
||||||
});
|
});
|
||||||
|
|
||||||
test('basicUsernameValidation', function() {
|
test('basicUsernameValidation', function() {
|
||||||
|
Reference in New Issue
Block a user