diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index b3624b14d..6a0b351ba 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -386,14 +386,16 @@ class IssuesController < ApplicationController
   end
 
   def add_journal
-    jour = Journal.new
-    jour.user_id = User.current.id
-    jour.notes = params[:notes]
-    jour.journalized = @issue
-    jour.save
-    @user_activity_id = params[:user_activity_id]
-    respond_to do |format|
-      format.js
+    if User.current.logged?
+      jour = Journal.new
+      jour.user_id = User.current.id
+      jour.notes = params[:notes]
+      jour.journalized = @issue
+      jour.save
+      @user_activity_id = params[:user_activity_id]
+      respond_to do |format|
+        format.js
+      end
     end
   end
 
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 965aacab0..f71103973 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -101,27 +101,27 @@ class MessagesController < ApplicationController
           ids = params[:asset_id].split(',')
           update_kindeditor_assets_owner ids,@message.id,OwnerTypeHelper::MESSAGE
         end
-        # 与我相关动态的记录add start
-        if(@board && @board.course) #项目的先不管
-          teachers = searchTeacherAndAssistant(@board.course)
-          for teacher in teachers
-            if(teacher.user_id != User.current.id)
-              notify = ActivityNotify.new()
-              if(@board.course)
-                notify.activity_container_id = @board.course_id
-                notify.activity_container_type = 'Course'
-              else
-                notify.activity_container_id = @board.project_id
-                notify.activity_container_type = 'Project'
-              end
-              notify.activity_id = @message.id
-              notify.activity_type = 'Message'
-              notify.notify_to = teacher.user_id
-              notify.is_read = 0
-              notify.save()
-            end
-          end
-        end
+        # # 与我相关动态的记录add start
+        # if(@board && @board.course) #项目的先不管
+        #   teachers = searchTeacherAndAssistant(@board.course)
+        #   for teacher in teachers
+        #     if(teacher.user_id != User.current.id)
+        #       notify = ActivityNotify.new()
+        #       if(@board.course)
+        #         notify.activity_container_id = @board.course_id
+        #         notify.activity_container_type = 'Course'
+        #       else
+        #         notify.activity_container_id = @board.project_id
+        #         notify.activity_container_type = 'Project'
+        #       end
+        #       notify.activity_id = @message.id
+        #       notify.activity_type = 'Message'
+        #       notify.notify_to = teacher.user_id
+        #       notify.is_read = 0
+        #       notify.save()
+        #     end
+        #   end
+        # end
         # 与我相关动态的记录add end
 
         call_hook(:controller_messages_new_after_save, { :params => params, :message => @message})
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d1eeda707..859f19f19 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -296,12 +296,16 @@ class UsersController < ApplicationController
 
   #用户作业列表
   def user_homeworks
-    @page = params[:page] ? params[:page].to_i + 1 : 0
-    user_course_ids = "(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
-    @homework_commons = HomeworkCommon.where("course_id in #{user_course_ids}").order("created_at desc").limit(10).offset(@page * 10)
-    respond_to do |format|
-      format.js
-      format.html {render :layout => 'new_base_user'}
+    if User.current == @user
+      @page = params[:page] ? params[:page].to_i + 1 : 0
+      user_course_ids = "(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
+      @homework_commons = HomeworkCommon.where("course_id in #{user_course_ids}").order("created_at desc").limit(10).offset(@page * 10)
+      respond_to do |format|
+        format.js
+        format.html {render :layout => 'new_base_user'}
+      end
+    else
+      render_403
     end
   end
 
@@ -345,16 +349,20 @@ class UsersController < ApplicationController
   end
 
   def new_user_commit_homework
-    @user = User.current
-    @homework = HomeworkCommon.find(params[:homework_id])
-    @is_test = params[:is_test] == 'true'
-    @student_work = @homework.student_works.where(user_id: User.current.id).first
-    if @student_work.nil?
-      @student_work = StudentWork.new
-    end
-    respond_to do |format|
-      format.js
-      format.html {render :layout => 'new_base_user'}
+    if User.current.logged?
+      @user = User.current
+      @homework = HomeworkCommon.find(params[:homework_id])
+      @is_test = params[:is_test] == 'true'
+      @student_work = @homework.student_works.where(user_id: User.current.id).first
+      if @student_work.nil?
+        @student_work = StudentWork.new
+      end
+      respond_to do |format|
+        format.js
+        format.html {render :layout => 'new_base_user'}
+      end
+    else
+      render_403
     end
   end
 
