Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
commit
1ec6b53d76
@ -1,8 +1,24 @@
|
|||||||
<% if @journal_destroyed.nil? %>
|
<% if @journal_destroyed.nil? %>
|
||||||
alert('<%=l(:notice_failed_delete)%>');
|
alert('<%=l(:notice_failed_delete)%>');
|
||||||
<% else %>
|
<% else %>
|
||||||
var destroyedItem = $('#word_li_<%=@journal_destroyed.id%>')
|
//教师评论
|
||||||
destroyedItem.fadeOut(600,function(){
|
<% if @is_comprehensive_evaluation == 1 %>
|
||||||
destroyedItem.remove();
|
//$('#comprehensive_evaluation').html('<#%= escape_javascript(render(:partial => 'comprehensive_evaluation',
|
||||||
});
|
//:locals => {:comprehensive_evaluation => @comprehensive_evaluation,:homework => @homework,:teaher_score => @teaher_score} )) %>');
|
||||||
|
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 @is_comprehensive_evaluation == 2 %>
|
||||||
|
// $('#message').html('<#%= escape_javascript(render(:partial => 'showjour', :locals => {:jour =>@jour, :state => false,:homework => @homework} )) %>');
|
||||||
|
// $('#pre_show').html('<#%= escape_javascript(render(:partial => 'pre_show', :locals => {:content => nil})) %>');
|
||||||
|
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})) %>')
|
||||||
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
Loading…
Reference in new issue