From ab0013d659ecd65bb0902ada879b9f321c70fb2d Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Mon, 28 Sep 2015 13:29:02 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=A1=B9=E7=9B=AE=E9=97=AE=E9=A2=98=E4=B8=AD?=
 =?UTF-8?q?=EF=BC=8C=E9=97=AE=E9=A2=98=E7=B1=BB=E5=9E=8B=E4=B8=BA=E2=80=9C?=
 =?UTF-8?q?=E5=91=A8=E6=8A=A5=E2=80=9D=E6=97=B6=EF=BC=8C=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=BA=94=E4=B8=BA=E2=80=9C=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E4=BA=86=E5=91=A8=E6=8A=A5=E2=80=9D=EF=BC=9B=202.stylesheet=5F?=
 =?UTF-8?q?link=5Ftag=20=E4=B8=AD=EF=BC=8Cprettify=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E5=BC=95=E5=8F=B7=EF=BC=8C=E5=90=A6=E5=88=99?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_users_new.html.erb | 2 +-
 app/views/users/user_messages.html.erb    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb
index 807fb2caa..9f77b248d 100644
--- a/app/views/layouts/base_users_new.html.erb
+++ b/app/views/layouts/base_users_new.html.erb
@@ -14,7 +14,7 @@
 <meta name="keywords" content="issue,bug,tracker" />
 <%= csrf_meta_tag %>
 <%= favicon %>
-<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'public_new', 'leftside_new',prettify,'users', :media => 'all' %>
+<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'public_new', 'leftside_new','prettify','users', :media => 'all' %>
 <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 <%= javascript_heads %>
 <%= javascript_include_tag "avatars",'prettify'%>
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 6d682048f..93969f71b 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -518,7 +518,7 @@
                       </li>
                       <li class="homepageNewsPubType fl">
                         <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
-                        <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">指派了问题给你：</span>
+                        <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>"><%= ma.forge_message.tracker_id == 5 ? "发布了周报：":"指派了问题给你："%></span>
                       </li>
                       <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                         <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",