X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0d3a9ed9cb47ce3b89ea9eaffbb589f9a9ff6d22..4377418d53a668d369b38f298db46cb7ef68b0de:/app/views/user/view.html.erb diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb index 97811d3a4..eb8406993 100644 --- a/app/views/user/view.html.erb +++ b/app/views/user/view.html.erb @@ -82,16 +82,20 @@ <% 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) %>

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

<%= t 'user.view.ct status' %> +

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

<% if @user and @user.administrator? -%> @@ -103,10 +107,6 @@

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

<% end -%> -

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

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