From 2def71a53e61eaeba9eac9f3c26288c17e45bfbf Mon Sep 17 00:00:00 2001
From: Andrew Pierce <andrunix@gmail.com>
Date: Wed, 11 Dec 2013 15:49:19 -0500
Subject: [PATCH] Moved flash messages from auth.jade to signin.jade. Placed
 within error div.

---
 app/views/users/auth.jade   |  7 -------
 app/views/users/signin.jade | 10 +++++++++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/views/users/auth.jade b/app/views/users/auth.jade
index de60489987..d5e74263fa 100755
--- a/app/views/users/auth.jade
+++ b/app/views/users/auth.jade
@@ -12,11 +12,4 @@ block content
       a(href="/auth/google")
         img(src="/img/icons/google.png")
     .span6
-      if (typeof errors !== 'undefined')
-        .fade.in.alert.alert-block.alert-error
-          a.close(data-dismiss="alert", href="javascript:void(0)") x
-          ul
-            each error in errors
-              li= error.type
-
       block auth
diff --git a/app/views/users/signin.jade b/app/views/users/signin.jade
index ef96cb67f4..d9753599d7 100755
--- a/app/views/users/signin.jade
+++ b/app/views/users/signin.jade
@@ -1,8 +1,16 @@
 extends auth
 
 block auth
+  if message.length > 0
+    .fade.in.alert.alert-block.alert-error
+      p #{message}
+      a.close(data-dismiss="alert", href="javascript:void(0)") x
+      ul
+        each error in errors
+          li= error
+
+
   form.signin.form-horizontal(action="/users/session", method="post")
-    p.error= message
     .control-group
       label.control-label(for='email') Email
       .controls