Add a "friendly" date/time format and use it whenever we are printing

[rails.git] / app / views / user / view.html.erb

diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb
index 0a182861e4611c5575c59b42c8609bfb3b6dbb87..77ad06a8f7059410a170280f9bef454636ef8885 100644 (file)
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -1,8 +1,4 @@
-<% if @this_user.image %>
-  <%= image_tag url_for_file_column(@this_user, "image"), :style => "float: right; margin-top: 19px", :class => "user_image" %>
-<% else %>
-  <%= image_tag "anon_large.png", :style => "float: right; margin-top: 19px", :class => "user_image" %>
-<% end %>
+<%= user_image @this_user, :style => "float: right" %>
 
 <h2><%= h(@this_user.display_name) %>
 
@@ -79,7 +75,7 @@
   <% end %>
 </div>
 
-<p><b><%= t 'user.view.mapper since' %></b> <%= l @this_user.creation_time %> <%= t 'user.view.ago', :time_in_words_ago => time_ago_in_words(@this_user.creation_time) %></p>
+<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>
 
 <% if @user and @user.administrator? %>
   <p><b><%= t 'user.view.email address' %></b> <%= @this_user.email %></p>