diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb index 57c786f50..2237ccab6 100644 --- a/app/controllers/homework_attach_controller.rb +++ b/app/controllers/homework_attach_controller.rb @@ -128,9 +128,6 @@ class HomeworkAttachController < ApplicationController pt.praise_tread_object_id = @homework.id pt.praise_tread_object_type = "HomeworkAttach" pt.praise_or_tread = 1 - @is_my_homework = params[:is_my_homework] - @is_student_batch_homework = params[:is_student_batch_homework] - @is_teacher = params[:is_teacher] if pt.save respond_to do |format| format.js diff --git a/app/views/homework_attach/_homework.html.erb b/app/views/homework_attach/_homework.html.erb index 6bf4128eb..b84f36984 100644 --- a/app/views/homework_attach/_homework.html.erb +++ b/app/views/homework_attach/_homework.html.erb @@ -59,23 +59,8 @@ <% else %> - <% if is_praise_homework User.current.id,homework.id %> -
  • - <%= link_to "",praise_homework_homework_attach_path(homework,:is_my_homework => is_my_homework, - :is_student_batch_homework => is_student_batch_homework, - :is_teacher => is_teacher), - :class => "wzan_img wzan_visited", :remote => true%> - - <%= praise_homework_count homework.id %> - -
  • - <% else %> -
  • - - - <%= praise_homework_count homework.id %> - -
  • - <% end %> +
  • + <%= render :partial => "homework_attach/homework_praise", locals: {:homework => homework} %> +
  • <% end %> <% end %> \ No newline at end of file diff --git a/app/views/homework_attach/_homework_praise.html.erb b/app/views/homework_attach/_homework_praise.html.erb new file mode 100644 index 000000000..7fc967644 --- /dev/null +++ b/app/views/homework_attach/_homework_praise.html.erb @@ -0,0 +1,9 @@ +<% if is_praise_homework User.current.id,homework.id %> + <%= link_to "",praise_homework_homework_attach_path(homework), + :class => "wzan_img", :remote => true, :title => "点赞"%> +<% else %> + +<% end %> + + <%= praise_homework_count homework.id %> + \ No newline at end of file diff --git a/app/views/homework_attach/praise_homework.js.erb b/app/views/homework_attach/praise_homework.js.erb index 77855cd3c..1f627a017 100644 --- a/app/views/homework_attach/praise_homework.js.erb +++ b/app/views/homework_attach/praise_homework.js.erb @@ -1,4 +1,3 @@ -$('#homework_li_<%= @homework.id%>'). - html('<%= escape_javascript(render :partial => 'homework_attach/homework', - :locals => {:homework => @homework, :is_student_batch_homework => @is_student_batch_homework, - :is_my_homework => @is_my_homework, :is_teacher => @is_teacher})%>'); \ No newline at end of file +$('#homeworl_praise_li_<%= @homework.id%>'). + html('<%= escape_javascript(render :partial => 'homework_attach/homework_praise', + :locals => {:homework => @homework})%>'); \ No newline at end of file diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css index 2a1ae81a7..c91f9f83f 100644 --- a/public/stylesheets/css.css +++ b/public/stylesheets/css.css @@ -60,7 +60,7 @@ ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; } .dis ul li.wmine{ margin:12px 0 0 10px;} .dis ul li.wmine a{ color:#3d7ec2; text-align:center; width:50px; font-weight: bold;} .wzan{ margin:15px 0 0 25px; width:32px; height:44px;} -.wzan a{ display: block;} +.wzan a{ display: block;text-align: center;} a.wzan_img{background:url(images/pic_zan.png) 0 -59px no-repeat; display:block; height:31px; width:30px; color:#fff;} a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;}