From b08d4da7f975a248157bbb44c4bfa751e6b94b18 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 25 Aug 2017 15:55:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E4=BD=9C=E4=B8=9A=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=8D=E5=A4=9F1=E9=A1=B5=E7=9A=84=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_homework_index_list.html.erb             | 34 ++++++++++---------
 public/javascripts/edu/application.js         |  2 +-
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/app/views/homework_common/_homework_index_list.html.erb b/app/views/homework_common/_homework_index_list.html.erb
index 12f82afc0..a3f23d783 100644
--- a/app/views/homework_common/_homework_index_list.html.erb
+++ b/app/views/homework_common/_homework_index_list.html.erb
@@ -63,13 +63,13 @@
                   </li>
                   <li><%= link_to "导出成绩", student_work_index_path(:homework => homework_common, :format => 'xls'), :id => "export_student_work" %></li>
                   <% if homework_common.homework_type == 1 || homework_common.homework_type == 3 %>
-                  <li>
-                    <% if homework_common.student_works.has_committed.empty?%>
-                        <a href="javascript:void(0)" onclick="notice_box('没有学生提交作业，暂无附件可下载');">导出作品附件</a>
-                    <% else%>
-                        <%= link_to "导出作品附件", zipdown_assort_path(obj_class: homework_common.class,obj_id: homework_common, format: :json), remote: true, :class => "download_homework_attachments" %>
-                    <% end%>
-                  </li>
+                      <li>
+                        <% if homework_common.student_works.has_committed.empty?%>
+                            <a href="javascript:void(0)" onclick="notice_box('没有学生提交作业，暂无附件可下载');">导出作品附件</a>
+                        <% else%>
+                            <%= link_to "导出作品附件", zipdown_assort_path(obj_class: homework_common.class,obj_id: homework_common, format: :json), remote: true, :class => "download_homework_attachments" %>
+                        <% end%>
+                      </li>
                   <% end %>
                   <% unless homework_common.is_public %>
                       <li id="set_homework_public_<%= homework_common.id %>">
@@ -99,16 +99,18 @@
           <% end %>
         </div>
     <% end %>
-    <div style="text-align:center;">
-      <div class="pages" style="width:auto; display:inline-block;">
-        <ul  id="homework_pository_ref_pages">
-          <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => true, :flag => true, :is_new => true %>
-        </ul>
-        <div class="cl"></div>
-      </div>
-    </div>
+    <% if @obj_count > 20 %>
+        <div style="text-align:center;">
+          <div class="pages" style="width:auto; display:inline-block;">
+            <ul  id="homework_pository_ref_pages">
+              <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => true, :flag => true, :is_new => true %>
+            </ul>
+            <div class="cl"></div>
+          </div>
+        </div>
+    <% end %>
 <% else %>
     <div style="background-color: #fff;padding-bottom: 10px;">
-        <%= render :partial => "welcome/no_data" %>
+      <%= render :partial => "welcome/no_data" %>
     </div>
 <% end %>
diff --git a/public/javascripts/edu/application.js b/public/javascripts/edu/application.js
index 7435a10bb..453533a4d 100644
--- a/public/javascripts/edu/application.js
+++ b/public/javascripts/edu/application.js
@@ -136,7 +136,7 @@ $(function(){
             }).hide();
         });
 //下拉框
-    $("[select-for]").append("<i class='fa fa-sort-desc lesson_img'></i>");
+    $("[select-for]").append("<i class='fa fa-sort-desc lesson_img color-grey'></i>");
     $("[select-for]").hover(function(){
         $(this).find(".down-select").show();
     },function(){