Merge remote-tracking branch 'origin/szzh' into szzh
This commit is contained in:
commit
e1c5c02c0d
|
@ -84,7 +84,9 @@
|
||||||
<% if ma.course_message_type == "HomeworkCommon" && ma.status == 1 %>
|
<% if ma.course_message_type == "HomeworkCommon" && ma.status == 1 %>
|
||||||
<ul class="homepageNewsList fl">
|
<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="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>
|
<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", :title => "#{ma.course_message.user.lastname + ma.course_message.user.firstname}老师" %>
|
||||||
|
<span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布的作业:</span></li>
|
||||||
<li class="homepageHomeworkContent fl">
|
<li class="homepageHomeworkContent fl">
|
||||||
<%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
|
<%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
|
||||||
:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
|
:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
|
||||||
|
|
Loading…
Reference in New Issue