consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes credentials page

Browse Source
This commit is contained in:
rgarcia
2015-08-07 17:47:12 +02:00
parent 8fdba1b5b4
commit 076448ec80
3 changed files with 42 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/views/account/show.html.erb
View File

@@ -27,45 +27,8 @@
</div> </div>
</div> </div>
<% end %> <% end %>
</div>
</div>
<%= link_to t("account.show.change_credentials_link"), edit_user_registration_path %> <%= link_to t("account.show.change_credentials_link"), edit_user_registration_path %>
<h2><%= t("devise_views.registrations.edit.edit") %> user</h2>
<%= form_for(@account, as: "user", url: registration_path(@account), html: { method: :put }) do |f| %>
<div class="field">
<%= f.label :email, t("devise_views.registrations.edit.email_label") %><br />
<%= f.email_field :email, autofocus: true %>
</div> </div>
<% if devise_mapping.confirmable? && @resource.pending_reconfirmation? %>
<div><%= t("devise_views.registrations.edit.waiting_for") %> <%= @resource.unconfirmed_email %></div>
<% end %>
<div class="field">
<%= f.label :password, t("devise_views.registrations.edit.password_label") %> <i><%= t("devise_views.registrations.edit.leave_blank") %></i><br />
<%= f.password_field :password, autocomplete: "off" %>
</div> </div>
<div class="field">
<%= f.label :password_confirmation, t("devise_views.registrations.edit.password_confirmation_label") %><br />
<%= f.password_field :password_confirmation, autocomplete: "off" %>
</div>
<div class="field">
<%= f.label :current_password, t("devise_views.registrations.edit.current_password_label") %> <i><%= t("devise_views.registrations.edit.need_current") %></i><br />
<%= f.password_field :current_password, autocomplete: "off" %>
</div>
<div class="actions">
<%= f.submit t("devise_views.registrations.edit.update_submit") %>
</div>
<% end %>
<h3><%= t("devise_views.registrations.edit.cancel_title") %></h3>
<p><%= t("devise_views.registrations.edit.cancel_text") %> <%= button_to t("devise_views.registrations.edit.cancel_link"), registration_path(user), data: { confirm: t("devise_views.registrations.edit.cancel_confirm") }, method: :delete %></p>
<%= link_to t("devise_views.registrations.edit.back_link"), :back %>

12
app/views/devise/registrations/edit.html.erb
View File

@@ -1,4 +1,7 @@
<h2><%= t("devise_views.registrations.edit.edit") %> <%= resource_name.to_s.humanize %></h2> <div class="row account">
<div class="small-12 medium-9 column">
<h1><%= t("devise_views.registrations.edit.edit") %> <%= resource_name.to_s.humanize %></h1>
<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %> <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
<%= devise_error_messages! %> <%= devise_error_messages! %>
@@ -32,8 +35,7 @@
</div> </div>
<% end %> <% end %>
<h3><%= t("devise_views.registrations.edit.cancel_title") %></h3>
<p><%= t("devise_views.registrations.edit.cancel_text") %> <%= button_to t("devise_views.registrations.edit.cancel_link"), registration_path(resource_name), data: { confirm: t("devise_views.registrations.edit.cancel_confirm") }, method: :delete %></p>
<%= link_to t("devise_views.registrations.edit.back_link"), :back %> <%= link_to t("devise_views.registrations.edit.back_link"), :back %>
</div>
</div>

2
config/locales/es.yml
View File

@@ -62,7 +62,7 @@ es:
show: show:
title: "Mi cuenta" title: "Mi cuenta"
save_changes_submit: "Guardar cambios" save_changes_submit: "Guardar cambios"
change_credentials_link: "Cambiar mi contraseña" change_credentials_link: "Cambiar mis credenciales"
first_name_label: "Nombre" first_name_label: "Nombre"
last_name_label: "Apellidos" last_name_label: "Apellidos"
use_nickname_label: "Usar pseudónimo" use_nickname_label: "Usar pseudónimo"