From f8c8b89ba89d39e3a0e0baa18507e9d356cf0b98 Mon Sep 17 00:00:00 2001 From: Dan K Date: Mon, 21 Mar 2016 15:20:14 +0300 Subject: [PATCH] Remove unnecessary br tags, fix indentation --- app/views/devise/registrations/edit.html.erb | 4 +-- app/views/devise/registrations/new.html.erb | 2 +- app/views/devise/shared/_links.html.erb | 38 ++++++++++---------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb index c0764c5..fae1ef3 100644 --- a/app/views/devise/registrations/edit.html.erb +++ b/app/views/devise/registrations/edit.html.erb @@ -10,11 +10,11 @@ <%= f.email_field :email, autofocus: true, class: "form-control" %>
- <%= f.label :password %> (<%= t('.leave_blank_if_you_don_t_want_to_change_it', :default => "leave blank if you don't want to change it") %>)
+ <%= f.label :password %> (<%= t('.leave_blank_if_you_don_t_want_to_change_it', :default => "leave blank if you don't want to change it") %>) <%= f.password_field :password, :autocomplete => "off", class: "form-control" %>
- <%= f.label :password_confirmation %>
+ <%= f.label :password_confirmation %> <%= f.password_field :password_confirmation, class: "form-control" %>
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index 7cb0306..14babef 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -10,7 +10,7 @@ <%= f.email_field :email, autofocus: true, class: "form-control" %>
- <%= f.label :password %>
+ <%= f.label :password %> <%= f.password_field :password, class: "form-control" %>
diff --git a/app/views/devise/shared/_links.html.erb b/app/views/devise/shared/_links.html.erb index f6ecca0..10d312e 100644 --- a/app/views/devise/shared/_links.html.erb +++ b/app/views/devise/shared/_links.html.erb @@ -1,25 +1,25 @@ -<%- if controller_name != 'sessions' %> -<%= link_to t(".sign_in", :default => "Sign in"), new_session_path(resource_name) %>
-<% end -%> +<% if controller_name != 'sessions' %> + <%= link_to t(".sign_in", :default => "Sign in"), new_session_path(resource_name) %>
+<% end %> -<%- if devise_mapping.registerable? && controller_name != 'registrations' %> -<%= link_to t(".sign_up", :default => "Sign up"), new_registration_path(resource_name) %>
-<% end -%> +<% if devise_mapping.registerable? && controller_name != 'registrations' %> + <%= link_to t(".sign_up", :default => "Sign up"), new_registration_path(resource_name) %>
+<% end %> -<%- if devise_mapping.recoverable? && controller_name != 'passwords' %> -<%= link_to t(".forgot_your_password", :default => "Forgot your password?"), new_password_path(resource_name) %>
-<% end -%> +<% if devise_mapping.recoverable? && controller_name != 'passwords' %> + <%= link_to t(".forgot_your_password", :default => "Forgot your password?"), new_password_path(resource_name) %>
+<% end %> -<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> -<%= link_to t('.didn_t_receive_confirmation_instructions', :default => "Didn't receive confirmation instructions?"), new_confirmation_path(resource_name) %>
-<% end -%> +<% if devise_mapping.confirmable? && controller_name != 'confirmations' %> + <%= link_to t('.didn_t_receive_confirmation_instructions', :default => "Didn't receive confirmation instructions?"), new_confirmation_path(resource_name) %>
+<% end %> -<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> -<%= link_to t('.didn_t_receive_unlock_instructions', :default => "Didn't receive unlock instructions?"), new_unlock_path(resource_name) %>
-<% end -%> +<% if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> + <%= link_to t('.didn_t_receive_unlock_instructions', :default => "Didn't receive unlock instructions?"), new_unlock_path(resource_name) %>
+<% end %> -<%- if devise_mapping.omniauthable? %> - <%- resource_class.omniauth_providers.each do |provider| %> +<% if devise_mapping.omniauthable? %> + <% resource_class.omniauth_providers.each do |provider| %> <%= link_to t('.sign_in_with_provider', :provider => provider.to_s.titleize, :default => "Sign in with #{provider.to_s.titleize}"), omniauth_authorize_path(resource_name, provider) %>
- <% end -%> -<% end -%> + <% end %> +<% end %>