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

消息通知页面的完成

This commit is contained in:
SylorHuang 2019-10-23 11:37:24 +08:00
parent 0da8977115
commit 6d6445465b
15 changed files with 1097 additions and 1264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/layouts/_show_messages_list.html.erb
View File

@ -247,7 +247,7 @@
<% end %> <% end %>
</ul> </ul>
<!--<a onclick = "show_more();" id = "show_more_messages" style="display: none; cursor: pointer;" class = "shadowbox_news_all">展开更多</a>--> <!--<a onclick = "show_more();" id = "show_more_messages" style="display: none; cursor: pointer;" class = "shadowbox_news_all">展开更多</a>-->
<%= link_to '查看全部', user_path(User.current), :id =>'show_all_messages', :class => "shadowbox_news_all", :target =>"_Blank" %> <%= link_to '查看全部', user_message_path(User.current), :id =>'show_all_messages', :class => "shadowbox_news_all", :target =>"_Blank" %>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">

2
app/views/users/_applied_organization_sundomain.html.erb
View File

@ -23,7 +23,7 @@
<%=link_to ma.applied.name, organization_path(ma.applied_id), :target => '_blank' %> <%=link_to ma.applied.name, organization_path(ma.applied_id), :target => '_blank' %>
</span> </span>
<span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span> <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
<span><%= render :partial => "users/user_message_organization_applied_action", :locals => {:ma => ma} %></span> <span class="ml20"><%= render :partial => "users/user_message_organization_applied_action", :locals => {:ma => ma} %></span>
</p> </p>
<p class="c_grey02 f14"> <p class="c_grey02 f14">
<span class="homepageNewsType fl"> <span class="homepageNewsType fl">

54
app/views/users/_apply_homework_course_message.html.erb
View File

@ -1,35 +1,33 @@
<div class="shortMessageWidth"> <% user = User.find(ma.apply_user_id) %>
<li class="homepageNewsPortrait fl"> <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
<div class="navHomepageLogo fl">
<%= link_to image_tag(url_to_avatar(User.find(ma.apply_user_id)), :width => "30", :height => "30"), user_path(User.find(ma.apply_user_id)), :target => '_blank' %> <div>
</div> <p class="lh25 mb10">
</li> <span class="mr20 f16 color-grey3">
<li class="homepageNewsPubType fl"> <%= link_to "#{user.try(:show_name)}", user_path(user), :target => "_blank", :title => "#{user.try(:show_name)}" %>
<%= link_to User.find(ma.apply_user_id).show_name, user_path(User.find(ma.apply_user_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> </span>
<span class="homepageNewsType fl">申请引用作业：</span> <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
</li> <span id="deal_info_<%= ma.id %>" class="ml20">
<li class="messageInformationContents"> <% if ma.apply_result == 0 || ma.apply_result.nil? %>
<%= link_to '同意', dealwith_apply_homework_user_path(User.current, :agree=>'Y', :msg_id=>ma.id), :remote=>'true'%>
|
<%= link_to '拒绝', dealwith_apply_homework_user_path(User.current, :agree=>'N', :msg_id=>ma.id), :remote=>'true'%>
<% elsif ma.apply_result == 1 %> <!-- 同意 -->
<span class="fs12 infoTips bg-green">您已同意申请</span>
<% elsif ma.apply_result == 2 %> <!-- 拒绝 -->
<span class="fs12 infoTips bg-refuse">您已拒绝申请</span>
<% end %>
</span>
</p>
<p class="c_grey02 f14">
<span class="homepageNewsType fl">
申请引用作业：
</span>
<% content = ma.content.nil? ? '' : '：'+ ma.content.to_s %> <% content = ma.content.nil? ? '' : '：'+ ma.content.to_s %>
<%= link_to User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}", <%= link_to User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}",
student_work_index_path(:homework => ma.course_message.id), student_work_index_path(:homework => ma.course_message.id),
:title => User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}", :title => User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}",
:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}", :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}",
:target => '_blank' %> :target => '_blank' %>
<!--:onmouseover => "message_titile_show($(this),event)",--> </p>
<!--:onmouseout => "message_titile_hide($(this))" %>-->
</li>
</div> </div>
<li class="messageApplyContents fl">
<span id="deal_info_<%= ma.id %>">
<% if ma.apply_result == 0 || ma.apply_result.nil? %>
<%= link_to '同意', dealwith_apply_homework_user_path(User.current, :agree=>'Y', :msg_id=>ma.id), :remote=>'true'%>
|
<%= link_to '拒绝', dealwith_apply_homework_user_path(User.current, :agree=>'N', :msg_id=>ma.id), :remote=>'true'%>
<% elsif ma.apply_result == 1 %> <!-- 同意 -->
您已同意申请
<% elsif ma.apply_result == 2 %> <!-- 拒绝 -->
您已拒绝申请
<% end %>
</span>
</li>
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>

63
app/views/users/_apply_resource_course_message.html.erb
View File