@@ -364,53 +372,57 @@ class UsersController < ApplicationController
   end
 
   def user_new_homework
-    if params[:homework_common]
-      homework = HomeworkCommon.new
-      homework.name = params[:homework_common][:name]
-      homework.description = params[:homework_common][:description]
-      homework.end_time = params[:homework_common][:end_time] || Time.now
-      homework.publish_time = Time.now
-      homework.homework_type = params[:homework_type].to_i || 1
-      homework.late_penalty = 2
-      homework.user_id = User.current.id
-      homework.course_id = params[:course_id]
+    if User.current.logged?
+      if params[:homework_common]
+        homework = HomeworkCommon.new
+        homework.name = params[:homework_common][:name]
+        homework.description = params[:homework_common][:description]
+        homework.end_time = params[:homework_common][:end_time] || Time.now
+        homework.publish_time = Time.now
+        homework.homework_type = params[:homework_type].to_i || 1
+        homework.late_penalty = 2
+        homework.user_id = User.current.id
+        homework.course_id = params[:course_id]
 
-      homework.save_attachments(params[:attachments])
-      render_attachment_warning_if_needed(homework)
+        homework.save_attachments(params[:attachments])
+        render_attachment_warning_if_needed(homework)
 
-      #匿评作业相关属性
-      if homework.homework_type == 1
-        homework_detail_manual = HomeworkDetailManual.new
-        homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
-        homework_detail_manual.comment_status = 1
-        homework_detail_manual.evaluation_start = Time.now
-        homework_detail_manual.evaluation_end = Time.now
-        homework_detail_manual.evaluation_num = params[:evaluation_num] || 3
-        homework_detail_manual.absence_penalty = 2
-        homework.homework_detail_manual = homework_detail_manual
-      else
-        homework_detail_programing = HomeworkDetailPrograming.new
-        homework.homework_detail_programing = homework_detail_programing
-        homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
-        homework_detail_programing.language = params[:program][:language].to_i
+        #匿评作业相关属性
+        if homework.homework_type == 1
+          homework_detail_manual = HomeworkDetailManual.new
+          homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
+          homework_detail_manual.comment_status = 1
+          homework_detail_manual.evaluation_start = Time.now
+          homework_detail_manual.evaluation_end = Time.now
+          homework_detail_manual.evaluation_num = params[:evaluation_num] || 3
+          homework_detail_manual.absence_penalty = 2
+          homework.homework_detail_manual = homework_detail_manual
+        else
+          homework_detail_programing = HomeworkDetailPrograming.new
+          homework.homework_detail_programing = homework_detail_programing
+          homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
+          homework_detail_programing.language = params[:program][:language].to_i
 
-        inputs = params[:program][:input]
-        if Array === inputs
-          inputs.each_with_index do |val, i|
-            homework.homework_tests << HomeworkTest.new(
-              input: val,
-              output: params[:program][:output][i]
-            )    
+          inputs = params[:program][:input]
+          if Array === inputs
+            inputs.each_with_index do |val, i|
+              homework.homework_tests << HomeworkTest.new(
+                  input: val,
+                  output: params[:program][:output][i]
+              )
+            end
           end
-        end
-        
-      end
 
-      if homework.save
-        homework_detail_manual.save if homework_detail_manual
-        homework_detail_programing.save if homework_detail_programing
-        redirect_to user_homeworks_user_path(User.current.id)
+        end
+
+        if homework.save
+          homework_detail_manual.save if homework_detail_manual
+          homework_detail_programing.save if homework_detail_programing
+          redirect_to user_homeworks_user_path(User.current.id)
+        end
       end
+    else
+      render_403
     end
   end
 
@@ -507,6 +519,7 @@ class UsersController < ApplicationController
         att_copy = atta.copy
         att_copy.container_id = nil
         att_copy.container_type = nil
+        att_copy.author_id = User.current.id
         att_copy.copy_from = atta.id
         att_copy.save
         @attachments << att_copy
