From abeebb9991d9726045c3006ff78813d74b8c73b1 Mon Sep 17 00:00:00 2001
From: Michael Q Larson <michaelqlarson@gmail.com>
Date: Sun, 30 Nov 2014 00:10:21 -0800
Subject: [PATCH] may have fixed email forms

---
 controllers/user.js       |  4 ++--
 views/account/login.jade  | 17 ++++++-----------
 views/account/signup.jade |  3 ---
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/controllers/user.js b/controllers/user.js
index 79969f5a45..7190282c7f 100644
--- a/controllers/user.js
+++ b/controllers/user.js
@@ -88,7 +88,7 @@ exports.postSignup = function(req, res, next) {
 
   if (errors) {
     req.flash('errors', errors);
-    return res.redirect('/signup');
+    return res.redirect('/login');
   }
 
   var user = new User({
@@ -99,7 +99,7 @@ exports.postSignup = function(req, res, next) {
   User.findOne({ email: req.body.email }, function(err, existingUser) {
     if (existingUser) {
       req.flash('errors', { msg: 'Account with that email address already exists.' });
-      return res.redirect('/signup');
+      return res.redirect('/login');
     }
     user.save(function(err) {
       if (err) return next(err);
diff --git a/views/account/login.jade b/views/account/login.jade
index 17cbcf89e6..655f89244d 100644
--- a/views/account/login.jade
+++ b/views/account/login.jade
@@ -19,40 +19,35 @@ block content
           | Sign in with Twitter
         hr
         h2 Sign up with an email address here:
-        form.form-horizontal(id='signup-form', method='POST')
+        form.form-horizontal(id='signup-form', action='signup', method='POST')
             input(type='hidden', name='_csrf', value=_csrf)
             .form-group
-                //label.col-sm-3.control-label(for='email') Email
                 .col-sm-6.col-sm-offset-3
-                    input.form-control(type='email', name='email', id='email', placeholder='Email', autofocus)
+                    input.form-control(type='email', name='email', id='email', placeholder='Email', autofocus=true)
             .form-group
-                //label.col-sm-3.control-label(for='password') Password
                 .col-sm-6.col-sm-offset-3
                     input.form-control(type='password', name='password', id='password', placeholder='Password')
             .form-group
-                //label.col-sm-3.control-label(for='confirmPassword') Confirm Password
                 .col-sm-6.col-sm-offset-3
                     input.form-control(type='password', name='confirmPassword', id='confirmPassword', placeholder='Confirm Password')
             .form-group
                 .col-sm-offset-3.col-sm-6
                     button.btn.btn-success(type='submit')
                         span.ion-person-add
-                        | Signup
+                        | Sign up
         hr
         h2 Sign in with an email address here:
-        form(method='POST')
+        form(action='login', method='POST')
           input(type='hidden', name='_csrf', value=_csrf)
           .col-sm-6.col-sm-offset-3
             .form-group
-              //label.control-label(for='email') Email
-              input.form-control(type='email', name='email', id='email', placeholder='Email', autofocus=true)
+              input.form-control(type='email', name='email', id='email', placeholder='Email')
             .form-group
-              //label.control-label(for='password') Password
               input.form-control(type='password', name='password', id='password', placeholder='Password')
             .form-group
               button.btn.btn-primary(type='submit')
                 span.ion-android-hand
-                | Login
+                | Sign in
               span &nbsp;&nbsp;
               a.btn.btn-info(href='/forgot') Forgot your password?
         br
diff --git a/views/account/signup.jade b/views/account/signup.jade
index d943a332c5..0bc111bd9e 100644
--- a/views/account/signup.jade
+++ b/views/account/signup.jade
@@ -22,15 +22,12 @@ block content
     form.form-horizontal(id='signup-form', method='POST')
       input(type='hidden', name='_csrf', value=_csrf)
       .form-group
-        //label.col-sm-3.control-label(for='email') Email
         .col-sm-6.col-sm-offset-3
           input.form-control(type='email', name='email', id='email', placeholder='Email', autofocus)
       .form-group
-        //label.col-sm-3.control-label(for='password') Password
         .col-sm-6.col-sm-offset-3
           input.form-control(type='password', name='password', id='password', placeholder='Password')
       .form-group
-        //label.col-sm-3.control-label(for='confirmPassword') Confirm Password
         .col-sm-6.col-sm-offset-3
           input.form-control(type='password', name='confirmPassword', id='confirmPassword', placeholder='Confirm Password')
       .form-group