From 0d9a397453c1a1cb83f21f47ae14a609a9467179 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 25 Aug 2015 16:01:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E3=80=81=E6=9C=AA=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?js=20=E7=94=A8=E6=88=B7=E4=B8=BB=E9=A1=B5=20show=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb        | 12 ++++----
 app/views/layouts/_logined_header.html.erb | 32 ++++++++++++----------
 app/views/layouts/_unlogin_header.html.erb | 32 ++++++++++++----------
 public/javascripts/new_user.js             |  7 -----
 4 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index e1b9f4252..22d8deb0c 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -549,13 +549,11 @@ class UsersController < ApplicationController
   end
 
   def show
-    #if @user == User.current
-
-      @user_activities = UserActivity.where("(container_type='Course' and container_id in (select course_id FROM members WHERE user_id=#{@user.id})) or (container_type='Project' and container_id in (SELECT project_id FROM members WHERE user_id=#{@user.id}))").order('created_at desc')
-      @user_activities = paginateHelper @user_activities,500
-      #SELECT * FROM user_activities WHERE (container_type='Course' AND container_id IN (SELECT course_id FROM members WHERE user_id=4)) OR (container_type='Project' AND container_id IN (SELECT project_id FROM members WHERE user_id=4))
-    #else
-    #end
+    @page = (params[:page] || -1).to_i + 1
+    user_project_ids = "(" + @user.projects.visible.map{|project| project.id}.join(",") + ")"
+    user_course_ids = "(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
+    @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids}) or (container_type = 'Course' and container_id in #{user_course_ids})").order('created_at desc').limit(10).offset(@page * 10)
+    # @user_activities = paginateHelper @user_activities,500
     render :layout=>'new_base_user'
   end
 
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 16e5be059..74c4bb9a9 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -25,23 +25,18 @@
     </form>
 
     <div class="navSearchTypeBox" id="navHomepageSearchType">
-      <div class="fl mr15">
-        <div class="fl mt5">
-          <input type="radio" value="课程" name="navSearchType" checked/>
-        </div>
+      <div class="fl mr15 mt5">
+        <input type="radio" value="课程" name="navSearchType" checked/>
         课程
       </div>
-      <div class="fl mr15">
-        <div class="fl mt5">
-          <input type="radio" value="项目" name="navSearchType" />
-        </div>
+      <div class="fl mr15 mt5">
+        <input type="radio" value="项目" name="navSearchType" />
         项目
       </div>
-      <div class="fl mr15">
-        <div class="fl mt5">
-          <input type="radio" value="用户" name="navSearchType" />
-        </div>
-        用户</div>
+      <div class="fl mr15 mt5">
+        <input type="radio" value="用户" name="navSearchType" />
+        用户
+      </div>
       <div id="navSearchAlert" class="fr mr10">
         <span class="c_red">请选择搜索类型</span>
       </div>
@@ -67,4 +62,13 @@
     <% end %>
     <div class="newsActive"></div>
   </div>
-</div>
\ No newline at end of file
+</div>
+
+<script type="text/javascript">
+    //搜索相关
+    $("#navHomepageSearch").mouseover(function(){
+        $("#navHomepageSearchType").show();
+    }).mouseout(function(){
+        $("#navHomepageSearchType").hide();
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index b4423a713..9d9ed813f 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -16,23 +16,18 @@
       <a href="javascript:void(0);" class="homepageSearchIcon"></a>
     </form>
     <div class="navSearchTypeBox" id="navHomepageSearchType">
-      <div class="fl mr15">
-        <div class="fl mt5">
-          <input type="radio" value="课程" name="navSearchType" checked/>
-        </div>
+      <div class="fl mr15 mt5">
+        <input type="radio" value="课程" name="navSearchType" checked/>
         课程
       </div>
-      <div class="fl mr15">
-        <div class="fl mt5">
-          <input type="radio" value="项目" name="navSearchType" />
-        </div>
+      <div class="fl mr15 mt5">
+        <input type="radio" value="项目" name="navSearchType" />
         项目
       </div>
-      <div class="fl mr15">
-        <div class="fl mt5">
-          <input type="radio" value="用户" name="navSearchType" />
-        </div>
-        用户</div>
+      <div class="fl mr15 mt5">
+        <input type="radio" value="用户" name="navSearchType" />
+        用户
+      </div>
       <div id="navSearchAlert" class="fr mr10">
         <span class="c_red">请选择搜索类型</span>
       </div>
@@ -44,4 +39,13 @@
   <div id="loginSignButton" class="fr">
     <a href="javascript:void(0);" class="c_white db">注册</a>
   </div>
-</div>
\ No newline at end of file
+</div>
+
+<script type="text/javascript">
+    //搜索相关
+    $("#navHomepageSearch").mouseover(function(){
+        $("#navHomepageSearchType").show();
+    }).mouseout(function(){
+        $("#navHomepageSearchType").hide();
+    });
+</script>
\ No newline at end of file
diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index 97894bd45..377842b66 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -10,13 +10,6 @@ $(function(){
         $("#edit_user_file_btn").hide();
         $("#watch_user_btn").hide();
     });
-
-    //搜索相关
-    $("#navHomepageSearch").mouseover(function(){
-        $("#navHomepageSearchType").show();
-    }).mouseout(function(){
-        $("#navHomepageSearchType").hide();
-    });
 });
 
 //编辑个人简介