@ -1,39 +1,38 @@
<div class="shortMessageWidth"> <% user = User.find(ma.apply_user_id) %>
<li class="homepageNewsPortrait fl"> <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
<div class="navHomepageLogo fl"> <div>
<%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %> <p class="lh25 mb10">
</div> <span class="mr20 f16 color-grey3">
</li> <%= link_to "#{user.try(:show_name)}", user_path(user), :target => "_blank", :title => "#{user.try(:show_name)}" %>
<li class="homepageNewsPubType fl"> </span>
<%= link_to ma.course_message.user.show_name, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %> <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
<span class="homepageNewsType fl">申请引用资源：</span> <span id="deal_info_<%= ma.id %>" class="ml20">
</li> <% if ma.apply_result == 0 || ma.apply_result.nil? %>
<li class="messageInformationContents"> <%= link_to '同意', deal_with_apply_resource_user_path(User.current, :agree => 'Y', :msg_id => ma.id, :apply_user_id => ma.course_message.apply_user_id), :remote => 'true' %> |
<% content = ma.course_message.content.nil? ? '' : '：'+ ma.course_message.content.to_s %> <%= link_to '拒绝', deal_with_apply_resource_user_path(User.current, :agree => 'N', :msg_id => ma.id, :apply_user_id => ma.course_message.apply_user_id), :remote => 'true' %>
<% show_content = ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)}"+"\"#{content}" %> <% elsif ma.apply_result == 1 %>
<% if ma.course_message.container_type == "Course" %> <span class="fs12 infoTips bg-green">您已同意申请</span>
<% elsif ma.apply_result == 2 %>
<span class="fs12 infoTips bg-refuse">您已拒绝申请</span>
<%end %>
</span>
</p>
<p class="c_grey02 f14">
<span class="homepageNewsType fl">
申请引用资源：
</span>
<% content = ma.course_message.content.nil? ? '' : '：'+ ma.course_message.content.to_s %>
<% show_content = ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)}"+"\"#{content}" %>
<% if ma.course_message.container_type == "Course" %>
<%= link_to show_content, course_files_path(ma.course_message.container_id), :title => show_content, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %> <%= link_to show_content, course_files_path(ma.course_message.container_id), :title => show_content, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
<% elsif ma.course_message.container_type == "Project" %> <% elsif ma.course_message.container_type == "Project" %>
<%= link_to show_content, project_files_path(ma.course_message.container_id), :title => show_content, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %> <%= link_to show_content, project_files_path(ma.course_message.container_id), :title => show_content, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
<% elsif ma.course_message.container_type == "OrgSubfield" %> <% elsif ma.course_message.container_type == "OrgSubfield" %>
<%= link_to show_content, org_subfield_files_path(ma.course_message.container_id), :title => show_content, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %> <%= link_to show_content, org_subfield_files_path(ma.course_message.container_id), :title => show_content, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
<% else %> <% else %>
<a title="<%= show_content %>" class = "<%= ma.viewed == 0 ? "newsBlack" : "newsGrey "%>"> <a title="<%= show_content %>" class = "<%= ma.viewed == 0 ? "newsBlack" : "newsGrey "%>">
<%= show_content %> <%= show_content %>
</a> </a>
<% end %> <% end %>
</li> </p>
</div> </div>
<li class="messageApplyContents fl">
<span id="deal_info_<%= ma.id %>">
<% if ma.apply_result == 0 || ma.apply_result.nil? %>
<%= link_to '同意', deal_with_apply_resource_user_path(User.current, :agree => 'Y', :msg_id => ma.id, :apply_user_id => ma.course_message.apply_user_id), :remote => 'true' %> |
<%= link_to '拒绝', deal_with_apply_resource_user_path(User.current, :agree => 'N', :msg_id => ma.id, :apply_user_id => ma.course_message.apply_user_id), :remote => 'true' %>
<% elsif ma.apply_result == 1 %>
您已同意申请
<% elsif ma.apply_result == 2 %>
您已拒绝申请
<%end %>
</span>
</li>
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>

53
app/views/users/_apply_resource_course_message_reply.html.erb
View File

@ -1,31 +1,34 @@
<div class="longMessageWidth"> <% user = User.find(ma.course_message.apply_user_id) %>
<li class="homepageNewsPortrait fl"> <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
<% owner = User.find(ma.course_message.apply_user_id) %> <div>
<div class="navHomepageLogo fl"> <p class="lh25 mb10">
<%= link_to image_tag(url_to_avatar(owner), :width => "30", :height => "30", class: "mt3"), user_path(owner) %> <span class="mr20 f16 color-grey3">
</div> <%= link_to "#{user.try(:show_name)}", user_path(user), :target => "_blank", :title => "#{user.try(:show_name)}" %>
</li> </span>
<li class="homepageNewsPubType fl"> <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
<%= link_to owner.show_name, user_path(owner), :class => "newsBlue homepageNewsPublisher" %> <span id="deal_info_<%= ma.id %>" class="ml20">
<span class="homepageNewsType fl"><%= ma.apply_result == 2 ? '同意' : '拒绝'%>引用资源：</span> <% if ma.apply_result == 2 %>
</li> <span class="fs12 infoTips bg-green">同意引用资源</span>
<li class="messageInformationContents"> <% else %>
<span class="fs12 infoTips bg-refuse">拒绝引用资源</span>
<%end %>
</span>
</p>
<p class="c_grey02 f14">
<% link_str = ma.apply_result == 2 ? <% link_str = ma.apply_result == 2 ?
'您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename) + '"的申请已通过' '您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename) + '"的申请已通过'
: :
'您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename) + '"的申请被婉拒' %> '您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename) + '"的申请被婉拒' %>
<% if ma.course_message.container_type == "Course" %> <% if ma.course_message.container_type == "Course" %>
<%= link_to link_str, course_files_path(ma.course_message.container_id), :title => link_str, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %> <%= link_to link_str, course_files_path(ma.course_message.container_id), :title => link_str, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
<% elsif ma.course_message.container_type == "Project" %> <% elsif ma.course_message.container_type == "Project" %>
<%= link_to link_str, project_files_path(ma.course_message.container_id), :title => link_str, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %> <%= link_to link_str, project_files_path(ma.course_message.container_id), :title => link_str, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
<% elsif ma.course_message.container_type == "OrgSubfield" %> <% elsif ma.course_message.container_type == "OrgSubfield" %>
<%= link_to link_str, org_subfield_files_path(ma.course_message.container_id), :title => link_str, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %> <%= link_to link_str, org_subfield_files_path(ma.course_message.container_id), :title => link_str, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
<% else %> <% else %>
<a title="<%= link_str %>" class = "<%= ma.viewed == 0 ? "newsBlack" : "newsGrey "%>"> <a title="<%= link_str %>" class = "<%= ma.viewed == 0 ? "newsBlack" : "newsGrey "%>">
<%= link_str %> <%= link_str %>
</a> </a>
<% end %> <% end %>
<%= link_to link_str, user_resource_user_path(User.current, :type => 2), :title => link_str,:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %> </p>
</li> </div>
</div>
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>

58
app/views/users/_join_course_course_message.html.erb
View File

