From 6245b6ba33a2651b9ec5e5bc745eef38afa8ea38 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 18 Nov 2014 16:47:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=BE=91=E3=80=81?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E5=8C=BF=E8=AF=84=E3=80=81=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E5=8C=BF=E8=AF=84=E3=80=81=E6=8F=90=E4=BA=A4=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/bids/_bid_homework_show.html.erb | 32 +++++++++++++++++----- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/app/views/bids/_bid_homework_show.html.erb b/app/views/bids/_bid_homework_show.html.erb index cd9b7b037..cc8159821 100644 --- a/app/views/bids/_bid_homework_show.html.erb +++ b/app/views/bids/_bid_homework_show.html.erb @@ -17,6 +17,21 @@ +second+" "); } + <% if bids.blank? %> <%#= l(:label_uncommit_homework) %> @@ -46,10 +61,12 @@ <% cur_user_homework = cur_user_homework_for_bid(bid) %> <% if cur_user_homework!= nil && cur_user_homework.empty? %> <% if bid.comment_status == 0 || bid.comment_status == 2%> - <%= link_to l(:label_commit_homework),new_exercise_book_path(bid) %> + + <%= link_to l(:label_commit_homework),new_exercise_book_path(bid) %> + <% else %> - - <%= l(:label_commit_homework)%> + + 提交作业 <% end %> <% else %> @@ -59,7 +76,7 @@ <% end %> <% end %> <% if (User.current.admin?||User.current.id==bid.author_id) %> - + <% case bid.comment_status %> <% when 0 %> <%= link_to '启动匿评', alert_anonymous_comment_bid_path(bid), id: "#{bid.id}_start_anonymous_comment", remote: true, disable_with: '加载中...' %> @@ -69,11 +86,12 @@ 匿评结束 <% end %> - <%= link_to( + + <%= link_to( l(:button_edit), - {:action => 'edit', :controller=>'bids', :course_id =>@course.id, :bid_id => bid.id}, - :class => 'icon icon-edit' + {:action => 'edit', :controller=>'bids', :course_id =>@course.id, :bid_id => bid.id} ) %> + <%#= link_to( l(:button_delete), {:action => 'homework_destroy', :controller=>'bids', :course_id => bid.id},