Merge branch 'dev_hjq' into szzh
This commit is contained in:
commit
82b21fd4ec
|
|
@ -118,44 +118,39 @@
|
|||
<% if ma.course_message_type == "HomeworkCommon" && ma.status.nil? %>
|
||||
<ul class="homepageNewsList fl">
|
||||
<li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
|
||||
<li class="homepageNewsPubTypeHomework fl"><%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
|
||||
<span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotReadHomework fl":"homepageNewsTypeHomework fl" %>">发布了作业于课程：<%= ma.course_message.course.name %></span>
|
||||
<li class="homepageNewsPubType fl"><%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
|
||||
<span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了课程作业：</span>
|
||||
</li>
|
||||
<li class="homepageNewsContent fl" style="width:315px;"><a href="javascript:void(0);" class="newsGrey">
|
||||
<li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
|
||||
<%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
|
||||
:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
|
||||
:onmouseover =>"message_titile_show($(this),event)",
|
||||
:onmouseout => "message_titile_hide($(this))" %></a></li>
|
||||
<div style="display: none" class="message_title_red system_message_style">
|
||||
<% if User.current.members.where("course_id = ?", ma.course_message.course.id).first.roles.first.name == 'Student' %>
|
||||
<p>您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业，详情如下：</p>
|
||||
<p><strong>课程：</strong><%= ma.course_message.course.name %>
|
||||
<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.term %>)</p>
|
||||
<p><strong>作业标题：</strong><%= ma.course_message.name %></p>
|
||||
<% unless ma.course_message.description.blank? %>
|
||||
<div class="fl"><strong>作业内容：</strong></div>
|
||||
<div class="ml60"><%= ma.course_message.description.html_safe %></div>
|
||||
<% end %>
|
||||
<p><strong>作业提交截止日期：</strong><%= ma.course_message.end_time %></p>
|
||||
<p><strong>匿评自动关闭日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_end %></p>
|
||||
<p><strong>迟交扣分：</strong><%= ma.course_message.late_penalty %>分</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_end %> 24点</span></p>
|
||||
<p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
|
||||
<p>
|
||||
请同学们抓紧时间提交自己的作品，谢谢！
|
||||
请抓紧时间提交自己的作品，谢谢！
|
||||
</p>
|
||||
<% else %>
|
||||
<p>您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业，详情如下：</p>
|
||||
<p><strong>课程：</strong><%= ma.course_message.course.name %>
|
||||
<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.term %>)</p>
|
||||
<p><strong>作业标题：</strong><%= ma.course_message.name %></p>
|
||||
<% unless ma.course_message.description.blank? %>
|
||||
<div class="fl"><strong>作业内容：</strong></div>
|
||||
<div class="ml60"><%= ma.course_message.description.html_safe %></div>
|
||||
<% end %>
|
||||
<p><strong>作业提交截止日期：</strong><%= ma.course_message.end_time %></p>
|
||||
<p><strong>匿评自动开始日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_start %></p>
|
||||
<p><strong>匿评自动关闭日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_end %></p>
|
||||
<p><strong>迟交扣分：</strong><%= ma.course_message.late_penalty %>分</p>
|
||||
<p><strong>缺评扣分：</strong><%= ma.course_message.homework_detail_manual.absence_penalty %>分</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>
|
||||
|
|
@ -168,59 +163,62 @@
|
|||
<ul class="homepageNewsList fl">
|
||||
<li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
|
||||
<li class="homepageNewsPubType fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布的作业：</span></li>
|
||||
<% if ma.viewed == 0 %>
|
||||
<li class="homepageHomeworkContent fl">
|
||||
<%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
|
||||
:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
|
||||
:onmouseover =>"message_titile_show($(this),event)",
|
||||
:onmouseout => "message_titile_hide($(this))" %>
|
||||
</li>
|
||||
<div style="display: none" class="message_title_red system_message_style">
|
||||
<% if User.current.members.where("course_id = ?", ma.course_message.course.id).first.roles.first.name == 'Student' %>
|
||||
<p>您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业，详情如下：</p>
|
||||
<p><strong>课程：</strong><%= ma.course_message.course.name %>
|
||||
(<%= ma.course_message.course.term %>)</p>
|
||||
<p><strong>作业标题：</strong><%= ma.course_message.name %></p>
|
||||
<% unless ma.course_message.description.blank? %>
|
||||
<div class="fl"><strong>作业内容：</strong></div>
|
||||
<div class="ml60"><%= ma.course_message.description.html_safe %></div>
|
||||
<% end %>
|
||||
<p><strong>作业提交截止日期：</strong><%= ma.course_message.end_time %></p>
|
||||
<p><strong>匿评自动关闭日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_end %></p>
|
||||
<p><strong>迟交扣分：</strong><%= ma.course_message.late_penalty %>分</p>
|
||||
<p>
|
||||
请同学们抓紧时间提交自己的作品，谢谢！
|
||||
</p>
|
||||
<% else %>
|
||||
<p>您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业，详情如下：</p>
|
||||
<p><strong>课程：</strong><%= ma.course_message.course.name %>
|
||||
(<%= ma.course_message.course.term %>)</p>
|
||||
<p><strong>作业标题：</strong><%= ma.course_message.name %></p>
|
||||
<% unless ma.course_message.description.blank? %>
|
||||
<div class="fl"><strong>作业内容：</strong></div>
|
||||
<div class="ml60"><%= ma.course_message.description.html_safe %></div>
|
||||
<% end %>
|
||||
<p><strong>作业提交截止日期：</strong><%= ma.course_message.end_time %></p>
|
||||
<p><strong>匿评自动开始日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_start %></p>
|
||||
<p><strong>匿评自动关闭日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_end %></p>
|
||||
<p><strong>迟交扣分：</strong><%= ma.course_message.late_penalty %>分</p>
|
||||
<p><strong>缺评扣分：</strong><%= ma.course_message.homework_detail_manual.absence_penalty %>分</p>
|
||||
<p>
|
||||
您可以修改作业内容、评分规则、匿评过程等，谢谢！
|
||||
</p>
|
||||
<% end %>
|
||||
</div>
|
||||
<li class="homepageHomeworkContentWarn fl"> 截止时间快到了！</li>
|
||||
<% else %>
|
||||
<li class="homepageNewsContent fl">
|
||||
<%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
|
||||
:onmouseover =>"message_titile_show($(this),event)",
|
||||
:onmouseout => "message_titile_hide($(this))"%>
|
||||
</li>
|
||||
<div style="display: none" class="message_title_red system_message_style">
|
||||
<%= ma.course_message.name %>
|
||||
</div>
|
||||
<% end %>
|
||||
<li class="homepageHomeworkContent fl">
|
||||
<%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
|
||||
:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
|
||||
:onmouseover => "message_titile_show($(this),event)",
|
||||
:onmouseout => "message_titile_hide($(this))" %>
|
||||
</li>
|
||||
<div style="display: none" class="message_title_red system_message_style">
|
||||
<% if User.current.members.where("course_id = ?", ma.course_message.course.id).first.roles.first.name == 'Student' %>
|
||||
<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.term %>)</p>
|
||||
|
||||
<p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
|
||||
|
||||
<p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>@nbsp; 24点</span></p>
|
||||
|
||||
<p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>
|
||||
@nbsp;@nbsp;24点</span></p>
|
||||
|
||||
<p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_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><strong>课程名称：</strong><%= ma.course_message.course.name %>
|
||||
(<%= ma.course_message.course.term %>)</p>
|
||||
|
||||
<p><strong>作业标题：</strong><%= ma.course_message.name %></p>
|
||||
|
||||
<p><strong>提交截止：</strong><%= ma.course_message.end_time %>@nbsp;@nbsp;24点</p>
|
||||
|
||||
<p><strong>匿评开始：</strong><%= ma.course_message.homework_detail_manual.evaluation_start %>
|
||||
@nbsp;@nbsp;24点</p>
|
||||
|
||||
<p><strong>匿评关闭：</strong><%= ma.course_message.homework_detail_manual.evaluation_end %>
|
||||
@nbsp;@nbsp;24点</p>
|
||||
|
||||
<p><strong>迟交扣分：</strong><%= ma.course_message.late_penalty %>分</p>
|
||||
|
||||
<p><strong>缺评扣分：</strong><%= ma.course_message.homework_detail_manual.absence_penalty %>分
|
||||
</p>
|
||||
|
||||
<p>
|
||||
您可以修改作业内容、评分规则、匿评过程等，谢谢！
|
||||
</p>
|
||||
<% end %>
|
||||
</div>
|
||||
<li class="homepageHomeworkContentWarn fl"> 截止时间快到了！</li>
|
||||
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
|
||||
</ul>
|
||||
<% end %>
|
||||
|
|
|
|||
Loading…
Reference in New Issue