From a3a16b5591afa81cf928180a8f334f9201e6e6f9 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 11 Jan 2016 10:21:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E8=B7=9F=E8=B8=AA=E3=80=81?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E2=80=9C?=
 =?UTF-8?q?=E5=B1=95=E5=BC=80=E6=9B=B4=E5=A4=9A=E2=80=9D=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E2=80=9C=E7=82=B9=E5=87=BB=E5=B1=95=E5=BC=80=E6=9B=B4=E5=A4=9A?=
 =?UTF-8?q?=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_list.html.erb              | 11 +----------
 app/views/users/_user_homework_list.html.erb |  4 ++--
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index e47967099..2a1ae56d4 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -24,14 +24,5 @@
      <%= 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}.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"%>
+     <%= link_to "点击展开更多",project_issues_path({:project_id => project.id}.merge(params)),:id => "show_more_issues",: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">
-     $("#show_more_issues").mouseover(function(){
-         $("#more_issues_link").click();
-     });
- </script>
\ No newline at end of file
diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb
index efe9216df..36f823a9a 100644
--- a/app/views/users/_user_homework_list.html.erb
+++ b/app/views/users/_user_homework_list.html.erb
@@ -42,9 +42,9 @@
 <% if homework_commons.count == 10%>
     <% if is_in_course == 1%>
         <!-- 在课程内 -->
-        <%= link_to "加载更多",homework_common_index_path(:course => course_id,:page => page,:is_in_course => is_in_course),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>
+        <%= link_to "点击展开更多",homework_common_index_path(:course => course_id,:page => page,:is_in_course => is_in_course),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>
     <% else%>
         <!-- 在个人主页 -->
-        <%= link_to "加载更多",user_homeworks_user_path(User.current.id,:page => page,:is_in_course => is_in_course),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>
+        <%= link_to "点击展开更多",user_homeworks_user_path(User.current.id,:page => page,:is_in_course => is_in_course),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>
     <% end%>
 <% end%>
\ No newline at end of file