diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb index da58043045..2b24fb02f2 100644 --- a/app/views/user/view.html.erb +++ b/app/views/user/view.html.erb @@ -78,17 +78,7 @@ <% end %> -

<%= 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 %>

@@ -99,10 +89,22 @@

<%= t 'user.view.spam score' %> <%= @this_user.spam_score %>

<% end -%> -

<%= t 'user.view.description' %>

-
<%= @this_user.description.to_html %>
+

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

+ <% if @user and @this_user.id == @user.id %>
<% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %>