app/views/devise/registrations/edit.html.erb in devise_rails3_ennder-1.0.5 vs app/views/devise/registrations/edit.html.erb in devise_rails3_ennder-1.1.0

- old
+ new

@@ -1,33 +1,64 @@ +<% + # Localized by Ennder, "Edit", activerecord.models +-%> <h2><%= t('devise.registrations.edit_only') %> <%= t("activerecord.models.#{resource_name}") %></h2> <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %> <% - if !resource.errors.empty? + # Ennder id : flash_error + test -%> - <div id="flash_error"><%= devise_error_messages! %></div> <% - end + if !resource.errors.empty? -%> + <div id="flash_error"><%= devise_error_messages! %></div> +<% + end +-%> - <p><%= f.label :email %><br /> - <%= f.email_field :email %></p> + <div><%= f.label :email %><br /> + <%= f.email_field :email, :autofocus => true %></div> - <p><%= f.label :password %> <i>(<%= t('devise.registrations.leave_password_blank_dont_change') %>)</i><br /> - <%= f.password_field :password %></p> + <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %> + <div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div> + <% end %> - <p><%= f.label :password_confirmation %><br /> - <%= f.password_field :password_confirmation %></p> +<% + # Localized by Ennder, "leave blank if you don't want to change it" +-%> + <div><%= f.label :password %> <i>(<%= t('devise.registrations.leave_password_blank_dont_change') %>)</i><br /> + <%= f.password_field :password, :autocomplete => "off" %></div> - <p><%= f.label :current_password %> <i>(<%= t('devise.registrations.need_current_passord') %>)</i><br /> - <%= f.password_field :current_password %></p> + <div><%= f.label :password_confirmation %><br /> + <%= f.password_field :password_confirmation %></div> +<% + # Localized by Ennder, "we need your current password to confirm your changes" +-%> + <div><%= f.label :current_password %> <i>(<%= t('devise.registrations.need_current_passord') %>)</i><br /> + <%= f.password_field :current_password %></div> + +<% + # Added by Ennder +-%> <%= render :partial => 'users/form_personal_fields', :locals => { :f => f } %> - <p><%= f.submit t('Update') %></p> +<% + # Localized by Ennder, "Update" +-%> + <div><%= f.submit t('Update') %></div> <% end %> +<% + # Localized by Ennder, "Cancel my account" +-%> <h3><%= t('devise.registrations.cancel_account') %></h3> -<p><%= t('devise.registrations.unhappy') %> <%= link_to t('devise.registrations.cancel_account'), registration_path(resource_name), :confirm => t('confirmation.are_you_sure'), :method => :delete %>.</p> +<% + # Localized by Ennder, "Unhappy?", "Are you sure?" +-%> +<p><%= t('devise.registrations.unhappy') %> <%= button_to t('devise.registrations.cancel_account'), registration_path(resource_name), :data => { :confirm => t('confirmation.are_you_sure') }, :method => :delete %></p> +<% + # Localized by Ennder, "Back" +-%> <%= link_to t('links.back'), :back %>