Download as
Browse Code »

Commit b60df0c35ab0589ac385131bcee2213e2023be12

Authored by Pedro
Committed by Rafael Manzo
1 parent c482de1f
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

Fixed some styles after devise internationalization

Showing 6 changed files with 12 additions and 9 deletions   Show diff stats
app/views/devise/confirmations/new.html.erb
  Diff comments   View file @b60df0c
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <%= devise_error_messages! %> 6 <%= devise_error_messages! %>
7 7
8 <div><%= f.label :email %><br /> 8 <div><%= f.label :email %><br />
9 - <%= f.email_field :emaill, :autofocus => true %></div> 9 + <%= f.email_field :email, :autofocus => true %></div>
10 10
11 <div><%= f.submit t('.resend_confirmation_instructions', :default => 'Resend confirmation instructions'), class: 'btn btn-default' %></div> 11 <div><%= f.submit t('.resend_confirmation_instructions', :default => 'Resend confirmation instructions'), class: 'btn btn-default' %></div>
12 <% end %> 12 <% end %>
app/views/devise/passwords/edit.html.erb
  Diff comments   View file @b60df0c
@@ -7,12 +7,12 @@ @@ -7,12 +7,12 @@
7 <%= f.hidden_field :reset_password_token %> 7 <%= f.hidden_field :reset_password_token %>
8 8
9 <div><%= f.label :password, t('.new_password', :default => 'New password') %><br /> 9 <div><%= f.label :password, t('.new_password', :default => 'New password') %><br />
10 - <%= f.password_field :password %></div> 10 + <%= f.password_field :password, :autofocus => true %></div>
11 11
12 <div><%= f.label :password_confirmation, t('.confirm_new_password', :default => 'Confirm new password') %><br /> 12 <div><%= f.label :password_confirmation, t('.confirm_new_password', :default => 'Confirm new password') %><br />
13 <%= f.password_field :password_confirmation %></div> 13 <%= f.password_field :password_confirmation %></div>
14 14
15 - <div><%= f.submit t('.change_my_password', :default => 'Change my password') %></div> 15 + <div><%= f.submit t('.change_my_password', :default => 'Change my password'), class: 'btn btn-warning' %></div>
16 <% end %> 16 <% end %>
17 17
18 <%= render "devise/shared/links" %> 18 <%= render "devise/shared/links" %>
app/views/devise/registrations/edit.html.erb
  Diff comments   View file @b60df0c
1 <div class="page-header"> 1 <div class="page-header">
2 <h1><%= t('.title', :resource => resource_class.model_name.human , :default => "Edit #{resource_name.to_s.humanize}") %></h1> 2 <h1><%= t('.title', :resource => resource_class.model_name.human , :default => "Edit #{resource_name.to_s.humanize}") %></h1>
3 - 3 +</div>
4 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put, :class => "form-inline" }) do |f| %> 4 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put, :class => "form-inline" }) do |f| %>
5 <%= devise_error_messages! %> 5 <%= devise_error_messages! %>
6 6
@@ -77,6 +77,7 @@ @@ -77,6 +77,7 @@
77 </div> 77 </div>
78 <% end %> 78 <% end %>
79 79
  80 +<hr />
80 <h2><%= t('.cancel_my_account', :default => 'Cancel my account') %></h2> 81 <h2><%= t('.cancel_my_account', :default => 'Cancel my account') %></h2>
81 82
82 <p><%= t('.unhappy', :default => 'Unhappy') %>? <%= link_to t('.cancel_my_account', :default => "Cancel my account"), registration_path(resource_name), :data => { :confirm => t('.are_you_sure', :default => "Are you sure?") }, :method => :delete, class: 'btn btn-warning' %>.</p> 83 <p><%= t('.unhappy', :default => 'Unhappy') %>? <%= link_to t('.cancel_my_account', :default => "Cancel my account"), registration_path(resource_name), :data => { :confirm => t('.are_you_sure', :default => "Are you sure?") }, :method => :delete, class: 'btn btn-warning' %>.</p>
app/views/devise/sessions/new.html.erb
  Diff comments   View file @b60df0c
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 <div class="form-row"> 33 <div class="form-row">
34 <div class="field-container"> 34 <div class="field-container">
35 <label> 35 <label>
36 - <%= f.check_box :remember_me %> <%= f.label :remember_me %> 36 + <%= f.check_box :remember_me, class: "checkbox" %> <%= f.label :remember_me %>
37 </label> 37 </label>
38 </div> 38 </div>
39 <div class="help-container"> 39 <div class="help-container">
app/views/devise/shared/_links.erb
  Diff comments   View file @b60df0c
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <% end -%> 7 <% end -%>
8 8
9 <!-- <%- if devise_mapping.recoverable? && controller_name != 'passwords' %> 9 <!-- <%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
10 -<%= link_to t(".forgot_your_password", :default => "Forgot your password?"), new_password_path(resource_name) %> 10 +<%= link_to t(".forgot_your_password", :default => "Forgot your password?"), new_password_path(resource_name), class: 'btn btn-info' %>
11 <% end -%> --> 11 <% end -%> -->
12 12
13 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> 13 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
app/views/devise/unlocks/new.html.erb
  Diff comments   View file @b60df0c
1 -<h2><%= t('.resend_unlock_instructions', :default => "Resend unlock instructions") %></h2>  
2 - 1 +<div class="page-header">
  2 + <h2><%= t('.resend_unlock_instructions', :default => "Resend unlock instructions") %></h2>
  3 +</div>
  4 +
3 <%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %> 5 <%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
4 <%= devise_error_messages! %> 6 <%= devise_error_messages! %>
5 7
6 <div><%= f.label :email %><br /> 8 <div><%= f.label :email %><br />
7 - <%= f.email_field :email %></div> 9 + <%= f.email_field :email, :autofocus => true %></div>
8 10
9 <div><%= f.submit t('.resend_unlock_instructions', :default => "Resend unlock instructions"), class: 'btn btn-primary' %></div> 11 <div><%= f.submit t('.resend_unlock_instructions', :default => "Resend unlock instructions"), class: 'btn btn-primary' %></div>
10 <% end %> 12 <% end %>