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

[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..f647cc84ffa8e7e42e7a4e60c6061e98b1e577d8 100644 (file)
--- a/app/views/users/account.html.erb
+++ b/app/views/users/account.html.erb
@@ -4,24 +4,22 @@
 
 <% content_for :heading do %>
   <h1><%= t ".my settings" %></h1>
 
 <% content_for :heading do %>
   <h1><%= t ".my settings" %></h1>

-  <ul class='secondary-actions clearfix'>
-    <li><%= link_to t(".return to profile"), user_path(current_user) %></li>
-    <li><%= link_to t("users.show.oauth settings"), :controller => "oauth_clients", :action => "index" %></li>
-  </ul>

 <% end %>
 
 <% end %>
 

+<%= render :partial => "settings_menu", :locals => { :selected => "account" } %>
+

 <%= bootstrap_form_for current_user, :url => { :action => :account }, :method => :post, :html => { :multipart => true, :id => "accountForm", :autocomplete => :off } do |f| %>
 
   <%= f.text_field :display_name %>
   <%= f.email_field :email, :disabled => true, :label => t(".current email address") %>
 <%= bootstrap_form_for current_user, :url => { :action => :account }, :method => :post, :html => { :multipart => true, :id => "accountForm", :autocomplete => :off } do |f| %>
 
   <%= 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">
 
   <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>
       <%= 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>


@@ -56,57 +54,6 @@
     </span>
   </div>
 
     </span>
   </div>
 

-  <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{Settings.default_editor}.name")), "default"]] + Editors::AVAILABLE_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %>
-  <%= f.richtext_field :description, :cols => 80, :rows => 20 %>
-  <%= f.text_field :languages %>
-
-  <fieldset class="form-group">
-    <%= f.label t(".image") %>
-    <div class="form-row">
-      <div class="col-sm-2">
-        <%= user_image current_user %>
-      </div>
-      <div class="col-sm-10">
-        <% if current_user.avatar.attached? %>
-          <%= f.radio_button "avatar_action", "keep", :name => "avatar_action", :label => t(".keep image"), :checked => !current_user.image_use_gravatar %>
-        <% end %>
-        <% if current_user.avatar.attached? || current_user.image_use_gravatar? %>
-          <%= f.radio_button "avatar_action", "delete", :name => "avatar_action", :label => t(".delete image"), :checked => false %>
-        <% end %>
-        <% if current_user.avatar.attached? %>
-          <%= f.form_group :help => t(".image size hint"), :class => "mb-0" do %>
-            <%= f.radio_button "avatar_action", "new", :name => "avatar_action", :label => t(".replace image"), :checked => false %>
-            <%= f.file_field :avatar, :hide_label => true, :wrapper => { :class => "mb-0" } %>
-          <% end %>
-        <% else %>
-          <%= f.form_group :help => t(".image size hint"), :class => "mb-0" do %>
-            <%= f.radio_button "avatar_action", "new", :name => "avatar_action", :label => t(".new image"), :checked => false %>
-            <%= f.file_field :avatar, :hide_label => true, :wrapper => { :class => "mb-0" } %>
-          <% end %>
-        <% end %>
-        <%= f.form_group :help => link_to(t(".gravatar.what_is_gravatar"), t(".gravatar.link")) do %>
-          <%= f.radio_button "avatar_action", "gravatar", :name => "avatar_action", :label => t(".gravatar.gravatar"), :checked => current_user.image_use_gravatar %>
-        <% end %>
-      </div>
-    </div>
-  </fieldset>
-
-  <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>
-      <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>
-    <%= tag.div "", :id => "map", :class => "content_map set_location" %>
-  </fieldset>
-

   <%= f.primary t(".save changes button") %>
 <% end %>
 
   <%= f.primary t(".save changes button") %>
 <% end %>