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

1.修改老师关闭作品评阅和开启作品评阅内容和样式 

2.修改老师关闭作品评阅和开启作品评阅的tips内容
This commit is contained in:
ouyangxuhua 2015-09-24 14:48:48 +08:00
parent e41de221c5
commit f4cad2897a
1 changed files with 41 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
app/views/users/user_messages.html.erb
View File

@ -224,61 +224,57 @@
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li> <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
</ul> </ul>
<% end %> <% end %>
<!--作品开启匿评 待整合：时间紧--> <!--作品开启匿评 待整合：时间紧-->
<% if ma.course_message_type == "HomeworkCommon" && ma.status == 2 %> <% if ma.course_message_type == "HomeworkCommon" && ma.status == 2 %>
<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">
<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> <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>
<% if ma.viewed == 0 %> </li>
<li class="homepageHomeworkContent fl"> <li class="homepageNewsPubType fl">
<%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
:onmouseover =>"message_titile_show($(this),event)", <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">启动了作业匿评：</span>
:onmouseout => "message_titile_hide($(this))" %> </li>
</li> <li class="homepageNewsContent fl">
<div style="display: none" class="message_title_red system_message_style"> <%= link_to "作业题目：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
<%= ma.course_message.name %> :onmouseover => "message_titile_show($(this),event)",
</div> :onmouseout => "message_titile_hide($(this))" %>
<li class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp; 开启匿评了！</li> </li>
<% else %> <div style="display: none" class="message_title_red system_message_style">
<li class="homepageNewsContent fl"> <p>您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师开启了匿评，作业详情如下：</p>
<%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", <p><strong>课程：</strong><%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
:onmouseover =>"message_titile_show($(this),event)", <p><strong>作业标题：</strong><%= ma.course_message.name %></p>
:onmouseout => "message_titile_hide($(this))"%> <% unless ma.course_message.description.blank? %>
</li> <div class="fl"><strong>作业内容：</strong></div>
<div style="display: none" class="message_title_red system_message_style"> <div class="ml60"><%= ma.course_message.description.html_safe %></div>
<%= ma.course_message.name %> <% end %>
</div> <p><strong>匿评自动关闭日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_end %>
<% end %> </p>
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li> </div>
</ul> <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
<% end %> </ul>
<% end %>
<!--作品关闭匿评--> <!--作品关闭匿评-->
<% if ma.course_message_type == "HomeworkCommon" && ma.status == 3 %> <% if ma.course_message_type == "HomeworkCommon" && ma.status == 3 %>
<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">
<% if ma.viewed == 0 %> <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
<li class="homepageHomeworkContent fl"> user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">关闭了作业匿评：</span></li>
<%= 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>
<li class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp; 匿评已经关闭！</li>
<% else %>
<li class="homepageNewsContent fl"> <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"}", <%= 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)", :onmouseover =>"message_titile_show($(this),event)",
:onmouseout => "message_titile_hide($(this))"%> :onmouseout => "message_titile_hide($(this))"%>
</li> </li>
<div style="display: none" class="message_title_red system_message_style"> <div style="display: none" class="message_title_red system_message_style">
<%= ma.course_message.name %> <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 %>
</div> </div>
<% end %>
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li> <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
</ul> </ul>
<% end %> <% end %>