From d7de5fc48025df1124d8cc4d169013acbb7b84c7 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 25 Aug 2015 13:04:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=B6=88=E6=81=AF=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_messages.html.erb | 14 +++++++-------
 db/schema.rb                           | 10 ++++++++++
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 16a1bdf4b..231403575 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -68,7 +68,7 @@
                         <ul class="homepageNewsList fl">
                           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30") %></a></li>
                           <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue" %></a></li>
-                          <li class="homepageNewsType fl">发布作业</li>
+                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布作业</li>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                             <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),:class => "newsGrey", :title => "#{ma.course_message.name}" %></a></li>
                           <li class="homepageNewsTime fl"><%= time_tag(ma.course_message.created_at).html_safe %> </li>
@@ -111,7 +111,7 @@
                         <ul class="homepageNewsList fl">
                           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30") %></a></li>
                           <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue" %></li>
-                          <li class="homepageNewsType fl">评阅了作品</li>
+                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">评阅了作品</li>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                             <%= link_to "#{ma.course_message.comment.nil? ? "分数："+ma.course_message.score.to_s : "分数："+ma.course_message.score.to_s + "----" + "评语：" + ma.course_message.comment}", student_work_index_path(:homework => ma.course_message.student_work.homework_common_id),:class=>"newsGrey",:title => "#{ma.course_message.comment}" %></a></li>
                           <li class="homepageNewsTime fl"><%= time_tag(ma.course_message.created_at).html_safe %> </li>
@@ -121,7 +121,7 @@
                         <ul class="homepageNewsList fl">
                           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30") %></a></li>
                           <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue" %></li>
-                          <li class="homepageNewsType fl">回复了作品</li>
+                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">回复了作品</li>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                             <%= link_to ma.course_message.notes, student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id),:class=>"newsGrey",:title => "#{ma.course_message.notes}" %></a></li>
                           <li class="homepageNewsTime fl"><%= time_tag(ma.course_message.created_on).html_safe %> </li>
@@ -186,7 +186,7 @@
                           <li class="homepageNewsPublisher fl">
                             <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue" %>
                           </li>
-                          <li class="homepageNewsType fl">发布新闻</li>
+                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布新闻</li>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                             <%= link_to ("#{ma.forge_message.title.html_safe}"), {:controller => 'news', :action => 'show', :id => ma.forge_message.id}, :class => "newsGrey", :title => "#{ma.forge_message.title.html_safe}" %></a>
                           </li>
@@ -197,7 +197,7 @@
                         <ul class="homepageNewsList fl">
                           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30") %></a></li>
                           <li class="homepageNewsPublisher fl"><%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue" %></li>
-                          <li class="homepageNewsType fl">回复了新闻</li>
+                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">回复了新闻</li>
                           <li class="homepageNewsContent fl">
                             <%= link_to "#{ma.forge_message.comments.html_safe}",
                                         {:controller => 'news', :action => 'show', :id => ma.forge_message.commented.id },:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :title => "#{ma.forge_message.comments.html_safe}"%></li>
@@ -215,7 +215,7 @@
                           <li class="homepageNewsPublisher fl">
                             <%=link_to ma.memo.author, user_path(ma.memo.author), :class => "newsBlue" %>
                           </li>
-                          <li class="homepageNewsType fl" ><%= ma.memo.parent_id.nil? ? "新建贴吧帖子" : "回复贴吧帖子" %></li>
+                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>" ><%= ma.memo.parent_id.nil? ? "新建贴吧帖子" : "回复贴吧帖子" %></li>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                             <%= link_to ma.memo.content.html_safe, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id),:class => "newsGrey" , :title => "#{ma.memo.content.html_safe}" %></a>
                           </li>
@@ -233,7 +233,7 @@
                           <li class="homepageNewsPublisher fl">
                             <%=link_to ma.journals_for_message.user, user_path(ma.journals_for_message.user), :class => "newsBlue" %>
                           </li>
-                          <li class="homepageNewsType fl"><%= ma.journals_for_message.reply_id == 0 ? "给你留言了" : "回复了你的留言" %></li>
+                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.journals_for_message.reply_id == 0 ? "给你留言了" : "回复了你的留言" %></li>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                             <%= link_to ma.journals_for_message.notes.html_safe, feedback_path(ma.journals_for_message.jour_id), :class => "newsGrey", :title => "#{ma.journals_for_message.notes}".html_safe %></a>
                           </li>
diff --git a/db/schema.rb b/db/schema.rb
index 791c5b14d..2a339c656 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -572,6 +572,16 @@ ActiveRecord::Schema.define(:version => 20150824133916) do
     t.datetime "updated_at",         :null => false
   end
 
+  create_table "forum_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "forum_id"
+    t.integer  "memo_message_id"
+    t.string   "memo_message_type"
+    t.integer  "viewed"
+    t.datetime "created_at",        :null => false
+    t.datetime "updated_at",        :null => false
+  end
+
   create_table "forums", :force => true do |t|
     t.string   "name",                        :null => false
     t.text     "description"