X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cb7b79a58f0337ab28b41ed5105215de302d3f73..606492c3df124092ed119716c5b1cbe922f6b315:/app/views/dashboards/show.html.erb diff --git a/app/views/dashboards/show.html.erb b/app/views/dashboards/show.html.erb index 3fe27b779..744661dfd 100644 --- a/app/views/dashboards/show.html.erb +++ b/app/views/dashboards/show.html.erb @@ -5,9 +5,9 @@
<% if current_user and @user.id == current_user.id %>
- <% if @user.home_lat.nil? or @user.home_lon.nil? %> -
-

<%= t(".no_home_location_html", :edit_profile_link => link_to(t(".edit_your_profile"), edit_profile_path)) %>

+ <% if !@user.home_location? %> +
+

<%= t(".no_home_location_html", :edit_profile_link => link_to(t(".edit_your_profile"), edit_profile_path)) %>

<% else %> <% content_for :head do %> @@ -19,7 +19,7 @@ :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-grey rounded", :data => { :user => user_data } %> <% end %> <% friends = @user.friends %> @@ -32,10 +32,12 @@ <% if friends.empty? %> <%= t ".no friends" %> <% else %> -
    -
  • <%= link_to t(".friends_changesets"), friend_changesets_path %>
  • -
  • <%= link_to t(".friends_diaries"), friends_diary_entries_path %>
  • -
+
<%= render :partial => "contact", :collection => friends, :locals => { :type => "friend" } %>
@@ -48,10 +50,12 @@ <% if nearby.empty? %> <%= t ".no nearby users" %> <% else %> -
    -
  • <%= link_to t(".nearby_changesets"), nearby_changesets_path %>
  • -
  • <%= link_to t(".nearby_diaries"), nearby_diary_entries_path %>
  • -
+
<%= render :partial => "contact", :collection => nearby, :locals => { :type => "nearby mapper" } %>