@@ -771,7 +784,7 @@ class UsersController < ApplicationController
     @page = params[:page] ? params[:page].to_i + 1 : 0
     user_project_ids = @user.projects.visible.empty? ? "(-1)" : "(" + @user.projects.visible.map{|project| project.id}.join(",") + ")"
     user_course_ids = @user.courses.visible.empty? ? "(-1)" : "(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
-    course_types = "('Message','News','HomeworkCommon','poll')"
+    course_types = "('Message','News','HomeworkCommon','Poll')"
     project_types = "('Message','Issue')"
     if params[:type].present?
       case params[:type]
diff --git a/app/helpers/user_score_helper.rb b/app/helpers/user_score_helper.rb
index 41f76a792..c82255d00 100644
--- a/app/helpers/user_score_helper.rb
+++ b/app/helpers/user_score_helper.rb
@@ -27,7 +27,7 @@ module UserScoreHelper
     issue_c = issue_c + Journal.where("user_id = ?", user.id).count
     ############################
     memos = Memo.where('author_id = ? AND parent_id IS NOT NULL', user.id)
-    
+
     memos.each do |m|
       if Memo.find(m.parent_id).author.id != user.id
         issue_c = issue_c + 1
@@ -35,18 +35,18 @@ module UserScoreHelper
         issue_c = issue_c - 1
       end
     end
-    
-    
+
+
     pmemos = Memo.where('author_id = ? AND parent_id IS NULL', user.id)
     pmemos.each do |pm|
       issue_c = issue_c + pm.replies_count
     end
     ############################
-    
+
     issue_c = issue_c + JournalsForMessage.where('user_id = ? AND reply_id IS NOT NULL AND reply_id <> ?', user.id, user.id).count + JournalsForMessage.where('reply_id = ? AND user_id <> ?', user.id, user.id).count
-    
-    
-    
+
+
+
     return issue_c
   end
 
@@ -58,14 +58,14 @@ module UserScoreHelper
 
 
   def calculate_skill_count(user)
-    
+
     praise_count_l0 = 0
     praise_count_l1 = 0
     praise_count_l2 = 0
     tread_count_l0 = 0
     tread_count_l1 = 0
     tread_count_l2 = 0
-    issues = Issue.where('author_id = ?', user.id)   
+    issues = Issue.where('author_id = ?', user.id)
     issues.each do |i|
       pts = PraiseTread.where('praise_tread_object_id = ?', i.id)
       pts.each do |p|
@@ -75,7 +75,7 @@ module UserScoreHelper
           if p.praise_or_tread == 1
             praise_count_l0 = praise_count_l0 + 1
           else
-            tread_count_l0 = tread_count_l0 + 1            
+            tread_count_l0 = tread_count_l0 + 1
           end
         end
         if templevel.to_i == 1
@@ -97,7 +97,7 @@ module UserScoreHelper
 
 
 
-    
+
     bids = Bid.where('author_id = ?', user.id)
     bids.each do |b|
       ptcs = PraiseTread.where('praise_tread_object_id = ?', b.id)
@@ -108,7 +108,7 @@ module UserScoreHelper
           if p.praise_or_tread == 1
             praise_count_l0 = praise_count_l0 + 1
           else
-            tread_count_l0 = tread_count_l0 + 1            
+            tread_count_l0 = tread_count_l0 + 1
           end
         end
         if templevel.to_i == 1
@@ -127,7 +127,7 @@ module UserScoreHelper
         end
       end
     end
-    
+
     contests = Contest.where('author_id = ?', user.id)
     contests.each do |c|
       ptcs = PraiseTread.where('praise_tread_object_id = ?', c.id)
@@ -138,7 +138,7 @@ module UserScoreHelper
           if p.praise_or_tread == 1
             praise_count_l0 = praise_count_l0 + 1
           else
-            tread_count_l0 = tread_count_l0 + 1            
+            tread_count_l0 = tread_count_l0 + 1
           end
         end
         if templevel.to_i == 1
@@ -154,12 +154,12 @@ module UserScoreHelper
           else
             tread_count_l2 + tread_count_l2 + 1
           end
-        end 
-      end     
+        end
+      end
     end
-    
-    
-    
+
+
+
 #    case level
 #      when 0 skill_score = praise_count - 0.5 * tread_count
 #      when 1 skill_score = 2 * praise_count - 1.5 * tread_count
