X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/bc5e0bf2c31af6fcf44fb430763f329a8745f5f4..8eef66cee2837ce5df84906dbcbf4c5a8df3bea2:/app/views/user/view.html.erb diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb index 0264065ee..bd3a371aa 100644 --- a/app/views/user/view.html.erb +++ b/app/views/user/view.html.erb @@ -78,6 +78,16 @@

<%= t 'user.view.mapper since' %> <%= l @this_user.creation_time, :format => :friendly %> <%= t 'user.view.ago', :time_in_words_ago => time_ago_in_words(@this_user.creation_time) %>

+

<%= 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) %> +<% elsif not @this_user.terms_seen? -%> +<%= t 'user.view.ct undecided' %> +<% else -%> +<%= t 'user.view.ct declined' %> +<% end -%> +

+ <% if @user and @user.administrator? -%>

<%= t 'user.view.email address' %> <%= @this_user.email %>

<% unless @this_user.creation_ip.nil? -%> @@ -108,6 +118,8 @@ <% if friends.empty? %> <%= t 'user.view.no friends' %> <% else %> + <%= link_to t('user.view.friends_changesets'), {:controller => 'browse', :action => 'friends'} %>
+ <%= link_to t('user.view.friends_diaries'), {:controller => 'diary', :action => 'friends'} %>

<%= render :partial => "contact", :collection => friends %>
@@ -118,6 +130,8 @@ <% if nearby.empty? %> <%= t 'user.view.no nearby users' %> <% else %> + <%= link_to t('user.view.nearby_changesets'), {:controller => 'browse', :action => 'nearby'} %>
+ <%= link_to t('user.view.nearby_diaries'), {:controller => 'diary', :action => 'nearby'} %>

<%= render :partial => "contact", :collection => nearby %>