Update Potlatch 2 to 2.3-534-g63a3364 build

[rails.git] / app / views / user / view.html.erb

diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb
index 70e4f18288b7799436880def9db0a7eca2924ca3..114f9b90af67ba6673f9cc36b7e7c953d84b0865 100644 (file)
--- 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 %>
     |
@@ -36,12 +37,15 @@
     <!-- Displaying another user's profile page -->
     <%= 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 %>
     |
     <% if @user and @user.is_friends_with?(@this_user) %>
-      <%= link_to t('user.view.remove as friend'), :controller => 'user', :action => 'remove_friend', :display_name => @this_user.display_name, :method => :post %>
+      <%= link_to t('user.view.remove as friend'), remove_friend_path(:display_name => @this_user.display_name), :method => :post %>
     <% else %>
-      <%= link_to t('user.view.add as friend'), :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name, :method => :post %>
+      <%= link_to t('user.view.add as friend'), make_friend_path(:display_name => @this_user.display_name), :method => :post %>
     <% end %>
     <% if @this_user.blocks.exists? %>
       |
@@ -76,20 +80,24 @@
   <% end %>
 </div>
 
-<p><b><%= t 'user.view.mapper since' %></b> <%= l @this_user.creation_time, :format => :friendly %> <%= t 'user.view.ago', :time_in_words_ago => time_ago_in_words(@this_user.creation_time) %></p>
+<div id="description"><%= @this_user.description.to_html %></div>
 
-<p><b><%= t 'user.view.ct status' %></b>
+<p class='deemphasize'><small>
+<%= t 'user.view.mapper since' %> <%= l @this_user.creation_time.to_date, :format => :long %>
+/
+<%= t 'user.view.ct status' %>
 <% if not @this_user.terms_agreed.nil? -%>
-<%= t 'user.view.ct accepted', :ago =>time_ago_in_words(@this_user.terms_agreed)  %> 
+<%= t 'user.view.ct accepted', :ago =>time_ago_in_words(@this_user.terms_agreed)  %>
 <% elsif not @this_user.terms_seen? -%>
 <%= t 'user.view.ct undecided' %>
 <% else -%>
 <%= t 'user.view.ct declined' %>
 <% end -%>
+</small>
 </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 -%>
@@ -97,18 +105,25 @@
   <p><b><%= t 'user.view.spam score' %></b> <%= @this_user.spam_score %></p>
 <% end -%>
 
-<h3><%= t 'user.view.description' %></h3>
-
-<div id="description"><%= @this_user.description.to_html %></div>
-
 <% if @user and @this_user.id == @user.id %>
-  <div id="map" class="user_map">
-    <% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %>
+  <% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %>
+    <div id="map" class="user_map">
       <p id="no_home_location"><%= raw(t 'user.view.if set location', :settings_link => (link_to t('user.view.settings_link_text'), :controller => 'user', :action => 'account', :display_name => @user.display_name)) %></p>
-    <% else %>
-      <%= render :partial => 'map', :locals => { :setting_location => false, :show_other_users => true } %>
+    </div>
+  <% else %>
+    <% content_for :head do %>
+      <%= javascript_include_tag "user" %>
     <% end %>
-  </div>
+    <%
+      user_data = {
+        :lon => @user.home_lon,
+        :lat => @user.home_lat,
+        :icon => "marker.png",
+        :description => render(:partial => "popup", :object => @user, :locals => {:type => "your location"})
+      }
+    %>
+    <%= content_tag "div", "", :id => "map", :class => "user_map", :data => {:user => user_data} %>
+  <% end %>
 
   <% friends = @this_user.friends.collect { |f| f.befriendee } %>
   <% nearby = @this_user.nearby - friends %>
@@ -121,7 +136,7 @@
     <%= link_to t('user.view.friends_changesets'), friend_changesets_path %><br/>
     <%= link_to t('user.view.friends_diaries'), friend_diaries_path %><br/><br/>
     <table id="friends">
-      <%= render :partial => "contact", :collection => friends %>
+      <%= render :partial => "contact", :collection => friends, :locals => {:type => "friend"} %>
     </table>
   <% end %>
 
@@ -133,7 +148,7 @@
     <%= link_to t('user.view.nearby_changesets'), nearby_changesets_path %><br/>
     <%= link_to t('user.view.nearby_diaries'), nearby_diaries_path %><br/><br/>
     <table id="nearbyusers">
-      <%= render :partial => "contact", :collection => nearby %>
+      <%= render :partial => "contact", :collection => nearby, :locals => {:type => "nearby mapper"} %>
     </table>
   <% end %>
 <% end %>