@@ -170,9 +170,9 @@ module UserScoreHelper
 
     skill_score = 2 * praise_count_l0.to_f + 3 * praise_count_l1.to_f + 4 * praise_count_l2.to_f
                   - 1 * tread_count_l0.to_f - 1.5 * tread_count_l1.to_f - 2 * tread_count_l2.to_f
-    
+
     tread_user_count = PraiseTread.where('praise_or_tread = ? AND user_id = ?', 0, user.id).count
-    
+
     skill_score = skill_score.to_f - tread_user_count.to_f
 
 
@@ -182,17 +182,17 @@ module UserScoreHelper
 
 
     return skill_score
-    
-    
-    
+
+
+
   end
-  
+
   def calculate_level(user)
     commit_count = user.changesets.count
     max_praise_num = 0
-    
-    
-    issues = Issue.where('author_id = ?', user.id)   
+
+
+    issues = Issue.where('author_id = ?', user.id)
     issues.each do |i|
       ptcs = PraiseTreadCache.where('object_id = ?', i.id)
       ptcs.each do |p|
@@ -201,7 +201,7 @@ module UserScoreHelper
         end
       end
     end
-    
+
     bids = Bid.where('author_id = ?', user.id)
     bids.each do |b|
       ptcs = PraiseTreadCache.where('object_id = ?', b.id)
@@ -211,7 +211,7 @@ module UserScoreHelper
         end
       end
     end
-    
+
     contests = Contest.where('author_id = ?', user.id)
     contests.each do |c|
       ptcs = PraiseTreadCache.where('object_id = ?', c.id)
@@ -219,12 +219,12 @@ module UserScoreHelper
         if p.praise_num.to_i > max_praise_num.to_i
           max_praise_num = p.praise_num
         end
-      end     
+      end
     end
-    
-    
+
+
     best_answer_num = 0
-    
+
     isManager = 0
     members = Member.where('user_id = ?', user.id)
     members.each do |m|
@@ -238,21 +238,21 @@ module UserScoreHelper
 
 
     end
-    
+
     level = 0
-    
+
     if max_praise_num > 4
       level = 1
     end
     if commit_count > 0 and commit_count < 101
       level = 1
-    end  
+    end
     if commit_count > 100 or isManager == 1
       level = 2
     end
-    
+
     return level
-    
+
   end
 
   def calculate_activity_count(user)
@@ -282,23 +282,23 @@ module UserScoreHelper
 
   def calculate_issue(user)
     commit_count = user.changesets.count
-     
+
     issue_details_count = 0
     issues = Issue.where('assigned_to_id = ?', user.id)
-    
+
     change_count = 0
     issues.each do |issue|
       js = issue.journals
       js.each do |j|
         change_count = change_count + j.details.where("prop_key = ?", "done_ratio").count
       end
-    
-      
+
+
       issue_details_count = change_count + issue_details_count
     end
-    
+
     return (commit_count + issue_details_count)
-    
+
   end
 
 
@@ -306,9 +306,9 @@ module UserScoreHelper
     attachments = Attachment.where("container_type IS NOT NULL AND container_type <> 'Issue' AND author_id = ?", user.id).count
 
     return attachments
-    
+
   end
-  
+
   def calculate_user_score(user)
     collaboration = calculate_collaboration_count(user)
     influence = calculate_influence_count(user)
@@ -322,7 +322,7 @@ module UserScoreHelper
     UserScore.new(:collaboration => collaboration, :influence => influence, :skill => skill,
                                      :activity => activity, :file => file, :issue => issue, :level => level)
   end
-  
+
   def update_user_score(user)
     collaboration = calculate_collaboration_count(user)
     influence = calculate_influence_count(user)
@@ -331,7 +331,7 @@ module UserScoreHelper
     issue = calculate_issue(user)
 
     ##activity = calculate_activity_count(user)
-    
+
     level = calculate_level(user)
     user.user_score.update_attributes(:collaboration => collaboration, :influence => influence, :skill => skill,
                                       :activity => activity, :file => file, :issue => issue, :level => level)
@@ -423,7 +423,7 @@ module UserScoreHelper
 
   #更新分数
   def update_score(option_number)
-    option_number.total_score = collaboration(option_number) + influence(option_number) + skill(option_number) + active(option_number)
+    option_number.total_score = collaboration(option_number) + influence(option_number) + skill(option_number) + project_active(option_number)
     if option_number.total_score < 0
       option_number.total_score = 0
     end
