diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 8a49f8e2d..f68ae7f34 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -482,7 +482,7 @@ module UsersHelper when "Message" return ( activity.act.parent_id == nil || activity.act.parent_id == '' ) ? '发布了帖子' : '回复了帖子' when "Poll" - return '发布了问卷' + return '创建了问卷' else return '有了新动态' end diff --git a/app/views/courses/_course.html.erb b/app/views/courses/_course.html.erb index f2972df44..0b879f905 100644 --- a/app/views/courses/_course.html.erb +++ b/app/views/courses/_course.html.erb @@ -61,7 +61,7 @@

- <%= content_tag('span', link_to("#{@course_activity_count[@course.id]}", course_path(@course)), :class => "info") %> + <%= content_tag('span', link_to("#{course_activity_count @course}", course_path(@course)), :class => "info") %> <%= content_tag('span', l(:label_x_activity, :count => @course_activity_count[@course.id])) %>

diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb index a8d00bbac..a0b4a442f 100644 --- a/app/views/layouts/base_users_new.html.erb +++ b/app/views/layouts/base_users_new.html.erb @@ -184,7 +184,7 @@ <% if (get_join_course_count(@user) != 0) %>
  • 加入课程 :
  • <% end %> - <% if @user.user_extensions.identity == 0 %> + <% if @user.user_extensions.identity == 1 %>
  • 参加匿评 :
  • <% end %> <% if (get_projectandcourse_attachment_count(@user) != 0) %> @@ -215,7 +215,7 @@ <% if (get_join_course_count(@user) != 0) %>
  • <%= get_join_course_count(@user) %>
  • <% end %> - <% if @user.user_extensions.identity == 0 %> + <% if @user.user_extensions.identity == 1 %>
  • <%= get_anonymous_evaluation_count(@user) %>
  • <% end %> <% if (get_projectandcourse_attachment_count(@user) != 0) %> @@ -239,6 +239,17 @@
    + +
    +

    <%= l(:label_tag)%>:

    +
    +
    + <%= render :partial => 'tags/project_tag', :locals => {:obj => @user,:object_flag => "1"}%> +
    +
    +
    +
    + <%= render :partial => 'layouts/user_watch_list', :locals => {:user => @user} %> <%= render :partial => 'layouts/user_fans_list', :locals => {:user => @user} %> <% visitor_count,visitor_list = get_visitor_users(@user) %> diff --git a/app/views/tags/_tag_name.html.erb b/app/views/tags/_tag_name.html.erb index cb00ac8d7..7cd7bc02b 100644 --- a/app/views/tags/_tag_name.html.erb +++ b/app/views/tags/_tag_name.html.erb @@ -42,7 +42,7 @@ <% else %>
    - + <%= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id %> <% case object_flag %>