Display user's email addresses and the IP address used to create

their account to people that are logged in as administrators.

diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb
index 4a8fde862f072592f0636544d1111303a19b27f5..107535f0040534ac79d0506662e47083c94b35bb 100644 (file)
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -43,12 +43,13 @@
 <% end %>
 </div>
 
-<% if @this_user != nil %>
-<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 %> <%= 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>  
+<p><b><%= t 'user.view.created from' %></b> <%= @this_user.creation_ip %></p>
 <% end %>
-  
+
 <h3><%= t 'user.view.user image heading' %></h3>
 <% if @this_user.image %>
   <%= image_tag url_for_file_column(@this_user, "image") %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index f2c9d7700d4a38ef9f77d3752df621f9bdcc4b4d..f046798ae81d3b8e0bcc4cb727a6282438f4d786 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -939,6 +939,8 @@ en:
       add as friend: add as friend
       mapper since: "Mapper since:"
       ago: "({{time_in_words_ago}} ago)"
+      email address: "Email address:"
+      created from: "Created from:"
       user image heading: User image
       delete image: Delete Image
       upload an image: Upload an image