@@ -433,7 +433,7 @@ module UserScoreHelper
 
   #协同得分
   def collaboration(option_number)
-    option_number.messages_for_issues + option_number.issues_status + option_number.replay_for_message + option_number.replay_for_memo
+    option_number.memo * 2 + option_number.messages_for_issues + option_number.issues_status + option_number.replay_for_message + option_number.replay_for_memo
   end
   #影响力得分
   def influence(option_number)
@@ -444,8 +444,8 @@ module UserScoreHelper
      option_number.praise_by_one * 4  + option_number.praise_by_two * 6 + option_number.praise_by_three * 8 - option_number.tread * 2 - option_number.tread_by_one * 2 - option_number.tread_by_two * 4 - option_number.tread_by_three * 6
   end
   #项目贡献得分
-  def active(option_number)
-    option_number.changeset * 4 + option_number.document * 4 + option_number.attachment * 4 + option_number.issue_done_ratio * 2 + option_number.post_issue * 4 + option_number.memo * 2
+  def project_active(option_number)
+    option_number.changeset * 4 + option_number.document * 4 + option_number.attachment * 4 + option_number.issue_done_ratio * 2 + option_number.post_issue * 4
   end
 
   #更新发帖数
diff --git a/app/models/course_message.rb b/app/models/course_message.rb
index 4f62d24c2..eae880380 100644
--- a/app/models/course_message.rb
+++ b/app/models/course_message.rb
@@ -15,6 +15,8 @@ class CourseMessage < ActiveRecord::Base
   after_create :add_user_message
 
   def add_user_message
-    self.message_alls << MessageAll.new(:user_id => self.user_id)
+    if MessageAll.where("message_type = '#{self.class.to_s}' and message_id = '#{self.id}'").first.nil?
+      self.message_alls << MessageAll.new(:user_id => self.user_id)
+    end
   end
 end
diff --git a/app/models/forge_message.rb b/app/models/forge_message.rb
index 2d05972ab..0c8b3384f 100644
--- a/app/models/forge_message.rb
+++ b/app/models/forge_message.rb
@@ -22,6 +22,8 @@ class ForgeMessage < ActiveRecord::Base
   after_create :add_user_message
 
   def add_user_message
-    self.message_alls << MessageAll.new(:user_id => self.user_id)
+    if MessageAll.where("message_type = '#{self.class.to_s}' and message_id = '#{self.id}'").first.nil?
+      self.message_alls << MessageAll.new(:user_id => self.user_id)
+    end
   end
 end
diff --git a/app/models/memo_message.rb b/app/models/memo_message.rb
index 9be00ce14..ce3896389 100644
--- a/app/models/memo_message.rb
+++ b/app/models/memo_message.rb
@@ -12,6 +12,8 @@ class MemoMessage < ActiveRecord::Base
   after_create :add_user_message
 
   def add_user_message
-    self.message_alls << MessageAll.new(:user_id => self.user_id)
+    if MessageAll.where("message_type = '#{self.class.to_s}' and message_id = '#{self.id}'").first.nil?
+      self.message_alls << MessageAll.new(:user_id => self.user_id)
+    end
   end
 end
diff --git a/app/models/news.rb b/app/models/news.rb
index 6e2725d1c..a9e9d1d18 100644
--- a/app/models/news.rb
+++ b/app/models/news.rb
@@ -121,7 +121,7 @@ class News < ActiveRecord::Base
   # Description 公用表中也要记录
   def act_as_forge_activity
     # 如果是project为空，那么是课程相关的，不需要保存
-    if !self.project.nil?
+    if self.project
       self.forge_acts << ForgeActivity.new(:user_id => self.author_id,
                                              :project_id => self.project.id)
     end
diff --git a/app/models/query.rb b/app/models/query.rb
index e49147dea..65c78e71f 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -492,28 +492,29 @@ class Query < ActiveRecord::Base
 
   def project_statement
     project_clauses = []
