From bb461cd24414df24686e4fd7b7bbc6388b9c0932 Mon Sep 17 00:00:00 2001
From: zhangyang <zhangyanggfkd@gmail.com>
Date: Tue, 6 Aug 2013 16:44:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=9A=84=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb | 13 ++++++++++---
 app/views/projects/show.html.erb       |  5 +++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index a068fe398..54befe296 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -195,7 +195,7 @@ class ProjectsController < ApplicationController
 
     @key = User.current.rss_key
   #新增内容
-  @days = Setting.activity_days_default.to_i
+    @days = Setting.activity_days_default.to_i
 
     if params[:from]
       begin; @date_to = params[:from].to_date + 1; rescue; end
@@ -214,8 +214,15 @@ class ProjectsController < ApplicationController
                                                              :author => @author)
     @activity.scope_select {|t| !has["show_#{t}"].nil?}
  #   @activity.scope = (@author.nil? ? :default : :all) if @activity.scope.empty?
-
-    events = @activity.events(@date_from, @date_to, {:limit=>15})
+    #Added by young
+    events = @activity.events(@date_from, @date_to)
+    
+    @offset, @limit = api_offset_and_limit({:limit => 10})
+    @events_count = events.count
+    @events_pages = Paginator.new @events_count, @limit, params['page']
+    @offset ||= @events_pages.offset 
+    events = events.slice(@offset,@limit)
+    #Ended by young
     @events_by_day = events.group_by {|event| User.current.time_to_date(event.event_datetime)}
  #  documents   
      @sort_by = %w(category date title author).include?(params[:sort_by]) ? params[:sort_by] : 'category'
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 5d6b76dd5..4defbc091 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -43,6 +43,11 @@
 		<% end -%>
 	</div>
 	<% end -%>
+	<div class="pagination">
+		<ul>
+			<%= pagination_links_full @events_pages%>
+		</ul>
+    </div>
 </div>
 </div>