nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reset password: added localized text, improved layout

Browse source
This commit is contained in:
Diaspora Europe 2012-03-12 12:48:09 +01:00
parent dbe7a4c72b
commit bcc754b07c
2 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/views/devise/passwords/edit.haml
View file

@ -1,15 +1,18 @@
%h2 Change your password .span-12.prepend-6.last
= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| .floating
%h2
= t('.change_password')
= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f|
= devise_error_messages! = devise_error_messages!
= f.hidden_field :reset_password_token = f.hidden_field :reset_password_token
%p %p
= f.label :password = f.label :password, t('password')
%br/ %br/
= f.password_field :password = f.password_field :password
%p %p
= f.label :password_confirmation = f.label :password_confirmation, t('password_confirmation')
%br/ %br/
= f.password_field :password_confirmation = f.password_field :password_confirmation
%p %p
= f.submit t('.change_password') = f.submit t('.change_password')
= render :partial => "devise/shared/links" = render :partial => "devise/shared/links"

6
app/views/devise/passwords/new.haml
View file

@ -1,13 +1,13 @@
.span-12.prepend-6.last .span-12.prepend-6.last
.floating .floating
%h3 %h2
=t('.forgot_password') = t('.forgot_password')
- unless devise_error_messages!.empty? - 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| = form_for(resource, :as => resource_name, :url => password_path(resource_name)) do |f|
%p %p
= f.label :email = f.label :email, t('email')
= f.text_field :email = f.text_field :email
%p %p
= f.submit t('.send_password_instructions') = f.submit t('.send_password_instructions')