From 596c512d0afc6800226c9343e2b326d73d1ac91c Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Thu, 10 Sep 2015 11:39:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb    |  2 ++
 app/views/users/user_messages.html.erb | 29 ++++++++++++++++++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 23106c954..220781ed9 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -148,6 +148,8 @@ class UsersController < ApplicationController
             @message_alls << message_all.message
           end
         end
+      when 'system_message'
+        @message_alls = SystemMessage.order("created_at desc").all
       when 'apply'
         @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?" , "AppliedProject", @user).order("created_at desc")
       when 'homework'
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index e36fd4f32..b5473edee 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -6,6 +6,8 @@
           <li><%= link_to "全部",user_message_path(User.current), :class => "resourcesGrey" %></li>
           <li><%= link_to "未读消息", user_message_path(User.current, :type => 'unviewed'), :class => "resourcesGrey" %></li>
           <li><%= link_to "用户申请", user_message_path(User.current, :type => 'apply'), :class => "resourcesGrey" %></li>
+          <%# 系统消息 %>
+          <li><%= link_to "系统消息", user_message_path(User.current, :type => 'system_message'), :class => "resourcesGrey" %></li>
           <%# 课程相关消息 %>
           <li><%= link_to "作业消息", user_message_path(User.current, :type => 'homework'), :class => "resourcesGrey" %></li>
           <li><%= link_to "课程讨论",user_message_path(User.current, :type => 'course_message'), :class => "resourcesGrey"  %></li>
@@ -42,8 +44,14 @@
     <%# 系统消息 %>
     <% @user_system_messages.each do |usm| %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);">ddddddddddddddd</a></li>
-          <li class="homepageNewsPubType fl">Trustiep平台<span class="homepageNewsType fl">发布新消息：</span></li>
+          <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, {:controller => 'system_messages', :action => 'index'},
                         :class =>"newsGrey",
@@ -303,6 +311,23 @@
                     </ul>
                 <% end %>
             <% end %>
+              <% if ma.class == SystemMessage %>
+                  <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 ma.content, {:controller => 'system_messages', :action => 'index'},
+                                  :class =>"newsGrey",
+                                  :title => "#{ma.content.html_safe}" %></li>
+                    <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+                  </ul>
+                  <% end %>
         <% end %>
         <ul class="wlist" style=" border:none; padding-top: 15px;">
           <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>