-    unless project.descendants.blank?
-      if project && !project.descendants.active.empty?
-        ids = [project.id]
-        if has_filter?("subproject_id")
-          case operator_for("subproject_id")
-            when '='
-              # include the selected subprojects
-              ids += values_for("subproject_id").each(&:to_i)
-            when '!*'
-              # main project only
-            else
-              # all subprojects
-              ids += project.descendants.collect(&:id)
-          end
-        elsif Setting.display_subprojects_issues?
-          ids += project.descendants.collect(&:id)
-        end
-        project_clauses << "#{Project.table_name}.id IN (%s)" % ids.join(',')
-      elsif project
+    # unless project.descendants.blank?
+    #   if project && project.descendants && project.descendants.active && !project.descendants.active.empty?
+        # ids = [project.id]
+        # if has_filter?("subproject_id")
+        #   case operator_for("subproject_id")
+        #     when '='
+        #       # include the selected subprojects
+        #       ids += values_for("subproject_id").each(&:to_i)
+        #     when '!*'
+        #       # main project only
+        #     else
+        #       # all subprojects
+        #       ids += project.descendants.collect(&:id)
+        #   end
+        # elsif Setting.display_subprojects_issues?
+        #   ids += project.descendants.collect(&:id)
+        # end
+        # project_clauses << "#{Project.table_name}.id IN (%s)" % ids.join(',')
+      # elsif project
+    if project
         project_clauses << "#{Project.table_name}.id = %d" % project.id
-      end
     end
+    # end
     project_clauses.any? ? project_clauses.join(' AND ') : nil
   end
 
diff --git a/app/models/user_feedback_message.rb b/app/models/user_feedback_message.rb
index 02335b8e2..db7d3a384 100644
--- a/app/models/user_feedback_message.rb
+++ b/app/models/user_feedback_message.rb
@@ -11,6 +11,8 @@ class UserFeedbackMessage < ActiveRecord::Base
   after_save :add_user_message
 
   def add_user_message
-    self.message_alls << MessageAll.new(:user_id => self.user_id)
+    if MessageAll.where("message_type = '#{self.class.to_s}' and message_id = '#{self.id}'").first.nil?
+      self.message_alls << MessageAll.new(:user_id => self.user_id)
+    end
   end
 end
diff --git a/app/views/layouts/base_tags.html.erb b/app/views/layouts/base_tags.html.erb
index 6a5b490d1..3fd00e042 100644
--- a/app/views/layouts/base_tags.html.erb
+++ b/app/views/layouts/base_tags.html.erb
@@ -19,12 +19,23 @@
 <%= call_hook :view_layouts_base_html_head %>
 <!-- page specific tags -->
 <%= yield :header_tags -%>
+  <%= stylesheet_link_tag 'base','header', :media => 'all'%>
 </head>
 <body class="<%=h body_css_classes %>">
+
+<div class="cl"></div>
+<div class="navContainer mb10">
+  <% if User.current.logged? %>
+      <%= render :partial => 'layouts/logined_header',:locals=>{:name=>@name,:type=>@type} %>
+  <% else%>
+      <%= render :partial => 'layouts/unlogin_header',:locals=>{:name=>@name,:type=>@type} %>
+  <% end%>
+</div>
+<div class="cl"></div>
+
 <div id="wrapper">
 <div id="wrapper2">
 <div id="wrapper3">
-<%= render :partial => 'layouts/base_header'%>
 
 <div id="main" class="">
     <div id="sidebar">
@@ -38,7 +49,6 @@
         <%= call_hook :view_layouts_base_content %>
         <div style="clear:both;"></div>
     </div>
-    <%= render :partial => 'layouts/base_footer'%>
 </div>
 </div>
 
@@ -47,6 +57,11 @@
 
 </div>
 </div>
+
+<div class="cl"></div>
+<%= render :partial => 'layouts/footer' %>
+<div class="cl"></div>
+
 <%= call_hook :view_layouts_base_body_bottom %>
 </body>
 </html>
diff --git a/app/views/users/_course_poll.html.erb b/app/views/users/_course_poll.html.erb
index 24adf108e..bde8de90d 100644
--- a/app/views/users/_course_poll.html.erb
+++ b/app/views/users/_course_poll.html.erb
@@ -1,5 +1,6 @@
 <% has_commit = has_commit_poll?(activity.id ,User.current)%>
 <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
+<% if has_commit || activity.user_id == User.current %>
 <div class="resources mt10">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
@@ -43,4 +44,5 @@
     </div>
     <div class="cl"></div>
   </div>
