From f149dd3a571c52c478ed028f58bf2d1e090b0b9c Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 6 Nov 2014 10:58:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E4=BD=9C=E5=93=81=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E6=98=AF=E7=BC=BA=E7=9C=81=E6=98=BE=E7=A4=BA=E7=9A=84?= =?UTF-8?q?tab=EF=BC=8C=E7=AD=89=E5=88=B0=E8=80=81=E5=B8=88=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E5=8C=BF=E8=AF=84=E5=90=8E=EF=BC=8C=E5=BE=85=E8=AF=84?= =?UTF-8?q?=E4=BD=9C=E5=93=81=E6=89=8D=E6=98=AF=E7=BC=BA=E7=9C=81tab=20?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E7=9A=84=E4=BD=9C=E4=B8=9A=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E2=80=9C=E6=89=80=E6=9C=89=E4=BD=9C=E5=93=81?= =?UTF-8?q?=E2=80=9D=E5=BA=94=E8=AF=A5=E6=98=AF=E7=BC=BA=E7=9C=81=E7=9A=84?= =?UTF-8?q?tab=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/bids/_homework.html.erb | 38 ++++++++++++++++---------- app/views/bids/_homework_list.html.erb | 6 ++-- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/app/views/bids/_homework.html.erb b/app/views/bids/_homework.html.erb index 673ea2674..078ca8000 100644 --- a/app/views/bids/_homework.html.erb +++ b/app/views/bids/_homework.html.erb @@ -27,20 +27,30 @@ $("#what_is_project_div").slideToggle(); } - window.onready = function() - { - <% if !@is_teacher && @homework_list.count > 0 && @bid.comment_status == 1%> - //登录者不是老师,且作业列表数目不为0,且作业处于开启匿评阶段 - var alert_model = "'#ajax-modal'"; - $('#ajax-modal').html('<%= escape_javascript(render :partial => 'homework_attach/praise_alert') %>'); - showModal('ajax-modal', '480px'); - $('#ajax-modal').css('height','240px'); - $('#ajax-modal').before("" + - ""); - $('#ajax-modal').parent().css("top","").css("left","").css("width","511"); - $('#ajax-modal').parent().addClass("alert_praise"); - <% end %> - } + $(document).ready( + function() + { + <% if !@is_teacher && @homework_list.count > 0 && @bid.comment_status == 1%> + //登录者不是老师,且作业列表数目不为0,且作业处于开启匿评阶段 + var alert_model = "'#ajax-modal'"; + $('#ajax-modal').html('<%= escape_javascript(render :partial => 'homework_attach/praise_alert') %>'); + showModal('ajax-modal', '480px'); + $('#ajax-modal').css('height','240px'); + $('#ajax-modal').before("" + + ""); + $('#ajax-modal').parent().css("top","").css("left","").css("width","511"); + $('#ajax-modal').parent().addClass("alert_praise"); + <% end %> + + <% unless @is_teacher%> + <% if @bid.comment_status == 0%> + $("#my_homework").click(); + <% elsif @bid.comment_status == 2%> + $("#all_homeworks").click(); + <% end %> + <% end %> + } + ); function hiddent_alert_model(){hideModal($('#popbox02'));} diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb index ded8d5874..5421ed8d9 100644 --- a/app/views/bids/_homework_list.html.erb +++ b/app/views/bids/_homework_list.html.erb @@ -29,15 +29,15 @@ <% else %>