From 1374444ec193a6959564a5ceabc4c0ce829b8df1 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Sat, 13 Aug 2016 17:04:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E9=A1=B9=E7=9B=AE=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E5=B1=95=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_user_projects.html.erb | 10 +++++-----
 app/views/layouts/new_base_user.html.erb  |  1 -
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/views/layouts/_user_projects.html.erb b/app/views/layouts/_user_projects.html.erb
index 37760b17e..caaaaf031 100644
--- a/app/views/layouts/_user_projects.html.erb
+++ b/app/views/layouts/_user_projects.html.erb
@@ -2,7 +2,7 @@
     <li>
       <span class="user_icons_class"></span>
       <% count = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Project' and shield_id=#{project.id}").count %>
-      <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :target => '_blank', :class => "course_list_menu hidden",:id => "show_project_#{project.id}", :title => (project.is_public? ? "公开项目：":"私有项目：") + project.name%>
+      <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :target => '_blank', :class => "project_list_menu hidden",:id => "show_project_#{project.id}", :title => (project.is_public? ? "公开项目：":"私有项目：") + project.name%>
 
       <div class="user_navmore_box">
         <ul class="<%#= count > 0 ? 'shild shildP':'subNavArrow'%>">
@@ -60,16 +60,16 @@
 
 <% if all_count > (page.to_i+1) * 10%>
     <input type="hidden" value="<%= page%>" id="project_page_num">
-    <a class="user_navmorebox" href="javascript:void(0);" id="user_show_more_project" onclick="show_more_project('<%= user_projects4show_user_path(user.id)%>');">
+    <a class="user_navmorebox" href="javascript:void(0);" id="user_show_more_project" onclick="show_more_project('<%= user_projects4show_user_path(user.id,:page => page)%>');">
       <span class="user_icons_moreclass"></span>
     </a>
 <% end%>
 
 <script type="text/javascript">
-    var projectcount = <%= @user.projects.visible.count %>;
-    var projectshowcount = document.getElementsByClassName("course_list_menu").length;
+    var projectcount = <%= all_count %>;
+    var projectshowcount = document.getElementsByClassName("project_list_menu").length;
 
-    if((projectcount <= projectshowcount)&&(projectcount > 5)){
+    if((projectcount <= projectshowcount)&&(projectcount > 10)){
         $("#user_show_more_project").hide();
         $('#user_hide_project').show();
     }
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 6af6bde3c..f98585b77 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -328,7 +328,6 @@
         for(var i = 10; i < target.length; i++){
             target.eq(i).slideToggle();
         }
-        $('#homepageLeftMenuForge').slideToggle();
         $('#hide_show_projecticon').toggleClass("user_icons_closeclass");
         $('#hide_show_projecticon').toggleClass("user_icons_moreclass");
     }