jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/szzh' into szzh

This commit is contained in:
lizanle 2015-11-02 10:37:51 +08:00
parent 0aa2aefe03 a2e2c5de3c
commit 8846e2ff67
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/users/_user_homework_detail.html.erb
View File

@ -41,6 +41,11 @@
<%= homework_common.language_name%> <%= homework_common.language_name%>
</div> </div>
<% end %> <% end %>
<% if homework_common.homework_detail_manual.comment_status == 0 %>
<div class="homepagePostDeadline mr15">
<%= l(:label_publish_time)%>：<%= homework_common.publish_time%>
</div>
<% end %>
<div class="homepagePostDeadline"> <div class="homepagePostDeadline">
<%= l(:label_end_time)%>：<%= homework_common.end_time%> <%= l(:label_end_time)%>：<%= homework_common.end_time%>
</div> </div>

1
config/locales/zh.yml
View File

@ -2024,6 +2024,7 @@ zh:
label_creat: 创建 label_creat: 创建
#api end #api end
label_publish_time: 发布时间
label_end_time: 截止时间 label_end_time: 截止时间
label_send_email: 确定发送 label_send_email: 确定发送
label_input_email: 请输入邮箱地址(必填) label_input_email: 请输入邮箱地址(必填)

3
public/javascripts/course.js
View File

@ -666,6 +666,7 @@ function regex_homework_end_publish_time()
$("#homework_publish_time").val(myDate.toLocaleDateString()); $("#homework_publish_time").val(myDate.toLocaleDateString());
} }
var publish_time = Date.parse($("#homework_publish_time").val()); var publish_time = Date.parse($("#homework_publish_time").val());
var end_time = Date.parse($("#homework_end_time").val());
if(end_time < publish_time) if(end_time < publish_time)
{ {
$("#homework_end_time_span").text("截止日期不能小于发布日期"); $("#homework_end_time_span").text("截止日期不能小于发布日期");
@ -1258,4 +1259,4 @@ function course_outline(id){
// $('#course_outline_search').on('input',function(){ // $('#course_outline_search').on('input',function(){
// alert('<%= @course.id%>') // alert('<%= @course.id%>')
// }) // })
//}) //})