From d67d21eb428d27c9bbd9ea4ac2fa5d9a6bbb78a4 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Wed, 12 Aug 2015 11:28:51 +0800
Subject: [PATCH 1/4] =?UTF-8?q?1=E3=80=81=E8=A7=A3=E5=86=B3=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=90=9C=E7=B4=A0=20=E5=88=86=E9=A1=B5=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb | 6 ++++++
 app/views/projects/search.html.erb     | 8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 3dfae3432..f042bba50 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -86,8 +86,14 @@ class ProjectsController < ApplicationController
       @project_pages = Project.project_entities.visible.like(params[:name]).page(params[:page]).per(10)
     else
       @project_pages =  Project.project_entities.visible.page(params[:page] ).per(10)
+      @project_pages =  Project.project_entities.visible.page(params[:page] ).per(10)
     end
     @projects =   @project_pages.order("created_on desc")
+    @limit = 10#per_page_option
+
+    @project_count = Project.project_entities.visible.like(params[:name]).page(params[:page]).count
+    @project_pages = Paginator.new @project_count, @limit, params['page']
+
     respond_to do |format|
       format.html {
         render :layout => 'base'
diff --git a/app/views/projects/search.html.erb b/app/views/projects/search.html.erb
index b77b3fda6..3f2a61306 100644
--- a/app/views/projects/search.html.erb
+++ b/app/views/projects/search.html.erb
@@ -104,9 +104,13 @@
 </div>
 <% end %>
 
+<div class="pagination">
+  <ul>
+    <%= pagination_links_full @project_pages, @user_count %>
+  </ul>
+</div>
 
-
-<%= paginate  @project_pages %>
+<%#= paginate  @project_pages %>
 
 
 

From 78ccfe6a03b6a0bcea1d4eed70dc1d51cdbd2c77 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Wed, 12 Aug 2015 16:28:21 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=B3=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_show.html.erb | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_user_show.html.erb b/app/views/users/_user_show.html.erb
index 8e3d27666..7cbb20e40 100644
--- a/app/views/users/_user_show.html.erb
+++ b/app/views/users/_user_show.html.erb
@@ -23,8 +23,19 @@
              </tr>
             <tr>
               <td colspan="2">
-                <%= l(:label_x_has_fans,:count=>user.watcher_users.count)%>
-                <%= l(:label_has_watchers,:count=>User.watched_by(user.id).count) %>
+                <%= l(:label_x_has_fans,:count=>user.watcher_users.count, :remote => true)%>
+                <%= l(:label_has_watchers,:count=>User.watched_by(user.id).count, :remote => true) %>
+                <% if User.current.logged?%>
+                    <% if User.current == user%>
+                        <a href="<%= url_for(:controller => 'my', :action => 'account') %>" class="fr gz_btn mr10 ">编辑资料</a>
+                    <%else%>
+                        <%if(user.watched_by?(User.current))%>
+                            <a id="user_watch_id" href="<%= watch_path(:object_type=> 'user',:object_id=>user.id,:target_id=>user.id) %>" class="fr qx_btn mr10" data-method="delete" data-remote="true" title="取消关注">取消关注</a>
+                        <% else %>
+                            <a id="user_watch_id" href="<%= watch_path(:object_type=>'user',:object_id=>user.id,:target_id=>user.id) %>" class="fr gz_btn mr10" data-method="post" data-remote="true" title="添加关注">添加关注</a>
+                        <% end %>
+                    <% end%>
+                <% end %>
               </td>
             </tr>
           </table>

From 115e1e67d5043a13c974c6c597842667f40011f7 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Wed, 12 Aug 2015 16:32:34 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E8=87=B3=E7=9B=B8=E5=BA=94=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_set_join.js.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/courses/_set_join.js.erb b/app/views/courses/_set_join.js.erb
index 0542f2a0c..f1a9c5cfd 100644
--- a/app/views/courses/_set_join.js.erb
+++ b/app/views/courses/_set_join.js.erb
@@ -12,6 +12,7 @@
 		alert("课程已过期\n请联系课程管理员重启课程。(在配置课程处)");
 	<% elsif @state == 3 %>
         alert("您已经加入了课程");
+        window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= course.id%>"
     <% elsif @state == 4 %>
         alert("您加入的课程不存在");
     <% elsif @state == 5 %>

From e5289410dd9369f8a778f3cc16aa52a11bc3f942 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Wed, 12 Aug 2015 16:35:10 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E9=A1=B5=E7=A0=81=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/search.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/search.html.erb b/app/views/projects/search.html.erb
index 3f2a61306..c5edc4667 100644
--- a/app/views/projects/search.html.erb
+++ b/app/views/projects/search.html.erb
@@ -106,7 +106,7 @@
 
 <div class="pagination">
   <ul>
-    <%= pagination_links_full @project_pages, @user_count %>
+    <%= pagination_links_full @project_pages, @project_count %>
   </ul>
 </div>