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

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

diff --git a/app/views/accounts/edit.html.erb b/app/views/accounts/edit.html.erb
deleted file mode 100644 (file)
index e31c5e9..0000000
--- a/app/views/accounts/edit.html.erb
+++ /dev/null
@@ -1,73 +0,0 @@
-<% content_for :head do %>
-  <%= javascript_include_tag "user" %>
-<% end %>
-
-<% content_for :heading do %>
-  <h1><%= t ".my settings" %></h1>
-<% end %>
-
-<%= render :partial => "settings_menu" %>
-
-<%= bootstrap_form_for current_user, :url => { :action => :update }, :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 => "email" %>
-  <%= f.password_field :pass_crypt, :value => "", :autocomplete => "new-password" %>
-  <%= f.password_field :pass_crypt_confirmation, :value => "", :autocomplete => "new-password" %>
-
-  <fieldset class="mb-3">
-    <label for="user_auth_provider" class="form-label"><%= t(".external auth") %></label>
-    <div class="row">
-      <%= 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>
-    <small class="form-text text-body-secondary">(<a href="<%= t ".openid.link" %>" target="_new"><%= t ".openid.link text" %></a>)</small>
-  </fieldset>
-
-  <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>)
-      <% else %>
-        <%= t ".public editing.disabled" %>
-        (<a href="#public"><%= t ".public editing.disabled link text" %></a>)
-      <% end %>
-    </span>
-  </div>
-
-  <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.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="row justify-content-between g-1">
-    <div class="col-auto">
-      <%= f.primary t(".save changes button") %>
-    </div>
-    <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? %>
-  <%= render :partial => "go_public" %>
-<% end %>