Merge https://github.com/codecombat/codecombat

app/locale/en.coffee

@@ -75,6 +75,7 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
     creating: "Creating Account..."
     sign_up: "Sign Up"
     log_in: "log in with password"
+    social_signup: "Or, you can sign up through Facebook or G+:"
 
   home:
     slogan: "Learn to Code JavaScript by Playing a Game"

app/styles/modal/login.sass

@@ -10,3 +10,16 @@
 
   a[data-toggle="coco-modal"]
     cursor: pointer
+
+#signup-modal
+  .modal-footer
+    padding-top: 0
+    div
+      text-align: center
+    .social-login-text
+      padding-top: 20px
+  .network-logins
+    width: 263px
+    margin: 0 auto
+    div:last-of-type
+      margin-right: 0px

app/templates/modal/signup.jade

@@ -30,5 +30,14 @@ block modal-body-content
 block modal-body-wait-content
   h3(data-i18n="signup.creating") Creating Account...
 
-block modal-footer-content
-  button.btn.btn-primary.btn-large#signup-button(data-i18n="signup.sign_up") Sign Up
+block modal-footer
+  .modal-footer
+    div
+      button.btn.btn-primary.btn-large#signup-button(data-i18n="signup.sign_up") Sign Up
+    div.social-login-text(data-i18n="signup.social_signup") Or, you can sign up through Facebook or G+:
+
+  .modal-footer.network-logins
+    div
+      .fb-login-button(data-show-faces="false", data-width="200", data-max-rows="1", data-scope="email")
+    div
+      .gplus-login-button#gplus-login-button

app/views/modal/signup_modal.coffee

@@ -62,3 +62,7 @@ module.exports = class SignupModalView extends View
     window.tracker?.trackEvent 'Finished Signup'
     @enableModalInProgress(@$el)
     createUser userObject, null, window.nextLevelURL
+
+  afterInsert: ->
+    super()
+    application.router.renderLoginButtons()