From a6f5603dc94e486f674f79e392fdf1212f87d6ed Mon Sep 17 00:00:00 2001
From: danielvincent <danielgrippi@gmail.com>
Date: Fri, 6 Aug 2010 23:54:39 -0700
Subject: [PATCH] added email field to login screen.  strange error won't let
 me log in?

---
 app/helpers/sockets_helper.rb            |  2 +-
 app/views/devise/sessions/new.html.haml  | 13 ++++++-------
 app/views/layouts/session_wall.html.haml |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/helpers/sockets_helper.rb b/app/helpers/sockets_helper.rb
index cbb913b23..629709402 100644
--- a/app/helpers/sockets_helper.rb
+++ b/app/helpers/sockets_helper.rb
@@ -13,7 +13,7 @@ module SocketsHelper
     begin
       v = render_to_string(:partial => type_partial(object), :locals => {:post => object}) unless object.is_a? Retraction
     rescue Exception => e
-      Rails.logger.error ("web socket view rendering failed for some reason." + v.inspect)
+      Rails.logger.error("web socket view rendering failed for some reason." + v.inspect)
       Rails.logger.error("Socketed object was #{object.inspect}")
       raise e 
     end
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index 96b9ca9c4..367dc3b5f 100644
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@@ -1,12 +1,11 @@
 = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
   %p
+    = f.text_field :email
+    %br 
     = f.password_field :password
-  %p
-    - if devise_mapping.rememberable?
-      /= f.check_box :remember_me
-      /= f.label :remember_me
-
-    = hidden_field_tag "user_email", "#{User.owner.email}", :name => "user[email]"
-    = f.submit "Sign in"
+  /- if devise_mapping.rememberable?
+  /= f.check_box :remember_me
+  /= f.label :remember_me
+  = f.submit "Sign in"
 /= render :partial => "devise/shared/links"
 
diff --git a/app/views/layouts/session_wall.html.haml b/app/views/layouts/session_wall.html.haml
index 3b85566bc..b025e419b 100644
--- a/app/views/layouts/session_wall.html.haml
+++ b/app/views/layouts/session_wall.html.haml
@@ -13,7 +13,7 @@
 
     :javascript
       $(document).ready(function(){
-        $("#user_password").focus(); 
+        $("#user_email").focus(); 
       });
   
     = csrf_meta_tag