update generated Devise views

fortuity · Feb 26, 2011 · 161aa1e · 161aa1e
1 parent b2ec645
commit 161aa1e
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 8 deletions.
diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
@@ -4,7 +4,7 @@
   <%= devise_error_messages! %>
 
   <p><%= f.label :email %><br />
-  <%= f.text_field :email %></p>
+  <%= f.email_field :email %></p>
 
   <p><%= f.submit "Resend confirmation instructions" %></p>
 <% end %>

diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
@@ -4,10 +4,10 @@
   <%= devise_error_messages! %>
   <%= f.hidden_field :reset_password_token %>
 
-  <p><%= f.label :password %><br />
+  <p><%= f.label :password, "New password" %><br />
   <%= f.password_field :password %></p>
 
-  <p><%= f.label :password_confirmation %><br />
+  <p><%= f.label :password_confirmation, "Confirm new password" %><br />
   <%= f.password_field :password_confirmation %></p>
 
   <p><%= f.submit "Change my password" %></p>

diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
@@ -4,7 +4,7 @@
   <%= devise_error_messages! %>
 
   <p><%= f.label :email %><br />
-  <%= f.text_field :email %></p>
+  <%= f.email_field :email %></p>
 
   <p><%= f.submit "Send me reset password instructions" %></p>
 <% end %>

diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
@@ -6,7 +6,7 @@
   <%= f.text_field :name %></p>
 
   <p><%= f.label :email %><br />
-  <%= f.text_field :email %></p>
+  <%= f.email_field :email %></p>
 
   <p><%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
   <%= f.password_field :password %></p>

diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
@@ -6,7 +6,7 @@
   <%= f.text_field :name %></p>
 
   <p><%= f.label :email %><br />
-  <%= f.text_field :email %></p>
+  <%= f.email_field :email %></p>
 
   <p><%= f.label :password %><br />
   <%= f.password_field :password %></p>

diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
@@ -2,7 +2,7 @@
 
 <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
   <p><%= f.label :email %><br />
-  <%= f.text_field :email %></p>
+  <%= f.email_field :email %></p>
 
   <p><%= f.label :password %><br />
   <%= f.password_field :password %></p>

diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb
@@ -17,3 +17,9 @@
 <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
   <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
 <% end -%>
+
+<%- if devise_mapping.omniauthable? %>
+  <%- resource_class.omniauth_providers.each do |provider| %>
+    <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
+  <% end -%>
+<% end -%>
diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb
@@ -4,7 +4,7 @@
   <%= devise_error_messages! %>
 
   <p><%= f.label :email %><br />
-  <%= f.text_field :email %></p>
+  <%= f.email_field :email %></p>
 
   <p><%= f.submit "Resend unlock instructions" %></p>
 <% end %>