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

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

diff --git a/app/views/profiles/edit.html.erb b/app/views/profiles/edit.html.erb
index c57f98a044d534a44bd87399ccd116288466ce71..ac76b4d2d532711fc0f39e09e27c35b16ee70b1c 100644 (file)
--- a/app/views/profiles/edit.html.erb
+++ b/app/views/profiles/edit.html.erb
@@ -9,9 +9,9 @@
 <%= bootstrap_form_for current_user, :url => { :action => :update }, :html => { :multipart => true, :autocomplete => :off } do |f| %>
   <%= f.richtext_field :description, :cols => 80, :rows => 20 %>
 
 <%= bootstrap_form_for current_user, :url => { :action => :update }, :html => { :multipart => true, :autocomplete => :off } do |f| %>
   <%= f.richtext_field :description, :cols => 80, :rows => 20 %>
 

-  <fieldset class="form-group">
+  <fieldset class="mb-3">

     <%= f.label t(".image") %>
     <%= f.label t(".image") %>

-    <div class="form-row">
+    <div class="row">

       <div class="col-sm-2">
         <%= user_image current_user %>
       </div>
       <div class="col-sm-2">
         <%= user_image current_user %>
       </div>


@@ -42,20 +42,23 @@
 
   <fieldset>
     <legend><%= t ".home location" -%></legend>
 
   <fieldset>
     <legend><%= t ".home location" -%></legend>

-    <div id="homerow" <% unless current_user.home_lat and current_user.home_lon %> class="nohome"<% end %>>
-      <p class="message text-muted"><%= t ".no home location" %></p>
-      <div class="form-row">
-        <%= f.text_field :home_lat, :wrapper_class => "col-sm-4", :id => "home_lat" %>
-        <%= f.text_field :home_lon, :wrapper_class => "col-sm-4", :id => "home_lon" %>
+    <p id="home_message" class="text-body-secondary m-0<% if current_user.home_location? %> invisible<% end %>"><%= t ".no home location" %></p>
+    <div class="row">
+      <%= f.text_field :home_lat, :wrapper_class => "col-sm-4 d-flex flex-column", :class => "mt-auto", :id => "home_lat" %>
+      <%= f.text_field :home_lon, :wrapper_class => "col-sm-4 d-flex flex-column", :class => "mt-auto", :id => "home_lon" %>
+      <div class="col-sm-4 pt-2 align-self-end">
+        <button type="button" id="home_show" class="btn btn-outline-primary"<% unless current_user.home_location? %> hidden<% end %> disabled><%= t ".show" %></button>
+        <button type="button" id="home_delete" class="btn btn-outline-primary"<% unless current_user.home_location? %> hidden<% end %>><%= t ".delete" %></button>
+        <button type="button" id="home_undelete" class="btn btn-outline-primary" hidden><%= t ".undelete" %></button>

       </div>
     </div>
     <div class="form-check">
       </div>
     </div>
     <div class="form-check">

-      <input class="form-check-input" type="checkbox" name="updatehome" value="1" <% unless current_user.home_lat and current_user.home_lon %> checked="checked" <% end %> id="updatehome" />
+      <input class="form-check-input" type="checkbox" name="updatehome" value="1" <% unless current_user.home_location? %> checked <% end %> id="updatehome" />

       <label class="form-check-label" for="updatehome"><%= t ".update home location on click" %></label>
     </div>
       <label class="form-check-label" for="updatehome"><%= t ".update home location on click" %></label>
     </div>

-    <%= tag.div "", :id => "map", :class => "content_map set_location border border-grey rounded" %>
+    <%= tag.div "", :id => "map", :class => "content_map set_location border border-secondary-subtle rounded z-0" %>

   </fieldset>
 
   <%= f.primary t(".save") %>
   </fieldset>
 
   <%= f.primary t(".save") %>

-    <%= link_to t(".cancel"), user_path(current_user), :class => "btn btn-link" %>
+    <%= link_to t(".cancel"), current_user, :class => "btn btn-link" %>

 <% end %>
 <% end %>