@ -1,26 +1,31 @@
<div class="shortMessageWidth"> <% message_user = User.find(ma.course_message_id) %>
<% message_user = User.find(ma.course_message_id) %> <%= render partial: "users/user_info_message_avatar", locals: {user: message_user} %>
<li class="homepageNewsPortrait fl"> <div>
<div class="navHomepageLogo fl"> <p class="lh25 mb10">
<%= link_to image_tag(url_to_avatar(message_user), :width => "30", :height => "30"), user_path(message_user), :target => '_blank' %> <span class="mr20 f16 color-grey3">
</div> <%= link_to message_user.try(:show_name), user_path(message_user), :target => "_blank", :title => "#{message_user.try(:show_name)}" %>
</li>
<li class="homepageNewsPubType fl">
<span class="newsBlue homepageNewsPublisher">
<%=link_to message_user.show_name, user_path(ma.course_message_id),
:class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
</span> </span>
<span class="homepageNewsType fl"> <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
申请以<%= ma.content && ma.content.include?('9') ? "“教师”" : "“助教”" %>的身份加入班级： <span id="deal_info_<%=ma.id%>" class="ml20">
</span> <% if ma.status == 0 || ma.status.nil?%>
</li> <%= link_to '同意',dealwith_apply_request_user_path(User.current,:agree=>'Y',:msg_id=>ma.id),:remote=>'true',:class=>'linkBlue'%>
<li class="messageInformationContents"> |
<%= link_to '拒绝',dealwith_apply_request_user_path(User.current,:agree=>'N',:msg_id=>ma.id),:remote=>'true',:class=>'linkBlue'%>
<% elsif ma.status == 1%> <!-- 同意 -->
<span class="infoTips bg-green"><%= Course.find(ma.course_id).teacher.show_name %>已同意</span>
<% elsif ma.status == 2%> <!-- 拒绝 -->
<span class="infoTips bg-refuse"><%= Course.find(ma.course_id).teacher.show_name %>已拒绝</span>
<% end %>
</span>
</p>
<p class="c_grey02 f14">
<span class="homepageNewsType fl">
申请以<%= ma.content && ma.content.include?('9') ? "“教师”" : "“助教”" %>的身份加入班级：
</span>
<% content = User.find(ma.course_message_id).name+"申请成为班级\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content && ma.content.include?('9') ? "教师" : "助教"}" %> <% content = User.find(ma.course_message_id).name+"申请成为班级\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content && ma.content.include?('9') ? "教师" : "助教"}" %>
<%= link_to Course.find(ma.course_id).name, course_path(Course.find(ma.course_id)), <%= link_to Course.find(ma.course_id).name, course_path(Course.find(ma.course_id)),
:class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank', :title => "#{content}" %> :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank', :title => "#{content}" %>
<!--:onmouseover => "message_titile_show($(this),event)",--> </p>
<!--:onmouseout => "message_titile_hide($(this))" %>-->
</li>
<div style="display: none" class="message_title_red system_message_style"> <div style="display: none" class="message_title_red system_message_style">
<p> <p>
<%= User.current.lastname + User.current.firstname %>老师您好！您有了新的班级成员申请，信息如下： <%= User.current.lastname + User.current.firstname %>老师您好！您有了新的班级成员申请，信息如下：
@ -32,18 +37,5 @@
<p>申请职位：<%=ma.content && ma.content.include?('9') ? "教师" : "助教"%></p> <p>申请职位：<%=ma.content && ma.content.include?('9') ? "教师" : "助教"%></p>
</div> </div>
</div> </div>
<li class="messageOperateContents 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',:class=>'linkBlue'%>
|
<%= link_to '拒绝',dealwith_apply_request_user_path(User.current,:agree=>'N',:msg_id=>ma.id),:remote=>'true',:class=>'linkBlue'%>
<% elsif ma.status == 1%> <!-- 同意 -->
<span title="<%= Course.find(ma.course_id).teacher.show_name %>已同意"><%= Course.find(ma.course_id).teacher.show_name %>已同意</span>
<% elsif ma.status == 2%> <!-- 拒绝 -->
<span title="<%= Course.find(ma.course_id).teacher.show_name %>已拒绝"><%= Course.find(ma.course_id).teacher.show_name %>已拒绝</span>
<% end %>
</span>
</li>
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>

25
app/views/users/_new_user_message.html.erb
View File

@ -11,49 +11,52 @@
<% end %> <% end %>
<%# 课程消息 %> <%# 课程消息 %>
<% if ma.class == CourseMessage %> <% if ma.class == CourseMessage && ma.present? %>
<%= render :partial => 'users/user_message_course', :locals => {:ma => ma} %> <li>
<%= render :partial => 'users/user_message_course', :locals => {:ma => ma} %>
</li>
<% end %> <% end %>
<!--项目消息--> <!--项目消息-->
<% if ma.class == ForgeMessage %> <% if ma.class == ForgeMessage && ma.present? %>
<li> <li>
<%= render :partial => 'users/user_message_forge', :locals => {:ma => ma} %> <%= render :partial => 'users/user_message_forge', :locals => {:ma => ma} %>
</li> </li>
<% end %> <% end %>
<%# 竞赛消息 %> <%# 竞赛消息 %>
<% if ma.class == ContestMessage %> <% if ma.class == ContestMessage && ma.present? %>
<%= render :partial => 'users/user_message_contest', :locals => {:ma => ma} %> <li>
<%= render :partial => 'users/user_message_contest', :locals => {:ma => ma} %>
</li>
<% end %> <% end %>
<%# 博客消息 %> <%# 博客消息 %>
<% if ma.class == BlogMessage %> <% if ma.class == BlogMessage && ma.present? %>
<%= render :partial => 'users/user_message_blog', :locals => {:ma => ma} %> <%= render :partial => 'users/user_message_blog', :locals => {:ma => ma} %>
<% end %> <% end %>
<!--公共贴吧--> <!--公共贴吧-->
<% if ma.class == MemoMessage %> <% if ma.class == MemoMessage && ma.present? %>
<%= render :partial => 'users/user_message_forum', :locals => {:ma => ma} %> <%= render :partial => 'users/user_message_forum', :locals => {:ma => ma} %>
<% end %> <% end %>
<!--用户留言--> <!--用户留言-->
<% if ma.class == UserFeedbackMessage %> <% if ma.class == UserFeedbackMessage && ma.present? %>
<li> <li>
<%= render :partial => 'users/user_message_userfeedaback', :locals => {:ma => ma} %> <%= render :partial => 'users/user_message_userfeedaback', :locals => {:ma => ma} %>
</li> </li>
<% end %> <% end %>
<!--子域名申请通知--> <!--子域名申请通知-->
<% if ma.class == OrgMessage %> <% if ma.class == OrgMessage && ma.present? %>
<li> <li>
<%= render :partial => 'users/user_message_org', :locals => {:ma => ma} %> <%= render :partial => 'users/user_message_org', :locals => {:ma => ma} %>
</li> </li>
<% end %> <% end %>
<%# 申请类消息 %> <%# 申请类消息 %>
<% if ma.class == AppliedMessage %> <% if ma.class == AppliedMessage && ma.present? %>
<li> <li>
<%= render :partial => 'users/user_message_applied', :locals => {:ma => ma} %> <%= render :partial => 'users/user_message_applied', :locals => {:ma => ma} %>
</li> </li>

1
app/views/users/_user_info_message_avatar.html.erb Normal file
View File

@ -0,0 +1 @@
<%= link_to image_tag(url_to_avatar(user), class:"r_list_img"), user_path(user), :target => '_blank' %>

6
app/views/users/_user_info_message_header.html.erb Normal file
View File

@ -0,0 +1,6 @@
<p class="lh25 mb10">
<span class="mr20 f16 color-grey3">
<%= link_to user.try(:show_name), user_path(user), :target => "_blank", :title => "#{user.try(:show_name)}" %>
</span>
<span class="fontGrey4 f12"><%= time_from_now(target_time) %></span>
</p>

51
app/views/users/_user_message_applied.html.erb
View File