-</div>
\ No newline at end of file
+</div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/_influence_new_score_index.html.erb b/app/views/users/_influence_new_score_index.html.erb
index 505785351..f99cdee19 100644
--- a/app/views/users/_influence_new_score_index.html.erb
+++ b/app/views/users/_influence_new_score_index.html.erb
@@ -5,4 +5,4 @@
 <div>&nbsp;&nbsp;&nbsp; <%= l('userscore.active.update_issues')%> * 2 = <%= option_num.issue_done_ratio %> * 2 = <%= option_num.issue_done_ratio * 2 %></div>
 <div>&nbsp;&nbsp;&nbsp; <%= l('userscore.active.release_issues')%> * 4 = <%= option_num.post_issue %> * 4 = <%= option_num.post_issue * 4 %></div>
 <div>&nbsp;&nbsp;&nbsp; <%= l('userscore.active.release_messages')%> * 1 = <%= option_num.memo %> * 2 = <%=  option_num.memo * 2 %></div>
-<div>&nbsp;&nbsp;&nbsp; <%= l(:label_user_score_of_active)%> = <%= option_num.changeset * 4 %> + <%= option_num.document * 4 %> + <%= option_num.attachment * 4 %> + <%= option_num.issue_done_ratio * 2 %> + <%= option_num.post_issue * 4 %> + <%=  option_num.memo * 2 %> = <%= active(option_num) %> </div>
\ No newline at end of file
+<div>&nbsp;&nbsp;&nbsp; <%= l(:label_user_score_of_active)%> = <%= option_num.changeset * 4 %> + <%= option_num.document * 4 %> + <%= option_num.attachment * 4 %> + <%= option_num.issue_done_ratio * 2 %> + <%= option_num.post_issue * 4 %> + <%=  option_num.memo * 2 %> = <%= project_active(option_num) %> </div>
\ No newline at end of file
diff --git a/app/views/users/_score_new_index.html.erb b/app/views/users/_score_new_index.html.erb
index e50b240fd..c1d23d0ed 100644
--- a/app/views/users/_score_new_index.html.erb
+++ b/app/views/users/_score_new_index.html.erb
@@ -5,8 +5,8 @@
   <%= l(:label_user_score_of_skill)%> + <%= l(:label_user_score_of_active) %></div>
 <!-- <div>&nbsp;&nbsp;&nbsp;+ <%#= l(:label_user_score_of_influence) %></div> -->
 <div> = <%= format("%.2f" ,collaboration(option_num)).to_i %> +  <%= format("%.2f" , influence(option_num) ).to_i %>
-   + <%= "(" if skill(option_num) < 0 %> <%= format("%.2f" , skill(option_num)).to_i %> <%= ")" if skill(option_num) < 0 %> + <%= format("%.2f" , active(option_num)).to_i %></div>
- <% if (format("%.2f" ,collaboration(option_num)).to_i + format("%.2f" , influence(option_num) ).to_i + format("%.2f" , skill(option_num)).to_i + format("%.2f" , active(option_num)).to_i) < 0 %>
+   + <%= "(" if skill(option_num) < 0 %> <%= format("%.2f" , skill(option_num)).to_i %> <%= ")" if skill(option_num) < 0 %> + <%= format("%.2f" ,project_active(option_num)).to_i %></div>
+ <% if (format("%.2f" ,collaboration(option_num)).to_i + format("%.2f" , influence(option_num) ).to_i + format("%.2f" , skill(option_num)).to_i + format("%.2f" , project_active(option_num)).to_i) < 0 %>
     <div><%= l(:label_score_less_than_zero) %></div>
     <% else %>
     <div> = <%= format("%.2f" ,option_num.total_score).to_i %></div>
diff --git a/app/views/users/_show_new_score.html.erb b/app/views/users/_show_new_score.html.erb
index 2081c38d6..4e89506a6 100644
--- a/app/views/users/_show_new_score.html.erb
+++ b/app/views/users/_show_new_score.html.erb
@@ -68,7 +68,7 @@
     </li>
     <li>
       <%= link_to l(:label_user_score_of_active), "javascript:void(0)", :onclick => "show_div('influence_new_score_index')" %> ：
