Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq

app/controllers/news_controller.rb

@@ -99,18 +99,31 @@ class NewsController < ApplicationController
    end
 
   def show
+    #更新news对应的forge_messages的viewed字段
     query_forge_news = @news.forge_messages
     query_forge_news.each do |query|
       if User.current.id == query.user_id
         query.update_attributes(:viewed => true)
       end
     end
+    #更新news对应的course_messages的viewed字段
     query_course_news = @news.course_messages
     query_course_news.each do |query|
       if User.current.id == query.user_id
         query.update_attributes(:viewed => true)
       end
     end
+    #更新项目新闻的评阅的viewed字段
+    current_forge_comments = @news.comments
+    current_forge_comments.each do |current_forge_comment|
+      query_forge_comment = current_forge_comment.forge_messages
+      query_forge_comment.each do |query|
+        if User.current.id == query.user_id
+          query.update_attributes(:viewed => true)
+        end
+      end
+    end
+
     cs = CoursesService.new
     result = cs.show_course_news params,User.current
     @news = result[:news]

public/stylesheets/new_public.css

@@ -833,3 +833,5 @@ a.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
     color: #7A7A7A;
     padding-left: 10px;
 }
+.homepageNewsType {width:95px; font-size:12px; color:#888888; display:block;}
+.homepageNewsTypeNotRead {width:95px; font-size:12px; color:#888888; display:block;}