Merge pull request #5449 from AntonKhorev/edit-preferences

[rails.git] / app / views / accounts / edit.html.erb

diff --git a/app/views/accounts/edit.html.erb b/app/views/accounts/edit.html.erb
index cd53d294d9708978028fb3a161a9b1194abb2e34..16f109c9f99b77d23ced80ae371be78bae461c4d 100644 (file)
--- a/app/views/accounts/edit.html.erb
+++ b/app/views/accounts/edit.html.erb
@@ -16,18 +16,22 @@
   <%= f.password_field :pass_crypt, :value => "", :autocomplete => "new-password" %>
   <%= f.password_field :pass_crypt_confirmation, :value => "", :autocomplete => "new-password" %>
 
   <%= 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>
+  <fieldset class="mb-3">
+    <label for="user_auth_provider" class="form-label"><%= t(".external auth") %></label>

     <div class="row">
     <div class="row">

-      <%= f.select(:auth_provider, Auth.providers, :hide_label => true, :wrapper => { :class => "col-auto mb-0" }) %>
+      <%= f.select :auth_provider,
+                   Auth.providers.map { |provider| [I18n.t("auth.providers.#{provider}"), provider] },
+                   :include_blank => t("auth.providers.none"),
+                   :hide_label => true,
+                   :wrapper => { :class => "col-auto mb-0" } %>

       <%= f.text_field(:auth_uid, :hide_label => true, :wrapper => { :class => "col mb-0" }) %>
     </div>
       <%= 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>
+    <small class="form-text text-body-secondary">(<a href="<%= t ".openid.link" %>" target="_new"><%= t ".openid.link text" %></a>)</small>

   </fieldset>
 
   </fieldset>
 

-  <div class="form-group">
-    <label><%= t ".public editing.heading" %></label>
-    <span class="form-text text-muted">
+  <div class="mb-3">
+    <label class="form-label"><%= t ".public editing.heading" %></label>
+    <span class="form-text text-body-secondary">

       <% 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>)
       <% 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>)


@@ -38,9 +42,9 @@
     </span>
   </div>
 
     </span>
   </div>
 

-  <div class="form-group">
-    <label><%= t ".contributor terms.heading" %></label>
-    <span class="form-text text-muted">
+  <div class="mb-3">
+    <label class="form-label"><%= t ".contributor terms.heading" %></label>
+    <span class="form-text text-body-secondary">

       <% 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.terms_agreed? %>
         <%= t ".contributor terms.agreed" %>
         (<a href="<%= t ".contributor terms.link" %>" target="_new"><%= t ".contributor terms.link text" %></a>)


@@ -49,24 +53,21 @@
         <% end %>
       <% else %>
         <%= t ".contributor terms.not yet agreed" %>
         <% end %>
       <% else %>
         <%= t ".contributor terms.not yet agreed" %>

-        <%= link_to t(".contributor terms.review link text"), :controller => "users", :action => "terms" %>
+        <%= link_to t(".contributor terms.review link text"), account_terms_path %>

       <% end %>
     </span>
   </div>
 
       <% end %>
     </span>
   </div>
 

-  <div class="row justify-content-between">
-    <div class="col-auto btn-wrapper">
+  <div class="row justify-content-between g-1">
+    <div class="col-auto">

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

-    <div class="col-auto btn-wrapper">
+    <div class="col-auto">

       <%= link_to t(".delete_account"), account_deletion_path, :class => "btn btn-outline-danger" %>
     </div>
   </div>
 <% end %>
 
 <% unless current_user.data_public? %>
       <%= link_to t(".delete_account"), account_deletion_path, :class => "btn btn-outline-danger" %>
     </div>
   </div>
 <% end %>
 
 <% unless current_user.data_public? %>

-<a name="public"></a>
-<h2><%= t ".public editing note.heading" %></h2>
-<%= t ".public editing note.html" %>
-<%= button_to t(".make edits public button"), user_go_public_path, :class => "btn btn-primary" %>
+  <%= render :partial => "go_public" %>

 <% end %>
 <% end %>