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 @@
  • <%= link_to "导出成绩", student_work_index_path(:homework => homework_common, :format => 'xls'), :id => "export_student_work" %>
  • <% if homework_common.homework_type == 1 || homework_common.homework_type == 3 %> -
  • - <% if homework_common.student_works.has_committed.empty?%> - 导出作品附件 - <% else%> - <%= link_to "导出作品附件", zipdown_assort_path(obj_class: homework_common.class,obj_id: homework_common, format: :json), remote: true, :class => "download_homework_attachments" %> - <% end%> -
  • +
  • + <% if homework_common.student_works.has_committed.empty?%> + 导出作品附件 + <% else%> + <%= link_to "导出作品附件", zipdown_assort_path(obj_class: homework_common.class,obj_id: homework_common, format: :json), remote: true, :class => "download_homework_attachments" %> + <% end%> +
  • <% end %> <% unless homework_common.is_public %>
  • @@ -99,16 +99,18 @@ <% end %> <% end %> -
    -
    -
      - <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => true, :flag => true, :is_new => true %> -
    -
    -
    -
    + <% if @obj_count > 20 %> +
    +
    +
      + <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => true, :flag => true, :is_new => true %> +
    +
    +
    +
    + <% end %> <% else %>
    - <%= render :partial => "welcome/no_data" %> + <%= render :partial => "welcome/no_data" %>
    <% 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(""); + $("[select-for]").append(""); $("[select-for]").hover(function(){ $(this).find(".down-select").show(); },function(){