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

[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 16f109c9f99b77d23ced80ae371be78bae461c4d..ce7dd97a83d4dd7597810559c4d2fa8452f2b56b 100644 (file)
--- a/app/views/accounts/edit.html.erb
+++ b/app/views/accounts/edit.html.erb
@@ -29,27 +29,18 @@
     <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>
+  <div class="mb-3 d-flex flex-column flex-sm-row column-gap-1">
+    <label class="form-label text-nowrap mb-0"><%= 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>)
+        <br>
         <% if current_user.consider_pd? %>
           <%= t ".contributor terms.agreed_with_pd" %>
+        <% else %>
+          <%= t ".contributor terms.not_agreed_with_pd" %>
+          (<%= link_to t(".contributor terms.pd_link_text"), account_pd_declaration_path %>)
         <% end %>
       <% else %>
         <%= t ".contributor terms.not yet agreed" %>