From f73865b77135fa3282cbd5f2a65afd283133e84b Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 28 Sep 2015 10:20:14 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=BD=9C=E4=B8=9A=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E7=9A=84=E6=A0=B7=E5=BC=8F=EF=BC=9B=202.=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E7=B3=BB=E7=BB=9F=E6=B6=88=E6=81=AF=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_messages.html.erb | 20 ++++++++++---------- public/stylesheets/new_user.css | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index d207150b8..b93101c25 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -51,7 +51,7 @@
  • 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), @@ -195,22 +195,22 @@ <%= ma.course_message.user.lastname + ma.course_message.user.firstname %> 老师发布的作业截止日期快到了:

    -

    课程名称:<%= ma.course_message.course.name %> +

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

    -

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

    +

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

    -

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

    +

    提交截止:<%= 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_start %> + @nbsp;@nbsp;24点

    -

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

    +

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

    -

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

    +

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

    -

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

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

    diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 8817dd325..33cb08bfd 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -553,7 +553,7 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;} .homepageNewsPubType {width:230px; font-size:12px; color:#888888; display: block;} .homepageNewsPubTypeHomework {width:270px; font-size:12px; color:#888888; display: block; white-space:nowrap;} .homepageNewsContent {width:355px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; } -.homepageSystenMessageContent {width:291px; max-width:291px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden;text-overflow:ellipsis;max-height: 49px; } +.homepageSystenMessageContent {width:281px; max-width:291px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden;text-overflow:ellipsis;max-height: 49px; } .homepageHomeworkContentWarn {width:110px; max-width:365px; margin-right:10px; font-size:12px; color:red; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; } .homepageHomeworkContent {width:235px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }