diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb new file mode 100644 index 000000000..885bfd6c5 --- /dev/null +++ b/app/views/users/_user_message_course.html.erb @@ -0,0 +1,338 @@ +<% if ma.class == CourseMessage %> + <% if ma.course_message_type == "News" %> + + <% end %> + <% if ma.course_message_type == "Comment" %> + + <% end %> + <% if ma.course_message_type == "HomeworkCommon" && ma.status.nil? %> + + <% end %> + <% if ma.course_message_type == "HomeworkCommon" && ma.status == 1 %> + + <% end %> + + <% if ma.course_message_type == "HomeworkCommon" && ma.status == 2 %> + + <% end %> + + <% if ma.course_message_type == "HomeworkCommon" && ma.status == 3 %> + + <% end %> + + <% if ma.course_message_type == "HomeworkCommon" && ma.status == 4 %> + + <% end %> + + <% if ma.course_message_type == "Poll" %> + + <% end %> + <% if ma.course_message_type == "Message" %> + + <% end %> + <% if ma.course_message_type == "StudentWorksScore" %> + + <% end %> + <% if ma.course_message_type == "JournalsForMessage" %> + <% if ma.course_message.jour_type == 'Course' %> + <% if params[:type] != 'homework' %> + + <% end %> + <% else %> + + <% end %> + <% end %> +<% end %> \ No newline at end of file diff --git a/app/views/users/_user_message_forge.html.erb b/app/views/users/_user_message_forge.html.erb new file mode 100644 index 000000000..fcd4ba30a --- /dev/null +++ b/app/views/users/_user_message_forge.html.erb @@ -0,0 +1,187 @@ +<% if ma.class == ForgeMessage %> + + <% if ma.forge_message_type == "AppliedProject" %> + + <% end %> + + <% if ma.forge_message_type == "ProjectInvite" %> + <% inviter = User.find(ma.forge_message_id) %> + + <% end %> + <% if ma.forge_message_type == "Issue" %> + + <% end %> + <% if ma.forge_message_type == "Journal" %> + + <% end %> + <% if ma.forge_message_type == "Message" %> + + <% end %> + <% if ma.forge_message_type == "News" %> + + <% end %> + <% if ma.forge_message_type == "Comment" %> + + <% end %> +<% end %> \ No newline at end of file diff --git a/app/views/users/_user_message_forum.html.erb b/app/views/users/_user_message_forum.html.erb new file mode 100644 index 000000000..102b4a155 --- /dev/null +++ b/app/views/users/_user_message_forum.html.erb @@ -0,0 +1,41 @@ +<% if ma.class == MemoMessage %> + <% if ma.memo_type == "Memo" %> + + <% end %> +<% end %> \ No newline at end of file diff --git a/app/views/users/_user_message_userfeedaback.html.erb b/app/views/users/_user_message_userfeedaback.html.erb new file mode 100644 index 000000000..672dfda64 --- /dev/null +++ b/app/views/users/_user_message_userfeedaback.html.erb @@ -0,0 +1,30 @@ +<% if ma.class == UserFeedbackMessage %> + <% if ma.journals_for_message_type == "JournalsForMessage" %> + + <% end %> +<% end %> \ No newline at end of file diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 63876084d..bd794438c 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -31,662 +31,73 @@
-
-<% if @message_alls.count >0 || @user_system_messages.count >0 %> - <% if params[:type].nil? || params[:type] == "unviewed" %> -
- 有 <%= unviewed_message(@user) %> 条未读 - <% unless (unviewed_message(@user) == 0 || User.current != @user) %> - <%= link_to "全部设为已读", user_message_path(User.current, :viewed => 'all') %> - <% end %> -
- <% end %> - <%# 系统消息 %> - <% if params[:type] != 'system_messages' %> - <% @user_system_messages.each do |usm| %> - +
+ <% if @message_alls.count >0 || @user_system_messages.count >0 %> + <% if params[:type].nil? || params[:type] == "unviewed" %> +
+ 有 <%= unviewed_message(@user) %> 条未读 + <% unless (unviewed_message(@user) == 0 || User.current != @user) %> + <%= link_to "全部设为已读", user_message_path(User.current, :viewed => 'all') %> + <% end %> +
<% end %> - <% end %> - - <% unless @message_alls.nil? %> - <% @message_alls.each do |ma| %> - <%# 课程消息 %> - <% if ma.class == CourseMessage %> - <% if ma.course_message_type == "News" %> -
    -
  • <%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"),user_path(ma.course_message.author) %>
    • -
  • <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %>">发布了通知：
    • -
  • - <%= link_to ma.course_message.title, {:controller => 'news', :action => 'show', :id => ma.course_message.id }, - :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", - :onmouseover =>"message_titile_show($(this),event)", - :onmouseout => "message_titile_hide($(this))" %>
    • - -
  • <%= time_tag(ma.created_at).html_safe %>
    • -
- <% end %> - <% if ma.course_message_type == "Comment" %> -
    -
  • <%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %>
    • -
  • <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %>">评论了通知：
    • -
  • - <%= link_to ma.course_message.comments.html_safe, {:controller => 'news', :action => 'show', :id => ma.course_message.commented.id }, - :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", - :onmouseover =>"message_titile_show($(this),event)", - :onmouseout => "message_titile_hide($(this))" %>
    • - -
  • <%= time_tag(ma.created_at).html_safe %>
    • -
- <% end %> - <% if ma.course_message_type == "HomeworkCommon" && ma.status.nil? %> -
    -
  • <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %>
    • -
  • <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %> - ">发布了课程作业： -
    • -
  • - <%= 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))" %>
    • - -
  • <%= time_tag(ma.created_at).html_safe %>
    • -
