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

[rails.git] / app / views / dashboards / show.html.erb

diff --git a/app/views/dashboards/show.html.erb b/app/views/dashboards/show.html.erb
index 3fe27b7798c2aeba837600ce2fbdea245f26f522..be4461a00221c21d1a45b78532df5a00aa9fd861 100644 (file)
--- a/app/views/dashboards/show.html.erb
+++ b/app/views/dashboards/show.html.erb
@@ -5,9 +5,9 @@
 <div class="row">
   <% if current_user and @user.id == current_user.id %>
     <div class="col-md order-md-last">
 <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">
-          <p id="no_home_location"><%= t(".no_home_location_html", :edit_profile_link => link_to(t(".edit_your_profile"), edit_profile_path)) %></p>
+      <% 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 %>
         <% content_for :head do %>
         </div>
       <% else %>
         <% content_for :head do %>


@@ -19,39 +19,43 @@
              :icon => image_path("marker-red.png"),
              :description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" })
            } %>
              :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 %>
 
       <% end %>
 

-      <% friends = @user.friends %>
+      <% friends = @user.followings %>

       <% nearby = @user.nearby - friends %>
     </div>
 
     <div class="col-md">
       <% nearby = @user.nearby - friends %>
     </div>
 
     <div class="col-md">

-      <h3><%= t ".my friends" %></h3>
+      <h2><%= t ".followings" %></h2>

 
       <% if friends.empty? %>
 
       <% if friends.empty? %>

-        <%= t ".no friends" %>
+        <%= t ".no followings" %>

       <% else %>
       <% else %>

-        <ul class='secondary-actions clearfix'>
-          <li><%= link_to t(".friends_changesets"), friend_changesets_path %></li>
-          <li><%= link_to t(".friends_diaries"), friends_diary_entries_path %></li>
-        </ul>
-        <div id="friends-container">
-          <%= render :partial => "contact", :collection => friends, :locals => { :type => "friend" } %>
+        <nav class='secondary-actions mb-3'>
+          <ul class='clearfix'>
+            <li><%= link_to t(".followed_changesets"), friend_changesets_path %></li>
+            <li><%= link_to t(".followed_diaries"), friends_diary_entries_path %></li>
+          </ul>
+        </nav>
+        <div>
+          <%= render :partial => "contact", :collection => friends, :locals => { :type => "following" } %>

         </div>
       <% end %>
 
       <hr>
 
         </div>
       <% end %>
 
       <hr>
 

-      <h3><%= t ".nearby users" %></h3>
+      <h2><%= t ".nearby users" %></h2>

 
       <% if nearby.empty? %>
         <%= t ".no nearby users" %>
       <% else %>
 
       <% if nearby.empty? %>
         <%= t ".no nearby users" %>
       <% else %>

-        <ul class='secondary-actions clearfix'>
-          <li><%= link_to t(".nearby_changesets"), nearby_changesets_path %></li>
-          <li><%= link_to t(".nearby_diaries"), nearby_diary_entries_path %></li>
-        </ul>
+        <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>
+          </ul>
+        </nav>

         <div id="nearbyusers">
           <%= render :partial => "contact", :collection => nearby, :locals => { :type => "nearby mapper" } %>
         </div>
         <div id="nearbyusers">
           <%= render :partial => "contact", :collection => nearby, :locals => { :type => "nearby mapper" } %>
         </div>