From 9e0eccb78f23d6850b219a5a09ac31d91c980794 Mon Sep 17 00:00:00 2001 From: huangjingquan Date: Mon, 12 Aug 2013 23:21:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=20?= =?UTF-8?q?=E6=97=A0=E9=A1=B9=E7=9B=AE=E3=80=81=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_users.html.erb | 6 +++--- app/views/users/show.html.erb | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) 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) %>