From 3955075d03d469382dc17757f5ba497bc140c7fe Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Sat, 10 Oct 2015 15:00:49 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=B8=AD=EF=BC=8C?= =?UTF-8?q?=E5=B0=86=E7=94=A8=E6=88=B7=E7=95=99=E8=A8=80=E5=89=8D=E9=9D=A2?= =?UTF-8?q?=E7=9A=84=E7=A9=BA=E8=A1=8C=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_message_userfeedaback.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/_user_message_userfeedaback.html.erb b/app/views/users/_user_message_userfeedaback.html.erb index 672dfda64..23a0774c3 100644 --- a/app/views/users/_user_message_userfeedaback.html.erb +++ b/app/views/users/_user_message_userfeedaback.html.erb @@ -9,7 +9,7 @@ "><%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %>
  • - <%= link_to ma.journals_for_message.notes.html_safe, feedback_path(ma.journals_for_message.jour_id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", + <%= link_to ma.journals_for_message.notes.gsub("

    ","").gsub("

    ","").gsub("
    ","").html_safe, feedback_path(ma.journals_for_message.jour_id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :onmouseover =>"message_titile_show($(this),event)", :onmouseout => "message_titile_hide($(this))" %>
    • From 3d993304e31b1d0573c534c96444b9dc654ccc01 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Sat, 10 Oct 2015 15:27:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=9A=84=E4=B8=80=E4=BA=9B=E4=BB=A3=E7=A0=81?= =?UTF-8?q?bug;=202.=E8=B0=83=E6=95=B4=E6=B6=88=E6=81=AF=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E5=8D=95=E9=97=B4=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_message_course.html.erb | 10 +++++----- app/views/users/user_messages.html.erb | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index fee28f761..07066f6dc 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -99,17 +99,17 @@

    课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)

    作业标题：<%= ma.course_message.name %>

    -

    提交截止：<%= ma.course_message.end_time %>@nbsp; 24点

    -

    匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %>@nbsp;@nbsp;24点

    +

    提交截止：<%= ma.course_message.end_time %>  24点

    +

    匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %> @ 24点

    迟交扣分：<%= ma.course_message.late_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.term %>)

    作业标题：<%= ma.course_message.name %>

    -

    提交截止：<%= ma.course_message.end_time %>@nbsp;@nbsp;24点

    -

    匿评开始：<%= ma.course_message.homework_detail_manual.evaluation_start %>@nbsp;@nbsp;24点

    -

    匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %>@nbsp;@nbsp;24点

    +

    提交截止：<%= ma.course_message.end_time %>  24点

    +

    匿评开始：<%= ma.course_message.homework_detail_manual.evaluation_start %>  24点

    +

    匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %>  24点

    迟交扣分：<%= ma.course_message.late_penalty %>分

    缺评扣分：<%= ma.course_message.homework_detail_manual.absence_penalty %>分

    您可以修改作业内容、评分规则、匿评过程等，谢谢！

    diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index d0f7bb9bb..6f583f76d 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -2,9 +2,9 @@
    <%= title_for_message(params[:type]) %>