qyzh1996
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

作业tag的调整 作业截止时间精确到分

This commit is contained in:
cxt 2015-11-04 15:24:24 +08:00
parent c9778353c4
commit 1133b35169
4 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/views/users/_course_homework.html.erb
View File

@ -13,25 +13,31 @@
<% end %> TO <!--+"(课程名称)" -->
<%= link_to activity.course.name.to_s+" | 课程作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course), :class => "newsBlue ml15"%>
</div>
<div class="homepagePostTitle hidden m_w480 fl"> <!--+"(作业名称)"-->
<div class="homepagePostTitle hidden m_w505 fl"> <!--+"(作业名称)"-->
<%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id,:host=> Setting.host_course), :class => "postGrey"%>
</div>
<% if activity.homework_detail_manual%>
<% if activity.homework_detail_manual.comment_status == 1%>
<% if activity.anonymous_comment == 0%>
<span class="grey_btn_cir ml5">未开启匿评</span>
<% else %>
<span class="grey_btn_cir ml5">匿评已禁用</span>
<% end %>
<span class="green_btn_cir ml5">作品提交中</span>
<% elsif activity.homework_detail_manual.comment_status == 2%>
<% if activity.anonymous_comment == 0%>
<span class="green_btn_cir ml5">匿评中</span>
<% else %>
<span class="grey_btn_cir ml5">匿评已禁用</span>
<% end %>
<span class="green_btn_cir ml5">教师教辅评阅中</span>
<span class="green_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
<% elsif activity.homework_detail_manual.comment_status == 3%>
<% if activity.anonymous_comment == 0%>
<span class="grey_btn_cir ml5">匿评已结束</span>
<% else %>
<span class="grey_btn_cir ml5">匿评已禁用</span>
<% end %>
<span class="green_btn_cir ml5">教师教辅评阅中</span>
<span class="green_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
<% end%>
<% end%>
<div class="homepagePostSubmitContainer">
@ -52,7 +58,7 @@
</div>
<% end %>
<div class="homepagePostDeadline">截止时间：<%= activity.end_time.to_s %></div>
<div class="homepagePostDeadline">截止时间：<%= activity.end_time.to_s %>&nbsp;23:59</div>
</div>
<div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id%>">
<div id="intro_content_<%= user_activity_id%>">

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

@ -10,7 +10,7 @@
TO
<%= link_to homework_common.course.name, course_path(homework_common.course_id), :class => "newsBlue ml15"%>
</div>
<span class="homepagePostTitle hidden m_w480 fl">
<span class="homepagePostTitle hidden m_w505 fl">
<%= link_to homework_common.name,student_work_index_path(:homework => homework_common.id),:class => "postGrey"%>
</span>
@ -19,19 +19,25 @@
<span class="grey_btn_cir ml5">未发布</span>
<% elsif homework_common.homework_detail_manual.comment_status == 1%>
<% if homework_common.anonymous_comment == 0%>
<span class="grey_btn_cir ml5">未开启匿评</span>
<span class="grey_btn_cir ml5">未开启匿评</span>
<% else %>
<span class="grey_btn_cir ml5">匿评已禁用</span>
<% end %>
<span class="green_btn_cir ml5">作品提交中</span>
<% elsif homework_common.homework_detail_manual.comment_status == 2%>
<% if homework_common.anonymous_comment == 0%>
<span class="green_btn_cir ml5">匿评中</span>
<span class="green_btn_cir ml5">匿评中</span>
<% else %>
<span class="grey_btn_cir ml5">匿评已禁用</span>
<% end %>
<span class="green_btn_cir ml5">教师教辅评阅中</span>
<span class="green_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
<% elsif homework_common.homework_detail_manual.comment_status == 3%>
<% if homework_common.anonymous_comment == 0%>
<span class="grey_btn_cir ml5">匿评已结束</span>
<span class="grey_btn_cir ml5">匿评已结束</span>
<% else %>
<span class="grey_btn_cir ml5">匿评已禁用</span>
<% end %>
<span class="green_btn_cir ml5">教师教辅评阅中</span>
<span class="green_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
<% end%>
<% end%>
@ -56,7 +62,7 @@
</div>
<% end %>
<div class="homepagePostDeadline">
<%= l(:label_end_time)%>：<%= homework_common.end_time%>
<%= l(:label_end_time)%>：<%= homework_common.end_time%>&nbsp;23:59
</div>
</div>
<div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="homework_description_<%= homework_common.id%>">

2
public/stylesheets/courses.css
View File

@ -966,7 +966,7 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r
.ProResultCon{ padding:10px; color:#888888; line-height:24px; border-bottom:1px solid #dddddd; }
.W50{ width:50px;}
.W200{ width:200px;}
.m_w480{max-width: 480px;}
.m_w505{max-width: 505px;}
.m_w500{max-width: 500px;}
.m_w530{max-width: 530px;}
.ProResultTable{ color:#888888;}

2
public/stylesheets/new_user.css
View File

@ -1073,7 +1073,7 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r
.ProResultCon{ padding:10px; color:#888888; line-height:24px; border-bottom:1px solid #dddddd; }
.W50{ width:50px;}
.W200{ width:200px;}
.m_w480{max-width: 480px;}
.m_w505{max-width: 505px;}
.m_w530{max-width: 530px;}
.ProResultTable{ color:#888888;}
.T_C{ text-align:center;}