X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dd1ec4eb9bd23c2e7d93451b41f3eda99ffb9f08..bd8713f42b4a5196cf89e8270c57322742ba1f5e:/app/views/user/view.html.erb?ds=sidebyside

diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb
index 64d75ad17..114f9b90a 100644
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -12,6 +12,7 @@
     <span class='count-number'><%= number_with_delimiter(@user.traces.size) %></span>
     |
     <%= link_to t('user.view.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %>
+    <span class='count-number'><%= number_with_delimiter(@user.diary_entries.size) %></span>
     |
     <%= link_to t('user.view.my comments' ), :controller => 'diary_entry', :action => 'comments', :display_name => @user.display_name %>
     |
@@ -37,6 +38,7 @@
     <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => @this_user.display_name %>
     |
     <%= link_to t('user.view.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %>
+    <span class='count-number'><%= number_with_delimiter(@this_user.diary_entries.size) %></span>
     |
     <%= link_to t('user.view.comments'), :controller => 'diary_entry', :action => 'comments', :display_name => @this_user.display_name %>
     |
@@ -95,7 +97,7 @@
 </p>
 
 <% if @user and @user.administrator? -%>
-  <p><b><%= t 'user.view.email address' %></b> <%= @this_user.email %></p>  
+  <p><b><%= t 'user.view.email address' %></b> <%= @this_user.email %></p>
   <% unless @this_user.creation_ip.nil? -%>
   <p><b><%= t 'user.view.created from' %></b> <%= @this_user.creation_ip %></p>
   <% end -%>
@@ -113,20 +115,14 @@
       <%= javascript_include_tag "user" %>
     <% end %>
     <%
-      data = {
+      user_data = {
         :lon => @user.home_lon,
         :lat => @user.home_lat,
-        :zoom => 12,
-        :marker => {
-          :description => render(:partial => "popup", :object => @user, :locals => {:type => "your location"})
-        }
+        :icon => "marker.png",
+        :description => render(:partial => "popup", :object => @user, :locals => {:type => "your location"})
       }
-
-      if params[:scale].to_f > 0 then
-        data[:zoom] = scale_to_zoom params[:scale]
-      end
     %>
-    <%= content_tag "div", "", :id => "map", :class => "user_map", :data => data %>
+    <%= content_tag "div", "", :id => "map", :class => "user_map", :data => {:user => user_data} %>
   <% end %>
 
   <% friends = @this_user.friends.collect { |f| f.befriendee } %>