X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e91c02f2ceb2b72a77846a0c31f5eca22b9b0a65..50e5d49bc44181425cdfd798ab75ca108d1bf8a1:/app/views/dashboards/show.html.erb?ds=sidebyside

diff --git a/app/views/dashboards/show.html.erb b/app/views/dashboards/show.html.erb
index 9aa4abed4..70dae774e 100644
--- a/app/views/dashboards/show.html.erb
+++ b/app/views/dashboards/show.html.erb
@@ -5,8 +5,8 @@
 <div class="row">
   <% if current_user and @user.id == current_user.id %>
     <div class="col-md order-md-last">
-      <% if @user.home_lat.nil? or @user.home_lon.nil? %>
-        <div id="map" class="content_map">
+      <% if !@user.home_location? %>
+        <div id="map" class="content_map border border-secondary-subtle">
           <p class="m-3"><%= t(".no_home_location_html", :edit_profile_link => link_to(t(".edit_your_profile"), edit_profile_path)) %></p>
         </div>
       <% else %>
@@ -19,38 +19,38 @@
              :icon => image_path("marker-red.png"),
              :description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" })
            } %>
-        <%= tag.div "", :id => "map", :class => "content_map", :data => { :user => user_data } %>
+        <%= tag.div "", :id => "map", :class => "content_map border border-secondary-subtle rounded z-0", :data => { :user => user_data } %>
       <% end %>
 
-      <% friends = @user.friends %>
-      <% nearby = @user.nearby - friends %>
+      <% followings = @user.followings %>
+      <% nearby = @user.nearby - followings %>
     </div>
 
     <div class="col-md">
-      <h3><%= t ".my friends" %></h3>
+      <h2><%= t ".followings" %></h2>
 
-      <% if friends.empty? %>
-        <%= t ".no friends" %>
+      <% if followings.empty? %>
+        <%= t ".no followings" %>
       <% else %>
-        <nav class='secondary-actions'>
+        <nav class='secondary-actions mb-3'>
           <ul class='clearfix'>
-            <li><%= link_to t(".friends_changesets"), friend_changesets_path %></li>
-            <li><%= link_to t(".friends_diaries"), friends_diary_entries_path %></li>
+            <li><%= link_to t(".followed_changesets"), friend_changesets_path %></li>
+            <li><%= link_to t(".followed_diaries"), friends_diary_entries_path %></li>
           </ul>
         </nav>
-        <div id="friends-container">
-          <%= render :partial => "contact", :collection => friends, :locals => { :type => "friend" } %>
+        <div>
+          <%= render :partial => "contact", :collection => followings, :locals => { :type => "following" } %>
         </div>
       <% end %>
 
       <hr>
 
-      <h3><%= t ".nearby users" %></h3>
+      <h2><%= t ".nearby users" %></h2>
 
       <% if nearby.empty? %>
         <%= t ".no nearby users" %>
       <% else %>
-        <nav class='secondary-actions'>
+        <nav class='secondary-actions mb-3'>
           <ul class='clearfix'>
             <li><%= link_to t(".nearby_changesets"), nearby_changesets_path %></li>
             <li><%= link_to t(".nearby_diaries"), nearby_diary_entries_path %></li>