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

[rails.git] / app / views / users / account.html.erb

diff --git a/app/views/users/account.html.erb b/app/views/users/account.html.erb
index 4562033a2555dce046eaf8afd55209709a4e49b5..10b33063e773c4c04611abb58da9e96e2b3148e2 100644 (file)
--- a/app/views/users/account.html.erb
+++ b/app/views/users/account.html.erb
@@ -14,14 +14,14 @@
 
   <%= f.text_field :display_name %>
   <%= f.email_field :email, :disabled => true, :label => t(".current email address") %>
-  <%= f.email_field :new_email, :autocomplete => :off %>
-  <%= f.password_field :pass_crypt, :value => "", :autocomplete => :off %>
-  <%= f.password_field :pass_crypt_confirmation, :value => "", :autocomplete => :off %>
+  <%= f.email_field :new_email, :autocomplete => "email" %>
+  <%= f.password_field :pass_crypt, :value => "", :autocomplete => "new-password" %>
+  <%= f.password_field :pass_crypt_confirmation, :value => "", :autocomplete => "new-password" %>
 
   <fieldset class="form-group">
     <label for="user_auth_provider"><%= t(".external auth") %></label>
     <div class="form-row">
-      <%= f.select(:auth_provider, Auth.providers, :hide_label => "true", :wrapper => { :class => "col-auto mb-0" }) %>
+      <%= f.select(:auth_provider, Auth.providers, :hide_label => true, :wrapper => { :class => "col-auto mb-0" }) %>
       <%= f.text_field(:auth_uid, :hide_label => true, :wrapper => { :class => "col mb-0" }) %>
     </div>
     <small class="form-text text-muted">(<a href="<%= t ".openid.link" %>" target="_new"><%= t ".openid.link text" %></a>)</small>
@@ -94,15 +94,15 @@
   <fieldset>
     <legend><%= t ".home location" -%></legend>
     <div id="homerow" <% unless current_user.home_lat and current_user.home_lon %> class="nohome"<% end %>>
-      <p class="message form-help deemphasize"><%= t ".no home location" %></p>
+      <p class="message text-muted"><%= t ".no home location" %></p>
       <div class="form-row">
         <%= f.text_field :home_lat, :wrapper_class => "col-sm-4", :id => "home_lat" %>
         <%= f.text_field :home_lon, :wrapper_class => "col-sm-4", :id => "home_lon" %>
       </div>
     </div>
-    <div class="standard-form-row">
-      <input type="checkbox" name="updatehome" value="1" <% unless current_user.home_lat and current_user.home_lon %> checked="checked" <% end %> id="updatehome" />
-      <label class="standard-label" for="updatehome"><%= t ".update home location on click" %></label>
+    <div class="form-check">
+      <input class="form-check-input" type="checkbox" name="updatehome" value="1" <% unless current_user.home_lat and current_user.home_lon %> checked="checked" <% end %> id="updatehome" />
+      <label class="form-check-label" for="updatehome"><%= t ".update home location on click" %></label>
     </div>
     <%= tag.div "", :id => "map", :class => "content_map set_location" %>
   </fieldset>