From e20fe85ddff0a915bf5e6d5898f0dae9fd807760 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 21 Mar 2016 18:16:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=8E=BB=E6=8E=89tip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_at_message.html.erb | 7 - app/views/users/_user_message_course.html.erb | 320 +----------------- app/views/users/_user_message_forge.html.erb | 106 +----- app/views/users/_user_message_forum.html.erb | 14 - app/views/users/_user_message_system.html.erb | 8 - .../_user_message_userfeedaback.html.erb | 1 - 6 files changed, 16 insertions(+), 440 deletions(-) diff --git a/app/views/users/_user_at_message.html.erb b/app/views/users/_user_at_message.html.erb index 089171c3d..8f0c6acaf 100644 --- a/app/views/users/_user_at_message.html.erb +++ b/app/views/users/_user_at_message.html.erb @@ -21,13 +21,6 @@ <%= link_to ma.subject.html_safe, ma.url, :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}", :onmouseover =>"message_titile_show($(this),event)", :onmouseout => "message_titile_hide($(this))" %> <% end %> -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> \ No newline at end of file diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index 7de1ce417..e042cd738 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -9,13 +9,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -29,13 +22,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -58,43 +44,6 @@ <% end %> -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -110,24 +59,6 @@ -
  •    截止时间快到啦
  • <%= time_tag(ma.created_at).html_safe %>
    • @@ -148,22 +79,6 @@ :onmouseover => "message_titile_show($(this),event)", :onmouseout => "message_titile_hide($(this))" %> -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -179,22 +94,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -214,18 +113,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -240,9 +127,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -252,37 +136,13 @@
  • <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %>"> <%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %>
    • - <% if ma.course_message.parent_id.nil? %> -
  • - <%= link_to ma.course_message.subject, course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id), - :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %> - - -
    • - - <% else %> -
  • - <%= link_to ma.course_message.content.html_safe, course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id), - :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %> - - -
    • - - <% end %> +
  • + <%= link_to ma.course_message.subject, course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id), + :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %> + + +
  • <%= time_tag(ma.created_at).html_safe %>
    • - <% end %> <% if ma.course_message_type == "StudentWorksScore" %> @@ -312,28 +172,9 @@ - <% end %> -
  • <%= time_tag(ma.created_at).html_safe %>
    • - +
  • <%= time_tag(ma.created_at).html_safe %>
    • + <% end %> <% if ma.course_message_type == "JournalsForMessage" %> <% if ma.course_message.jour_type == 'Course' %> @@ -352,9 +193,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -375,18 +213,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -406,20 +232,6 @@ -
  •   您成功提交了作品（但被标记为迟交啦）
  • <%= time_tag(ma.created_at).html_safe %>
    • @@ -440,23 +252,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -474,16 +269,6 @@ -
  • <% if ma.status == 0 || ma.status.nil?%> @@ -519,15 +304,6 @@
    • -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -548,20 +324,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -582,20 +344,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -616,21 +364,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -647,27 +380,6 @@ - -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -683,23 +395,7 @@ <%= link_to "测验题目：" + ma.course_message.exercise_name, exercise_path(:id => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %> - - -
  • 截止时间快到啦
  • <%= time_tag(ma.created_at).html_safe %>
    • diff --git a/app/views/users/_user_message_forge.html.erb b/app/views/users/_user_message_forge.html.erb index 574411055..1fd981d73 100644 --- a/app/views/users/_user_message_forge.html.erb +++ b/app/views/users/_user_message_forge.html.erb @@ -15,9 +15,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -38,21 +35,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -74,21 +56,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -114,9 +81,6 @@ - <% 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}, @@ -144,13 +108,6 @@
    • -
  •    截止时间快到了！
  • <%= time_tag(ma.created_at).html_safe %>
    • @@ -169,13 +126,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -197,11 +147,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -210,37 +155,14 @@
  • <%=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" %> "><%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %>
    • - <% if ma.forge_message.parent_id.nil? %> -
  • - <%= link_to ma.forge_message.subject, project_boards_path(ma.forge_message.project, - :parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id, - :topic_id => ma.forge_message.id), :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %> - - -
    • - - <% else %> -
  • - <%= link_to ma.forge_message.subject, project_boards_path(ma.forge_message.project, - :parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id, - :topic_id => ma.forge_message.id), :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %> - - -
    • - - <% end %> +
  • + <%= link_to ma.forge_message.subject, project_boards_path(ma.forge_message.project, + :parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id, + :topic_id => ma.forge_message.id), :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %> + + + +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -260,13 +182,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -281,11 +196,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> diff --git a/app/views/users/_user_message_forum.html.erb b/app/views/users/_user_message_forum.html.erb index d18292068..716fef349 100644 --- a/app/views/users/_user_message_forum.html.erb +++ b/app/views/users/_user_message_forum.html.erb @@ -15,13 +15,6 @@ - <% else %>
  • <%= link_to ma.memo.content.html_safe, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %> @@ -29,13 +22,6 @@
    • - <% end %>
  • <%= time_tag(ma.memo.created_at).html_safe %>
    • diff --git a/app/views/users/_user_message_system.html.erb b/app/views/users/_user_message_system.html.erb index a80d35bd4..72241636f 100644 --- a/app/views/users/_user_message_system.html.erb +++ b/app/views/users/_user_message_system.html.erb @@ -15,14 +15,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <%# end %> diff --git a/app/views/users/_user_message_userfeedaback.html.erb b/app/views/users/_user_message_userfeedaback.html.erb index 894eedbfc..1898090aa 100644 --- a/app/views/users/_user_message_userfeedaback.html.erb +++ b/app/views/users/_user_message_userfeedaback.html.erb @@ -24,7 +24,6 @@ <% end %>
  • <%= time_tag(ma.journals_for_message.created_on).html_safe %>
    • - <% end %> <% end %> \ No newline at end of file