From c541865fa3e1ddf6be999ee3a7c3af282cbf4af5 Mon Sep 17 00:00:00 2001 From: yanxd Date: Wed, 22 Jan 2014 09:22:12 +0800 Subject: [PATCH] fix bugs --- app/views/layouts/base.html.erb | 2 +- app/views/layouts/base_users.html.erb | 2 +- app/views/welcome/index.html.erb | 2 +- config/locales/en.yml | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb index f4c624968..fe42d00e8 100644 --- a/app/views/layouts/base.html.erb +++ b/app/views/layouts/base.html.erb @@ -1,5 +1,5 @@ - + <%=h html_title %> diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index 9595b322e..d71555e8d 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -55,7 +55,7 @@ - diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 742c28a25..74d7a4a2a 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -41,7 +41,7 @@
<%= h @user.lastname<<@user.firstname %> + <%= h (@user.lastname+@user.firstname) %> <%= image_tag(gender_avatar_uri(@user), weight:"25px", height:"25px") if (@user.user_extensions && (@user.user_extensions.identity != 2) )%>
- + diff --git a/config/locales/en.yml b/config/locales/en.yml index 3a1113bc7..fa07505ef 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1535,6 +1535,7 @@ en: label_teacher_work_unit: Position label_course_overview: Status label_course_file: File + label_stores_index: Resource search label_course_news: News label_x_base_courses_member:
<%= l(:label_welcome) %> <%=link_to User.current.lastname< <%= l(:label_join) %><%= l(:label_welcome) %> <%=link_to (User.current.lastname+User.current.firstname), user_path(User.current) %> <%= l(:label_join) %>
<%= image_tag(url_to_avatar(User.current), :class => 'avatar') %>