From a0d0f859ba9220ebad4aea756b339ac1bc2e02bc Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 14 Aug 2014 12:51:16 -0400
Subject: [PATCH] Add login buttons to create account template.

---
 .../discourse/components/login-buttons.js.es6    | 16 ++++++++++++++++
 .../discourse/controllers/create-account.js.es6  |  6 ++++++
 .../components/login-buttons.js.handlebars       |  3 +++
 .../templates/modal/create_account.js.handlebars |  2 ++
 .../templates/modal/login.js.handlebars          |  8 +-------
 app/assets/javascripts/main_include.js           |  1 +
 .../controllers/create-account-test.js.es6       |  2 +-
 7 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/components/login-buttons.js.es6
 create mode 100644 app/assets/javascripts/discourse/templates/components/login-buttons.js.handlebars

diff --git a/app/assets/javascripts/discourse/components/login-buttons.js.es6 b/app/assets/javascripts/discourse/components/login-buttons.js.es6
new file mode 100644
index 00000000000..07cd9fc57b1
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/login-buttons.js.es6
@@ -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);
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6
index a8dba32d378..81d3abafa52 100644
--- a/app/assets/javascripts/discourse/controllers/create-account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/create-account.js.es6
@@ -3,6 +3,8 @@ import ModalFunctionality from 'discourse/mixins/modal-functionality';
 import DiscourseController from 'discourse/controllers/controller';
 
 export default DiscourseController.extend(ModalFunctionality, {
+  needs: ['login'],
+
   uniqueUsernameValidation: null,
   globalNicknameExists: false,
   complete: false,
@@ -323,6 +325,10 @@ export default DiscourseController.extend(ModalFunctionality, {
   tosAcceptRequired: Discourse.computed.setting('tos_accept_required'),
 
   actions: {
+    externalLogin: function(provider) {
+      this.get('controllers.login').send('externalLogin', provider);
+    },
+
     createAccount: function() {
       var self = this;
       this.set('formSubmitted', true);
diff --git a/app/assets/javascripts/discourse/templates/components/login-buttons.js.handlebars b/app/assets/javascripts/discourse/templates/components/login-buttons.js.handlebars
new file mode 100644
index 00000000000..e5aabe80624
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/login-buttons.js.handlebars
@@ -0,0 +1,3 @@
+{{#each buttons}}
+  <button {{bind-attr class=":btn :btn-social name"}} {{action externalLogin this}}>{{title}}</button>
+{{/each}}
diff --git a/app/assets/javascripts/discourse/templates/modal/create_account.js.handlebars b/app/assets/javascripts/discourse/templates/modal/create_account.js.handlebars
index 983b068b6f0..a514cc0c62b 100644
--- a/app/assets/javascripts/discourse/templates/modal/create_account.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/create_account.js.handlebars
@@ -1,5 +1,7 @@
 {{#unless complete}}
   <div class="modal-body">
+    {{login-buttons action="externalLogin"}}
+
     <div>
       <form>
       <table>
diff --git a/app/assets/javascripts/discourse/templates/modal/login.js.handlebars b/app/assets/javascripts/discourse/templates/modal/login.js.handlebars
index 58d24be7486..ef7798ac411 100644
--- a/app/assets/javascripts/discourse/templates/modal/login.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/login.js.handlebars
@@ -1,11 +1,5 @@
 <div class="modal-body">
-  {{#if hasAtLeastOneLoginButton}}
-    <div id="login-buttons">
-      {{#each Discourse.LoginMethod.all}}
-        <button class="btn btn-social {{unbound name}}" {{action externalLogin this}}>{{unbound title}}</button>
-      {{/each}}
-    </div>
-  {{/if}}
+  {{login-buttons action="externalLogin"}}
   {{#if Discourse.SiteSettings.enable_local_logins}}
     {{#if hasAtLeastOneLoginButton}}
       <h3 style="text-align:center; margin-bottom:10px;">{{i18n login.or}}</h3>
diff --git a/app/assets/javascripts/main_include.js b/app/assets/javascripts/main_include.js
index c20e8c1341e..f2d404990e0 100644
--- a/app/assets/javascripts/main_include.js
+++ b/app/assets/javascripts/main_include.js
@@ -20,6 +20,7 @@
 //= require ./discourse/models/composer
 //= require ./discourse/models/topic
 //= require ./discourse/controllers/controller
+//= require ./discourse/controllers/discovery-sortable
 //= require ./discourse/controllers/object
 //= require ./discourse/controllers/navigation/default
 //= require ./discourse/views/modal_body_view
diff --git a/test/javascripts/controllers/create-account-test.js.es6 b/test/javascripts/controllers/create-account-test.js.es6
index 3cb737c1b2d..160dd92e8de 100644
--- a/test/javascripts/controllers/create-account-test.js.es6
+++ b/test/javascripts/controllers/create-account-test.js.es6
@@ -1,5 +1,5 @@
 moduleFor("controller:create-account", "controller:create-account", {
-  needs: ['controller:modal']
+  needs: ['controller:modal', 'controller:login']
 });
 
 test('basicUsernameValidation', function() {