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

diff --combined app/views/users/show.html.erb
index 35ee7776be2c07bd12e02790031942019a19b8b1,5b8dcfcc970e20259a5f346c6a3abd9a8af98bd6..4e48ee983ea4bee5fcbc62d1d7a2fca3f4d986ce
--- 1/app/views/users/show.html.erb
--- 2/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@@ -11,7 -11,7 +11,7 @@@
              <span class='count-number'><%= number_with_delimiter(current_user.changesets.size) %></span>
            </li>
            <li>
 -            <%= link_to t(".my notes"), :controller => "notes", :action => "mine" %>
 +            <%= link_to t(".my notes"), user_notes_path(@user) %>
            </li>
            <li>
              <%= link_to t(".my traces"), :controller => "traces", :action => "mine" %>
@@@ -53,7 -53,7 +53,7 @@@
              <span class='count-number'><%= number_with_delimiter(@user.changesets.size) %></span>
            </li>
            <li>
 -            <%= link_to t(".notes"), :controller => "notes", :action => "mine" %>
 +            <%= link_to t(".notes"), user_notes_path(@user) %>
            </li>
            <li>
              <%= link_to t(".traces"), :controller => "traces", :action => "index", :display_name => @user.display_name %>
@@@ -180,56 -180,60 +180,60 @@@
  
  <% end %>
  
+ <div class="row">
    <% if current_user and @user.id == current_user.id %>
-     <% if @user.home_lat.nil? or @user.home_lon.nil? %>
-       <div id="map" class="content_map">
-         <p id="no_home_location"><%= t(".if_set_location_html", :settings_link => (link_to t(".settings_link_text"), :controller => "users", :action => "account", :display_name => current_user.display_name)) %></p>
-       </div>
-     <% else %>
-       <% content_for :head do %>
-         <%= javascript_include_tag "user" %>
+     <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(".if_set_location_html", :settings_link => (link_to t(".settings_link_text"), :controller => "users", :action => "account", :display_name => current_user.display_name)) %></p>
+         </div>
+       <% else %>
+         <% content_for :head do %>
+           <%= javascript_include_tag "user" %>
+         <% end %>
+         <% user_data = {
+              :lon => current_user.home_lon,
+              :lat => current_user.home_lat,
+              :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 } %>
        <% end %>
-       <% user_data = {
-            :lon => current_user.home_lon,
-            :lat => current_user.home_lat,
-            :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 } %>
-     <% end %>
- 
-     <% friends = @user.friends %>
-     <% nearby = @user.nearby - friends %>
- 
-   <div class="activity-block column-1">
-     <h3><%= t ".my friends" %></h3>
- 
-     <% if friends.empty? %>
-       <%= t ".no friends" %>
-     <% 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" } %>
-       </div>
-     <% end %>
-   </div>
  
-   <div class="activity-block column-1">
-     <h3><%= t ".nearby users" %></h3>
- 
-     <% 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>
-       <div id="nearbyusers">
-         <%= render :partial => "contact", :collection => nearby, :locals => { :type => "nearby mapper" } %>
-       </div>
-     <% end %>
-   </div>
- <% end %>
+       <% friends = @user.friends %>
+       <% nearby = @user.nearby - friends %>
+     </div>
+ 
+     <div class="col-md">
+       <h3><%= t ".my friends" %></h3>
+ 
+       <% if friends.empty? %>
+         <%= t ".no friends" %>
+       <% 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" } %>
+         </div>
+       <% end %>
+ 
+       <hr>
+ 
+       <h3><%= t ".nearby users" %></h3>
+ 
+       <% 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>
+         <div id="nearbyusers">
+           <%= render :partial => "contact", :collection => nearby, :locals => { :type => "nearby mapper" } %>
+         </div>
+       <% end %>
+     </div>
+   <% end %>
+ </div>