From 3044b07df7dd4629f547231a3425790aa8b7cbbd Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 11 Sep 2015 14:43:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=B6=88=E6=81=AF=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_messages.html.erb | 52 ++++++++++++++------------
 public/stylesheets/new_user.css        |  2 +
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 03e9f487d..e506b4a81 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -42,29 +42,33 @@
         </div>
     <% end %>
     <%# 系统消息 %>
-    <% @user_system_messages.each do |usm| %>
-        <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);">
-              <div class="navHomepageLogo fl">
-                <%=image_tag("/images/logo.png",width:"30px", height: "30px",class: "mt3") %>
-              </div>
-            </a>
-          </li>
-          <li class="homepageNewsPubType fl"><span class="newsBlue homepageNewsPublisher" >Trustie平台</span><span class="homepageNewsType fl">发布新消息：</span></li>
-          <li class="homepageNewsContent fl">
-            <%= link_to usm.content.html_safe, {:controller => 'system_messages', :action => 'index'},
-                        :class =>"newsGrey",
-                        :onmouseover =>"message_titile_show($(this),event);",
-                        :onmouseout => "message_titile_hide($(this));"
-          %>
-          </li>
-          <div style="display:none;" class="message_title">
-            <%= usm.content.html_safe%>
-          </div>
-          <li class="homepageNewsTime fl"><%= time_tag(usm.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
+      <% if params[:type] != 'system_message' %>
+          <% @user_system_messages.each do |usm| %>
+              <ul class="homepageNewsList fl">
+                <li class="homepageNewsPortrait fl">
+                  <a href="javascript:void(0);">
+                    <div class="navHomepageLogo fl">
+                      <%= image_tag("/images/logo.png", width: "30px", height: "30px", class: "mt3") %>
+                    </div>
+                  </a>
+                </li>
+                <li class="homepageNewsPubType fl">
+                  <span class="newsBlue homepageNewsPublisher">Trustie平台</span><span class="homepageNewsType fl">发布新消息：</span>
+                </li>
+                <li class="homepageNewsContent fl">
+                  <%= link_to usm.content.html_safe, {:controller => 'system_messages', :action => 'index'},
+                              :class => "newsGrey",
+                              :onmouseover => "message_titile_show($(this),event);",
+                              :onmouseout => "message_titile_hide($(this));"
+                  %>
+                </li>
+                <div style="display:none;" class="message_title">
+                  <%= usm.content.html_safe %>
+                </div>
+                <li class="homepageNewsTime fl"><%= time_tag(usm.created_at).html_safe %> </li>
+              </ul>
+          <% end %>
+      <% end %>
     <%# 课程消息 %>
     <% unless @message_alls.nil? %>
         <% @message_alls.each do |ma| %>
@@ -330,7 +334,7 @@
                     <li class="homepageNewsPubType fl"><span class="newsBlue homepageNewsPublisher" >Trustie平台</span><span class="homepageNewsType fl">发布新消息：</span></li>
                     <li class="homepageNewsContent fl">
                       <%= link_to ma.content.html_safe, {:controller => 'system_messages', :action => 'index'},
-                                  :class =>"newsGrey",
+                                  :class => "#{params[:type]=="unviewed" ? "newsBlack" : "newsRed"}",
                                   :onmouseover =>"message_titile_show($(this),event);",
                                   :onmouseout => "message_titile_hide($(this));"
                    %>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index f8000f674..37af8ccea 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -519,6 +519,8 @@ a.homepageWhite {color:#ffffff;}
 a.homepageWhite:hover {color:#a1ebff}
 a.newsGrey {color:#4b4b4b;}
 a.newsGrey:hover {color:#000000;}
+a.newsRed {color:red;}
+a.newsRed:hovor {color:#888888;}
 a.replyGrey {color:#888888; display:inline-block;}
 a.replyGrey:hover {color:#4b4b4b;}
 a.replyGrey1 {color:#888888;}