From 7d4d3f590cb1b7fbc2c0c0384d19e63ed7555d7c Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Wed, 5 Nov 2014 09:51:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E3=80=81=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E3=80=81=E7=AB=9E=E8=B5=9B=E7=95=99=E8=A8=80=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=8E=A7=E4=BB=B6=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb      | 8 ++++----
 app/controllers/projects_controller.rb     | 8 ++++----
 app/views/contests/_contest_jours.html.erb | 4 +++-
 app/views/courses/_courses_jours.html.erb  | 4 +++-
 app/views/courses/feedback.html.erb        | 6 ------
 app/views/projects/_project_jours.html.erb | 4 +++-
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 8a5bfd9fb..a048c3c9c 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -672,10 +672,10 @@ class CoursesController < ApplicationController
       page = 1 + offset / @limit
     end
 
-    @feedback_count = @jours.count
-    @feedback_pages = Paginator.new @feedback_count, @limit, page
-    @offset ||= @feedback_pages.offset
-    @jour = @jours[@offset, @limit]
+    #@feedback_count = @jours.count
+    #@feedback_pages = Paginator.new @feedback_count, @limit, page
+    #@offset ||= @feedback_pages.offset
+    @jour = paginateHelper @jours,10
     @state = false
     respond_to do |format|
       format.html{render :layout => 'base_courses'}
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index bf0717aae..47c8107ce 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -424,10 +424,10 @@ class ProjectsController < ApplicationController
     end
 
 
-    @feedback_count = @jours.count
-    @feedback_pages = Paginator.new @feedback_count, @limit, @page
-    @offset ||= @feedback_pages.offset
-    @jour = @jours[@offset, @limit]
+    #@feedback_count = @jours.count
+    #@feedback_pages = Paginator.new @feedback_count, @limit, @page
+    #@offset ||= @feedback_pages.offset
+    @jour = paginateHelper @jours,10
     @state = false
     @base_courses_tag = @project.project_type
 
diff --git a/app/views/contests/_contest_jours.html.erb b/app/views/contests/_contest_jours.html.erb
index 94814c492..54a7f14a7 100644
--- a/app/views/contests/_contest_jours.html.erb
+++ b/app/views/contests/_contest_jours.html.erb
@@ -1,3 +1,4 @@
+<div class="dis">
 <div class="msg_box" id='leave-message'>
   <h4>留言内容</h4>
   <%= render :partial => 'new', :locals => {:contest => @contest, :sta => @state} %>
@@ -9,4 +10,5 @@
   <%= render :partial => 'history',:locals => { :contest => @contest, :journals => @jour, :state => false} %>
 </div>
 
-<ul class="wlist"><%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => true, :flag => true%></ul>
\ No newline at end of file
+<ul class="wlist"><%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%></ul>
+</div>
\ No newline at end of file
diff --git a/app/views/courses/_courses_jours.html.erb b/app/views/courses/_courses_jours.html.erb
index 70f956d4e..57bde9e68 100644
--- a/app/views/courses/_courses_jours.html.erb
+++ b/app/views/courses/_courses_jours.html.erb
@@ -1,3 +1,4 @@
+<div class="dis">
 <div class="msg_box" id='leave-message'>
   <% reply_allow = JournalsForMessage.create_by_user? User.current %>
 
@@ -26,4 +27,5 @@
 <div id="history">
   <%= render :partial => 'history',:locals => { :contest => @contest, :journals => @jour, :state => false} %>
 </div>
-
+<ul class="wlist"><%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%></ul>
+</div>
\ No newline at end of file
diff --git a/app/views/courses/feedback.html.erb b/app/views/courses/feedback.html.erb
index 90fb9e0c2..ccd171679 100644
--- a/app/views/courses/feedback.html.erb
+++ b/app/views/courses/feedback.html.erb
@@ -43,10 +43,4 @@ function checkMaxLength() {
 }
 
 </script>
-
-<div class="pagination" style="float:left;">
-	<ul>
-		<%= pagination_links_full @feedback_pages %>
-	</ul>
-</div>
 <% html_title(l(:label_course_feedback)) -%>
\ No newline at end of file
diff --git a/app/views/projects/_project_jours.html.erb b/app/views/projects/_project_jours.html.erb
index 6d6ae1362..2462d57ef 100644
--- a/app/views/projects/_project_jours.html.erb
+++ b/app/views/projects/_project_jours.html.erb
@@ -1,3 +1,4 @@
+<div class="dis">
 <div class="msg_box" id='leave-message'>
   <% reply_allow = JournalsForMessage.create_by_user? User.current %>
 
@@ -26,4 +27,5 @@
 <div id="history">
   <%= render :partial => 'history',:locals => { :contest => @contest, :journals => @jour, :state => false} %>
 </div>
-
+<ul class="wlist"><%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%></ul>
+</div>