对所有作业消息，统一在内容前加圆点，并且调整颜色
This commit is contained in:
parent
9375227250
commit
4a188dc81d
|
|
@ -62,27 +62,31 @@
|
|||
<%= User.current.lastname + User.current.firstname %>老师您好！
|
||||
<%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.show_name + "老师")%>刚刚发布了一个作业：
|
||||
</p>
|
||||
<p>课程名称：<%= ma.course_message.course.name %>
|
||||
(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</p>
|
||||
<p>作业标题：<span style="color:Red"><%= ma.course_message.name %></span></p>
|
||||
<p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %> 24点</span></p>
|
||||
<p>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %> 24点</span></p>
|
||||
<p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %> 24点</span></p>
|
||||
<p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
|
||||
<p>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></p>
|
||||
<ul class="ul_normal_color">
|
||||
<li>课程名称：<%= ma.course_message.course.name %>
|
||||
(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
|
||||
<li>作业标题：<span style="color:Red"><%= ma.course_message.name %></span></li>
|
||||
<li>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %> 24点</span></li>
|
||||
<li>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %> 24点</span></li>
|
||||
<li>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %> 24点</span></li>
|
||||
<li>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></li>
|
||||
<li>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></li>
|
||||
</ul>
|
||||
<p>
|
||||
您可以修改作业内容、评分规则、匿评过程等，谢谢！
|
||||
</p>
|
||||
<% else %>
|
||||
<p><%= User.current.lastname + User.current.firstname %>同学您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业：</p>
|
||||
<p>课程名称：<%= ma.course_message.course.name %>
|
||||
(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</p>
|
||||
<p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
|
||||
<p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %> 24点</span></p>
|
||||
<p>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %> 24点</span></p>
|
||||
<p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %> 24点</span></p>
|
||||
<p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
|
||||
<p>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></p>
|
||||
<ul class="ul_normal_color">
|
||||
<li>课程名称：<%= ma.course_message.course.name %>
|
||||
(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
|
||||
<li>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></li>
|
||||
<li>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %> 24点</span></li>
|
||||
<li>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %> 24点</span></li>
|
||||
<li>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %> 24点</span></li>
|
||||
<li>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></li>
|
||||
<li>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></li>
|
||||
</ul>
|
||||
<p>
|
||||
请抓紧时间提交您的作品，谢谢！
|
||||
</p>
|
||||
|
|
@ -109,24 +113,16 @@
|
|||
<%= User.current.lastname + User.current.firstname %>同学您好！
|
||||
<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师发布的作业截止日期快到了：
|
||||
</p>
|
||||
<p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</p>
|
||||
<p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
|
||||
<p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %> 24点</span></p>
|
||||
<p>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %> 24点</span></p>
|
||||
<p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %> 24点</span></p>
|
||||
<p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
|
||||
<p>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></p>
|
||||
<p>请抓紧时间提交您的作品，谢谢！</p>
|
||||
<% else %>
|
||||
<p><%= User.current.lastname + User.current.firstname %>老师您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师发布的作业截止日期快到了：</p>
|
||||
<p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</p>
|
||||
<p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
|
||||
<p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %> 24点</span></p>
|
||||
<p>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %> 24点</span></p>
|
||||
<p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %> 24点</span></p>
|
||||
<p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
|
||||
<p>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></p>
|
||||
<p>您可以修改作业内容、评分规则、匿评过程等，谢谢！</p>
|
||||
<ul class="ul_normal_color">
|
||||
<li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
|
||||
<li>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></li>
|
||||
<li>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %> 24点</span></li>
|
||||
<li>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %> 24点</span></li>
|
||||
<li>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %> 24点</span></li>
|
||||
<li>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></li>
|
||||
<li>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></li>
|
||||
<p>请抓紧时间提交您的作品，谢谢！</p>
|
||||
</ul>
|
||||
<% end %>
|
||||
</div>
|
||||
<li class="homepageHomeworkContentWarn fl"> 截止时间快到了！</li>
|
||||
|
|
@ -154,12 +150,12 @@
|
|||
<%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师' : '同学' %>您好！
|
||||
<%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>开启了匿评，作业详情如下：
|
||||
</p>
|
||||
<p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</p>
|
||||
<p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
|
||||
<p>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></p>
|
||||
<p>
|
||||
匿评截止：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %> 24点</span>
|
||||
</p>
|
||||
<ul class="ul_normal_color">
|
||||
<li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
|
||||
<li>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></li>
|
||||
<li>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></li>
|
||||
<li>匿评截止：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %> 24点</span></li>
|
||||
</ul>
|
||||
<% unless User.current.allowed_to?(:as_teacher, ma.course_message.course)%>
|
||||
<p>请您尽早完成匿评！如果您在规定时间内未完成匿评，一次将被扣<%= ma.course_message.homework_detail_manual.absence_penalty %>分。</p>
|
||||
<% end%>
|
||||
|
|
@ -184,8 +180,10 @@
|
|||
<%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师':'同学'%>您好！
|
||||
<%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>关闭了匿评，作业详情如下：
|
||||
</p>
|
||||
<p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</p>
|
||||
<p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
|
||||
<ul class="ul_grey">
|
||||
<li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
|
||||
<li>作业标题：<%= ma.course_message.name %></li>
|
||||
</ul>
|
||||
</div>
|
||||
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
|
||||
</ul>
|
||||
|
|
@ -210,14 +208,14 @@
|
|||
<p>
|
||||
<%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher, ma.course_message.course) ? '老师':'同学'%>您好！
|
||||
<%= User.current.eql?(ma.course_message.user) ?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname + "老师") %>启动作业匿评失败！
|
||||
<p> 失败原因：提交作品的人数低于2人</p>
|
||||
</p>
|
||||
<p>作业详情如下：</p>
|
||||
<p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年' + ma.course_message.course.term %>)</p>
|
||||
<p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
|
||||
<p>
|
||||
提交截止：<span style="color:Red;"><%= ma.course_message.end_time%> 24点</span>
|
||||
|
||||
</p>
|
||||
<ul class="ul_normal_color">
|
||||
<li>失败原因：<span style="color:red;">提交作品的人数低于2人</span></li>
|
||||
<li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年' + ma.course_message.course.term %>)</li>
|
||||
<li>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></li>
|
||||
<li>提交截止：<span style="color:Red;"><%= ma.course_message.end_time%> 24点</span></li>
|
||||
</ul>
|
||||
</div>
|
||||
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
|
||||
</ul>
|
||||
|
|
@ -304,16 +302,16 @@
|
|||
<%= User.current.show_name %>同学您好！
|
||||
<%= ma.course_message.reviewer_role == 3? "匿名用户" : (ma.course_message.user.show_name + "老师")%><%= ma.status == 0? "评阅了您的作品":"重新评阅了您的作品"%>。详情如下：
|
||||
</p>
|
||||
<p>课程名称：<%= ma.course.name %>(<%= ma.course.time.to_s + '年'+ ma.course.term %>)</p>
|
||||
<p>作业标题：<span style="color:Red;"><%=ma.course_message.student_work.homework_common.name %></span></p>
|
||||
<% content = ma.content.gsub("作业评分：","").split(" 评语：")%>
|
||||
<p>
|
||||
作品评分：<span style="color:Red;"><%= content[0] %>分</span>
|
||||
</p>
|
||||
<% if content.size > 1 %>
|
||||
<div class="fl">作品评语：</div>
|
||||
<div class="ml60"><span style="color:Red;"><%= content[1] %></span></div>
|
||||
<% end %>
|
||||
<ul class="ul_normal_color">
|
||||
<li>课程名称：<%= ma.course.name %>(<%= ma.course.time.to_s + '年'+ ma.course.term %>)</li>
|
||||
<li>作业标题：<span style="color:Red;"><%=ma.course_message.student_work.homework_common.name %></span></li>
|
||||
<% content = ma.content.gsub("作业评分：","").split(" 评语：")%>
|
||||
<li>作品评分：<span style="color:Red;"><%= content[0] %>分</span></li>
|
||||
<% if content.size > 1 %>
|
||||
<div class="fl"><li>作品评语：</li></div>
|
||||
<div style="margin-left:74px"><span style="color:Red;"><%= content[1] %></span></div>
|
||||
<% end %>
|
||||
</ul>
|
||||
<p>
|
||||
本次作业将在<%= ma.course_message.student_work.homework_common.homework_detail_manual.evaluation_end %> 24点结束匿评，到时您将可以看到所有其他同学的作品啦！大家可以进一步互相学习。 期待您取得更大的进步！
|
||||
</p>
|
||||
|
|
@ -351,7 +349,7 @@
|
|||
</li>
|
||||
<li class="homepageNewsPubType fl">
|
||||
<%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname +
|
||||
"#{ma.course_message.user.allowed_to?(:as_teacher, ma.course)?"同学":"老师"}",
|
||||
"#{ma.course_message.user.allowed_to?(:as_teacher, ma.course)?"老师":"同学"}",
|
||||
user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
|
||||
<span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">回复了作品评论：</span>
|
||||
</li>
|
||||
|
|
@ -365,12 +363,12 @@
|
|||
<%= User.current.show_name %>老师您好！
|
||||
<%= ma.course_message.user.show_name%><%= ma.course_message.user.allowed_to?(:as_teacher, ma.course)?"老师":"学生"%>回复了您的作品评论。详情如下：
|
||||
</p>
|
||||
<div class="fl">回复内容：</div>
|
||||
<div class="ml60"><%= ma.course_message.notes %></div>
|
||||
<div class="fl">您的评论：</div>
|
||||
<div class="ml60"><%= ma.course_message.jour.comment %></div>
|
||||
<p>课程名称：<%= ma.course.name %>(<%= ma.course.time.to_s + '年'+ ma.course.term %>)</p>
|
||||
<p>作业标题：<span style="color:Red;"><%=ma.course_message.jour.student_work.homework_common.name %></span></p>
|
||||
<ul class="ul_normal_color">
|
||||
<li>回复内容：<span style="color:red;"><%= ma.course_message.notes %></span></li>
|
||||
<li>您的评论：<span style="color:red;"><%= ma.course_message.jour.comment %></span></li>
|
||||
<li>课程名称：<%= ma.course.name %>(<%= ma.course.time.to_s + '年'+ ma.course.term %>)</li>
|
||||
<li>作业标题：<span style="color:Red;"><%=ma.course_message.jour.student_work.homework_common.name %></span></li>
|
||||
</ul>
|
||||
</div>
|
||||
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
|
||||
</ul>
|
||||
|
|
@ -395,14 +393,12 @@
|
|||
<%= User.current.lastname + User.current.firstname %>
|
||||
<%= User.current.allowed_to?(:as_teacher,ma.course_message.homework_common.course) ? '老师':'同学'%>您好！由于迟交作业，您及您的作品都不能参与以下作业的匿评。作业详情如下：
|
||||
</p>
|
||||
<ul style="margin-left:7px;">
|
||||
<li style="list-style-type:disc;margin-left:5px">
|
||||
课程名称：<%= ma.course_message.homework_common.course.name %>(<%= ma.course_message.homework_common.course.time.to_s + '年' + ma.course_message.homework_common.course.term %>)
|
||||
</li>
|
||||
<li style="list-style-type:disc;margin-left:5px">作业标题：<%= ma.course_message.homework_common.name %></li>
|
||||
<li style="list-style-type:disc;margin-left:5px">提交截止：<%= ma.course_message.homework_common.end_time %> 24:00</li>
|
||||
<li style="list-style-type:disc;margin-left:5px">提交时间：<%= format_time(ma.course_message.created_at) %></li>
|
||||
<li style="list-style-type:disc;margin-left:5px">迟交扣分：<%= ma.course_message.homework_common.late_penalty %>分</li>
|
||||
<ul class="ul_grey">
|
||||
<li>课程名称：<%= ma.course_message.homework_common.course.name %>(<%= ma.course_message.homework_common.course.time.to_s + '年' + ma.course_message.homework_common.course.term %>)</li>
|
||||
<li>作业标题：<%= ma.course_message.homework_common.name %></li>
|
||||
<li>提交截止：<%= ma.course_message.homework_common.end_time %> 24:00</li>
|
||||
<li>提交时间：<%= format_time(ma.course_message.created_at) %></li>
|
||||
<li>迟交扣分：<%= ma.course_message.homework_common.late_penalty %>分</li>
|
||||
</ul>
|
||||
<p>如需获得最终成绩，请您联系主讲老师对您的作品进行单独评分!</p>
|
||||
</div>
|
||||
|
|
@ -444,23 +440,12 @@
|
|||
<span class="newsBlue homepageNewsPublisher">系统提示</span>
|
||||
<span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">您有了新的课程成员申请：</span>
|
||||
</li>
|
||||
<li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
|
||||
<li class="homepageHomeworkContent fl"><a href="javascript:void(0);" class="newsGrey">
|
||||
<%= link_to User.find(ma.course_message_id).name+"申请成为课程\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content == '9' ? "教师" : "教辅"}", user_path(User.find(ma.course_message_id)),
|
||||
:class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
|
||||
:onmouseover => "message_titile_show($(this),event)",
|
||||
:onmouseout => "message_titile_hide($(this))" %></a>
|
||||
<span id="deal_info_<%=ma.id%>">
|
||||
<% if ma.status == 0 || ma.status.nil?%>
|
||||
<%= link_to '同意',dealwith_apply_request_user_path(User.current,:agree=>'Y',:msg_id=>ma.id),:remote=>'true'%>
|
||||
|
|
||||
<%= link_to '拒绝',dealwith_apply_request_user_path(User.current,:agree=>'N',:msg_id=>ma.id),:remote=>'true'%>
|
||||
<% elsif ma.status == 1%> <!-- 同意 -->
|
||||
您已经同意了该申请
|
||||
<% elsif ma.status == 2%> <!-- 拒绝 -->
|
||||
您已经拒绝了该申请
|
||||
<%end %>
|
||||
</span>
|
||||
</li>
|
||||
</li>
|
||||
<div style="display: none" class="message_title_red system_message_style">
|
||||
<p>
|
||||
<%= User.current.lastname + User.current.firstname %>老师您好！您有了新的课程成员申请，信息如下：
|
||||
|
|
@ -471,6 +456,19 @@
|
|||
<div class="ml60"><%= Course.find(ma.course_id).description.html_safe %></div>
|
||||
<p>申请职位：<%= ma.content == '9' ? "教师" : "教辅"%></p>
|
||||
</div>
|
||||
<li class="homepageHomeworkContentWarn fl">
|
||||
<span id="deal_info_<%=ma.id%>">
|
||||
<% if ma.status == 0 || ma.status.nil?%>
|
||||
<%= link_to '同意',dealwith_apply_request_user_path(User.current,:agree=>'Y',:msg_id=>ma.id),:remote=>'true'%>
|
||||
|
|
||||
<%= link_to '拒绝',dealwith_apply_request_user_path(User.current,:agree=>'N',:msg_id=>ma.id),:remote=>'true'%>
|
||||
<% elsif ma.status == 1%> <!-- 同意 -->
|
||||
您已经同意了该申请
|
||||
<% elsif ma.status == 2%> <!-- 拒绝 -->
|
||||
您已经拒绝了该申请
|
||||
<%end %>
|
||||
</span>
|
||||
</li>
|
||||
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
|
||||
</ul>
|
||||
<% end %>
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 976 B |
Binary file not shown.
|
After Width: | Height: | Size: 976 B |
|
|
@ -1298,5 +1298,5 @@ a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; c
|
|||
|
||||
.list_style ol li{list-style-type: decimal;margin-left: 20px;}
|
||||
.list_style ul li{list-style-type: disc;margin-left: 20px;}
|
||||
.list_style_disc {list-style-type:disc;margin-left:5px;}
|
||||
.system_message_style li{color:#909090}
|
||||
.ul_grey li {color:#909090; list-style-position:inside; padding-left:1px;list-style-image:url('../images/news_dot2.png')}
|
||||
.ul_normal_color li {list-style-position:inside; padding-left:1px; list-style-image:url('../images/news_dot.png')}
|
||||
|
|
|
|||
Loading…
Reference in New Issue