diff --git a/app/views/homework_common/_new_shixun_homework_list.html.erb b/app/views/homework_common/_new_shixun_homework_list.html.erb new file mode 100644 index 000000000..332192e03 --- /dev/null +++ b/app/views/homework_common/_new_shixun_homework_list.html.erb @@ -0,0 +1,11 @@ +<% @shixuns.each do |shixun| %> + + + + + <%= link_to shixun.name, shixun_path(shixun), :class => "edu-info-dark task-hide mt3" %> + + <%= link_to shixun.owner.try(:show_name), user_path(shixun.owner), :class => "edu-txt-w140 mt3 task-hide" %> + <%= shixun.myshixuns.count %> + +<% end %> \ No newline at end of file diff --git a/app/views/homework_common/_shixuns.html.erb b/app/views/homework_common/_shixuns.html.erb index 6463e30ef..b9ecd8ad9 100644 --- a/app/views/homework_common/_shixuns.html.erb +++ b/app/views/homework_common/_shixuns.html.erb @@ -4,8 +4,8 @@
- <%= labelled_form_for @homework, :url =>{:controller=> 'homework_common', :action => 'shixuns', :course => @course.id}, :id => 'shixun_search_form', :method => "get", :remote => true do |f| %> -
+ <%= labelled_form_for @homework, :url =>{:controller=> 'homework_common', :action => 'shixuns', :course => @course.id, :is_search => 1}, :html => {:id => 'shixun_search_form'}, :method => "get", :remote => true do |f| %> +
@@ -22,18 +22,8 @@ 请至少选中一个实训 - - <% @shixuns.each do |shixun| %> - - - - - <%= link_to shixun.name, shixun_path(shixun), :class => "edu-info-dark task-hide mt3" %> - - <%= link_to shixun.owner.try(:show_name), user_path(shixun.owner), :class => "edu-txt-w140 mt3 task-hide" %> - <%= shixun.myshixuns.count %> - - <% end %> + + <%= render :partial => "new_shixun_homework_list" %> <% end %> diff --git a/app/views/homework_common/shixuns.js.erb b/app/views/homework_common/shixuns.js.erb index 5381d0188..5192bd2a6 100644 --- a/app/views/homework_common/shixuns.js.erb +++ b/app/views/homework_common/shixuns.js.erb @@ -1,2 +1,6 @@ +<% if params[:is_search] %> +$("#new_shixun_homework_list").html("<%= j(render :partial => 'new_shixun_homework_list') %>"); +<% else %> var htmlvalue = "<%= escape_javascript(render :partial => 'homework_common/shixuns') %>"; -pop_box_new(htmlvalue, 680, 454); \ No newline at end of file +pop_box_new(htmlvalue, 680, 454); +<% end %> \ No newline at end of file