6 files changed, 40 insertions, 49 deletions
diff --git a/app/views/auth/confirmations/new.html.haml b/app/views/auth/confirmations/new.html.haml
index e287f1528..fb1019def 100644
--- a/app/views/auth/confirmations/new.html.haml
+++ b/app/views/auth/confirmations/new.html.haml
@@ -1,12 +1,12 @@
 - content_for :page_title do
   Confirmation instructions
 
-= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
-  = devise_error_messages!
+= simple_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
+  = render 'shared/error_messages', object: resource
+
+  = f.input :email, autofocus: true, required: true, placeholder: 'E-mail address'
 
-  .field
-    = f.email_field :email, autofocus: true, required: true, placeholder: 'E-mail address'
   .actions
-    = f.button "Resend confirmation instructions", type: 'submit'
+    = f.button :button, "Resend confirmation instructions", type: :submit
 
 .form-footer= render "auth/shared/links"
diff --git a/app/views/auth/passwords/edit.html.haml b/app/views/auth/passwords/edit.html.haml
index 79a044acf..06c50445a 100644
--- a/app/views/auth/passwords/edit.html.haml
+++ b/app/views/auth/passwords/edit.html.haml
@@ -1,15 +1,14 @@
 - content_for :page_title do
   Set new password
 
-= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
-  = devise_error_messages!
-  = f.hidden_field :reset_password_token
-
-  .field
-    = f.password_field :password, autofocus: true, autocomplete: "off", placeholder: 'New password'
-  .field
-    = f.password_field :password_confirmation, autocomplete: "off", placeholder: 'Confirm new password'
+= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
+  = render 'shared/error_messages', object: resource
+  = f.input :reset_password_token, as: :hidden
+
+  = f.input :password, autofocus: true, autocomplete: "off", placeholder: 'New password'
+  = f.input :password_confirmation, autocomplete: "off", placeholder: 'Confirm new password'
+
   .actions
-    = f.button "Change my password", type: :submit
+    = f.button :button, "Change my password", type: :submit
 
-= render "devise/shared/links"
+.form-footer= render "devise/shared/links"
diff --git a/app/views/auth/passwords/new.html.haml b/app/views/auth/passwords/new.html.haml
index 416870de8..4c7ec8292 100644
--- a/app/views/auth/passwords/new.html.haml
+++ b/app/views/auth/passwords/new.html.haml
@@ -1,12 +1,12 @@
 - content_for :page_title do
   Reset password
 
-= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
-  = devise_error_messages!
+= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
+  = render 'shared/error_messages', object: resource
+
+  = f.input :email, autofocus: true, required: true, placeholder: 'E-mail address'
 
-  .field
-    = f.email_field :email, autofocus: true, required: true, placeholder: 'E-mail address'
   .actions
-    = f.button "Reset password", type: 'submit'
+    = f.button :button, "Reset password", type: :submit
 
 .form-footer= render "auth/shared/links"
diff --git a/app/views/auth/registrations/edit.html.haml b/app/views/auth/registrations/edit.html.haml
index 567f0ea44..25ed58647 100644
--- a/app/views/auth/registrations/edit.html.haml
+++ b/app/views/auth/registrations/edit.html.haml
@@ -1,19 +1,15 @@
 - content_for :page_title do
   Change password
 
-= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
-  = devise_error_messages!
+= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
+  = render 'shared/error_messages', object: resource
 
-  .field
-    = f.email_field :email, placeholder: 'E-mail address'
-  .field
-    = f.password_field :password, autocomplete: "off", placeholder: 'New password'
-  .field
-    = f.password_field :password_confirmation, autocomplete: "off", placeholder: 'Confirm new password'
-  .field
-    = f.password_field :current_password, autocomplete: "off", placeholder: 'Current password'
+  = f.input :email, placeholder: 'E-mail address'
+  = f.input :password, autocomplete: "off", placeholder: 'New password'
+  = f.input :password_confirmation, autocomplete: "off", placeholder: 'Confirm new password'
+  = f.input :current_password, autocomplete: "off", placeholder: 'Current password'
 
   .actions
-    = f.button "Save changes", type: 'submit'
+    = f.button :button, "Save changes", type: :submit
 
 .form-footer= render "settings/shared/links"
diff --git a/app/views/auth/registrations/new.html.haml b/app/views/auth/registrations/new.html.haml
index 97ab5498e..766cbf1a5 100644
--- a/app/views/auth/registrations/new.html.haml
+++ b/app/views/auth/registrations/new.html.haml
@@ -1,20 +1,17 @@
 - content_for :page_title do
   Sign up
 
-= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
-  = devise_error_messages!
+= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
+  = render 'shared/error_messages', object: resource
 
-  = f.fields_for :account do |ff|
-    .field
-      = ff.text_field :username, autofocus: true, placeholder: 'Username', required: true
+  = f.simple_fields_for :account do |ff|
+    = ff.input :username, autofocus: true, placeholder: 'Username', required: true
+
+  = f.input :email, placeholder: 'E-mail address', required: true
+  = f.input :password, autocomplete: "off", placeholder: 'Password', required: true
+  = f.input :password_confirmation, autocomplete: "off", placeholder: 'Confirm password', required: true
 
-  .field
-    = f.email_field :email, placeholder: 'E-mail address', required: true
-  .field
-    = f.password_field :password, autocomplete: "off", placeholder: 'Password', required: true
-  .field
-    = f.password_field :password_confirmation, autocomplete: "off", placeholder: 'Confirm password', required: true
   .actions
-    = f.button "Sign up", type: 'submit'
+    = f.button :button, "Sign up", type: :submit
 
 .form-footer= render "auth/shared/links"
diff --git a/app/views/auth/sessions/new.html.haml b/app/views/auth/sessions/new.html.haml
index 7cfd1cb68..2ca7bf690 100644
--- a/app/views/auth/sessions/new.html.haml
+++ b/app/views/auth/sessions/new.html.haml
@@ -1,12 +1,11 @@
 - content_for :page_title do
   Log in
 
-= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
-  .field
-    = f.email_field :email, autofocus: true, placeholder: 'E-mail address', required: true
-  .field
-    = f.password_field :password, autocomplete: "off", placeholder: 'Password', required: true
+= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
+  = f.input :email, autofocus: true, placeholder: 'E-mail address', required: true
+  = f.input :password, placeholder: 'Password', required: true
+
   .actions
-    = f.button "Log in", type: 'submit'
+    = f.button :button, "Log in", type: :submit
 
 .form-footer= render "auth/shared/links"