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 b0839ad563573efb82b541a885c8f52ce4419196..f647cc84ffa8e7e42e7a4e60c6061e98b1e577d8 100644 (file)
--- a/app/views/users/account.html.erb
+++ b/app/views/users/account.html.erb
@@ -4,177 +4,62 @@
 
 <% 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 %>
 

-<%= error_messages_for current_user %>
-<%= form_for current_user, :url => { :action => :account }, :method => :post, :html => { :multipart => true, :id => "accountForm", :class => "standard-form", :autocomplete => :off } do |f| %>
-  <fieldset>
-    <div class="form-row">
-      <label class="standard-label"><%= t "users.new.display name" %></label>
-      <%= f.text_field :display_name %>
-    </div>
-  </fieldset>
+<%= render :partial => "settings_menu", :locals => { :selected => "account" } %>

 
 

-  <fieldset>
-    <div class="form-row">
-      <label class="standard-label"><%= t ".current email address" %></label>
-      <input type="email" disabled value="<%= current_user.email %>" />
-      <span class="form-help deemphasize"><%= t ".email never displayed publicly" %></span>
-    </div>
+<%= bootstrap_form_for current_user, :url => { :action => :account }, :method => :post, :html => { :multipart => true, :id => "accountForm", :autocomplete => :off } do |f| %>

 
 

-    <div class="form-row">
-      <label class="standard-label"><%= t ".new email address" %></label>
-      <%= f.email_field :new_email, :autocomplete => :off %>
-      <span class="form-help deemphasize"><%= t ".email never displayed publicly" %></span>
-    </div>
-  </fieldset>
-
-  <fieldset>
-    <div class="form-row">
-        <label class="standard-label"><%= t "users.new.password" %></label>
-      <%= f.password_field :pass_crypt, :value => "", :autocomplete => :off %>
-    </div>
-
-    <div class="form-row">
-      <label class="standard-label"><%= t "users.new.confirm password" %></label>
-      <%= f.password_field :pass_crypt_confirmation, :value => "", :autocomplete => :off %>
-    </div>
-  </fieldset>
-
-  <fieldset>
-    <div class="form-row">
-      <label class="standard-label"><%= t ".external auth" %></label>
-      <%= f.select :auth_provider, Auth::PROVIDERS %>
-      <%= f.text_field :auth_uid %>
-      <span class="form-help deemphasize">(<a href="<%= t ".openid.link" %>" target="_new"><%= t ".openid.link text" %></a>)</span>
-    </div>
-  </fieldset>
-
-  <fieldset class="form-divider">
-    <div class="form-row">
-      <label class="standard-label"><%= t ".public editing.heading" %></label>
-      <span class="form-help deemphasize">
-        <% if current_user.data_public? %>
-          <%= t ".public editing.enabled" %>
-          (<a href="<%= t ".public editing.enabled link" %>" target="_new"><%= t ".public editing.enabled link text" %></a>)
-        <% else %>
-          <%= t ".public editing.disabled" %>
-          (<a href="#public"><%= t ".public editing.disabled link text" %></a>)
-        <% end %>
-      </span>
-    </div>
+  <%= f.text_field :display_name %>
+  <%= f.email_field :email, :disabled => true, :label => t(".current email address") %>
+  <%= 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">
     <div class="form-row">

-      <label class="standard-label"><%= t ".contributor terms.heading" %></label>
-      <span class="form-help deemphasize">
-        <% if current_user.terms_agreed? %>
-          <%= t ".contributor terms.agreed" %>
-          (<a href="<%= t ".contributor terms.link" %>" target="_new"><%= t ".contributor terms.link text" %></a>)
-          <% if current_user.consider_pd? %>
-            <%= t ".contributor terms.agreed_with_pd" %>
-          <% end %>
-        <% else %>
-          <%= t ".contributor terms.not yet agreed" %>
-          <%= link_to t(".contributor terms.review link text"), :controller => "users", :action => "terms" %>
-        <% end %>
-      </span>
-    </div>
-    <div class="form-row">
-      <label class="standard-label"><%= t ".preferred editor" %></label>
-      <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{Settings.default_editor}.name")), "default"]] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %>
+      <%= 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>
     </div>

+    <small class="form-text text-muted">(<a href="<%= t ".openid.link" %>" target="_new"><%= t ".openid.link text" %></a>)</small>

   </fieldset>
 
   </fieldset>
 

