diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index fc09041ec..fb04f62a1 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -60,7 +60,7 @@ module WelcomeHelper when 'reply' '回复' when 'bid' - '众包' + '作业' else event.event_type end @@ -119,7 +119,7 @@ module WelcomeHelper end #取得所有活动 - def find_all_activities limit=5 + def find_all_activities limit=6 # users = [] # activities = Activity.find_by_sql("select distinct user_id from activities order by id DESC limit #{limit}" ) # activities.each { |activity| diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 56e63f0e2..e7bf1c50e 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -129,7 +129,7 @@ <%= image_tag url_to_avatar(event.event_author), :class => "avatar-3" %>
<%= time_tag_welcome event.event_datetime %>前
<%= link_to( project.name, project_path(project.project_id), :class => "d-g-blue d-p-project-name", :title => "#{project.name}")%> - <%= show_grade project %> + <%= show_grade project %>
@@ -221,7 +221,7 @@