From 1623d846f4ccf2fb3fd6869fa86097eb75653c29 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 22 Dec 2015 15:14:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E7=9A=84=E5=B1=95=E5=BC=80?=
 =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E6=94=B9=E6=88=90=E7=82=B9=E5=87=BB=E5=B1=95?=
 =?UTF-8?q?=E5=BC=80=E6=9B=B4=E5=A4=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/_course_show_detail.html.erb    | 6 ++++--
 app/views/courses/_course_activity.html.erb      | 6 ++++--
 app/views/issues/_list.html.erb                  | 8 ++++----
 app/views/organizations/_org_activities.html.erb | 7 ++++---
 app/views/projects/_project_activities.html.erb  | 6 ++++--
 app/views/users/_user_activities.html.erb        | 9 ++++++---
 6 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/app/views/boards/_course_show_detail.html.erb b/app/views/boards/_course_show_detail.html.erb
index c324f1d69..7b96c4f9a 100644
--- a/app/views/boards/_course_show_detail.html.erb
+++ b/app/views/boards/_course_show_detail.html.erb
@@ -59,12 +59,14 @@
     <% end %>
 
     <% if topics.count == 10 %>
-        <div id="show_more_course_topic" class="loadMore mt10 f_grey">展开更多<%= link_to "", boards_topic_path(@board, :course_id => @board.course.id ,:page => page), :id => "more_topic_link", :remote => "true", :class => "none" %></div>
+        <!--<div id="show_more_course_topic" class="loadMore mt10 f_grey">展开更多<%#= link_to "", boards_topic_path(@board, :course_id => @board.course.id ,:page => page), :id => "more_topic_link", :remote => "true", :class => "none" %></div>-->
+        <%= link_to "点击展开更多",boards_topic_path(@board, :course_id => @board.course.id ,:page => page),:id => "show_more_course_topic",:remote => "true",:class => "loadMore mt10 f_grey"%>
     <% end %>
 <% end%>
 
+<!--
 <script type="text/javascript">
     $("#show_more_course_topic").mouseover(function () {
         $("#more_topic_link").click();
     });
-</script>
\ No newline at end of file
+</script>-->
diff --git a/app/views/courses/_course_activity.html.erb b/app/views/courses/_course_activity.html.erb
index d31b28bc0..2f2622f3c 100644
--- a/app/views/courses/_course_activity.html.erb
+++ b/app/views/courses/_course_activity.html.erb
@@ -114,11 +114,13 @@
 <% end %>
 
 <% if course_activities.count == 10 %>
-    <div id="show_more_course_activities" class="loadMore mt10 f_grey">展开更多<%= link_to "", course_activity_path(@course.id, :type => type, :page => page), :id => "more_course_activities_link", :remote => "true", :class => "none" %></div>
+    <!--<div id="show_more_course_activities" class="loadMore mt10 f_grey">点击展开更多<%#= link_to "", course_activity_path(@course.id, :type => type, :page => page), :id => "more_course_activities_link", :remote => "true", :class => "none" %></div>-->
+    <%= link_to "点击展开更多",course_activity_path(@course.id, :type => type, :page => page),:id => "show_more_course_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
 <% end %>
 
+<!--
 <script type="text/javascript">
     $("#show_more_course_activities").mouseover(function () {
         $("#more_course_activities_link").click();
     });
-</script>
\ No newline at end of file
+</script>-->
diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index fd6171f18..5945fece4 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -40,14 +40,14 @@
      <%= render :partial => 'users/project_issue', :locals => {:activity => issue, :user_activity_id => issue.id} %>
  <% end %>
  <% if issues.count == 10%>
-     <div id="show_more_issues" class="loadMore mt10 f_grey">展开更多<%=link_to "",  project_issues_path({:project_id => project.id,:page => issue_pages.page}.merge(params)),:id => "more_issues_link",:remote => "true",:class => "none" %></div>
-     <%#= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
+     <!--<div id="show_more_issues" class="loadMore mt10 f_grey">点击展开更多<%#=link_to "",  project_issues_path({:project_id => project.id,:page => issue_pages.page}.merge(params)),:id => "more_issues_link",:remote => "true",:class => "none" %></div>-->
+     <%= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
  <% end%>
  <!--<ul class="wlist">-->
    <!--<%#= pagination_links_full issue_pages, issue_count, :per_page_links => false, :remote => true, :flag => true %>-->
  <!--</ul>-->
