Remove custom css for note icons on welcome and fixthemap pages

[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..e783367dd1b9600812e670e12c752aef3cba5a59 100644 (file)
--- a/app/views/accounts/edit.html.erb
+++ b/app/views/accounts/edit.html.erb
@@ -16,8 +16,8 @@
   <%= 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">
       <%= 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 class="row">
       <%= 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" }) %>


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

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

     <span class="form-text text-muted">
       <% if current_user.data_public? %>
         <%= t ".public editing.enabled" %>
     <span class="form-text text-muted">
       <% if current_user.data_public? %>
         <%= t ".public editing.enabled" %>


@@ -38,8 +38,8 @@
     </span>
   </div>
 
     </span>
   </div>
 

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

     <span class="form-text text-muted">
       <% if current_user.terms_agreed? %>
         <%= t ".contributor terms.agreed" %>
     <span class="form-text text-muted">
       <% if current_user.terms_agreed? %>
         <%= t ".contributor terms.agreed" %>


@@ -65,8 +65,5 @@
 <% end %>
 
 <% unless current_user.data_public? %>
 <% 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 %>