X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bc5e0bf2c31af6fcf44fb430763f329a8745f5f4..c29bcca57b9a05a3ca1e55d5b3a089c7ef0b1a03:/app/views/user/view.html.erb

diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb
index 0264065ee..0c6968be8 100644
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -23,7 +23,9 @@
     |
     <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list', :display_name => @user.display_name %>
     |
-    <%= link_to t('user.view.my traces'), :controller => 'trace', :action=>'mine' %>
+    <%= link_to t('user.view.my traces'), :controller => 'trace', :action=> 'mine' %>
+    |
+    <%= link_to t('user.view.my notes'), :controller => 'note', :action=> 'mine' %>
     |
     <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %>
     |
@@ -43,6 +45,8 @@
     |
     <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'list', :display_name => @this_user.display_name %>
     |
+    <%= link_to t('user.view.notes'), :controller => 'note', :action=> 'mine' %>
+    |
     <% 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 %>
     <% else %>
@@ -78,6 +82,16 @@
 
 <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>
 
+<p><b><%= t 'user.view.ct status' %></b>
+<% if not @this_user.terms_agreed.nil? -%>
+<%= 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 -%>
+</p>
+
 <% if @user and @user.administrator? -%>
   <p><b><%= t 'user.view.email address' %></b> <%= @this_user.email %></p>  
   <% unless @this_user.creation_ip.nil? -%>
@@ -108,6 +122,7 @@
   <% if friends.empty? %>
     <%= t 'user.view.no friends' %>
   <% else %>
+ 		<%= link_to t('user.view.friends_changesets'), {:controller => 'browse', :action => 'friends'} %><br/><br/>
     <table id="friends">
       <%= render :partial => "contact", :collection => friends %>
     </table>