X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fbabed694b5acae64c8baf633ab17d1e61010370..4377418d53a668d369b38f298db46cb7ef68b0de:/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 f8af1fccf..eb8406993 100644
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -11,6 +11,8 @@
     <%= link_to t('user.view.my traces'), :controller => 'trace', :action=>'mine' %>
     <span class='count-number'><%= number_with_delimiter(@user.traces.size) %></span>
     |
+    <%= link_to t('user.view.my notes'), :controller => 'note', :action=> 'mine' %>
+    |
     <%= link_to t('user.view.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %>
     |
     <%= link_to t('user.view.my comments' ), :controller => 'diary_entry', :action => 'comments', :display_name => @user.display_name %>
@@ -33,15 +35,19 @@
     <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'list', :display_name => @this_user.display_name %>
     <span class='count-number'><%= number_with_delimiter(@this_user.traces.size) %></span>
     |
+    <%= link_to t('user.view.notes'), :controller => 'note', :action=> 'mine' %>
+    |
     <!-- 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 %>
+    |
     <%= 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 %>
+      <%= 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 %>
+      <%= 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,16 +82,20 @@
   <% 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? -%>
@@ -97,10 +107,6 @@
   <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? %>