Merge remote-tracking branch 'upstream/pull/3603'

[rails.git] / app / views / sessions / new.html.erb

diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 2844f338992c0e182fc74dcb616880af039e82ed..18f536206007ab965724be7ec2cefc7d038c7bb7 100644 (file)
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -10,10 +10,10 @@
   <p class='text-muted'><%= t ".no account" %> <%= link_to t(".register now"), user_new_path(:referer => params[:referer]) %></p>
 
   <%= bootstrap_form_tag(:action => "login", :html => { :id => "login_form" }) do |f| %>
   <p class='text-muted'><%= t ".no account" %> <%= link_to t(".register now"), user_new_path(:referer => params[:referer]) %></p>
 
   <%= bootstrap_form_tag(:action => "login", :html => { :id => "login_form" }) do |f| %>

-    <%= hidden_field_tag("referer", h(params[:referer])) %>
+    <%= hidden_field_tag("referer", h(params[:referer]), :autocomplete => "off") %>

 
     <%= f.text_field :username, :label => t(".email or username"), :tabindex => 1, :value => params[:username] %>
 
     <%= f.text_field :username, :label => t(".email or username"), :tabindex => 1, :value => params[:username] %>

-    <%= f.password_field :password, :label => t(".password"), :tabindex => 2, :value => "", :help => link_to(t(".lost password link"), :controller => "users", :action => "lost_password") %>
+    <%= f.password_field :password, :label => t(".password"), :tabindex => 2, :value => "", :help => link_to(t(".lost password link"), :controller => "passwords", :action => "lost_password") %>

     <%= f.form_group do %>
       <%= f.check_box :remember_me, { :label => t(".remember"), :tabindex => 3, :checked => (params[:remember_me] == "yes") }, "yes" %>
     <% end %>
     <%= f.form_group do %>
       <%= f.check_box :remember_me, { :label => t(".remember"), :tabindex => 3, :checked => (params[:remember_me] == "yes") }, "yes" %>
     <% end %>


@@ -44,17 +44,14 @@
         <% if Settings.key?(:wikipedia_auth_id) -%>
         <li><%= auth_button "wikipedia", "wikipedia" %></li>
         <% end -%>
         <% if Settings.key?(:wikipedia_auth_id) -%>
         <li><%= auth_button "wikipedia", "wikipedia" %></li>
         <% end -%>

-        <li><%= auth_button "yahoo", "openid", :openid_url => "yahoo.com" %></li>
-        <li><%= auth_button "wordpress", "openid", :openid_url => "wordpress.com" %></li>
-        <li><%= auth_button "aol", "openid", :openid_url => "aol.com" %></li>

       </ul>
 
       <%= form_tag(auth_path(:provider => "openid"), :id => "openid_login_form") do %>
         <div id='login_openid_url' class="form-group">
           <label for='openid_url'><%= t ".openid_html", :logo => openid_logo %></label>
       </ul>
 
       <%= form_tag(auth_path(:provider => "openid"), :id => "openid_login_form") do %>
         <div id='login_openid_url' class="form-group">
           <label for='openid_url'><%= t ".openid_html", :logo => openid_logo %></label>

-          <%= hidden_field_tag("referer", params[:referer]) %>
-          <%= text_field_tag("openid_url", "", :tabindex => 3, :class => "openid_url form-control") %>
-          <span class="form-text text-muted">(<a href="<%= t "users.account.openid.link" %>" target="_new"><%= t "users.account.openid.link text" %></a>)</span>
+          <%= hidden_field_tag("referer", params[:referer], :autocomplete => "off") %>
+          <%= text_field_tag("openid_url", "", :tabindex => 3, :autocomplete => "on", :class => "openid_url form-control") %>
+          <span class="form-text text-muted">(<a href="<%= t "accounts.edit.openid.link" %>" target="_new"><%= t "accounts.edit.openid.link text" %></a>)</span>

         </div>
 
         <%= submit_tag t(".login_button"), :tabindex => 6, :id => "login_openid_submit", :class => "btn btn-primary" %>
         </div>
 
         <%= submit_tag t(".login_button"), :tabindex => 6, :id => "login_openid_submit", :class => "btn btn-primary" %>