diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index 8c1515ef1..338d2c2cf 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -56,15 +56,15 @@
- +
- + - +
<%= l(:label_user_joinin) %><%= format_date(@user.created_on) %><%= l(:label_user_joinin) %><%= format_date(@user.created_on) %>
<%= l(:label_user_login) %><%= format_date(@user.last_login_on) %>
<%= l(:label_user_mail) %><%= mail_to(h(@user.mail), nil, :encode => 'javascript') %><%= l(:label_user_mail) %><%= mail_to(h(@user.mail), nil, :encode => 'javascript') %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index bc9280184..0734a75e9 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -88,7 +88,11 @@ + + <% end %> + <% else %> + <%= l(:label_user_activities) %>