diff --git a/app/views/courses/homework.html.erb b/app/views/courses/homework.html.erb index 751558237..f5fe74953 100644 --- a/app/views/courses/homework.html.erb +++ b/app/views/courses/homework.html.erb @@ -29,10 +29,22 @@

<%= textilizable bid, :description %> -
<%= l(:label_create_time)%> : <%= format_time bid.created_on%>

-
<%= l(:label_expend_information)%> - +
+ <%= l(:button_more)%>... +
+ <%= l(:label_end_time)%>:<%= bid.deadline%> + <% if betweentime(bid.deadline) < 0 %> + + <%= l(:label_commit_limit)%> + + <% else %> + +
+
+ <% end %>
diff --git a/public/javascripts/course.js b/public/javascripts/course.js index f6bc4933c..4a9854fcd 100644 --- a/public/javascripts/course.js +++ b/public/javascripts/course.js @@ -35,7 +35,7 @@ $(document).ready(function () { $("#RSide").css("min-height",$("#LSide").height()-30); }); //课程作业结束时间倒计时 -function ShowCountDown(year,month,day,divname) +function show_bid_dead_line(year,month,day,divname) { var now = new Date(); var endDate = new Date(year, month-1, day); @@ -45,11 +45,13 @@ function ShowCountDown(year,month,day,divname) var hour=Math.floor((leftsecond-day1*24*60*60)/3600); var minute=Math.floor((leftsecond-day1*24*60*60-hour*3600)/60); var second=Math.floor(leftsecond-day1*24*60*60-hour*3600-minute*60); - $("#"+divname).html("作业提交还剩 : " - +day1+"  " - +hour+"  " - +minute+"  " - +second+" "); + $("#"+divname).html("
" + + " 天" + + " 小时" + + " 分" + + " 秒" + + "
" + + "

作业提交还剩:

"); } //验证新建作业的名字 function regex_bid_name()