- <% end %> - <% if ma.course_message_type == "HomeworkCommon" && ma.status == 1 %> -
    -
  • <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %>
    • -
  • <%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>">发布的作业：
    • -
  • - <%= 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))" %> -
    • - -
  •    截止时间快到了！
    • -
  • <%= time_tag(ma.created_at).html_safe %>
    • -
- <% end %> - - <% if ma.course_message_type == "HomeworkCommon" && ma.status == 2 %> -
    -
  • - <%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %> -
    • -
  • - <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", - user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %> - ">启动了作业匿评： -
    • -
  • - <%= 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))" %> -
    • - -
  • <%= time_tag(ma.created_at).html_safe %>
    • -
- <% end %> - - <% if ma.course_message_type == "HomeworkCommon" && ma.status == 3 %> -
    -
  • <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %>
    • -
  • - <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", - user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>">关闭了作业匿评：
    • -
  • - <%= 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))"%> -
    • - -
  • <%= time_tag(ma.created_at).html_safe %>
    • -
- <% end %> + <%# 系统消息 %> + <% if params[:type] != 'system_messages' %> + <% @user_system_messages.each do |usm| %> +
    +
  • + +
    • +
  • + Trustie平台发布新消息： +
    • + 【系统消息】 +
  • + + <%= link_to usm.subject.blank? ? (usm.content.nil? ? usm.description.html_safe : usm.content.html_safe) : usm.subject, user_system_messages_path(User.current), + :id => "content_link_#{usm.id}", + :onmouseover =>"message_titile_show($(this),event);", + :onmouseout => "message_titile_hide($(this));" + %> +
    • + +
  • <%= time_tag(usm.created_at).html_safe %>
    • +
+ <% end %> + <% end %> + + <% unless @message_alls.nil? %> + <% @message_alls.each do |ma| %> + <%# 课程消息 %> + <%= render :partial => 'users/user_message_course', :locals => {:ma => ma} %> - <% if ma.course_message_type == "HomeworkCommon" && ma.status == 4 %> -
    -
  • - <%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %> -
    • -
  • - <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", - user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %> - ">启动作业匿评失败 -
    • -
  • - <%= 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))" %> -
    • - -
  • <%= time_tag(ma.created_at).html_safe %>
    • -
- <% end %> + + <%= render :partial => 'users/user_message_forge', :locals => {:ma => ma} %> - <% if ma.course_message_type == "Poll" %> - - <% end %> - <% if ma.course_message_type == "Message" %> - - <% end %> - <% if ma.course_message_type == "StudentWorksScore" %> - - <% end %> - <% if ma.course_message_type == "JournalsForMessage" %> - <% if ma.course_message.jour_type == 'Course' %> - <% if params[:type] != 'homework' %> - - <% end %> - <% else %> - - <% end %> - <% end %> - <% end %> - - <% if ma.class == ForgeMessage %> - - <% if ma.forge_message_type == "AppliedProject" %> - - <% end %> - - <% if ma.forge_message_type == "ProjectInvite" %> - <% inviter = User.find(ma.forge_message_id) %> -
    -
  • - <%=link_to image_tag(url_to_avatar(inviter), :width => "30", :height => "30"), user_path(inviter) %> -
    • -
  • - <%=link_to inviter, user_path(inviter), :class => "newsBlue homepageNewsPublisher" %> - '>邀请你加入项目 -
    • - <% if ma.user.member_of?(ma.project) %> -
  • - <% else %> -
  • - <% end %> - <%= link_to ma.project, project_path(ma.project), - :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", - :onmouseover => "message_titile_show($(this),event)", - :onmouseout => "message_titile_hide($(this))" %> -
    • - - <% unless User.current.member_of?(ma.project) %> -
  • - <%=link_to "同意加入", {:controller => 'projects', :action => 'member', :id => ma.project_id, :message_id =>ma.id, :key => ma.secret_key}, - :value => ma.secret_key, - :class => "green_btn_cir ml10", - :style => "color:#fff" %> -
    • - <% end %> -
  • <%= time_tag(ma.created_at).html_safe %>
    • -
- <% end %> - <% if ma.forge_message_type == "Issue" %> - - <% end %> - <% if ma.forge_message_type == "Journal" %> - - <% end %> - <% if ma.forge_message_type == "Message" %> - - <% end %> - <% if ma.forge_message_type == "News" %> - - <% end %> - <% if ma.forge_message_type == "Comment" %> -
    -
  • <%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %>
    • -
  • <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %> - ">评论了新闻：
    • -
  • - <%= link_to "#{ma.forge_message.comments.html_safe}", - {:controller => 'news', :action => 'show', :id => ma.forge_message.commented.id },:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", - :onmouseover => "message_titile_show($(this),event)", - :onmouseout => "message_titile_hide($(this))" %> -
    • - -
  • <%= time_tag(ma.created_at).html_safe %>
    • -
- <% end %> - <% end %> - - <% if ma.class == MemoMessage %> - <% if ma.memo_type == "Memo" %> - - <% end %> - <% end %> - - <% if ma.class == UserFeedbackMessage %> - <% if ma.journals_for_message_type == "JournalsForMessage" %> - - <% end %> <% end %> +
    + <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> +
<% end %> -
    - <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> -
+ + <% else %> +
您目前还没有相关消息！
<% end %> - - -<% else %> -
您目前还没有相关消息！
-<% end %> -
-
+
+