- <script type="text/javascript">
+ <!--<script type="text/javascript">
      $("#show_more_issues").mouseover(function(){
          $("#more_issues_link").click();
      });
- </script>
\ No newline at end of file
+ </script>-->
\ No newline at end of file
diff --git a/app/views/organizations/_org_activities.html.erb b/app/views/organizations/_org_activities.html.erb
index 8bd1f5bbf..45ada5265 100644
--- a/app/views/organizations/_org_activities.html.erb
+++ b/app/views/organizations/_org_activities.html.erb
@@ -56,10 +56,11 @@
 <% end %>
 
 <% if org_act_count == 10 %>
-    <div id="show_more_activities" class="loadMore mt10 f_grey">展开更多<%=link_to "", organization_path(org,:page => page.to_i + 1, :show_homepage =>params[:show_homepage],:type => params[:type]),:id => "more_org_activities_link",:remote => "true",:class => "none" %></div>
-    <%#= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
+    <!--<div id="show_more_activities" class="loadMore mt10 f_grey">点击展开更多<%#=link_to "", organization_path(org,:page => page.to_i + 1, :show_homepage =>params[:show_homepage],:type => params[:type]),:id => "more_org_activities_link",:remote => "true",:class => "none" %></div>-->
+    <%= link_to "点击展开更多",organization_path(org,:page => page.to_i + 1, :show_homepage =>params[:show_homepage],:type => params[:type]),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
 <% end%>
 
+<!--
 <script>
     $(function(){
         $("#show_more_activities").mouseover(function(){
@@ -67,4 +68,4 @@
         })
     })
 
-</script>
\ No newline at end of file
+</script>-->
diff --git a/app/views/projects/_project_activities.html.erb b/app/views/projects/_project_activities.html.erb
index bdfa0055a..b46522fa1 100644
--- a/app/views/projects/_project_activities.html.erb
+++ b/app/views/projects/_project_activities.html.erb
@@ -92,11 +92,13 @@
 <% end %>
 
 <% if forge_acts.count == 10 %>
-    <div id="show_more_forge_activities" class="loadMore mt10 f_grey">展开更多<%= link_to "", project_path(@project.id, :type => type, :page => page), :id => "more_forge_activities_link", :remote => "true", :class => "none" %></div>
+    <!--<div id="show_more_forge_activities" class="loadMore mt10 f_grey">点击展开更多<%#= link_to "", project_path(@project.id, :type => type, :page => page), :id => "more_forge_activities_link", :remote => "true", :class => "none" %></div>-->
+    <%= link_to "点击展开更多",project_path(@project.id, :type => type, :page => page),:id => "show_more_forge_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
 <% end %>
 
+<!--
 <script type="text/javascript">
     $("#show_more_forge_activities").mouseover(function () {
         $("#more_forge_activities_link").click();
     });
-</script>
\ No newline at end of file
+</script>-->
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 557b9e9ee..5cadcddd6 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -109,12 +109,15 @@
 <% end %>
 
 <% if user_activities.count == 10%>
-    <div id="show_more_activities" class="loadMore mt10 f_grey">展开更多<%=link_to "", user_activities_path(@user.id,:type => type,:page => page),:id => "more_activities_link",:remote => "true",:class => "none" %></div>
-    <%#= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
+<!--
+    <div id="show_more_activities" class="loadMore mt10 f_grey">点击展开更多<%#=link_to "", user_activities_path(@user.id,:type => type,:page => page),:id => "more_activities_link",:remote => "true",:class => "none" %></div>
+-->
+    <%= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
 <% end%>
 
+<!--
 <script type="text/javascript">
   $("#show_more_activities").mouseover(function(){
       $("#more_activities_link").click();
   });
-</script>
\ No newline at end of file
+</script>-->