-      <%= format("%.2f" , active(option_num)).to_i %>
+      <%= format("%.2f" , project_active(option_num)).to_i %>
     </li>
   </ul>
 
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 2d447d739..4ff98b1b7 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -23,7 +23,7 @@
                     target.show();
                 }else{
                     btn.data('init',0);
-                    btn.html('点击展开更多回复('+btn.data('count')+')');
+                    btn.html('展开更多('+btn.data('count')+')');
                     target.hide();
                     target.eq(0).show();
                     target.eq(1).show();
diff --git a/app/views/users/resource_search.js.erb b/app/views/users/resource_search.js.erb
index 894c1d2fa..d295ce003 100644
--- a/app/views/users/resource_search.js.erb
+++ b/app/views/users/resource_search.js.erb
@@ -1,3 +1,5 @@
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
 $("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
-$("#res_all_count").html(<%= @atta_count%>);
\ No newline at end of file
+$("#res_all_count").html(<%= @atta_count%>);
+$("#res_count").html(0);
+$("#checkboxAll").attr('checked',false);
\ No newline at end of file
diff --git a/db/migrate/20150906025009_forge_activitues_date.rb b/db/migrate/20150906025009_forge_activitues_date.rb
new file mode 100644
index 000000000..b282d1938
--- /dev/null
+++ b/db/migrate/20150906025009_forge_activitues_date.rb
@@ -0,0 +1,25 @@
+class ForgeActivituesDate < ActiveRecord::Migration
+  def up
+    forge_count = ForgeActivity.all.count / 30 + 2
+    transaction do
+      for i in 1 ... forge_count do i
+      ForgeActivity.page(i).per(30).each do |activity|
+        unless activity.forge_act_type == "ProjectCreateInfo"
+          if activity.forge_act
+            unless activity.forge_act.project
+              # puts activity.id
+              activity.destroy
+            end
+          else
+            # puts activity.id.to_s + "----"
+            activity.destroy
+          end
+        end
+      end
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20150906083453_delete_anonymous_jour.rb b/db/migrate/20150906083453_delete_anonymous_jour.rb
new file mode 100644
index 000000000..5361eb5e1
--- /dev/null
+++ b/db/migrate/20150906083453_delete_anonymous_jour.rb
@@ -0,0 +1,15 @@
+class DeleteAnonymousJour < ActiveRecord::Migration
+  def up
+    jour_count = Journal.all.count / 30 + 2
+    transaction do
+      for i in 1 ... jour_count do i
+      Journal.page(i).per(30).each do |jour|
+        jour.destroy if jour.user_id == 2
+      end
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 05825bd5d..ec38d5c1d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150829070453) do
+ActiveRecord::Schema.define(:version => 20150906083453) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1296,11 +1296,11 @@ ActiveRecord::Schema.define(:version => 20150829070453) do
 
   create_table "student_work_tests", :force => true do |t|
     t.integer  "student_work_id"
-    t.integer  "homework_test_id"
-    t.integer  "result"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-    t.text     "error_msg"
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+    t.integer  "status",          :default => 9
+    t.text     "results"
+    t.text     "src"
   end
 
   create_table "student_works", :force => true do |t|
@@ -1317,6 +1317,7 @@ ActiveRecord::Schema.define(:version => 20150829070453) do
     t.datetime "updated_at",                                                   :null => false
     t.integer  "late_penalty",                                  :default => 0
     t.integer  "absence_penalty",                               :default => 0
+    t.integer  "system_score"
   end
 
   create_table "student_works_evaluation_distributions", :force => true do |t|
@@ -1534,7 +1535,6 @@ ActiveRecord::Schema.define(:version => 20150829070453) do
     t.string   "identity_url"
     t.string   "mail_notification",               :default => "",    :null => false
     t.string   "salt",              :limit => 64
-    t.integer  "gid"
   end
 
   add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id"
diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css
index 6c046d62c..b64e60831 100644
--- a/public/stylesheets/nyan.css
+++ b/public/stylesheets/nyan.css
@@ -210,7 +210,7 @@ span[id^=valid_user] {
 p.jRatingInfos {
     position: absolute;
     z-index: 9999;
-    background: transparent url('bg_jRatingInfos.png') no-repeat;
+    /*background: transparent url('bg_jRatingInfos.png') no-repeat;*/
     color: #CACACA;
     display: none;
     width: 91px;