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 %>
-
-
标题:<%= ma.subject %>
- <% unless ma.description.nil? %>
-
内容:
-
<%= ma.description.html_safe %>
- <% 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 @@
-
-
标题:<%= ma.course_message.title %>
- <% unless ma.course_message.description.nil? %>
-
内容:
-
<%= ma.course_message.description.html_safe %>
- <% end %>
-
<%= time_tag(ma.created_at).html_safe %>
<% end %>
@@ -29,13 +22,6 @@
-
-
评论对象:<%= ma.course_message.commented.title %>
- <% unless ma.course_message.comments.nil? %>
-
评论内容:
-
<%= ma.course_message.comments.html_safe %>
- <% end %>
-
<%= time_tag(ma.created_at).html_safe %>
<% end %>
@@ -58,43 +44,6 @@
<% end %>
-
- <% if User.current.allowed_to?(:as_teacher,ma.course_message.course) %>
-
- <%= User.current.lastname + User.current.firstname %>老师您好!
- <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.show_name + "老师")%>刚刚发布了一个作业:
-
-
- - 课程名称:<%= ma.course_message.course.name %>
- (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)
- - 作业标题:<%= ma.course_message.name %>
- - 发布时间:<%= DateTime.parse(ma.course_message.created_at.to_s).strftime('%Y-%m-%d %H:%M').to_s %>
- - 提交截止:<%= ma.course_message.end_time %> 23:59
- - 匿评开始:<%= ma.course_message.homework_detail_manual.evaluation_start %> 23:59
- - 匿评关闭:<%= ma.course_message.homework_detail_manual.evaluation_end %> 23:59
- - 迟交扣分:<%= ma.course_message.late_penalty %>分
- - 缺评扣分:<%= ma.course_message.homework_detail_manual.absence_penalty %>分
-
-
- 您可以修改作业内容、评分规则、匿评过程等,谢谢!
-
- <% else %>
-
<%= User.current.lastname + User.current.firstname %>同学您好!<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业:
-
- - 课程名称:<%= ma.course_message.course.name %>
- (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)
- - 作业标题:<%= ma.course_message.name %>
- - 提交截止:<%= ma.course_message.end_time %> 23:59
- - 匿评开始:<%= ma.course_message.homework_detail_manual.evaluation_start %> 23:59
- - 匿评关闭:<%= ma.course_message.homework_detail_manual.evaluation_end %> 23:59
- - 迟交扣分:<%= ma.course_message.late_penalty %>分
- - 缺评扣分:<%= ma.course_message.homework_detail_manual.absence_penalty %>分
-
-
- 请抓紧时间提交您的作品,谢谢!
-
- <% end %>
-
<%= time_tag(ma.created_at).html_safe %>
<% end %>
@@ -110,24 +59,6 @@
-
- <% if !User.current.allowed_to?(:as_teacher,ma.course_message.course) %>
-
- <%= User.current.lastname + User.current.firstname %>同学您好!
- <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师发布的作业截止日期快到了:
-
-
- - 课程名称:<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)
- - 作业标题:<%= ma.course_message.name %>
- - 提交截止:<%= ma.course_message.end_time %> 23:59
- - 匿评开始:<%= ma.course_message.homework_detail_manual.evaluation_start %> 23:59
- - 匿评关闭:<%= ma.course_message.homework_detail_manual.evaluation_end %> 23:59
- - 迟交扣分:<%= ma.course_message.late_penalty %>分
- - 缺评扣分:<%= ma.course_message.homework_detail_manual.absence_penalty %>分
- 请抓紧时间提交您的作品,谢谢!
-
- <% end %>
-
截止时间快到啦
<%= time_tag(ma.created_at).html_safe %>
@@ -148,22 +79,6 @@
:onmouseover => "message_titile_show($(this),event)",
:onmouseout => "message_titile_hide($(this))" %>
-
-
- <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师' : '同学' %>您好!
- <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>开启了匿评,作业详情如下:
-
-
- - 课程名称:<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)
- - 作业标题:<%= ma.course_message.name %>
- - 缺评扣分:<%= ma.course_message.homework_detail_manual.absence_penalty %>分
- - 匿评截止:<%= ma.course_message.homework_detail_manual.evaluation_end %> 23:59
-
- <% unless User.current.allowed_to?(:as_teacher, ma.course_message.course)%>
-
请您尽早完成匿评,如果您在截止日期前未完成匿评,您的最终成绩将被扣除<%= ma.course_message.homework_detail_manual.absence_penalty %>分乘以缺评份数。
-
例如,您缺评了两份作品,则您的最终成绩将被扣除 <%= ma.course_message.homework_detail_manual.absence_penalty %> * 2 = <%= ma.course_message.homework_detail_manual.absence_penalty * 2 %>分
- <% end%>
-
<%= time_tag(ma.created_at).html_safe %>
<% end %>
@@ -179,22 +94,6 @@
-
-
- <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师':'同学'%>您好!
- 该作业已经关闭了匿评。作业信息如下:
-
-
- - 课程名称:<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)
- - 作业标题:<%= ma.course_message.name %>
-
-
-
注:缺省情况下,系统将在作业提交截止日期后14天自动关闭匿评。
-
- <% if User.current.allowed_to?(:as_teacher,ma.course_message.course)%>
-
祝您的教学活动高效、顺利、愉快!
- <% end %>
-
<%= time_tag(ma.created_at).html_safe %>
<% end %>
@@ -214,18 +113,6 @@
-
-
- <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher, ma.course_message.course) ? '老师':'同学'%>您好!
- <%= User.current.eql?(ma.course_message.user) ?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname + "老师") %>启动作业匿评失败啦
-
-
-
- - 课程名称:<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年' + ma.course_message.course.term %>)
- - 作业标题:<%= ma.course_message.name %>
- - 提交截止:<%= ma.course_message.end_time%> 23:59
-
-
<%= time_tag(ma.created_at).html_safe %>
<% end %>
@@ -240,9 +127,6 @@
-
- <%= ma.course_message.polls_name %>
-
<%= 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"}" %>
-
-
-
-
-
主题:<%= ma.course_message.subject %>
- <% unless ma.course_message.content.nil? %>
-
内容:
-
<%= ma.course_message.content.html_safe %>
- <% end %>
-
- <% 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"}" %>
-
-
-
-
-
主题:<%= ma.course_message.subject %>
- <% unless ma.course_message.content.nil? %>
-
内容:
-
<%= ma.course_message.content.html_safe %>
- <% end %>
-
- <% 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 @@
-
-
- <%= User.current.show_name %>同学您好!
- <%= ma.course_message.reviewer_role == 3? "匿名用户" : (ma.course_message.user.show_name + "老师")%><%= ma.status == 0? "评阅了您的作品":"重新评阅了您的作品"%>。详情如下:
-
-
- - 课程名称:<%= ma.course.name %>(<%= ma.course.time.to_s + '年'+ ma.course.term %>)
- - 作业标题:<%=ma.course_message.student_work.homework_common.name %>
- <% content = ma.content.gsub("作业评分:","").split(" 评语:")%>
- - 作品评分:<%= content[0] %>分
- <% if content.size > 1 %>
- - 作品评语:
- <%= content[1] %>
- <% end %>
-
-
- 本次作业将在<%= ma.course_message.student_work.homework_common.homework_detail_manual.evaluation_end %> 23:59结束匿评,到时您将可以看到所有其他同学的作品啦!大家可以进一步互相学习。 期待您取得更大的进步!
-
-
<% 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 @@
-
- <%= ma.course_message.notes.html_safe %>
-
<%= time_tag(ma.created_at).html_safe %>
<% end %>
@@ -375,18 +213,6 @@
-
-
- <%= User.current.show_name %>老师您好!
- <%= ma.course_message.user.show_name%><%= ma.course_message.user.allowed_to?(:as_teacher, ma.course)?"老师":"同学"%>回复了您的作品评论。详情如下:
-
-
- - 回复内容:<%= ma.course_message.notes %>
- - 您的评论:<%= ma.course_message.jour.comment %>
- - 课程名称:<%= ma.course.name %>(<%= ma.course.time.to_s + '年'+ ma.course.term %>)
- - 作业标题:<%=ma.course_message.jour.student_work.homework_common.name %>
-
-
<%= time_tag(ma.created_at).html_safe %>
<% end %>
@@ -406,20 +232,6 @@
-
-
- <%= User.current.lastname + User.current.firstname %>
- <%= User.current.allowed_to?(:as_teacher,ma.course_message.homework_common.course) ? '老师':'同学'%>您好!由于迟交作业,您及您的作品都不能参与以下作业的匿评。作业详情如下:
-
-
- - 课程名称:<%= ma.course_message.homework_common.course.name %>(<%= ma.course_message.homework_common.course.time.to_s + '年' + ma.course_message.homework_common.course.term %>)
- - 作业标题:<%= ma.course_message.homework_common.name %>
- - 提交截止:<%= ma.course_message.homework_common.end_time %> 23:59
- - 提交时间:<%= format_time(ma.course_message.created_at) %>
- - 迟交扣分:<%= ma.course_message.homework_common.late_penalty %>分
-
-
如需获得最终成绩,请您联系主讲老师对您的作品进行单独评分!
-
您成功提交了作品(但被标记为迟交啦)
<%= time_tag(ma.created_at).html_safe %>
@@ -440,23 +252,6 @@
-
-
- <%= User.current.lastname + User.current.firstname %>老师您好!您成功创建了一个课程,详情如下:
-
-
课程名称:<%= ma.course_message.name %>
-
开课学期:<%= ma.course_message.time.to_s + '年' + ma.course_message.term %>
-
课程ID:<%= ma.course_message.id %>
-
课程密码:<%= ma.course_message.password %>
-
学时总数:<%= ma.course_message.class_period %>
-
创建时间:<%= format_time(ma.course_message.created_at) %>
-
您可以点击左上角的“配置”按钮,修改课程基本信息,添加及删除课程成员。您也可以把课程ID及密码告诉学生和其他成员,让他们输入ID及密码加入课程。
- <% if ma.course_message.is_public %>
-
您的课程是公开的,所有人都能访问您的课程。若不想设置为公开,您可以在配置中设置。
- <% else %>
-
您的课程是私有的,非课程成员不能访问您的课程。如果想设置为公开,您可以在配置中设置。
- <% end %>
-
<%= time_tag(ma.created_at).html_safe %>
<% end %>
@@ -474,16 +269,6 @@
-
-
- <%= User.current.lastname + User.current.firstname %>老师您好!您有了新的课程成员申请,信息如下:
-
-
真实姓名:<%= User.find(ma.course_message_id).realname %>
-
申请课程:<%= Course.find(ma.course_id).name%>
-
课程描述:
-
<%= Course.find(ma.course_id).description.html_safe %>
-
申请职位:<%= ma.content == '9' ? "教师" : "教辅"%>
-
<% if ma.status == 0 || ma.status.nil?%>
@@ -519,15 +304,6 @@
-
-
- <%= User.current.lastname + User.current.firstname %>老师您好!您已成功加入课程<%= Course.find(ma.course_id).name%>。
-
-
申请课程:<%= Course.find(ma.course_id).name%>
-
课程描述:
-
<%= Course.find(ma.course_id).description.html_safe %>
-
申请职位:<%= ma.content == '9' ? "教师" : "教辅"%>
-
<%= time_tag(ma.created_at).html_safe %>
<% end %>
@@ -548,20 +324,6 @@
-
- <% if ma.course.is_public? || User.current.member_of_course?(ma.course) || User.current.admin? %>
- <% teacher = User.find(ma.course_message_id) %>
-
<%= teacher.show_name %>(<%= teacher %>)老师把您加入了课程,详情如下:
-
课程名称:<%= ma.course.name %>
-
开课学期:<%= ma.course.time.to_s + '年'+ ma.course.term %>
-
课程ID:<%= ma.course.id %>
-
课时总数:<%= ma.course.class_period %>
- <% else %>
-
- 您已经被移出该私有课程,非课程成员没有权限访问私有课程
-
- <% end %>
-
<%= time_tag(ma.created_at).html_safe %>
<% end %>
@@ -582,20 +344,6 @@
-
- <% if ma.course.is_public? || User.current.member_of_course?(ma.course) || User.current.admin? %>
-
您增加了新的课程成员,详情如下:
-
成员:<%= User.find(ma.course_message_id).login+"("+(User.find(ma.course_message_id).realname ? User.find(ma.course_message_id).realname : User.find(ma.course_message_id).login) +")" %>
-
课程名称:<%= ma.course.name %>
-
开课学期:<%= ma.course.time.to_s + '年'+ ma.course.term %>
-
课程ID:<%= ma.course.id %>
-
课时总数:<%= ma.course.class_period %>
- <% else %>
-
- 您已经被移出该私有课程,非课程成员没有权限访问私有课程
-
- <% end %>
-
<%= time_tag(ma.created_at).html_safe %>
<% end %>
@@ -616,21 +364,6 @@
-
- <% if ma.course.is_public? || User.current.member_of?(ma.course) || User.current.admin? %>
-
您已被<%= User.find(ma.course_message_id).show_name %>老师移出了课程,详情如下:
-
课程名称:<%= ma.course.name %>
-
开课学期:<%= ma.course.time.to_s + '年'+ ma.course.term %>
- <% if !ma.content.nil? %>
-
担任角色:<%= ma.content %>
- <% end %>
-
学时总数:<%= ma.course.class_period %>
- <% else %>
-
- 您已经被移出该私有课程,非课程成员没有权限访问私有课程
-
- <% end %>
-
<%= time_tag(ma.created_at).html_safe %>
<% end %>
@@ -647,27 +380,6 @@
-
-
-
- <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师':'同学'%>您好!
- <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>发布了课程测验 ,测验详情如下:
-
-
- - 课程名称:<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)
- - 测验标题:<%= ma.course_message.exercise_name %>
-
-
-
-
-
- - 截止时间:<%= ma.course_message.end_time.to_s.gsub("+0800","").to_datetime.strftime("%Y-%m-%d %H:%M:%S") %>
- - 答题时长:<%= ma.course_message.time == -1 ? '不限时' : ma.course_message.time.to_s + '分钟' %>
- <% if !User.current.allowed_to?(:as_teacher,ma.course_message.course)%>
- 请记得在截止时间前完成测验噢,辛苦啦!
- <% end %>
-
-
<%= 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"}" %>
-
-
-
-
- <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师':'同学'%>您好!
- <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>发布的课程测验截止时间快到了,测验详情如下:
-
-
-
- - 课程名称:<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)
- - 测验标题:<%= ma.course_message.exercise_name %>
- - 截止时间:<%= ma.course_message.end_time.to_s.gsub("+0800","").to_datetime.strftime("%Y-%m-%d %H:%M:%S") %>
- - 答题时长:<%= ma.course_message.time == -1 ? '无限制' : ma.course_message.time.to_s + '分钟' %>
- 请及时完成课程测验,辛苦啦!
-
-
截止时间快到啦
<%= 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 @@
-
- <%= ma.project %>
-
<%= time_tag(ma.created_at).html_safe %>
<% end %>
@@ -38,21 +35,6 @@
-
- <% if ma.project.is_public? || User.current.member_of?(ma.project) || User.current.admin? %>
-
- 项目名称:<%= ma.project.name %>
-
-
-
- 项目描述:<%= ma.project.description %>
-
- <% else %>
-
- 您已经被移出该私有项目,非项目成员没有权限访问私有项目
-
- <% end %>
-
<%= time_tag(ma.created_at).html_safe %>
<% end %>
@@ -74,21 +56,6 @@
-
- <% if ma.project.is_public? || User.current.member_of?(ma.project) || User.current.admin? %>
-
- 项目名称:<%= ma.project.name %>
-
-
-
- 项目描述:<%= ma.project.description %>
-
- <% else %>
-
- 您已经被移出该私有项目,非项目成员没有权限访问私有项目
-
- <% end %>
-
<%= time_tag(ma.created_at).html_safe %>
<% end %>
@@ -114,9 +81,6 @@
-
- <%= ma.project %>
-
<% 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 @@
-
-
主题:<%= ma.forge_message.subject %>
- <% unless ma.forge_message.description.nil? || ma.forge_message.description == "" %>
-
描述:
-
<%= ma.forge_message.description.html_safe %>
- <% end %>
-
截止时间快到了!
<%= time_tag(ma.created_at).html_safe %>
@@ -169,13 +126,6 @@
-
-
主题:<%= ma.forge_message.subject %>
- <% unless ma.forge_message.description.nil? || ma.forge_message.description == "" %>
-
描述:
-
<%= ma.forge_message.description.html_safe %>
- <% end %>
-
<%= time_tag(ma.created_at).html_safe %>
<% end %>
@@ -197,11 +147,6 @@
-
-
问题标题:<%= ma.forge_message.journalized.subject %>
-
更新内容:
-
<%= get_issue_des_update(ma.forge_message).html_safe %>
-
<%= 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"}" %>
-
-
-
-
-
主题:<%= ma.forge_message.subject %>
- <% unless ma.forge_message.content.nil? %>
-
内容:
-
<%= ma.forge_message.content.html_safe %>
- <% end %>
-
- <% 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"}" %>
-
-
-
-
-
帖子主题:<%= ma.forge_message.subject %>
- <% unless ma.forge_message.content.nil? %>
-
评论内容:
-
<%= ma.forge_message.content.html_safe %>
- <% end %>
-
- <% 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 @@
-
-
标题:<%= ma.forge_message.title %>
- <% unless ma.forge_message.description.nil? %>
-
内容:
-
<%= ma.forge_message.description.html_safe %>
- <% end %>
-
<%= time_tag(ma.created_at).html_safe %>
<% end %>
@@ -281,11 +196,6 @@
-
-
新闻标题:<%= ma.forge_message.commented.title %>
-
评论内容:
-
<%= ma.forge_message.comments.html_safe %>
-
<%= 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 @@
-
-
标题:<%= ma.memo.subject %>
- <% unless ma.memo.content.nil? %>
-
内容:
-
<%= ma.memo.content.html_safe %>
- <% end %>
-
<% 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 @@
-
-
标题:<%= ma.memo.subject %>
- <% unless ma.memo.content.nil? %>
-
内容:
-
<%= ma.memo.content.html_safe %>
- <% end %>
-
<% 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 @@
-
- <% unless ma.subject.blank? %>
-
标题:<%= ma.subject %>
- <% end %>
- <% if (!ma.description.blank?) || (!ma.content.blank?) %>
-
内容:
<%= ma.description.nil? ? ma.content.html_safe : ma.description.html_safe %>
- <% end %>
-
<%= 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