-  <fieldset class="form-divider">
-    <div class='form-row'>
-      <label class="standard-label"><%= t ".profile description" %></label>
-      <%= richtext_area :user, :description, :object => current_user, :cols => 80, :rows => 20 %>
-    </div>
-
-    <div class="form-row">
-      <label class="standard-label"><%= t ".preferred languages" %></label>
-      <%= f.text_field :languages %>
-    </div>
-
-    <div class='form-row accountImage'>
-      <label class="standard-label"><%= t ".image" %></label>
-        <%= user_image current_user %>
-        <ul class='form-list accountImage-options'>
-        <% if current_user.image.file? %>
-        <li>
-          <%= radio_button_tag "image_action", "keep", !current_user.image_use_gravatar %>
-          <label class='standard-label' for='image_action_keep'><%= t ".keep image" %></label>
-        </li>
-        <% end %>
-        <% if current_user.image.file? || current_user.image_use_gravatar? %>
-        <li>
-          <%= radio_button_tag "image_action", "delete" %>
-          <label class='standard-label' for='image_action_delete'><%= t ".delete image" %></label>
-        </li>
+  <div class="form-group">
+    <label><%= t ".public editing.heading" %></label>
+    <span class="form-text text-muted">
+      <% if current_user.data_public? %>
+        <%= t ".public editing.enabled" %>
+        (<a href="<%= t ".public editing.enabled link" %>" target="_new"><%= t ".public editing.enabled link text" %></a>)
+      <% else %>
+        <%= t ".public editing.disabled" %>
+        (<a href="#public"><%= t ".public editing.disabled link text" %></a>)
+      <% end %>
+    </span>
+  </div>
+
+  <div class="form-group">
+    <label><%= t ".contributor terms.heading" %></label>
+    <span class="form-text text-muted">
+      <% if current_user.terms_agreed? %>
+        <%= t ".contributor terms.agreed" %>
+        (<a href="<%= t ".contributor terms.link" %>" target="_new"><%= t ".contributor terms.link text" %></a>)
+        <% if current_user.consider_pd? %>
+          <%= t ".contributor terms.agreed_with_pd" %>

         <% end %>
         <% end %>

-        <% if current_user.image.file? %>
-          <li>
-            <%= radio_button_tag "image_action", "new" %>
-            <label class='standard-label' for='image_action_new'>
-                <%= t ".replace image" %>
-                <span class="form-help deemphasize"><%= t ".image size hint" %></span>
-            </label>
-            <%= f.file_field :image %>
-          </li>
-        <% else %>
-        <li>
-          <%= radio_button_tag "image_action", "new" %>
-          <label class='standard-label' for='image_action_new'>
-            <%= t ".new image" %>
-            <span class="form-help deemphasize"><%= t ".image size hint" %></span>
-          </label>
-          <%= f.file_field :image %>
-        </li>
-        <% end %>
-        <li>
-          <%= radio_button_tag "image_action", "gravatar", current_user.image_use_gravatar %>
-          <label class='standard-label' for='image_action_gravatar'>
-            <%= t ".gravatar.gravatar" %>
-            <span class='form-help deemphasize'> (<a href="<%= t ".gravatar.link" %>" target="_new"><%= t ".gravatar.link text" %></a>)</span>
-          </label>
-        </li>
-      </ul>
-    </div>
-  </fieldset>
-
-  <fieldset class="form-divider">
-    <div class='form-row location clearfix'>
-    <label class="standard-label"><%= t ".home location" %></label>
-    <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-column'>
-          <label class="standard-label secondary"><%= t ".latitude" %></label>
-          <%= f.text_field :home_lat, :id => "home_lat" %>
-        </div>
-        <div class='form-column'>
-          <label class="standard-label secondary"><%= t ".longitude" %></label>
-          <%= f.text_field :home_lon, :id => "home_lon" %>
-        </div>
-      </div>
-    </div>
-
-    <div class="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>
-    <%= content_tag "div", "", :id => "map", :class => "content_map settings_map set_location" %>
-  </fieldset>
-
-  <%= submit_tag t(".save changes button") %>
+      <% else %>
+        <%= t ".contributor terms.not yet agreed" %>
+        <%= link_to t(".contributor terms.review link text"), :controller => "users", :action => "terms" %>
+      <% end %>
+    </span>
+  </div>
+
+  <%= f.primary t(".save changes button") %>

 <% end %>
 
 <% unless current_user.data_public? %>
 <a name="public"></a>
 <h2><%= t ".public editing note.heading" %></h2>
 <% end %>
 
 <% unless current_user.data_public? %>
 <a name="public"></a>
 <h2><%= t ".public editing note.heading" %></h2>

-<%= raw t ".public editing note.text" %>
+<%= t ".public editing note.html" %>

   <%= button_to t(".make edits public button"), :action => :go_public %>
 <% end %>
   <%= button_to t(".make edits public button"), :action => :go_public %>
 <% end %>