diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 33adb3ac9..c0c3ce764 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -361,22 +361,10 @@ class ProjectsController < ApplicationController
#Added by young
def homework
@offset, @limit = api_offset_and_limit({:limit => 10})
- @bids = @project.homeworks.order('deadline DESC')
+ @bids = @project.homeworks.order('deadline')
@bids = @bids.like(params[:name]) if params[:name].present?
- @bid_count = @bids.count
- @bid_pages = Paginator.new @bid_count, @limit, params['page']
- @offset ||= @bid_pages.reverse_offset
- #@bids = @bids.offset(@offset).limit(@limit).all.reverse
- unless @offset == 0
- @bids = @bids.offset(@offset).limit(@limit).all.reverse
- else
- limit = @bid_count % @limit
- if limit == 0
- limit = 10
- end
- @bids = @bids.offset(@offset).limit(limit).all.reverse
- end
+ @bids = paginateHelper @bids
render :layout => 'base_courses'
end
diff --git a/app/views/bids/_bid_homework_show.html.erb b/app/views/bids/_bid_homework_show.html.erb
index c4eb875a1..e89131081 100644
--- a/app/views/bids/_bid_homework_show.html.erb
+++ b/app/views/bids/_bid_homework_show.html.erb
@@ -92,9 +92,6 @@
<% end %>
<% end %>
-
\ No newline at end of file
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 16a4cbf21..6dbfd67d5 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -54,7 +54,6 @@
<% projects = find_miracle_project(10, 3) %>
<% projects.map do |project| %>
-
-
<%= image_tag(get_project_avatar(project), :class => "avatar-4") %>
@@ -75,7 +74,6 @@
:id => "tooltip-#{project.id}" %>
-
<% end; reset_cycle %>
@@ -88,7 +86,6 @@
<%activities = find_all_activities%>
<% activities.each do |event| %>
-
<%= image_tag url_to_avatar(event.event_author), :class => "avatar-3" %>
@@ -99,7 +96,6 @@
<%= l(:field_updated_on) %><%= time_tag_welcome event.event_datetime %>前 <%= show_event_reply event %>
-
<% end %>
@@ -107,7 +103,6 @@
-
贴吧动态
@@ -115,11 +110,9 @@
<%= link_to "我要反馈" , suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>
<%= link_to "更多>>", forums_path %>
-
<% topics = find_new_forum_topics(7) %>
<% topics.includes(:forum, :last_reply, :author).each do |topic|%>
-
-
<%= link_to '['+topic.forum.name + ']',forum_path(topic.forum),:class => 'memo_Bar_title' %><%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url,title: topic.subject %>
@@ -139,7 +132,6 @@
-
<% end %>