@ -40,37 +40,32 @@
<% elsif ma && ma.applied_type == "AppliedProject" %> <% elsif ma && ma.applied_type == "AppliedProject" %>
<%= render :partial => "users/applied_project_content", :locals =>{:ma => ma} %> <%= render :partial => "users/applied_project_content", :locals =>{:ma => ma} %>
<ul class="homepageNewsList fl" id="applied_project_<%= ma.id %>"> <!-- <ul class="homepageNewsList fl" id="applied_project_<%#= ma.id %>">-->
<%= render :partial => "users/applied_project_content", :locals =>{:ma => ma} %> <%#= render :partial => "users/applied_project_content", :locals =>{:ma => ma} %>
</ul> <!-- </ul>-->
<% elsif ma && ma.applied_type == "Organization" %> <% elsif ma && ma.applied_type == "Organization" %>
<ul class="homepageNewsList fl" id="applied_project_<%= ma.id %>"> <%= render :partial => "users/applied_organization_sundomain", :locals =>{:ma => ma} %>
<%= render :partial => "users/applied_organization_sundomain", :locals =>{:ma => ma} %>
</ul>
匿评成绩申诉
<% elsif ma && ma.applied_type == "StudentWorksScoresAppeal" %> <% elsif ma && ma.applied_type == "StudentWorksScoresAppeal" %>
<ul class="homepageNewsList fl"> <% applied_user = User.find(ma.applied_user_id) %>
<div class="longMessageWidth"> <%= render partial: "users/user_info_message_avatar", locals: {user: applied_user} %>
<% applied_user = User.find(ma.applied_user_id) %> <div>
<li class="homepageNewsPortrait fl"> <%= render partial: "users/user_info_message_header", locals: {user: applied_user, target_time: ma.updated_at} %>
<%= link_to image_tag(url_to_avatar(applied_user), :width => "30", :height => "30"), user_path(applied_user), :target => '_blank' %> <p class="c_grey02 f14">
</li> <span class="homepageNewsType fl">
<li class="homepageNewsPubType fl"> 申诉匿评成绩：
<%=link_to applied_user.show_name, user_path(applied_user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> </span>
<span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">申诉匿评成绩：</span> <% homework = ma.applied.student_works_score.student_work.homework_common %>
</li> <%= link_to homework.name, student_work_index_path(:homework => homework.id, :show_work_id => ma.applied.student_works_score.student_work_id, :tab => 2), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
<li class="messageInformationContents fl"> </p>
<% homework = ma.applied.student_works_score.student_work.homework_common %> </div>
<%= link_to homework.name, student_work_index_path(:homework => homework.id, :show_work_id => ma.applied.student_works_score.student_work_id, :tab => 2), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
</li>
</div>
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %>
</li>
</ul>
<% elsif ma && ma.applied_type == "AppliedContest" %> <% elsif ma && ma.applied_type == "AppliedContest" %>
<%= render :partial => 'join_contest_applied_message', :locals => {:ma => ma} %> <%= render :partial => 'join_contest_applied_message', :locals => {:ma => ma} %>
<ul class="homepageNewsList fl" id="contest_message_join_<%=ma.id %>"> <!-- <ul class="homepageNewsList fl" id="contest_message_join_<%#=ma.id %>">-->
<%= render :partial => 'join_contest_applied_message', :locals => {:ma => ma} %> <%#= render :partial => 'join_contest_applied_message', :locals => {:ma => ma} %>
</ul> <!-- </ul>-->
<% else %>
<span class="c_grey02">内容已删除</span>
<% end %> <% end %>

32
app/views/users/_user_message_blog.html.erb
View File

@ -1,23 +1,19 @@
<% ma.nil? ? local_assigns[:ma] : ma %> <% ma.nil? ? local_assigns[:ma] : ma %>
<% if ma.class == BlogMessage %> <% if ma.class == BlogMessage %>
<% if ma.blog_message_type == "BlogComment" %> <% if ma.blog_message_type == "BlogComment" %>
<ul class="homepageNewsList fl"> <% user = User.find(ma.user_operator_id) %>
<div class="longMessageWidth"> <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
<li class="homepageNewsPortrait fl"> <div>
<%= link_to image_tag(url_to_avatar(User.find(ma.user_operator_id)), :width => "30", :height => "30"), user_path(ma.user_operator_id), :target => '_blank' %> <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
</li> <p class="c_grey02 f14">
<li class="homepageNewsPubType fl"> <span class="homepageNewsType fl">
<%= link_to User.find(ma.user_operator_id).show_name, user_path(ma.user_operator_id), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> 回复了博客：
<span class="homepageNewsType fl">回复了博客：</span> </span>
</li> <% user_id = User.find(BlogComment.find(ma.blog_message_id).blog.author_id) %>
<li class="messageInformationContents"> <% blog_id = BlogComment.find(ma.blog_message_id).root_id %>
<% user_id = User.find(BlogComment.find(ma.blog_message_id).blog.author_id) %> <%= link_to message_content(ma.content), user_blog_blog_comment_path(:user_id => user_id, :blog_id => ma.blog_id, :id => blog_id),
<% blog_id = BlogComment.find(ma.blog_message_id).root_id %> :class => "#{ma.viewed == false ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
<%= link_to message_content(ma.content), user_blog_blog_comment_path(:user_id => user_id, :blog_id => ma.blog_id, :id => blog_id), </p>
:class => "#{ma.viewed == false ? "newsBlack" : "newsGrey"}", :target => '_blank' %> </div>
</li>
</div>
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
</ul>
<% end %> <% end %>
<% end %> <% end %>

529
app/views/users/_user_message_contest.html.erb
View File

@ -13,337 +13,290 @@
role_str = "参赛者" role_str = "参赛者"
end end
end %> end %>
<ul class="homepageNewsList fl"> <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
<div class="shortMessageWidth"> <div>
<li class="homepageNewsPortrait fl"> <p class="lh25 mb10">
<div class="navHomepageLogo fl"> <span class="mr20 f16 color-grey3">
<%= link_to image_tag(url_to_avatar(user), :width => "30", :height => "30"), user_path(user), :target => '_blank' %> <%= link_to user.try(:show_name), user_path(user), :target => "_blank", :title => "#{user.try(:show_name)}" %>
</div> </span>
</li> <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
<li class="homepageNewsPubType fl"> <span id="deal_info_<%=ma.id%>" class="ml20">
<span class="newsBlue homepageNewsPublisher">
<%=link_to user.show_name, user_path(user),
:class => "newsBlue homepageNewsPublisher", :target => '_blank' %></span>
<span class="homepageNewsType fl">
<%= user.user_extensions.school_id.blank? || user.user_extensions.school.nil? ? "" : "来自"+user.user_extensions.school.name+"，" %>
申请以"<%= role_str%>"的身份加入竞赛：
</span>
</li>
<li class="messageInformationContents">
<%= link_to Contest.find(ma.contest_id).name, contest_path(ma.contest_id),
:class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
</li>
</div>
<li class="messageOperateContents fl">
<span id="deal_info_<%=ma.id%>">
<% if ma.status == 1%> <!-- 同意 --> <% if ma.status == 1%> <!-- 同意 -->
<span title="<%= User.find(ma.contest_message_id).show_name %>已同意"><%= User.find(ma.contest_message_id).show_name %>已同意</span> <span class="infoTips bg-green"><%= User.find(ma.contest_message_id).show_name %>已同意</span>
<% else%> <!-- 拒绝 --> <% else%> <!-- 拒绝 -->
<span title="<%= User.find(ma.contest_message_id).show_name %>已拒绝"><%= User.find(ma.contest_message_id).show_name %>已拒绝</span> <span class="infoTips bg-refuse"><%= User.find(ma.contest_message_id).show_name %>已拒绝</span>
<%end %> <%end %>
</span> </span>
</li> </p>
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li> <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
</ul>
<p class="c_grey02 f14">
<span class="homepageNewsType fl">
<%= user.user_extensions.school_id.blank? || user.user_extensions.school.nil? ? "" : "来自"+user.user_extensions.school.name+"，" %>
申请以"<%= role_str%>"的身份加入竞赛：
</span>
<%= link_to Contest.find(ma.contest_id).name, contest_path(ma.contest_id),
:class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
</p>
<div style="display: none" class="message_title_red system_message_style">
<% if ma.course.is_public? || User.current.member_of_course?(ma.course) || User.current.admin? %>
<% teacher = User.find(ma.course_message_id) %>
<p><%= teacher.show_name %>(<%= teacher %>)老师把您加入了班级，详情如下：</p>
<p>班级名称：<%= ma.course.name %></p>
<p>开课学期：<%= ma.course.time.to_s + '年'+ ma.course.term %></p>
<p>班级ID：<%= ma.course.id %></p>
<p>课时总数：<%= ma.course.class_period %></p>
<% else %>
<p>
您已经被移出该私有班级，非班级成员没有权限访问私有班级
</p>
<% end %>
</div>
</div>
<!--被管理员拉入竞赛：学生身份--> <!--被管理员拉入竞赛：学生身份-->
<% elsif ma.contest_message_type == "JoinContest" and ma.status == 0 %> <% elsif ma.contest_message_type == "JoinContest" and ma.status == 0 %>
<ul class="homepageNewsList fl"> <% user = User.find(ma.contest_message_id) %>
<div class="longMessageWidth"> <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
<li class="homepageNewsPortrait fl"> <div>
<%= link_to image_tag(url_to_avatar(User.find(ma.contest_message_id)), :width => "30", :height => "30"), user_path(ma.contest_message_id), :target => '_blank' %> <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
</li> <p class="c_grey02 f14">
<li class="homepageNewsPubType fl"> <span class="homepageNewsType fl">
<%=link_to User.find(ma.contest_message_id).show_name, user_path(User.find(ma.contest_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> 将您加入了竞赛：
<span class="homepageNewsType fl">将您加入了竞赛：</span> </span>
</li> <%= link_to ma.contest.name, contest_path(ma.contest), :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
<li class="messageInformationContents"> </p>
<%= link_to ma.contest.name, contest_path(ma.contest), :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => '_blank' %> </div>
</li>
</div>
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
</ul>
<!--被管理员拉入竞赛：老师身份--> <!--被管理员拉入竞赛：老师身份-->
<% elsif ma.contest_message_type == "JoinContest" and ma.status == 1 %> <% elsif ma.contest_message_type == "JoinContest" and ma.status == 1 %>
<ul class="homepageNewsList fl">
<div class="longMessageWidth"> <%= link_to image_tag(url_to_avatar(""), class:"r_list_img"),"javascript:void(0)" %>
<li class="homepageNewsPortrait fl"> <div>
<div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div> <p class="lh25 mb10">
</li> <span class="mr20 f16 color-grey3">
<li class="homepageNewsPubType fl"> <%= link_to "系统提示","javascript:void(0)" %>
<span class="newsBlue homepageNewsPublisher">系统提示</span> </span>
<span class="homepageNewsType fl">您增加了新的竞赛成员：</span> <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
</li> </p>
<li class="messageInformationContents"> <p class="c_grey02 f14">
<%= link_to User.find(ma.contest_message_id).login+"("+(User.find(ma.contest_message_id).realname ? User.find(ma.contest_message_id).realname : User.find(ma.contest_message_id).login) +")", <span class="homepageNewsType fl">
{:controller => 'contests', :action => 'settings', :id => ma.contest_id, :tab=>'member'}, 您增加了新的竞赛成员：
:class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", </span>
:target => '_blank' %> <%= link_to User.find(ma.contest_message_id).login+"("+(User.find(ma.contest_message_id).realname ? User.find(ma.contest_message_id).realname : User.find(ma.contest_message_id).login) +")",
</li> {:controller => 'contests', :action => 'settings', :id => ma.contest_id, :tab=>'member'},
</div> :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}",
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li> :target => '_blank' %>
</ul> </p>
</div>
<!--主动加入竞赛--> <!--主动加入竞赛-->
<% elsif ma.contest_message_type == "JoinContest" and ma.status == 2 %> <% elsif ma.contest_message_type == "JoinContest" and ma.status == 2 %>
<ul class="homepageNewsList fl"> <% user = User.find(ma.contest_message_id) %>
<div class="longMessageWidth"> <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
<% user = User.find(ma.contest_message_id) %> <div>
<li class="homepageNewsPortrait fl"> <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
<div class="navHomepageLogo fl"> <p class="c_grey02 f14">
<%= link_to image_tag(url_to_avatar(user), :width => "30", :height => "30"), user_path(user), :target => '_blank' %> <span class="homepageNewsType fl">
</div> <%= user.user_extensions.school_id.blank? || user.user_extensions.school.nil? ? "" : "来自"+user.user_extensions.school.name+"，" %>
</li> 以"参赛者"的身份加入了竞赛：
<li class="homepageNewsPubType fl"> </span>
<span class="newsBlue homepageNewsPublisher"> <%= link_to ma.contest.name, contest_path(ma.contest), :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
<%=link_to user.show_name, user_path(user), </p>
:class => "newsBlue homepageNewsPublisher", :target => '_blank' %></span> </div>
<span class="homepageNewsType fl">
<%= user.user_extensions.school_id.blank? || user.user_extensions.school.nil? ? "" : "来自"+user.user_extensions.school.name+"，" %>
以"参赛者"的身份加入了竞赛：
</span>
</li>
<li class="messageInformationContents">
<%= link_to ma.contest.name, contest_path(ma.contest), :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
</li>
</div>
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
</ul>
<!--被老师移出课程--> <!--被老师移出课程-->
<% elsif ma.contest_message_type == "RemoveFromContest" %> <% elsif ma.contest_message_type == "RemoveFromContest" %>
<ul class="homepageNewsList fl"> <% user = User.find(ma.contest_message_id) %>
<div class="longMessageWidth"> <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
<li class="homepageNewsPortrait fl"> <div>
<%=link_to image_tag(url_to_avatar(User.find(ma.contest_message_id)), :width => "30", :height => "30"), user_path(ma.contest_message_id), :target => '_blank' %> <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
</li> <p class="c_grey02 f14">
<li class="homepageNewsPubType fl"> <span class="homepageNewsType fl">
<%=link_to User.find(ma.contest_message_id).show_name, user_path(User.find(ma.contest_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> 将您移出了竞赛：
<span class="homepageNewsType fl">将您移出了竞赛：</span> </span>
</li> <%= link_to ma.contest.name, contest_path(ma.contest), :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
<li class="messageInformationContents"> </p>
<%= link_to ma.contest.name, contest_path(ma.contest), :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => '_blank' %> </div>
</li>
</div>
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
</ul>
<!--发布竞赛题目--> <!--发布竞赛题目-->
<% elsif ma.contest_message_type == "Work" && ma.status.nil? && ma.contest_message %> <% elsif ma.contest_message_type == "Work" && ma.status.nil? && ma.contest_message %>
<ul class="homepageNewsList fl"> <% user = ma.contest_message.user %>
<div class="longMessageWidth"> <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
<li class="homepageNewsPortrait fl"> <div>
<%=link_to image_tag(url_to_avatar(ma.contest_message.user), :width => "30", :height => "30"), user_path(ma.contest_message.user), :target => '_blank' %> <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
</li> <p class="c_grey02 f14">
<li class="homepageNewsPubType fl"> <span class="homepageNewsType fl">
<%=link_to ma.contest_message.user.show_name, user_path(ma.contest_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> 发布了竞赛题：
<span class="homepageNewsType fl">发布了竞赛题：</span> </span>
</li> <%= link_to ma.contest_message.name, contestant_works_path(:work => ma.contest_message.id),
<li class="messageInformationContents"> :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}",
<%= link_to ma.contest_message.name, contestant_works_path(:work => ma.contest_message.id), :target => '_blank',
:class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :title => "竞赛题：#{ma.contest_message.name}"
:target => '_blank', %>
:title => "竞赛题：#{ma.contest_message.name}" </p>
%> </div>
</li>
</div>
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
</ul>
<!--竞赛截止时间快到了--> <!--竞赛截止时间快到了-->
<% elsif ma.contest_message_type == "Work" && ma.status == 1 && ma.contest_message %> <% elsif ma.contest_message_type == "Work" && ma.status == 1 && ma.contest_message %>
<ul class="homepageNewsList fl"> <% user = ma.contest_message.user %>
<div class="shortMessageWidth"> <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
<li class="homepageNewsPortrait fl"> <div>
<%=link_to image_tag(url_to_avatar(ma.contest_message.user), :width => "30", :height => "30"), user_path(ma.contest_message.user), :target => '_blank' %> <p class="lh25 mb10">
</li> <span class="mr20 f16 color-grey3">
<li class="homepageNewsPubType fl"> <%= link_to user.try(:show_name), user_path(user), :target => "_blank", :title => "#{user.try(:show_name)}" %>
<%=link_to ma.contest_message.user.show_name, user_path(ma.contest_message.user), </span>
:class => "newsBlue homepageNewsPublisher", <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
:title => "#{ma.contest_message.user.show_name}", <span class="ml20 fs12 infoTips bg-refuse">截止时间快到啦</span>
:target => '_blank' %> </p>
<span class="homepageNewsType fl">发布的竞赛题：</span></li> <p class="c_grey02 f14">
<li class="messageInformationContents"> <span class="homepageNewsType fl">
<%= link_to ma.contest_message.name, contestant_works_path(:work => ma.contest_message.id), 发布的竞赛题：
:class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", </span>
:target => '_blank', <%= link_to ma.contest_message.name, contestant_works_path(:work => ma.contest_message.id),
:title => "竞赛题：#{ma.contest_message.name}" :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}",
%> :target => '_blank',
</li> :title => "竞赛题：#{ma.contest_message.name}"
</div> %>
<li class="messageOperateContents fl" title="截止时间快到啦">截止时间快到啦</li> </p>
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li> </div>
</ul>
<!--竞赛启动在线评审--> <!--竞赛启动在线评审-->
<% elsif ma.contest_message_type == "Work" && ma.status == 2 && ma.contest_message %> <% elsif ma.contest_message_type == "Work" && ma.status == 2 && ma.contest_message %>
<ul class="homepageNewsList fl"> <% user = ma.contest_message.user %>
<div class="longMessageWidth"> <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
<li class="homepageNewsPortrait fl"> <div>
<%= link_to image_tag(url_to_avatar(ma.contest_message.user), :width => "30", :height => "30"), user_path(ma.contest_message.user), :target => '_blank' %> <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
</li> <p class="c_grey02 f14">
<li class="homepageNewsPubType fl"> <span class="homepageNewsType fl">
<%= link_to ma.contest_message.user.show_name, user_path(ma.contest_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> 启动了在线评审：
<span class="homepageNewsType fl">启动了在线评审：</span> </span>
</li> <%= link_to ma.contest_message.name, contestant_works_path(:work => ma.contest_message.id), :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}"%>
<li class="messageInformationContents"> </p>
<%= link_to ma.contest_message.name, contestant_works_path(:work => ma.contest_message.id), :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}"%> </div>
</li>
</div>
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
</ul>
<!--关闭在线评审--> <!--关闭在线评审-->
<% elsif ma.contest_message_type == "Work" && ma.status == 3 && ma.contest_message %> <% elsif ma.contest_message_type == "Work" && ma.status == 3 && ma.contest_message %>
<ul class="homepageNewsList fl"> <% user = ma.contest_message.user %>
<div class="longMessageWidth"> <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
<li class="homepageNewsPortrait fl"> <div>
<%= link_to image_tag(url_to_avatar(ma.contest_message.user), :width => "30", :height => "30"), user_path(ma.contest_message.user), :target => '_blank' %> <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
</li> <p class="c_grey02 f14">
<li class="homepageNewsPubType fl"> <span class="homepageNewsType fl">
<%= link_to ma.contest_message.user.show_name, user_path(ma.contest_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> 关闭了在线评审：
<span class="homepageNewsType fl">关闭了在线评审：</span> </span>
</li> <%= link_to ma.contest_message.name, contestant_works_path(:work => ma.contest_message.id), :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => "_blank"%>
<li class="messageInformationContents"> </p>
<%= link_to ma.contest_message.name, contestant_works_path(:work => ma.contest_message.id), :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => "_blank"%> </div>
</li>
</div>
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
</ul>
<!--在线评审启动失败--> <!--在线评审启动失败-->
<% elsif ma.contest_message_type == "Work" && ma.status == 4 && ma.contest_message %> <% elsif ma.contest_message_type == "Work" && ma.status == 4 && ma.contest_message %>
<ul class="homepageNewsList fl"> <% user = ma.contest_message.user %>
<div class="longMessageWidth"> <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
<li class="homepageNewsPortrait fl"> <div>
<%= link_to image_tag(url_to_avatar(ma.contest_message.user), :width => "30", :height => "30"), user_path(ma.contest_message.user), :target => '_blank' %> <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
</li> <p class="c_grey02 f14">
<li class="homepageNewsPubType fl"> <span class="homepageNewsType fl">
<%= link_to ma.contest_message.user.show_name, user_path(ma.contest_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> 在线评审启动失败<font class="c_red">(评委数为0或作品数为0)：</font>
<span class="homepageNewsType fl">在线评审启动失败<font class="c_red">(评委数为0或作品数为0)：</font></span> </span>
</li> <%= link_to ma.contest_message.name, contestant_works_path(:work => ma.contest_message.id), :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => "_blank" %>
<li class="messageInformationContents"> </p>
<%= link_to ma.contest_message.name, contestant_works_path(:work => ma.contest_message.id), :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => "_blank" %> </div>
</li>
</div>
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
</ul>
<!--在线评审时间快到了--> <!--在线评审时间快到了-->
<% elsif ma.contest_message_type == "Work" && ma.status == 5 && ma.contest_message %> <% elsif ma.contest_message_type == "Work" && ma.status == 5 && ma.contest_message %>
<ul class="homepageNewsList fl"> <% user = ma.contest_message.user %>
<div class="shortMessageWidth"> <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
<li class="homepageNewsPortrait fl"> <div>
<%=link_to image_tag(url_to_avatar(ma.contest_message.user), :width => "30", :height => "30"), user_path(ma.contest_message.user), :target => '_blank' %> <p class="lh25 mb10">
</li> <span class="mr20 f16 color-grey3">
<li class="homepageNewsPubType fl"> <%= link_to user.try(:show_name), user_path(user), :target => "_blank", :title => "#{user.try(:show_name)}" %>
<%=link_to ma.contest_message.user.show_name, user_path(ma.contest_message.user), </span>
:class => "newsBlue homepageNewsPublisher", <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
:title => "#{ma.contest_message.user.show_name}", <span class="ml20 fs12 infoTips bg-refuse">截止时间快到啦</span>
:target => '_blank' %> </p>
<span class="homepageNewsType fl">启动的在线评审：</span></li> <p class="c_grey02 f14">
<li class="messageInformationContents"> <span class="homepageNewsType fl">
<%= link_to ma.contest_message.name, contestant_works_path(:work => ma.contest_message.id), 启动的在线评审：
:class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", </span>
:target => '_blank', <%= link_to ma.contest_message.name, contestant_works_path(:work => ma.contest_message.id),
:title => "竞赛题：#{ma.contest_message.name}" :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}",
%> :target => '_blank',
</li> :title => "竞赛题：#{ma.contest_message.name}"
</div> %>
<li class="messageOperateContents fl" title="截止时间快到啦">截止时间快到啦</li> </p>
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li> </div>
</ul>
<!--发布竞赛通知--> <!--发布竞赛通知-->
<% elsif ma.contest_message_type == "News" && ma.contest_message %> <% elsif ma.contest_message_type == "News" && ma.contest_message %>
<ul class="homepageNewsList fl"> <% user = ma.contest_message.author %>
<div class="longMessageWidth"> <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
<li class="homepageNewsPortrait fl"> <div>
<%=link_to image_tag(url_to_avatar(ma.contest_message.author), :width => "30", :height => "30"),user_path(ma.contest_message.author), :target => '_blank' %> <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
</li> <p class="c_grey02 f14">
<li class="homepageNewsPubType fl"> <span class="homepageNewsType fl">
<%=link_to ma.contest_message.author.try(:show_name), user_path(ma.contest_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> 发布了竞赛通知：
<span class="homepageNewsType fl">发布了竞赛通知：</span> </span>
</li> <%= link_to ma.contest_message.title, {:controller => 'news', :action => 'show', :id => ma.contest_message.id },
<li class="messageInformationContents"> :class =>"#{!ma.viewed ? "newsBlack" : "newsGrey"}",
<%= link_to ma.contest_message.title, {:controller => 'news', :action => 'show', :id => ma.contest_message.id }, :target => '_blank',
:class =>"#{!ma.viewed ? "newsBlack" : "newsGrey"}", :title => "#{ma.contest_message.title}"
:target => '_blank', %>
:title => "#{ma.contest_message.title}" </p>
%> </div>
</li>
</div>
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
</ul>
<!--回复了竞赛通知--> <!--回复了竞赛通知-->
<% elsif ma.contest_message_type == "Comment" && ma.contest_message %> <% elsif ma.contest_message_type == "Comment" && ma.contest_message %>
<ul class="homepageNewsList fl"> <% user = ma.contest_message.author %>
<div class="longMessageWidth"> <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
<li class="homepageNewsPortrait fl"> <div>
<%=link_to image_tag(url_to_avatar(ma.contest_message.author), :width => "30", :height => "30"), user_path(ma.contest_message.author), :target => '_blank' %> <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
</li> <p class="c_grey02 f14">
<li class="homepageNewsPubType fl"> <span class="homepageNewsType fl">
<%=link_to User.find(ma.contest_message.author_id).show_name, user_path(ma.contest_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> 回复了竞赛通知：
<span class="homepageNewsType fl">回复了竞赛通知：</span> </span>
</li> <%= link_to ma.contest_message.commented.title, {:controller => 'news', :action => 'show', :id => ma.contest_message.commented.id },
<li class="messageInformationContents"> :class =>"#{!ma.viewed ? "newsBlack" : "newsGrey"}" ,
<%= link_to ma.contest_message.commented.title, {:controller => 'news', :action => 'show', :id => ma.contest_message.commented.id }, :target => '_blank',
:class =>"#{!ma.viewed ? "newsBlack" : "newsGrey"}" , :title => "#{ma.contest_message.commented.title}"
:target => '_blank', %>
:title => "#{ma.contest_message.commented.title}" </p>
%> </div>
</li>
</div>
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
</ul>
<!--发布/回复了竞赛帖子--> <!--发布/回复了竞赛帖子-->
<% elsif ma.contest_message_type == "Message" && !ma.nil? && !ma.contest_message.nil? %> <% elsif ma.contest_message_type == "Message" && !ma.nil? && !ma.contest_message.nil? %>
<ul class="homepageNewsList fl"> <% user = ma.contest_message.author %>
<div class="longMessageWidth"> <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
<li class="homepageNewsPortrait fl"> <div>
<%=link_to image_tag(url_to_avatar(ma.contest_message.author), :width => "30", :height => "30"), user_path(ma.contest_message.author), :target => '_blank' %> <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
</li> <p class="c_grey02 f14">
<li class="homepageNewsPubType fl"> <span class="homepageNewsType fl">
<%=link_to ma.contest_message.author.try(:show_name), user_path(ma.contest_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> <%= ma.contest_message.parent_id.nil? ? "发布了竞赛帖子：" : "回复了竞赛帖子：" %>
<span class="homepageNewsType fl"> </span>
<%= ma.contest_message.parent_id.nil? ? "发布了竞赛帖子：" : "回复了竞赛帖子：" %></span></li> <% if ma.contest_message.parent_id.nil? %>
<% if ma.contest_message.parent_id.nil? %> <%= link_to ma.contest_message.subject, board_message_path(ma.contest_message.board_id, ma.contest_message.id),
<li class="messageInformationContents"> :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}",
<%= link_to ma.contest_message.subject, board_message_path(ma.contest_message.board_id, ma.contest_message.id), :target => '_blank',
:class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :title => "#{ma.contest_message.subject}"
:target => '_blank', %>
:title => "#{ma.contest_message.subject}" <% else %>
%> <%= link_to message_content(ma.contest_message.content), board_message_path(ma.contest_message.board_id, ma.contest_message.parent_id),
</li> :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
<% else %> <% end %>
<li class="messageInformationContents"> </p>
<%= link_to message_content(ma.contest_message.content), board_message_path(ma.contest_message.board_id, ma.contest_message.parent_id), </div>
:class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
</li>
<% end %>
</div>
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
</ul>
<!--发布/回复了竞赛留言--> <!--发布/回复了竞赛留言-->
<% elsif ma.contest_message_type == "JournalsForMessage" && ma.contest_message && ma.contest_message.jour_type == 'Contest' %> <% elsif ma.contest_message_type == "JournalsForMessage" && ma.contest_message && ma.contest_message.jour_type == 'Contest' %>
<ul class="homepageNewsList fl"> <% user = ma.contest_message.author %>
<div class="longMessageWidth"> <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
<li class="homepageNewsPortrait fl"> <div>
<%= link_to image_tag(url_to_avatar(ma.contest_message.user), :width => "30", :height => "30"), user_path(ma.contest_message.user), :target => '_blank' %> <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
</li> <p class="c_grey02 f14">
<li class="homepageNewsPubType fl"> <span class="homepageNewsType fl">
<%= link_to ma.contest_message.user.try(:show_name), user_path(ma.contest_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> <%= ma.contest_message.m_parent_id.nil? ? "发布了竞赛留言：" : "回复了竞赛留言：" %>
<span class="homepageNewsType fl"><%= ma.contest_message.m_parent_id.nil? ? "发布了竞赛留言：" : "回复了竞赛留言：" %></span> </span>
</li> <%= link_to message_content(ma.contest_message.notes), feedback_contest_path(:id => ma.contest_id),
<li class="messageInformationContents"> :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
<%= link_to message_content(ma.contest_message.notes), feedback_contest_path(:id => ma.contest_id), </p>
:class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => '_blank' %> </div>
</li>
</div>
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
</ul>
<% end %> <% end %>

1440
app/views/users/_user_message_course.html.erb
View File

File diff suppressed because it is too large Load Diff

41
app/views/users/_user_message_forum.html.erb
View File

@ -1,28 +1,19 @@
<% if ma.memo_type == "Memo" && !ma.memo.nil? && !ma.memo.author.nil? %> <% if ma.memo_type == "Memo" && !ma.memo.nil? && !ma.memo.author.nil? %>
<ul class="homepageNewsList fl">
<div class="longMessageWidth"> <% user = ma.memo.author %>
<li class="homepageNewsPortrait fl"> <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
<%=link_to image_tag(url_to_avatar(ma.memo.author), :width => "30", :height => "30"), user_path(ma.memo.author), :target => '_blank' %> <div>
</li> <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
<li class="homepageNewsPubType fl"> <p class="c_grey02 f14">
<%=link_to User.find(ma.memo.author_id).show_name, user_path(ma.memo.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> <span class="homepageNewsType fl">
<span class="homepageNewsType fl" ><%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %></span> <%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %>
</li> </span>
<% if ma.memo.parent_id.nil? %> <% if ma.memo.parent_id.nil? %>
<li class="messageInformationContents"> <%= link_to ma.memo.subject, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
<%= link_to ma.memo.subject, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %> <% else %>
<!--:onmouseover =>"message_titile_show($(this),event)",--> <%= link_to message_content(ma.memo.content), forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
<!--:onmouseout => "message_titile_hide($(this))" %>--> <% end %>
</li> </p>
<% else %> </div>
<li class="messageInformationContents">
<%= link_to message_content(ma.memo.content), forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
<!--:onmouseover =>"message_titile_show($(this),event)",-->
<!--:onmouseout => "message_titile_hide($(this))" %>-->
</li>
<% end %>
</div>
<li class="homepageNewsTime fr"><%= time_tag(ma.memo.created_at).html_safe %> </li>
</ul>
<% end %> <% end %>

4
app/views/users/_user_message_organization_applied_action.html.erb
View File

@ -5,7 +5,7 @@
<%= link_to "拒绝", refused_apply_subdomain_organizations_path(:organization_id => ma.applied_id, :org_domain => ma.name, :user_id => ma.applied_user_id, :ma_id => ma.id), <%= link_to "拒绝", refused_apply_subdomain_organizations_path(:organization_id => ma.applied_id, :org_domain => ma.name, :user_id => ma.applied_user_id, :ma_id => ma.id),
:remote => true, :method => :post, :class => "link-blue",:style => "font-size: 14px;" %> :remote => true, :method => :post, :class => "link-blue",:style => "font-size: 14px;" %>
<% elsif ma.status == 2 %> <% elsif ma.status == 2 %>
<span style="font-size:14px;">已同意</span> <span class="fs12 infoTips bg-green">已同意</span>
<% elsif ma.status == 4 %> <% elsif ma.status == 4 %>
<span style="font-size:14px;">已拒绝</span> <span class="fs12 infoTips bg-refuse">已拒绝</span>
<% end %> <% end %>