From bcc754b07c88c36c4e0c722acfecbc3834c3e7b2 Mon Sep 17 00:00:00 2001
From: Diaspora Europe <info@diasp.eu>
Date: Mon, 12 Mar 2012 12:48:09 +0100
Subject: [PATCH] reset password: added localized text, improved layout

---
 app/views/devise/passwords/edit.haml | 33 +++++++++++++++-------------
 app/views/devise/passwords/new.haml  |  8 +++----
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/app/views/devise/passwords/edit.haml b/app/views/devise/passwords/edit.haml
index 267436a63..92d2175b3 100644
--- a/app/views/devise/passwords/edit.haml
+++ b/app/views/devise/passwords/edit.haml
@@ -1,15 +1,18 @@
-%h2 Change your 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
-  %p
-    = f.label :password
-    %br/
-    = f.password_field :password
-  %p
-    = f.label :password_confirmation
-    %br/
-    = f.password_field :password_confirmation
-  %p
-  = f.submit t('.change_password')
-= render :partial => "devise/shared/links"
+.span-12.prepend-6.last
+  .floating
+    %h2 
+      = t('.change_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
+      %p
+        = f.label :password, t('password')
+        %br/
+        = f.password_field :password
+      %p
+        = f.label :password_confirmation, t('password_confirmation')
+        %br/
+        = f.password_field :password_confirmation
+      %p
+      = f.submit t('.change_password')
+    = render :partial => "devise/shared/links"
diff --git a/app/views/devise/passwords/new.haml b/app/views/devise/passwords/new.haml
index cdec22a31..7095f9501 100644
--- a/app/views/devise/passwords/new.haml
+++ b/app/views/devise/passwords/new.haml
@@ -1,13 +1,13 @@
 .span-12.prepend-6.last
   .floating
-    %h3
-      =t('.forgot_password')
+    %h2
+      = t('.forgot_password')
     - unless devise_error_messages!.empty?
-      %i=  t('.no_account')
+      %i= t('.no_account')
 
     = form_for(resource, :as => resource_name, :url => password_path(resource_name)) do |f|
       %p
-        = f.label :email
+        = f.label :email, t('email')
         = f.text_field :email
       %p
       = f.submit t('.send_password_instructions')