From ad8bd131ced183df9ee556443524e24762615b00 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 2 Dec 2014 16:29:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/homework_attach/_addjour.html.erb | 4 +++- app/views/homework_attach/addjours.js.erb | 26 ++++++++++----------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/app/views/homework_attach/_addjour.html.erb b/app/views/homework_attach/_addjour.html.erb index 955399d31..79a7711c7 100644 --- a/app/views/homework_attach/_addjour.html.erb +++ b/app/views/homework_attach/_addjour.html.erb @@ -90,7 +90,9 @@ %> <%= f.text_field :reference_user_id, :style=>"display:none"%>
- <%= l(:label_submit_comments) %> + + <%= l(:label_submit_comments) %> +
<% else %>
diff --git a/app/views/homework_attach/addjours.js.erb b/app/views/homework_attach/addjours.js.erb index f0f55b657..8d32b10c1 100644 --- a/app/views/homework_attach/addjours.js.erb +++ b/app/views/homework_attach/addjours.js.erb @@ -1,22 +1,23 @@ //教师评论 <% if @cur_is_comprehensive_evaluation == "1" %> -HoverLi(4); -$('#jour_count_4').html('<%= @comprehensive_evaluation.count %>'); -$('#tbc_04').html('<%= escape_javascript(render(:partial => 'homework_attach/jour',:locals => {:jours => @comprehensive_evaluation,:show_score => true,:show_name => true,:is_jour => false})) %>'); + HoverLi(4); + $('#jour_count_4').html('<%= @comprehensive_evaluation.count %>'); + $('#tbc_04').html('<%= escape_javascript(render(:partial => 'homework_attach/jour',:locals => {:jours => @comprehensive_evaluation,:show_score => true,:show_name => true,:is_jour => false})) %>'); //匿评 <% elsif @cur_is_comprehensive_evaluation == "2" %> -$('#add_jour').html('<%= escape_javascript(render(:partial => 'addjour', :locals => {:homework_attach => @homework, :sta => 0, - :is_comprehensive_evaluation => @is_comprehensive_evaluation, - :cur_type => @cur_type, :cur_page => @cur_page, :m_score => @m_score, :is_teacher => false})) %>'); -HoverLi(5); -$('#jour_count_5').html('<%= @anonymous_comments.count %>'); -$('#tbc_05').html('<%= escape_javascript(render(:partial => 'homework_attach/jour',:locals => {:jours => @anonymous_comments,:show_score => true,:show_name => false,:is_jour => false})) %>'); + $('#add_jour').html('<%= escape_javascript(render(:partial => 'addjour', :locals => {:homework_attach => @homework, :sta => 0, + :is_comprehensive_evaluation => @is_comprehensive_evaluation, + :cur_type => @cur_type, :cur_page => @cur_page, :m_score => @m_score, :is_teacher => false})) %>'); + HoverLi(5); + $('#jour_count_5').html('<%= @anonymous_comments.count %>'); + $('#tbc_05').html('<%= escape_javascript(render(:partial => 'homework_attach/jour',:locals => {:jours => @anonymous_comments,:show_score => true,:show_name => false,:is_jour => false})) %>'); //留言 <% else %> -HoverLi(3); -$('#jour_count_3').html('<%= @jours.count %>'); -$('#tbc_03').html('<%= escape_javascript(render(:partial => 'homework_attach/jour',:locals => {:jours => @jour,:show_score => false,:show_name => true,:is_jour => true})) %>'); + HoverLi(3); + $('#jour_count_3').html('<%= @jours.count %>'); + $('#tbc_03').html('<%= escape_javascript(render(:partial => 'homework_attach/jour',:locals => {:jours => @jour,:show_score => false,:show_name => true,:is_jour => true})) %>'); <% end %> + $('#new_form_user_message').val(""); $('#new_form_reference_user_id').val(""); @@ -25,7 +26,6 @@ $('#new_form_reference_user_id').val(""); $("#tbc_01").html('<%= escape_javascript(render(:partial => 'homework_attach/homeworks_list',:locals => {:homeworks => @homework_list, :homework_count => @obj_count, :remote => false,:is_student_batch_homework => false})) %>'); - <% elsif @cur_type == "2" || @cur_type == "3" || @cur_type == "4" %> <% is_teacher = is_course_teacher(User.current,@homework.bid.courses.first) %> $("#homework_li_<%= @homework.id%>").html('<%= escape_javascript(render(:partial => 'homework_attach/homework',:locals => {:homework => @result_homework || @homework,