diff --git a/app/controllers/blog_comments_controller.rb b/app/controllers/blog_comments_controller.rb
index 95790a68d..14a0a3536 100644
--- a/app/controllers/blog_comments_controller.rb
+++ b/app/controllers/blog_comments_controller.rb
@@ -89,6 +89,9 @@ class BlogCommentsController < ApplicationController
 
   #回复
   def reply
+    if params[:in_user_center]
+      @in_user_center = true
+    end
     @article = BlogComment.find(params[:id]).root
     @quote = params[:quote][:quote]
     @blogComment = BlogComment.new
@@ -101,7 +104,11 @@ class BlogCommentsController < ApplicationController
     @blogComment.title = "RE: #{@article.title}" unless params[:blog_comment][:title]
     @article.children << @blogComment
     @user_activity_id = params[:user_activity_id]
-
+    user_activity = UserActivity.where("act_type='BlogComment' and act_id =#{@article.id}").first
+    if user_activity
+      user_activity.updated_at = Time.now
+      user_activity.save
+    end
     attachments = Attachment.attach_files(@blogComment, params[:attachments])
     render_attachment_warning_if_needed(@blogComment)
     #@article.save
diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 7793ef097..55807886b 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -217,7 +217,12 @@ class HomeworkCommonController < ApplicationController
 
   #评分设置
   def score_rule_set
-
+    if params[:user_activity_id]
+      @user_activity_id = params[:user_activity_id]
+    else
+      @user_activity_id = -1
+    end
+    @is_in_course = params[:is_in_course]
   end
 
   private
diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index 6bb61e6a1..34e039ae0 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -159,6 +159,14 @@ class MembersController < ApplicationController
               if role && (role.name == "学生" || role.name == "Student")
                 StudentsForCourse.create(:student_id => user_id, :course_id =>@course.id)
               end
+
+              #给新成员和老师发送加入课程的消息，发送者id放在CourseMessage的course_message_id字段中
+              #course_message_type设置为JoinCourse
+              #status = 0 表示给学生发，status = 1表示给老师发
+              course_join = CourseMessage.new(:user_id =>user_id, :course_message_id=>User.current.id,:course_id => @course.id,:course_message_type=>"JoinCourse", :viewed => false, :status => 0)
+              course_join.save
+              CourseMessage.create(:user_id => User.current.id, :course_message_id => user_id, :course_id => @course.id, :course_message_type => "JoinCourse", :viewed => false, status => 1)
+
               members << member
               #user_grades << UserGrade.new(:user_id => user_id, :course_id => @course.id)
               if (params[:membership][:role_ids])
@@ -305,7 +313,8 @@ class MembersController < ApplicationController
             grade.destroy
           end
         end
-         ForgeMessage.create(:user_id => @member.user_id, :project_id => @project.id, :forge_message_type => "RemoveFromProject", :viewed => false, :forge_message_id => User.current.id)
+        #移出项目发送消息
+        ForgeMessage.create(:user_id => @member.user_id, :project_id => @project.id, :forge_message_type => "RemoveFromProject", :viewed => false, :forge_message_id => User.current.id)
       end
       respond_to do |format|
         format.html { redirect_to_settings_in_projects }
@@ -333,6 +342,8 @@ class MembersController < ApplicationController
         end
         @roles = Role.givable.all[3..5]
         @members = @course.member_principals.includes(:roles, :principal).all.sort
+        #移出课程发送消息
+        CourseMessage.create(:user_id => @member.user_id, :course_id => @course.id, :course_message_type => "RemoveFromCourse", :viewed => false, :course_message_id => User.current.id)
       end
       respond_to do |format|
         format.html { redirect_to_settings_in_courses }
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 529c5ea72..25782ec4b 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -108,6 +108,7 @@ class StudentWorkController < ApplicationController
       else
         @stundet_works = []
       end
+      @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name).count
     else
       if @is_teacher || @homework.homework_detail_manual.nil?   #老师 || 超级管理员 显示所有列表
         @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
@@ -128,6 +129,7 @@ class StudentWorkController < ApplicationController
       else
         @stundet_works = []
       end
+      @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name).count
     end
 
     @score = @b_sort == "desc" ? "asc" : "desc"
@@ -456,14 +458,14 @@ class StudentWorkController < ApplicationController
         student_work.save
       end
     end
-    respond_to do |format|
-      format.html{
-        if params[:student_path]
-          redirect_to student_work_index_url(:homework => @homework.id)
-        else
-          redirect_to user_homeworks_user_path(User.current.id)
-        end
-      }
+    if params[:student_path]
+      redirect_to student_work_index_url(:homework => @homework.id)
+    else
+      @user_activity_id = params[:user_activity_id]
+      @is_in_course = params[:is_in_course]
+      respond_to do |format|
+        format.js
+      end
     end
   end
 
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 6d049783e..7c41dd038 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -949,10 +949,19 @@ class UsersController < ApplicationController
         when "current_user"
           @user_activities = UserActivity.where("user_id = #{@user.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))").order('updated_at desc').limit(10).offset(@page * 10)
         else
-          @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id})").order('updated_at desc').limit(10).offset(@page * 10)
+          blog_ids = "("+@user.blog.id.to_s+","+((User.watched_by(@user.id).count == 0 )? '0' :User.watched_by(@user.id).map{|u| u.blog.id}.join(','))+")"
+          @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +
+                                                   "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+
+                                                    "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id}) " +
+                                                   "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})").order('updated_at desc').limit(10).offset(@page * 10)
       end
     else
-      @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id})").order('updated_at desc').limit(10).offset(@page * 10)
+    #  @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id})").order('updated_at desc').limit(10).offset(@page * 10)
+      blog_ids = "("+@user.blog.id.to_s+","+((User.watched_by(@user.id).count == 0 )? '0' :User.watched_by(@user.id).map{|u| u.blog.id}.join(','))+")"
+      @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +
+                                                "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+
+                                                "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id}) " +
+                                                "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})").order('updated_at desc').limit(10).offset(@page * 10)
     end
     # @user_activities = paginateHelper @user_activities,500
     @type = params[:type]
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 7289d534b..84364b4f6 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2355,16 +2355,16 @@ module ApplicationHelper
       else #学生显示提交作品、修改作品等按钮
         work = cur_user_works_for_homework homework
         if work.nil?
-          link_to "提交作品",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
+          link_to "提交作品(#{homework.student_works.count})",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
         else
           if homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 2 #匿评作业，且作业状态不是在开启匿评之前
             link_to "作品匿评", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "开启匿评后不可修改作品"
           elsif homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 3
             link_to "匿评结束", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "匿评已结束"
           elsif homework.homework_type == 2 #编程作业不能修改作品
-            link_to "修改作品",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
+            link_to "修改作品(#{homework.student_works.count})",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
           else
-            link_to "修改作品",  edit_student_work_path(work.id),:class => 'c_blue'
+            link_to "修改作品(#{homework.student_works.count})",  edit_student_work_path(work.id),:class => 'c_blue'
           end
         end
       end
diff --git a/app/models/blog_comment.rb b/app/models/blog_comment.rb
index 92970b663..9bb28ddd8 100644
--- a/app/models/blog_comment.rb
+++ b/app/models/blog_comment.rb
@@ -7,7 +7,8 @@ class BlogComment < ActiveRecord::Base
   acts_as_tree :counter_cache => :comments_count, :order => "#{BlogComment.table_name}.sticky desc ,#{BlogComment.table_name}.created_on ASC"
   acts_as_attachable
   belongs_to :last_reply, :class_name => 'BlogComment', :foreign_key => 'last_comment_id'
-
+  # 虚拟关联
+  has_many :user_acts, :class_name => 'UserAcivity',:as =>:act
   acts_as_watchable
 
   validates_presence_of  :title, :content
@@ -15,6 +16,31 @@ class BlogComment < ActiveRecord::Base
   #validate :cannot_reply_to_locked_comment, :on => :create
   safe_attributes 'title', 'content',"sticky", "locked"
 
+  after_save :add_user_activity
+  before_destroy :destroy_user_activity
+
+  #在个人动态里面增加当前动态
+  def add_user_activity
+    if self.parent_id.nil? #只有发博文才插入动态
+        user_activity = UserActivity.where("act_type = '#{self.class.to_s}' and act_id = '#{self.id}'").first
+        if user_activity
+          user_activity.save
+        else
+            user_activity = UserActivity.new
+            user_activity.act_id = self.id
+            user_activity.act_type = self.class.to_s
+            user_activity.container_type = "Blog"
+            user_activity.container_id = self.blog_id
+            user_activity.user_id = self.author_id
+            user_activity.save
+        end
+    end
+  end
+
+  def destroy_user_activity
+    user_activity = UserActivity.where("act_type = '#{self.class.to_s}' and act_id = '#{self.id}'")
+    user_activity.destroy_all
+  end
   def deleted_attach_able_by? user
     (user && user.logged? && (self.author == user) ) || user.admin?
   end
diff --git a/app/views/blog_comments/reply.js.erb b/app/views/blog_comments/reply.js.erb
index 7ebe4d077..f8ed4bb24 100644
--- a/app/views/blog_comments/reply.js.erb
+++ b/app/views/blog_comments/reply.js.erb
@@ -1,2 +1,7 @@
+<% if @in_user_center%>
+    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_blog', :locals => {:activity => @article,:user_activity_id =>@user_activity_id}) %>");
+    init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+<% else%>
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'blogs/article', :locals => {:activity => @article,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
-init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
\ No newline at end of file
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+<% end %>
\ No newline at end of file
diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb
index 943d21852..33a3201c0 100644
--- a/app/views/blogs/_article.html.erb
+++ b/app/views/blogs/_article.html.erb
@@ -1,10 +1,36 @@
-<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
-  <div class="homepagePostBrief">
+<div class="resources mt10" id="user_activity_<%= user_activity_id%>" >
+  <div class="homepagePostBrief" onmouseover="$('#message_setting_<%=activity.id%>').show();" onmouseout="$('#message_setting_<%= activity.id%>').hide();">
     <div class="homepagePostPortrait">
       <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id,:host=>Setting.host_user), :alt => "用户头像" %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo break_word mt-4">
+      <% if activity.author.id == User.current.id%>
+          <div class="homepagePostSetting" id="message_setting_<%= activity.id%>" style="display: none">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <li>
+                    <%= link_to(
+                                l(:button_edit),
+                                {:controller => 'blog_comments',:action => 'edit',:user_id=>activity.author_id,:blog_id=>activity.blog_id, :id => activity.id},
+                                :class => 'postOptionLink'
+                        ) if User.current && User.current.id == activity.author.id %>
+                  </li>
+                  <li>
+                    <%= link_to(
+                                l(:button_delete),
+                                {:controller => 'blog_comments',:action => 'destroy',:user_id=>activity.author_id,:blog_id=>activity.blog_id, :id => activity.id},
+                                :method => :delete,
+                                :data => {:confirm => l(:text_are_you_sure)},
+                                :class => 'postOptionLink'
+                        ) if User.current && User.current.id == activity.author.id %>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+          </div>
+      <%end%>
+      <div class="homepagePostTo  mt-4 fl">
         <% if activity.try(:author).try(:realname) == ' ' %>
             <%= link_to activity.try(:author), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
         <% else %>
@@ -13,6 +39,7 @@
         TO
         <%= link_to activity.blog.name+" | 博客", user_blogs_path(:user_id=>activity.author_id,:host=>Setting.host_user), :class => "newsBlue ml15 mr5"%>
       </div>
+      <div class="cl"></div>
       <div class="homepagePostTitle hidden m_w530 fl">
         <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
             <%= link_to activity.title.to_s.html_safe, user_blog_blog_comment_path(:user_id=>activity.author_id, :blog_id=>activity.blog.id,:id=>activity), :class=> "postGrey" %>
diff --git a/app/views/courses/join_private_courses.js.erb b/app/views/courses/join_private_courses.js.erb
index 8a1680030..0c44770bd 100644
--- a/app/views/courses/join_private_courses.js.erb
+++ b/app/views/courses/join_private_courses.js.erb
@@ -1,3 +1,4 @@
+$('#topnav_course_menu').hide();
 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'join_private_course') %>');
 showModal('ajax-modal', '540px');
 $('#ajax-modal').css('height','390px');
diff --git a/app/views/homework_common/_set_evalutation_att.html.erb b/app/views/homework_common/_set_evalutation_att.html.erb
index 01d9351ee..d51713e9a 100644
--- a/app/views/homework_common/_set_evalutation_att.html.erb
+++ b/app/views/homework_common/_set_evalutation_att.html.erb
@@ -7,7 +7,7 @@
         <span class="f14 fontGrey3 fl mt5">开启匿评</span>
         <div class="calendar_div fl ml10">
           <input  type="text" name="evaluation_start" id="evaluation_start_time" placeholder="开启匿评日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= @homework_detail_manual.evaluation_start%>"/>
-          <%= calendar_for('evaluation_start_time')%>
+          <%#= calendar_for('evaluation_start_time')%>
         </div>
         <div class="cl"></div>
         <p id="homework_evaluation_start_time" class="c_red"></p>
@@ -18,7 +18,7 @@
         <span class="f14 fontGrey3 fl mt5">关闭匿评</span>
         <div class="calendar_div fl ml10">
           <input  type="text" name="evaluation_end" id="evaluation_end_time" placeholder="关闭匿评日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= @homework_detail_manual.evaluation_end%>"/>
-          <%= calendar_for('evaluation_end_time')%>
+          <%#= calendar_for('evaluation_end_time')%>
         </div>
         <div class="cl"></div>
         <p id="homework_evaluation_end_time" class="c_red"></p>
diff --git a/app/views/homework_common/score_rule_set.js.erb b/app/views/homework_common/score_rule_set.js.erb
index 5ff42dff7..a3afb0c9a 100644
--- a/app/views/homework_common/score_rule_set.js.erb
+++ b/app/views/homework_common/score_rule_set.js.erb
@@ -1,4 +1,4 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/set_score_rule',:locals => {:homework => @homework, :student_path => false}) %>');
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/set_score_rule',:locals => {:homework => @homework, :student_path => false, :user_activity_id => @user_activity_id,:is_in_course => @is_in_course,:remote=>true}) %>');
 showModal('ajax-modal', '350px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
diff --git a/app/views/homework_common/start_evaluation_set.js.erb b/app/views/homework_common/start_evaluation_set.js.erb
index 9d494f908..aac4ecd66 100644
--- a/app/views/homework_common/start_evaluation_set.js.erb
+++ b/app/views/homework_common/start_evaluation_set.js.erb
@@ -1,6 +1,10 @@
 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'homework_common/set_evalutation_att') %>');
+var datepickerOptions={dateFormat: 'yy-mm-dd', firstDay: 0, showOn: 'button', buttonImageOnly: true, buttonImage: '/images/public_icon.png', showButtonPanel: true, showWeek: true, showOtherMonths: true, selectOtherMonths: true};
 showModal('ajax-modal', '350px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
 "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-$('#ajax-modal').parent().css("top","25%").css("left","35%").css("position","fixed");
\ No newline at end of file
+$('#ajax-modal').parent().css("top","25%").css("left","35%").css("position","fixed");
+$(function() { $('#evaluation_start_time').datepicker(datepickerOptions);
+    $('#evaluation_end_time').datepicker(datepickerOptions);
+});
\ No newline at end of file
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 9b1dfbb7f..04d16a334 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -54,15 +54,16 @@
         </div>
         <div class="cl"></div>
 
-        <div >
-          <a class="pr_info_name fl c_dark fb break_word" href="http://<%= Setting.host_course%>/courses/<%= @course.id%>" target="_blank">
+        <div>
+          <a class="pr_info_name c_dark fb break_word fl" href="http://<%= Setting.host_course%>/courses/<%= @course.id%>" target="_blank">
             <%= @course.name %>
           </a>
           <% if @course.is_public == 0%>
-                <span class="img_private ">
+                <span class="img_private mr5 fl">
                   <%= l(:field_is_private)%>
                 </span>
           <% end %>
+          <a href="javascript:void(0);" title="课程大纲" class="mr5 syllabusIcon fl"> </a><a href="javascript:void(0);" title="课程大纲" class="mr5 syllabusSetting fl"> </a>
         </div>
         <div class="cl"></div>
         <div class="pr_info_foot ">
diff --git a/app/views/student_work/_set_score_rule.html.erb b/app/views/student_work/_set_score_rule.html.erb
index 508b89a1c..26e3b06cb 100644
--- a/app/views/student_work/_set_score_rule.html.erb
+++ b/app/views/student_work/_set_score_rule.html.erb
@@ -1,66 +1,9 @@
-<%= form_for('new_form',:url =>  {:controller => 'student_work',:action => 'set_score_rule',:homework => homework.id},:method => "post") do |f|%>
-    <% if student_path %>
-        <%=hidden_field_tag 'student_path', params[:student_path], :value => student_path  %>
-    <% end %>
-    <div class="markPopup" id="popbox02">
-      <span class="uploadText">评分设置</span>
-      <div class="mt15">
-        <span class="f14 fontGrey3 mr10">迟交扣分</span>
-        <input type="text" name="late_penalty" id="late_penalty_num" placeholder="请输入0-50数值" class=" markInput"  value="<%= homework.late_penalty%>" onkeyup="check_late_penalty('late_penalty_num')"/>
-      </div>
-      <div>
-        <span class="f14 fontGrey3 mr10">缺评扣分</span>
-        <input type="text" name="absence_penalty" id="absence_penalty_num" placeholder="请输入0-50数值" class="markInput" value="<%= homework.homework_detail_manual.absence_penalty%>" onkeyup="check_late_penalty('absence_penalty_num')"/>
-      </div>
-
-      <% if homework.homework_type == 2%>
-          <div>
-            <span class="f14 fontGrey3 mr10">系统评分</span>
-            <%= select_tag :sy_proportion,options_for_select(ta_proportion_option,homework.homework_detail_programing.ta_proportion), {:class => "markPercentage"}  %>
-          </div>
-
-          <script>
-              $("#sy_proportion").change(function(){
-                  var ta_proportion = 100 - parseInt($("#sy_proportion").val() * 100);
-                  $("#ta_proportion").replaceWith(build_selector(ta_proportion));
-                  $("#student_proportion").val("0%");
-              });
-
-              $("#ta_proportion").live("change",function(){
-                  var ta_proportion = 100 - parseInt($("#sy_proportion").val() * 100) - parseInt($("#ta_proportion").val() * 100);
-                  $("#student_proportion").val(ta_proportion  + "%");
-              });
-          </script>
-      <% else%>
-          <script>
-              $("#ta_proportion").change(function(){
-                  var ta_proportion = $("#ta_proportion").val();
-                  $("#student_proportion").val((100 - parseInt(ta_proportion * 100)) + "%");
-              });
-          </script>
-      <% end%>
-
-      <div>
-        <span class="f14 fontGrey3 mr10">教辅评分</span>
-        <%= select_tag :ta_proportion,options_for_select(ta_proportion_option_to(100-(homework.homework_detail_programing ? homework.homework_detail_programing.ta_proportion * 100 : 0).to_i),homework.homework_detail_manual.ta_proportion), {:class => "markPercentage"}  %>
-      </div>
-      <div>
-        <span class="f14 fontGrey3 mr10">学生匿评</span>
-        <input type="text" id="student_proportion" value="<%= (100 - homework.homework_detail_manual.ta_proportion * 100).to_i - (homework.homework_detail_programing ? homework.homework_detail_programing.ta_proportion * 100 : 0).to_i%>%" class="markPercentage" readonly>
-      </div>
-      <div class="mb20">
-        <span class="f14 fontGrey3 mr10">教师优先</span>
-        <input type="checkbox" name="teacher_priority" <%= homework.teacher_priority == 1 ? 'checked' : ''%>/>
-        <span class="f12 c_red ml10">教师评分为最终评分</span>
-      </div>
-      <div>
-        <div class="courseSendSubmit">
-          <a href="javascript:void(0);" class="sendSourceText" onclick="$('#ajax-modal').find('form').submit();">确定</a>
-        </div>
-        <div class="courseSendCancel">
-          <a href="javascript:void(0);" class="sendSourceText linkGrey6" onclick="clickCanel();">取消</a>
-        </div>
-      </div>
-      <div class="cl"></div>
-    </div>
-<% end%>
+<% if student_path%>
+    <%= form_for('new_form',:url =>  {:controller => 'student_work',:action => 'set_score_rule',:homework => homework.id,:student_path => student_path},:method => "post") do |f|%>
+        <% render :partial => 'student_work/set_score_rule_detail', :locals => {:homework => homework, :f => f}%>
+    <% end%>
+<% else %>
+    <%= form_for('new_form',:url =>  {:controller => 'student_work',:action => 'set_score_rule',:homework => homework.id,:user_activity_id=>user_activity_id,:is_in_course=>is_in_course},:method => "post",:remote => true) do |f|%>
+        <% render :partial => 'student_work/set_score_rule_detail', :locals => {:homework => homework, :f => f}%>
+    <% end%>
+<% end %>
\ No newline at end of file
diff --git a/app/views/student_work/_set_score_rule_detail.html.erb b/app/views/student_work/_set_score_rule_detail.html.erb
new file mode 100644
index 000000000..f49bb2c69
--- /dev/null
+++ b/app/views/student_work/_set_score_rule_detail.html.erb
@@ -0,0 +1,61 @@
+<div class="markPopup" id="popbox02">
+  <span class="uploadText">评分设置</span>
+  <div class="mt15">
+    <span class="f14 fontGrey3 mr10">迟交扣分</span>
+    <input type="text" name="late_penalty" id="late_penalty_num" placeholder="请输入0-50数值" class=" markInput"  value="<%= homework.late_penalty%>" onkeyup="check_late_penalty('late_penalty_num')"/>
+  </div>
+  <div>
+    <span class="f14 fontGrey3 mr10">缺评扣分</span>
+    <input type="text" name="absence_penalty" id="absence_penalty_num" placeholder="请输入0-50数值" class="markInput" value="<%= homework.homework_detail_manual.absence_penalty%>" onkeyup="check_late_penalty('absence_penalty_num')"/>
+  </div>
+
+  <% if homework.homework_type == 2%>
+      <div>
+        <span class="f14 fontGrey3 mr10">系统评分</span>
+        <%= select_tag :sy_proportion,options_for_select(ta_proportion_option,homework.homework_detail_programing.ta_proportion), {:class => "markPercentage"}  %>
+      </div>
+
+      <script>
+          $("#sy_proportion").change(function(){
+              var ta_proportion = 100 - parseInt($("#sy_proportion").val() * 100);
+              $("#ta_proportion").replaceWith(build_selector(ta_proportion));
+              $("#student_proportion").val("0%");
+          });
+
+          $("#ta_proportion").live("change",function(){
+              var ta_proportion = 100 - parseInt($("#sy_proportion").val() * 100) - parseInt($("#ta_proportion").val() * 100);
+              $("#student_proportion").val(ta_proportion  + "%");
+          });
+      </script>
+  <% else%>
+      <script>
+          $("#ta_proportion").change(function(){
+              var ta_proportion = $("#ta_proportion").val();
+              $("#student_proportion").val((100 - parseInt(ta_proportion * 100)) + "%");
+          });
+      </script>
+  <% end%>
+
+  <div>
+    <span class="f14 fontGrey3 mr10">教辅评分</span>
+    <%= select_tag :ta_proportion,options_for_select(ta_proportion_option_to(100-(homework.homework_detail_programing ? homework.homework_detail_programing.ta_proportion * 100 : 0).to_i),homework.homework_detail_manual.ta_proportion), {:class => "markPercentage"}  %>
+  </div>
+  <div>
+    <span class="f14 fontGrey3 mr10">学生匿评</span>
+    <input type="text" id="student_proportion" value="<%= (100 - homework.homework_detail_manual.ta_proportion * 100).to_i - (homework.homework_detail_programing ? homework.homework_detail_programing.ta_proportion * 100 : 0).to_i%>%" class="markPercentage" readonly>
+  </div>
+  <div class="mb20">
+    <span class="f14 fontGrey3 mr10">教师优先</span>
+    <input type="checkbox" name="teacher_priority" <%= homework.teacher_priority == 1 ? 'checked' : ''%>/>
+    <span class="f12 c_red ml10">教师评分为最终评分</span>
+  </div>
+  <div>
+    <div class="courseSendSubmit">
+      <a href="javascript:void(0);" class="sendSourceText" onclick="$('#ajax-modal').find('form').submit();">确定</a>
+    </div>
+    <div class="courseSendCancel">
+      <a href="javascript:void(0);" class="sendSourceText linkGrey6" onclick="clickCanel();">取消</a>
+    </div>
+  </div>
+  <div class="cl"></div>
+</div>
\ No newline at end of file
diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb
index 2d0e9220c..e23fcceda 100644
--- a/app/views/student_work/_student_work_list.html.erb
+++ b/app/views/student_work/_student_work_list.html.erb
@@ -2,8 +2,11 @@
   <span class="c_dark f14 fb fl mr30">
       作品
       <font class="f12 c_red">
-        （<%= @stundet_works.count%>）
+        （<%= @student_work_count%>）
       </font>
+    <% if !@is_teacher && @stundet_works.empty?%>
+       <span class="f12 c_red">未提交</span>
+    <% end %>
   </span>
   <%if @is_teacher || @homework.homework_detail_manual.comment_status == 3%>
       <div class="hworkSearchBox">
diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb
index 09544d004..072c26185 100644
--- a/app/views/student_work/new.html.erb
+++ b/app/views/student_work/new.html.erb
@@ -59,6 +59,10 @@
       <div class="HomeWorkP">
         <%= @homework.description.html_safe %>
       </div>
+      <div>
+        <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => @homework.attachments} %>
+        <div class="cl"></div>
+      </div>
     </div>
   </div><!----HomeWorkBox end-->
   <div class="cl"></div>
diff --git a/app/views/student_work/set_score_rule.js.erb b/app/views/student_work/set_score_rule.js.erb
new file mode 100644
index 000000000..ff3a0e7ed
--- /dev/null
+++ b/app/views/student_work/set_score_rule.js.erb
@@ -0,0 +1,8 @@
+clickCanel();
+<% if @user_activity_id %>
+    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id}) %>");
+    init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+<% else %>
+    $("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework,:is_in_course => @is_in_course}) %>");
+    init_activity_KindEditor_data(<%= @homework.id%>,"","87%");
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 70494192d..aa0344800 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -56,28 +56,31 @@
         <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => activity.attachments} %>
         <div class="cl"></div>
       </div>
-      <%# if is_teacher%>
-          <!--<div class="homepagePostSetting">
+      <% if is_teacher%>
+          <div class="homepagePostSetting">
             <ul>
               <li class="homepagePostSettingIcon">
                 <ul class="homepagePostSettiongText">
                   <li>
-                    <%#= link_to l(:button_edit),edit_homework_common_path(activity,:is_in_course => 0), :class => "postOptionLink"%>
+                    <%= link_to l(:button_edit),edit_homework_common_path(activity,:is_in_course => 0), :class => "postOptionLink"%>
                   </li>
                   <li>
-                    <%#= link_to(l(:label_bid_respond_delete), homework_common_path(activity,:is_in_course => 0),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink")  %>
+                    <%= link_to(l(:label_bid_respond_delete), homework_common_path(activity,:is_in_course => 0),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink")  %>
                   </li>
                   <li>
-                    <%#= link_to("匿评设置", start_evaluation_set_homework_common_path(activity),:class => "postOptionLink", :remote => true) if activity.homework_detail_manual.comment_status == 1%>
+                    <%= link_to("评分设置", score_rule_set_homework_common_path(activity,:user_activity_id => user_activity_id, :is_in_course => 0),:class => "postOptionLink", :remote => true) %>
                   </li>
                   <li>
-                    <%#= homework_anonymous_comment activity %>
+                    <%= link_to("匿评设置", start_evaluation_set_homework_common_path(activity),:class => "postOptionLink", :remote => true) if activity.homework_detail_manual.comment_status == 1%>
+                  </li>
+                  <li>
+                    <%= homework_anonymous_comment activity %>
                   </li>
                 </ul>
               </li>
             </ul>
           </div>
-      <%# end%>-->
+      <% end%>
       </div>
     <div class="cl"></div>
   </div>
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index b7981bdbc..f4ddcc050 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -92,6 +92,13 @@
                     <%= render :partial => 'user_journalsformessage', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
                 <% end %>
             <% end %>
+        <% when 'Blog'%>
+             <%if act %>
+                    <% case user_activity.act_type.to_s %>
+                    <% when 'BlogComment' %>
+                        <%= render :partial => 'user_blog', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
+                    <% end %>
+             <% end %>
         <% end %>
         <% else %>
             <%= render :partial => 'project_create', :locals => {:activity => user_activity,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
diff --git a/app/views/users/_user_blog.html.erb b/app/views/users/_user_blog.html.erb
new file mode 100644
index 000000000..c1219eb25
--- /dev/null
+++ b/app/views/users/_user_blog.html.erb
@@ -0,0 +1,119 @@
+<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait">
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
+    </div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo break_word mt-4">
+        <% if @ctivity.try(:author).try(:realname) == ' ' %>
+            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% else %>
+            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% end %> TO  <!--+"(课程名称)"-->
+        <%= link_to activity.author.name.to_s+" | 博客", user_blogs_path(:user_id=>activity.author_id), :class => "newsBlue ml15" %>
+      </div>
+      <div class="homepagePostTitle break_word"> <!--+"(通知标题)"-->
+        <div class="fl">
+        <%= link_to activity.title.to_s, user_blog_blog_comment_path(:user_id=>activity.author_id,:blog_id=>activity.blog_id,:id=>activity.id), :class => "postGrey" %>
+        </div>
+        <% if activity.sticky == 1%>
+            <span class="sticky_btn_cir ml10">置顶</span>
+        <% end%>
+        <% if activity.locked%>
+            <span class="locked_btn_cir ml10 fl" title="已锁定">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+        <% end%>
+        <div class="cl"></div>
+      </div>
+
+      <div class="homepagePostDate">
+        发布时间：<%= format_time(activity.created_on) %>
+      </div>
+      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id%>">
+        <div id="intro_content_<%= user_activity_id%>">
+          <%= activity.content.html_safe %>
+        </div>
+      </div>
+      <div class="cl"></div>
+      <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
+      <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
+      <div class="cl"></div>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <% count=activity.children.count %>
+  <div class="homepagePostReply">
+    <div class="topBorder" style="display: <%= count>0 ? 'none': '' %>"></div>
+    <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
+      <div class="homepagePostReplyBannerCount" onclick="expand_reply_input('#reply_input_<%= user_activity_id %>');">
+        回复（<%= count %>）
+      </div>
+      <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
+      <%if count>3 %>
+          <div class="homepagePostReplyBannerMore">
+            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+              展开更多
+            </a>
+          </div>
+      <% end %>
+    </div>
+
+    <% replies_all_i = 0 %>
+    <% if count > 0 %>
+        <div class="" id="reply_div_<%= user_activity_id %>">
+          <ul>
+            <% activity.children.reorder("created_on desc").each do |comment| %>
+                <script type="text/javascript">
+                    $(function(){
+                        showNormalImage('reply_content_<%= comment.id %>');
+                    });
+                </script>
+                <% replies_all_i = replies_all_i + 1 %>
+                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i > 3 ? 'none' : '' %>">
+                  <div class="homepagePostReplyPortrait">
+                    <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_path(comment.author_id), :alt => "用户头像" %>
+                  </div>
+                  <div class="homepagePostReplyDes">
+                    <div class="homepagePostReplyPublisher mt-4">
+                      <% if comment.try(:author).try(:realname) == ' ' %>
+                          <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
+                      <% else %>
+                          <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
+                      <% end %>
+                      <%= format_time(comment.created_on) %>
+                    </div>
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
+                      <%= comment.content.html_safe %></div>
+                  </div>
+                  <div class="cl"></div>
+                </li>
+            <% end %>
+          </ul>
+        </div>
+    <% end %>
+
+    <% if activity.locked == false && User.current.logged?%>
+    <div class="homepagePostReplyContainer borderBottomNone minHeight48">
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
+      <div class="homepagePostReplyInputContainer mb10">
+        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+          <%= form_for('new_form',:url =>  {:controller => 'blog_comments', :action => 'reply', :user_id=>activity.author_id,:blog_id=>activity.blog_id,:id=>activity.id},:method => "post", :remote => true) do |f|%>
+              <input type="hidden" name="quote[quote]" value="">
+              <input type="hidden" name="in_user_center" value="true">
+              <input type="hidden" name="blog_comment[sticky]" value="0">
+              <input type="hidden" name="blog_comment[locked]" value="0">
+              <input type="hidden" name="blog_comment[title]" value="RE:<%= activity.title%>">
+              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="blog_comment[content]"></textarea>
+              <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px; margin-left: 5px;"></div>
+              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+              <div class="cl"></div>
+              <p nhname='contentmsg_<%= user_activity_id%>'></p>
+          <% end%>
+        </div>
+        <div class="cl"></div>
+      </div>
+      <div class="cl"></div>
+    </div>
+    <% end %>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 4570f365c..25f14ab31 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -69,7 +69,7 @@
                     <%= link_to(l(:label_bid_respond_delete), homework_common_path(homework_common,:is_in_course => is_in_course),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink")  %>
                   </li>
                   <li>
-                    <%= link_to("评分设置", score_rule_set_homework_common_path(homework_common),:class => "postOptionLink", :remote => true) %>
+                    <%= link_to("评分设置", score_rule_set_homework_common_path(homework_common, :is_in_course => is_in_course),:class => "postOptionLink", :remote => true) %>
                   </li>
                   <li>
                     <%= link_to("匿评设置", start_evaluation_set_homework_common_path(homework_common),:class => "postOptionLink", :remote => true) if homework_common.homework_detail_manual.comment_status == 1%>
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index afbeb5ed5..ed0147be8 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -503,4 +503,64 @@
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
     <% end %>
+
+    <!--被老师拉入课程-->
+    <% if ma.course_message_type == "JoinCourse" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl">
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.course_message_id)), :width => "30", :height => "30"), user_path(ma.course_message_id) %></a>
+          </li>
+          <li class="homepageNewsPubType fl">
+            <%=link_to User.find(ma.course_message_id), user_path(User.find(ma.course_message_id)), :class => "newsBlue homepageNewsPublisher" %>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">将您加入了课程：</span>
+          </li>
+          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+            <%= link_to ma.course.name, course_member_path(ma.course), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                        :onmouseover => "message_titile_show($(this),event)",
+                        :onmouseout => "message_titile_hide($(this))" %></a>
+          </li>
+          <div style="display: none" class="message_title_red system_message_style">
+            <% if ma.course.is_public? || User.current.member_of_course?(ma.course) || User.current.admin? %>
+                <p>课程名称：<%= ma.course.name %>(<%= ma.course.time.to_s + '年'+ ma.course.term %>)</p>
+                <p>课程描述：<%= ma.course.description.blank? ? '无':ma.course.description %></p>
+                <p>课时总数：<%= ma.course.class_period %></p>
+            <% else %>
+                <p>
+                  您已经被移出该私有课程，非课程成员没有权限访问私有课程
+                </p>
+            <% end %>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+    
+    <!-被老师移出课程-->
+    <% if ma.course_message_type == "RemoveFromCourse" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl">
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.course_message_id)), :width => "30", :height => "30"), user_path(ma.course_message_id) %></a>
+          </li>
+          <li class="homepageNewsPubType fl">
+            <%=link_to User.find(ma.course_message_id), user_path(User.find(ma.course_message_id)), :class => "newsBlue homepageNewsPublisher" %>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">将您移出了课程：</span>
+          </li>
+          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+            <%= link_to ma.course.name, member_course_path(ma.course), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                        :onmouseover => "message_titile_show($(this),event)",
+                        :onmouseout => "message_titile_hide($(this))" %></a>
+          </li>
+          <div style="display: none" class="message_title_red system_message_style">
+            <% if ma.course.is_public? || User.current.member_of?(ma.course) || User.current.admin? %>
+                <p>课程名称：<%= ma.course.name %>(<%= ma.course.time.to_s + '年'+ ma.course.term %>)</p>
+                <p>课程描述：<%= ma.course.description.blank? ? '无' : ma.course.description %></p>
+                <p>学时总数：<%= ma.course.class_period %></p>
+            <% else %>
+                <p>
+                  您已经被移出该私有课程，非课程成员没有权限访问私有课程
+                </p>
+            <% end %>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/users/_user_message_system.html.erb b/app/views/users/_user_message_system.html.erb
index efbd5d76b..e3037f227 100644
--- a/app/views/users/_user_message_system.html.erb
+++ b/app/views/users/_user_message_system.html.erb
@@ -2,7 +2,7 @@
     <%# @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>
+            <a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.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>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index fc87bd3a0..2805c4379 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,3 +1,4 @@
+<script src="/javascripts/i18n/jquery.ui.datepicker-zh-CN.js" type="text/javascript"></script>
 <input type="hidden" value="<%= @type%>" name="type" id="user_activities_type">
 <div class="homepageRightBanner">
     <div class="NewsBannerName">最新动态</div>
diff --git a/app/views/users/user_system_messages.html.erb b/app/views/users/user_system_messages.html.erb
index 2905e1e7d..4b1ce2c70 100644
--- a/app/views/users/user_system_messages.html.erb
+++ b/app/views/users/user_system_messages.html.erb
@@ -4,7 +4,7 @@
     <div class="resources mt10">
       <div class="homepagePostBrief break_word">
         <div class="homepagePostPortrait">
-          <%= image_tag("/images/logo.png", :width => "50", :height => "50") %>
+          <%= image_tag("/images/trustie_logo1.png", :width => "50", :height => "50") %>
         </div>
         <div class="homepagePostDes">
           <div class="homepagePostTo break_word mt-4">
@@ -18,7 +18,7 @@
             </p>
           </div>
           <div class="cl"></div>
-            <p class="homepagePostDeadline">截止时间：<%= format_time(system_message.created_at) %></p>
+            <p class="homepagePostDeadline">发布时间：<%= format_time(system_message.created_at) %></p>
         </div>
         <div class="cl"></div>
       </div>
diff --git a/db/schema.rb b/db/schema.rb
index 7dab1b3a7..0388bdc5c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,1754 +1,1754 @@
-# encoding: UTF-8
-# This file is auto-generated from the current state of the database. Instead
-# of editing this file, please use the migrations feature of Active Record to
-# incrementally modify your database, and then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 20151022071804) do
-
-  create_table "activities", :force => true do |t|
-    t.integer  "act_id",                                  :null => false
-    t.string   "act_type",                                :null => false
-    t.integer  "user_id",                                 :null => false
-    t.integer  "activity_container_id"
-    t.string   "activity_container_type", :default => ""
-    t.datetime "created_at"
-  end
-
-  add_index "activities", ["act_id", "act_type"], :name => "index_activities_on_act_id_and_act_type"
-  add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type"
-  add_index "activities", ["user_id"], :name => "index_activities_on_user_id"
-
-  create_table "activity_notifies", :force => true do |t|
-    t.integer  "activity_container_id"
-    t.string   "activity_container_type"
-    t.integer  "activity_id"
-    t.string   "activity_type"
-    t.integer  "notify_to"
-    t.datetime "created_on"
-    t.integer  "is_read"
-  end
-
-  add_index "activity_notifies", ["activity_container_id", "activity_container_type"], :name => "index_an_activity_container_id"
-  add_index "activity_notifies", ["created_on"], :name => "index_an_created_on"
-  add_index "activity_notifies", ["notify_to"], :name => "index_an_notify_to"
-
-  create_table "api_keys", :force => true do |t|
-    t.string   "access_token"
-    t.datetime "expires_at"
-    t.integer  "user_id"
-    t.boolean  "active",       :default => true
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-  end
-
-  add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
-  add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
-
-  create_table "applied_projects", :force => true do |t|
-    t.integer "project_id", :null => false
-    t.integer "user_id",    :null => false
-  end
-
-  create_table "apply_project_masters", :force => true do |t|
-    t.integer  "user_id"
-    t.string   "apply_type"
-    t.integer  "apply_id"
-    t.integer  "status"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "attachments", :force => true do |t|
-    t.integer  "container_id"
-    t.string   "container_type", :limit => 30
-    t.string   "filename",                     :default => "", :null => false
-    t.string   "disk_filename",                :default => "", :null => false
-    t.integer  "filesize",                     :default => 0,  :null => false
-    t.string   "content_type",                 :default => ""
-    t.string   "digest",         :limit => 40, :default => "", :null => false
-    t.integer  "downloads",                    :default => 0,  :null => false
-    t.integer  "author_id",                    :default => 0,  :null => false
-    t.datetime "created_on"
-    t.string   "description"
-    t.string   "disk_directory"
-    t.integer  "attachtype",                   :default => 1
-    t.integer  "is_public",                    :default => 1
-    t.integer  "copy_from"
-    t.integer  "quotes"
-  end
-
-  add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id"
-  add_index "attachments", ["container_id", "container_type"], :name => "index_attachments_on_container_id_and_container_type"
-  add_index "attachments", ["created_on"], :name => "index_attachments_on_created_on"
-
-  create_table "attachmentstypes", :force => true do |t|
-    t.integer "typeId",                 :null => false
-    t.string  "typeName", :limit => 50
-  end
-
-  create_table "auth_sources", :force => true do |t|
-    t.string  "type",              :limit => 30, :default => "",    :null => false
-    t.string  "name",              :limit => 60, :default => "",    :null => false
-    t.string  "host",              :limit => 60
-    t.integer "port"
-    t.string  "account"
-    t.string  "account_password",                :default => ""
-    t.string  "base_dn"
-    t.string  "attr_login",        :limit => 30
-    t.string  "attr_firstname",    :limit => 30
-    t.string  "attr_lastname",     :limit => 30
-    t.string  "attr_mail",         :limit => 30
-    t.boolean "onthefly_register",               :default => false, :null => false
-    t.boolean "tls",                             :default => false, :null => false
-    t.string  "filter"
-    t.integer "timeout"
-  end
-
-  add_index "auth_sources", ["id", "type"], :name => "index_auth_sources_on_id_and_type"
-
-  create_table "biding_projects", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "bid_id"
-    t.integer  "user_id"
-    t.string   "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.string   "reward"
-  end
-
-  create_table "bids", :force => true do |t|
-    t.string   "name"
-    t.string   "budget",                                    :null => false
-    t.integer  "author_id"
-    t.date     "deadline"
-    t.text     "description"
-    t.datetime "created_on",                                :null => false
-    t.datetime "updated_on",                                :null => false
-    t.integer  "commit"
-    t.integer  "reward_type"
-    t.integer  "homework_type"
-    t.integer  "parent_id"
-    t.string   "password"
-    t.integer  "is_evaluation"
-    t.integer  "proportion",                :default => 60
-    t.integer  "comment_status",            :default => 0
-    t.integer  "evaluation_num",            :default => 3
-    t.integer  "open_anonymous_evaluation", :default => 1
-  end
-
-  create_table "blog_comments", :force => true do |t|
-    t.integer  "blog_id",                            :null => false
-    t.integer  "parent_id"
-    t.string   "title",           :default => "",    :null => false
-    t.text     "content"
-    t.integer  "author_id"
-    t.integer  "comments_count",  :default => 0,     :null => false
-    t.integer  "last_comment_id"
-    t.datetime "created_on",                         :null => false
-    t.datetime "updated_on",                         :null => false
-    t.boolean  "locked",          :default => false
-    t.integer  "sticky",          :default => 0
-    t.integer  "reply_id"
-    t.datetime "created_at",                         :null => false
-    t.datetime "updated_at",                         :null => false
-  end
-
-  create_table "blogs", :force => true do |t|
-    t.string   "name",             :default => "", :null => false
-    t.text     "description"
-    t.integer  "position",         :default => 1
-    t.integer  "article_count",    :default => 0,  :null => false
-    t.integer  "comments_count",   :default => 0,  :null => false
-    t.integer  "last_comments_id"
-    t.integer  "parent_id"
-    t.integer  "author_id"
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-  end
-
-  create_table "boards", :force => true do |t|
-    t.integer "project_id",                      :null => false
-    t.string  "name",            :default => "", :null => false
-    t.string  "description"
-    t.integer "position",        :default => 1
-    t.integer "topics_count",    :default => 0,  :null => false
-    t.integer "messages_count",  :default => 0,  :null => false
-    t.integer "last_message_id"
-    t.integer "parent_id"
-    t.integer "course_id"
-  end
-
-  add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id"
-  add_index "boards", ["project_id"], :name => "boards_project_id"
-
-  create_table "bug_to_osps", :force => true do |t|
-    t.integer  "osp_id"
-    t.integer  "relative_memo_id"
-    t.string   "description"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  create_table "changes", :force => true do |t|
-    t.integer "changeset_id",                               :null => false
-    t.string  "action",        :limit => 1, :default => "", :null => false
-    t.text    "path",                                       :null => false
-    t.text    "from_path"
-    t.string  "from_revision"
-    t.string  "revision"
-    t.string  "branch"
-  end
-
-  add_index "changes", ["changeset_id"], :name => "changesets_changeset_id"
-
-  create_table "changeset_parents", :id => false, :force => true do |t|
-    t.integer "changeset_id", :null => false
-    t.integer "parent_id",    :null => false
-  end
-
-  add_index "changeset_parents", ["changeset_id"], :name => "changeset_parents_changeset_ids"
-  add_index "changeset_parents", ["parent_id"], :name => "changeset_parents_parent_ids"
-
-  create_table "changesets", :force => true do |t|
-    t.integer  "repository_id", :null => false
-    t.string   "revision",      :null => false
-    t.string   "committer"
-    t.datetime "committed_on",  :null => false
-    t.text     "comments"
-    t.date     "commit_date"
-    t.string   "scmid"
-    t.integer  "user_id"
-  end
-
-  add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on"
-  add_index "changesets", ["repository_id", "revision"], :name => "changesets_repos_rev", :unique => true
-  add_index "changesets", ["repository_id", "scmid"], :name => "changesets_repos_scmid"
-  add_index "changesets", ["repository_id"], :name => "index_changesets_on_repository_id"
-  add_index "changesets", ["user_id"], :name => "index_changesets_on_user_id"
-
-  create_table "changesets_issues", :id => false, :force => true do |t|
-    t.integer "changeset_id", :null => false
-    t.integer "issue_id",     :null => false
-  end
-
-  add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true
-
-  create_table "code_review_assignments", :force => true do |t|
-    t.integer "issue_id"
-    t.integer "change_id"
-    t.integer "attachment_id"
-    t.string  "file_path"
-    t.string  "rev"
-    t.string  "rev_to"
-    t.string  "action_type"
-    t.integer "changeset_id"
-  end
-
-  create_table "code_review_project_settings", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "tracker_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "updated_by"
-    t.boolean  "hide_code_review_tab",     :default => false
-    t.integer  "auto_relation",            :default => 1
-    t.integer  "assignment_tracker_id"
-    t.text     "auto_assign"
-    t.integer  "lock_version",             :default => 0,     :null => false
-    t.boolean  "tracker_in_review_dialog", :default => false
-  end
-
-  create_table "code_review_user_settings", :force => true do |t|
-    t.integer  "user_id",           :default => 0, :null => false
-    t.integer  "mail_notification", :default => 0, :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "code_reviews", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "change_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "line"
-    t.integer  "updated_by_id"
-    t.integer  "lock_version",        :default => 0, :null => false
-    t.integer  "status_changed_from"
-    t.integer  "status_changed_to"
-    t.integer  "issue_id"
-    t.string   "action_type"
-    t.string   "file_path"
-    t.string   "rev"
-    t.string   "rev_to"
-    t.integer  "attachment_id"
-    t.integer  "file_count",          :default => 0, :null => false
-    t.boolean  "diff_all"
-  end
-
-  create_table "comments", :force => true do |t|
-    t.string   "commented_type", :limit => 30, :default => "", :null => false
-    t.integer  "commented_id",                 :default => 0,  :null => false
-    t.integer  "author_id",                    :default => 0,  :null => false
-    t.text     "comments"
-    t.datetime "created_on",                                   :null => false
-    t.datetime "updated_on",                                   :null => false
-  end
-
-  add_index "comments", ["author_id"], :name => "index_comments_on_author_id"
-  add_index "comments", ["commented_id", "commented_type"], :name => "index_comments_on_commented_id_and_commented_type"
-
-  create_table "contest_notifications", :force => true do |t|
-    t.text     "title"
-    t.text     "content"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "contesting_projects", :force => true do |t|
-    t.integer  "project_id"
-    t.string   "contest_id"
-    t.integer  "user_id"
-    t.string   "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.string   "reward"
-  end
-
-  create_table "contesting_softapplications", :force => true do |t|
-    t.integer  "softapplication_id"
-    t.integer  "contest_id"
-    t.integer  "user_id"
-    t.string   "description"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-    t.string   "reward"
-  end
-
-  create_table "contestnotifications", :force => true do |t|
-    t.integer  "contest_id"
-    t.string   "title"
-    t.string   "summary"
-    t.text     "description"
-    t.integer  "author_id"
-    t.integer  "notificationcomments_count"
-    t.datetime "created_at",                 :null => false
-    t.datetime "updated_at",                 :null => false
-  end
-
-  create_table "contests", :force => true do |t|
-    t.string   "name"
-    t.string   "budget",      :default => ""
-    t.integer  "author_id"
-    t.date     "deadline"
-    t.string   "description"
-    t.integer  "commit"
-    t.string   "password"
-    t.datetime "created_on",                  :null => false
-    t.datetime "updated_on",                  :null => false
-  end
-
-  create_table "course_activities", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "course_id"
-    t.integer  "course_act_id"
-    t.string   "course_act_type"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "course_attachments", :force => true do |t|
-    t.string   "filename"
-    t.string   "disk_filename"
-    t.integer  "filesize"
-    t.string   "content_type"
-    t.string   "digest"
-    t.integer  "downloads"
-    t.string   "author_id"
-    t.string   "integer"
-    t.string   "description"
-    t.string   "disk_directory"
-    t.integer  "attachtype"
-    t.integer  "is_public"
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-    t.integer  "container_id",   :default => 0
-  end
-
-  create_table "course_groups", :force => true do |t|
-    t.string   "name"
-    t.integer  "course_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "course_infos", :force => true do |t|
-    t.integer  "course_id"
-    t.integer  "user_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "course_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "course_id"
-    t.integer  "course_message_id"
-    t.string   "course_message_type"
-    t.integer  "viewed"
-    t.datetime "created_at",          :null => false
-    t.datetime "updated_at",          :null => false
-    t.string   "content"
-    t.integer  "status"
-  end
-
-  create_table "course_statuses", :force => true do |t|
-    t.integer  "changesets_count"
-    t.integer  "watchers_count"
-    t.integer  "course_id"
-    t.float    "grade",            :default => 0.0
-    t.integer  "course_ac_para",   :default => 0
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-  end
-
-  create_table "courses", :force => true do |t|
-    t.integer  "tea_id"
-    t.string   "name"
-    t.integer  "state"
-    t.string   "code"
-    t.integer  "time"
-    t.string   "extra"
-    t.datetime "created_at",                                  :null => false
-    t.datetime "updated_at",                                  :null => false
-    t.string   "location"
-    t.string   "term"
-    t.string   "string"
-    t.string   "password"
-    t.string   "setup_time"
-    t.string   "endup_time"
-    t.string   "class_period"
-    t.integer  "school_id"
-    t.text     "description"
-    t.integer  "status",                       :default => 1
-    t.integer  "attachmenttype",               :default => 2
-    t.integer  "lft"
-    t.integer  "rgt"
-    t.integer  "is_public",       :limit => 1, :default => 1
-    t.integer  "inherit_members", :limit => 1, :default => 1
-    t.integer  "open_student",                 :default => 0
-  end
-
-  create_table "custom_fields", :force => true do |t|
-    t.string  "type",            :limit => 30, :default => "",    :null => false
-    t.string  "name",            :limit => 30, :default => "",    :null => false
-    t.string  "field_format",    :limit => 30, :default => "",    :null => false
-    t.text    "possible_values"
-    t.string  "regexp",                        :default => ""
-    t.integer "min_length",                    :default => 0,     :null => false
-    t.integer "max_length",                    :default => 0,     :null => false
-    t.boolean "is_required",                   :default => false, :null => false
-    t.boolean "is_for_all",                    :default => false, :null => false
-    t.boolean "is_filter",                     :default => false, :null => false
-    t.integer "position",                      :default => 1
-    t.boolean "searchable",                    :default => false
-    t.text    "default_value"
-    t.boolean "editable",                      :default => true
-    t.boolean "visible",                       :default => true,  :null => false
-    t.boolean "multiple",                      :default => false
-  end
-
-  add_index "custom_fields", ["id", "type"], :name => "index_custom_fields_on_id_and_type"
-
-  create_table "custom_fields_projects", :id => false, :force => true do |t|
-    t.integer "custom_field_id", :default => 0, :null => false
-    t.integer "project_id",      :default => 0, :null => false
-  end
-
-  add_index "custom_fields_projects", ["custom_field_id", "project_id"], :name => "index_custom_fields_projects_on_custom_field_id_and_project_id", :unique => true
-
-  create_table "custom_fields_trackers", :id => false, :force => true do |t|
-    t.integer "custom_field_id", :default => 0, :null => false
-    t.integer "tracker_id",      :default => 0, :null => false
-  end
-
-  add_index "custom_fields_trackers", ["custom_field_id", "tracker_id"], :name => "index_custom_fields_trackers_on_custom_field_id_and_tracker_id", :unique => true
-
-  create_table "custom_values", :force => true do |t|
-    t.string  "customized_type", :limit => 30, :default => "", :null => false
-    t.integer "customized_id",                 :default => 0,  :null => false
-    t.integer "custom_field_id",               :default => 0,  :null => false
-    t.text    "value"
-  end
-
-  add_index "custom_values", ["custom_field_id"], :name => "index_custom_values_on_custom_field_id"
-  add_index "custom_values", ["customized_type", "customized_id"], :name => "custom_values_customized"
-
-  create_table "delayed_jobs", :force => true do |t|
-    t.integer  "priority",   :default => 0, :null => false
-    t.integer  "attempts",   :default => 0, :null => false
-    t.text     "handler",                   :null => false
-    t.text     "last_error"
-    t.datetime "run_at"
-    t.datetime "locked_at"
-    t.datetime "failed_at"
-    t.string   "locked_by"
-    t.string   "queue"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
-
-  create_table "discuss_demos", :force => true do |t|
-    t.string   "title"
-    t.text     "body"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "documents", :force => true do |t|
-    t.integer  "project_id",                :default => 0,  :null => false
-    t.integer  "category_id",               :default => 0,  :null => false
-    t.string   "title",       :limit => 60, :default => "", :null => false
-    t.text     "description"
-    t.datetime "created_on"
-    t.integer  "user_id",                   :default => 0
-    t.integer  "is_public",                 :default => 1
-  end
-
-  add_index "documents", ["category_id"], :name => "index_documents_on_category_id"
-  add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
-  add_index "documents", ["project_id"], :name => "documents_project_id"
-
-  create_table "dts", :primary_key => "Num", :force => true do |t|
-    t.string   "Defect",        :limit => 50
-    t.string   "Category",      :limit => 50
-    t.string   "File"
-    t.string   "Method"
-    t.string   "Module",        :limit => 20
-    t.string   "Variable",      :limit => 50
-    t.integer  "StartLine"
-    t.integer  "IPLine"
-    t.string   "IPLineCode",    :limit => 200
-    t.string   "Judge",         :limit => 15
-    t.integer  "Review",        :limit => 1
-    t.string   "Description"
-    t.text     "PreConditions", :limit => 2147483647
-    t.text     "TraceInfo",     :limit => 2147483647
-    t.text     "Code",          :limit => 2147483647
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "id",                                  :null => false
-  end
-
-  create_table "enabled_modules", :force => true do |t|
-    t.integer "project_id"
-    t.string  "name",       :null => false
-    t.integer "course_id"
-  end
-
-  add_index "enabled_modules", ["project_id"], :name => "enabled_modules_project_id"
-
-  create_table "enumerations", :force => true do |t|
-    t.string  "name",          :limit => 30, :default => "",    :null => false
-    t.integer "position",                    :default => 1
-    t.boolean "is_default",                  :default => false, :null => false
-    t.string  "type"
-    t.boolean "active",                      :default => true,  :null => false
-    t.integer "project_id"
-    t.integer "parent_id"
-    t.string  "position_name", :limit => 30
-  end
-
-  add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type"
-  add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id"
-
-  create_table "first_pages", :force => true do |t|
-    t.string   "web_title"
-    t.string   "title"
-    t.text     "description"
-    t.string   "page_type"
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-    t.integer  "sort_type"
-    t.integer  "image_width",  :default => 107
-    t.integer  "image_height", :default => 63
-    t.integer  "show_course",  :default => 1
-    t.integer  "show_contest", :default => 1
-  end
-
-  create_table "forge_activities", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "project_id"
-    t.integer  "forge_act_id"
-    t.string   "forge_act_type"
-    t.integer  "org_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
-  add_index "forge_activities", ["forge_act_id"], :name => "index_forge_activities_on_forge_act_id"
-
-  create_table "forge_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "project_id"
-    t.integer  "forge_message_id"
-    t.string   "forge_message_type"
-    t.integer  "viewed"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-    t.string   "secret_key"
-    t.integer  "status"
-  end
-
-  create_table "forums", :force => true do |t|
-    t.string   "name",                        :null => false
-    t.text     "description"
-    t.integer  "topic_count",  :default => 0
-    t.integer  "memo_count",   :default => 0
-    t.integer  "last_memo_id", :default => 0
-    t.integer  "creator_id",                  :null => false
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-    t.integer  "sticky"
-    t.integer  "locked"
-  end
-
-  create_table "groups_users", :id => false, :force => true do |t|
-    t.integer "group_id", :null => false
-    t.integer "user_id",  :null => false
-  end
-
-  add_index "groups_users", ["group_id", "user_id"], :name => "groups_users_ids", :unique => true
-
-  create_table "homework_attaches", :force => true do |t|
-    t.integer  "bid_id"
-    t.integer  "user_id"
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-    t.string   "reward"
-    t.string   "name"
-    t.text     "description"
-    t.integer  "state"
-    t.integer  "project_id",       :default => 0
-    t.float    "score",            :default => 0.0
-    t.integer  "is_teacher_score", :default => 0
-  end
-
-  add_index "homework_attaches", ["bid_id"], :name => "index_homework_attaches_on_bid_id"
-
-  create_table "homework_commons", :force => true do |t|
-    t.string   "name"
-    t.integer  "user_id"
-    t.text     "description"
-    t.date     "publish_time"
-    t.date     "end_time"
-    t.integer  "homework_type",    :default => 1
-    t.string   "late_penalty"
-    t.integer  "course_id"
-    t.datetime "created_at",                      :null => false
-    t.datetime "updated_at",                      :null => false
-    t.integer  "teacher_priority", :default => 1
-  end
-
-  create_table "homework_detail_manuals", :force => true do |t|
-    t.float    "ta_proportion"
-    t.integer  "comment_status"
-    t.date     "evaluation_start"
-    t.date     "evaluation_end"
-    t.integer  "evaluation_num"
-    t.integer  "absence_penalty",    :default => 1
-    t.integer  "homework_common_id"
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-  end
-
-  create_table "homework_detail_programings", :force => true do |t|
-    t.string   "language"
-    t.text     "standard_code",      :limit => 2147483647
-    t.integer  "homework_common_id"
-    t.datetime "created_at",                                                :null => false
-    t.datetime "updated_at",                                                :null => false
-    t.float    "ta_proportion",                            :default => 0.1
-    t.integer  "question_id"
-  end
-
-  create_table "homework_evaluations", :force => true do |t|
-    t.string   "user_id"
-    t.string   "homework_attach_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "homework_for_courses", :force => true do |t|
-    t.integer "course_id"
-    t.integer "bid_id"
-  end
-
-  add_index "homework_for_courses", ["bid_id"], :name => "index_homework_for_courses_on_bid_id"
-  add_index "homework_for_courses", ["course_id"], :name => "index_homework_for_courses_on_course_id"
-
-  create_table "homework_tests", :force => true do |t|
-    t.text     "input"
-    t.text     "output"
-    t.integer  "homework_common_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-    t.integer  "result"
-    t.text     "error_msg"
-  end
-
-  create_table "homework_users", :force => true do |t|
-    t.string   "homework_attach_id"
-    t.string   "user_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "invite_lists", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "user_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-    t.string   "mail"
-  end
-
-  create_table "issue_categories", :force => true do |t|
-    t.integer "project_id",                   :default => 0,  :null => false
-    t.string  "name",           :limit => 30, :default => "", :null => false
-    t.integer "assigned_to_id"
-  end
-
-  add_index "issue_categories", ["assigned_to_id"], :name => "index_issue_categories_on_assigned_to_id"
-  add_index "issue_categories", ["project_id"], :name => "issue_categories_project_id"
-
-  create_table "issue_relations", :force => true do |t|
-    t.integer "issue_from_id",                 :null => false
-    t.integer "issue_to_id",                   :null => false
-    t.string  "relation_type", :default => "", :null => false
-    t.integer "delay"
-  end
-
-  add_index "issue_relations", ["issue_from_id", "issue_to_id"], :name => "index_issue_relations_on_issue_from_id_and_issue_to_id", :unique => true
-  add_index "issue_relations", ["issue_from_id"], :name => "index_issue_relations_on_issue_from_id"
-  add_index "issue_relations", ["issue_to_id"], :name => "index_issue_relations_on_issue_to_id"
-
-  create_table "issue_statuses", :force => true do |t|
-    t.string  "name",               :limit => 30, :default => "",    :null => false
-    t.boolean "is_closed",                        :default => false, :null => false
-    t.boolean "is_default",                       :default => false, :null => false
-    t.integer "position",                         :default => 1
-    t.integer "default_done_ratio"
-  end
-
-  add_index "issue_statuses", ["is_closed"], :name => "index_issue_statuses_on_is_closed"
-  add_index "issue_statuses", ["is_default"], :name => "index_issue_statuses_on_is_default"
-  add_index "issue_statuses", ["position"], :name => "index_issue_statuses_on_position"
-
-  create_table "issues", :force => true do |t|
-    t.integer  "tracker_id",                              :null => false
-    t.integer  "project_id",                              :null => false
-    t.string   "subject",              :default => "",    :null => false
-    t.text     "description"
-    t.date     "due_date"
-    t.integer  "category_id"
-    t.integer  "status_id",                               :null => false
-    t.integer  "assigned_to_id"
-    t.integer  "priority_id",                             :null => false
-    t.integer  "fixed_version_id"
-    t.integer  "author_id",                               :null => false
-    t.integer  "lock_version",         :default => 0,     :null => false
-    t.datetime "created_on"
-    t.datetime "updated_on"
-    t.date     "start_date"
-    t.integer  "done_ratio",           :default => 0,     :null => false
-    t.float    "estimated_hours"
-    t.integer  "parent_id"
-    t.integer  "root_id"
-    t.integer  "lft"
-    t.integer  "rgt"
-    t.boolean  "is_private",           :default => false, :null => false
-    t.datetime "closed_on"
-    t.integer  "project_issues_index"
-  end
-
-  add_index "issues", ["assigned_to_id"], :name => "index_issues_on_assigned_to_id"
-  add_index "issues", ["author_id"], :name => "index_issues_on_author_id"
-  add_index "issues", ["category_id"], :name => "index_issues_on_category_id"
-  add_index "issues", ["created_on"], :name => "index_issues_on_created_on"
-  add_index "issues", ["fixed_version_id"], :name => "index_issues_on_fixed_version_id"
-  add_index "issues", ["priority_id"], :name => "index_issues_on_priority_id"
-  add_index "issues", ["project_id"], :name => "issues_project_id"
-  add_index "issues", ["root_id", "lft", "rgt"], :name => "index_issues_on_root_id_and_lft_and_rgt"
-  add_index "issues", ["status_id"], :name => "index_issues_on_status_id"
-  add_index "issues", ["tracker_id"], :name => "index_issues_on_tracker_id"
-
-  create_table "join_in_competitions", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "competition_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
-  create_table "join_in_contests", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "bid_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "journal_details", :force => true do |t|
-    t.integer "journal_id",               :default => 0,  :null => false
-    t.string  "property",   :limit => 30, :default => "", :null => false
-    t.string  "prop_key",   :limit => 30, :default => "", :null => false
-    t.text    "old_value"
-    t.text    "value"
-  end
-
-  add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
-
-  create_table "journal_replies", :id => false, :force => true do |t|
-    t.integer "journal_id"
-    t.integer "user_id"
-    t.integer "reply_id"
-  end
-
-  add_index "journal_replies", ["journal_id"], :name => "index_journal_replies_on_journal_id"
-  add_index "journal_replies", ["reply_id"], :name => "index_journal_replies_on_reply_id"
-  add_index "journal_replies", ["user_id"], :name => "index_journal_replies_on_user_id"
-
-  create_table "journals", :force => true do |t|
-    t.integer  "journalized_id",                 :default => 0,     :null => false
-    t.string   "journalized_type", :limit => 30, :default => "",    :null => false
-    t.integer  "user_id",                        :default => 0,     :null => false
-    t.text     "notes"
-    t.datetime "created_on",                                        :null => false
-    t.boolean  "private_notes",                  :default => false, :null => false
-  end
-
-  add_index "journals", ["created_on"], :name => "index_journals_on_created_on"
-  add_index "journals", ["journalized_id", "journalized_type"], :name => "journals_journalized_id"
-  add_index "journals", ["journalized_id"], :name => "index_journals_on_journalized_id"
-  add_index "journals", ["user_id"], :name => "index_journals_on_user_id"
-
-  create_table "journals_for_messages", :force => true do |t|
-    t.integer  "jour_id"
-    t.string   "jour_type"
-    t.integer  "user_id"
-    t.text     "notes"
-    t.integer  "status"
-    t.integer  "reply_id"
-    t.datetime "created_on",                  :null => false
-    t.datetime "updated_on",                  :null => false
-    t.string   "m_parent_id"
-    t.boolean  "is_readed"
-    t.integer  "m_reply_count"
-    t.integer  "m_reply_id"
-    t.integer  "is_comprehensive_evaluation"
-  end
-
-  create_table "kindeditor_assets", :force => true do |t|
-    t.string   "asset"
-    t.integer  "file_size"
-    t.string   "file_type"
-    t.integer  "owner_id"
-    t.string   "asset_type"
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
-    t.integer  "owner_type", :default => 0
-  end
-
-  create_table "member_roles", :force => true do |t|
-    t.integer "member_id",      :null => false
-    t.integer "role_id",        :null => false
-    t.integer "inherited_from"
-  end
-
-  add_index "member_roles", ["member_id"], :name => "index_member_roles_on_member_id"
-  add_index "member_roles", ["role_id"], :name => "index_member_roles_on_role_id"
-
-  create_table "members", :force => true do |t|
-    t.integer  "user_id",           :default => 0,     :null => false
-    t.integer  "project_id",        :default => 0
-    t.datetime "created_on"
-    t.boolean  "mail_notification", :default => false, :null => false
-    t.integer  "course_id",         :default => -1
-    t.integer  "course_group_id",   :default => 0
-  end
-
-  add_index "members", ["project_id"], :name => "index_members_on_project_id"
-  add_index "members", ["user_id", "project_id", "course_id"], :name => "index_members_on_user_id_and_project_id", :unique => true
-  add_index "members", ["user_id"], :name => "index_members_on_user_id"
-
-  create_table "memo_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "forum_id"
-    t.integer  "memo_id"
-    t.string   "memo_type"
-    t.integer  "viewed"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "memos", :force => true do |t|
-    t.integer  "forum_id",                         :null => false
-    t.integer  "parent_id"
-    t.string   "subject",                          :null => false
-    t.text     "content",                          :null => false
-    t.integer  "author_id",                        :null => false
-    t.integer  "replies_count", :default => 0
-    t.integer  "last_reply_id"
-    t.boolean  "lock",          :default => false
-    t.boolean  "sticky",        :default => false
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    t.integer  "viewed_count",  :default => 0
-  end
-
-  create_table "message_alls", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "message_id"
-    t.string   "message_type"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-  end
-
-  create_table "messages", :force => true do |t|
-    t.integer  "board_id",                         :null => false
-    t.integer  "parent_id"
-    t.string   "subject",       :default => "",    :null => false
-    t.text     "content"
-    t.integer  "author_id"
-    t.integer  "replies_count", :default => 0,     :null => false
-    t.integer  "last_reply_id"
-    t.datetime "created_on",                       :null => false
-    t.datetime "updated_on",                       :null => false
-    t.boolean  "locked",        :default => false
-    t.integer  "sticky",        :default => 0
-    t.integer  "reply_id"
-  end
-
-  add_index "messages", ["author_id"], :name => "index_messages_on_author_id"
-  add_index "messages", ["board_id"], :name => "messages_board_id"
-  add_index "messages", ["created_on"], :name => "index_messages_on_created_on"
-  add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id"
-  add_index "messages", ["parent_id"], :name => "messages_parent_id"
-
-  create_table "news", :force => true do |t|
-    t.integer  "project_id"
-    t.string   "title",          :limit => 60, :default => "", :null => false
-    t.string   "summary",                      :default => ""
-    t.text     "description"
-    t.integer  "author_id",                    :default => 0,  :null => false
-    t.datetime "created_on"
-    t.integer  "comments_count",               :default => 0,  :null => false
-    t.integer  "course_id"
-  end
-
-  add_index "news", ["author_id"], :name => "index_news_on_author_id"
-  add_index "news", ["created_on"], :name => "index_news_on_created_on"
-  add_index "news", ["project_id"], :name => "news_project_id"
-
-  create_table "no_uses", :force => true do |t|
-    t.integer  "user_id",     :null => false
-    t.string   "no_use_type"
-    t.integer  "no_use_id"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "notificationcomments", :force => true do |t|
-    t.string   "notificationcommented_type"
-    t.integer  "notificationcommented_id"
-    t.integer  "author_id"
-    t.text     "notificationcomments"
-    t.datetime "created_at",                 :null => false
-    t.datetime "updated_at",                 :null => false
-  end
-
-  create_table "onclick_times", :force => true do |t|
-    t.integer  "user_id"
-    t.datetime "onclick_time"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-  end
-
-  create_table "open_id_authentication_associations", :force => true do |t|
-    t.integer "issued"
-    t.integer "lifetime"
-    t.string  "handle"
-    t.string  "assoc_type"
-    t.binary  "server_url"
-    t.binary  "secret"
-  end
-
-  create_table "open_id_authentication_nonces", :force => true do |t|
-    t.integer "timestamp",  :null => false
-    t.string  "server_url"
-    t.string  "salt",       :null => false
-  end
-
-  create_table "open_source_projects", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.integer  "commit_count",     :default => 0
-    t.integer  "code_line",        :default => 0
-    t.integer  "users_count",      :default => 0
-    t.date     "last_commit_time"
-    t.string   "url"
-    t.date     "date_collected"
-    t.datetime "created_at",                      :null => false
-    t.datetime "updated_at",                      :null => false
-  end
-
-  create_table "option_numbers", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "memo"
-    t.integer  "messages_for_issues"
-    t.integer  "issues_status"
-    t.integer  "replay_for_message"
-    t.integer  "replay_for_memo"
-    t.integer  "follow"
-    t.integer  "tread"
-    t.integer  "praise_by_one"
-    t.integer  "praise_by_two"
-    t.integer  "praise_by_three"
-    t.integer  "tread_by_one"
-    t.integer  "tread_by_two"
-    t.integer  "tread_by_three"
-    t.integer  "changeset"
-    t.integer  "document"
-    t.integer  "attachment"
-    t.integer  "issue_done_ratio"
-    t.integer  "post_issue"
-    t.integer  "score_type"
-    t.integer  "total_score"
-    t.datetime "created_at",          :null => false
-    t.datetime "updated_at",          :null => false
-    t.integer  "project_id"
-  end
-
-  create_table "organizations", :force => true do |t|
-    t.string   "name"
-    t.string   "logo_link"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "phone_app_versions", :force => true do |t|
-    t.string   "version"
-    t.text     "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "poll_answers", :force => true do |t|
-    t.integer  "poll_question_id"
-    t.text     "answer_text"
-    t.integer  "answer_position"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  create_table "poll_questions", :force => true do |t|
-    t.string   "question_title"
-    t.integer  "question_type"
-    t.integer  "is_necessary"
-    t.integer  "poll_id"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-    t.integer  "question_number"
-  end
-
-  create_table "poll_users", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "poll_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "poll_votes", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "poll_question_id"
-    t.integer  "poll_answer_id"
-    t.text     "vote_text"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  create_table "polls", :force => true do |t|
-    t.string   "polls_name"
-    t.string   "polls_type"
-    t.integer  "polls_group_id"
-    t.integer  "polls_status"
-    t.integer  "user_id"
-    t.datetime "published_at"
-    t.datetime "closed_at"
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    t.text     "polls_description"
-    t.integer  "show_result",       :default => 1
-  end
-
-  create_table "praise_tread_caches", :force => true do |t|
-    t.integer  "object_id",   :null => false
-    t.string   "object_type"
-    t.integer  "praise_num"
-    t.integer  "tread_num"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "praise_treads", :force => true do |t|
-    t.integer  "user_id",                  :null => false
-    t.integer  "praise_tread_object_id"
-    t.string   "praise_tread_object_type"
-    t.integer  "praise_or_tread"
-    t.datetime "created_at",               :null => false
-    t.datetime "updated_at",               :null => false
-  end
-
-  create_table "principal_activities", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "principal_id"
-    t.integer  "principal_act_id"
-    t.string   "principal_act_type"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "project_infos", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "user_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "project_scores", :force => true do |t|
-    t.string   "project_id"
-    t.integer  "score"
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    t.integer  "issue_num",         :default => 0
-    t.integer  "issue_journal_num", :default => 0
-    t.integer  "news_num",          :default => 0
-    t.integer  "documents_num",     :default => 0
-    t.integer  "changeset_num",     :default => 0
-    t.integer  "board_message_num", :default => 0
-  end
-
-  create_table "project_statuses", :force => true do |t|
-    t.integer "changesets_count"
-    t.integer "watchers_count"
-    t.integer "project_id"
-    t.integer "project_type"
-    t.float   "grade",            :default => 0.0
-    t.integer "course_ac_para",   :default => 0
-  end
-
-  add_index "project_statuses", ["grade"], :name => "index_project_statuses_on_grade"
-
-  create_table "projecting_softapplictions", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "softapplication_id"
-    t.integer  "project_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "projects", :force => true do |t|
-    t.string   "name",             :default => "",    :null => false
-    t.text     "description"
-    t.string   "homepage",         :default => ""
-    t.boolean  "is_public",        :default => true,  :null => false
-    t.integer  "parent_id"
-    t.datetime "created_on"
-    t.datetime "updated_on"
-    t.string   "identifier"
-    t.integer  "status",           :default => 1,     :null => false
-    t.integer  "lft"
-    t.integer  "rgt"
-    t.boolean  "inherit_members",  :default => false, :null => false
-    t.integer  "project_type"
-    t.boolean  "hidden_repo",      :default => false, :null => false
-    t.integer  "attachmenttype",   :default => 1
-    t.integer  "user_id"
-    t.integer  "dts_test",         :default => 0
-    t.string   "enterprise_name"
-    t.integer  "organization_id"
-    t.integer  "project_new_type"
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 20151022071804) do
+
+  create_table "activities", :force => true do |t|
+    t.integer  "act_id",                                  :null => false
+    t.string   "act_type",                                :null => false
+    t.integer  "user_id",                                 :null => false
+    t.integer  "activity_container_id"
+    t.string   "activity_container_type", :default => ""
+    t.datetime "created_at"
+  end
+
+  add_index "activities", ["act_id", "act_type"], :name => "index_activities_on_act_id_and_act_type"
+  add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type"
+  add_index "activities", ["user_id"], :name => "index_activities_on_user_id"
+
+  create_table "activity_notifies", :force => true do |t|
+    t.integer  "activity_container_id"
+    t.string   "activity_container_type"
+    t.integer  "activity_id"
+    t.string   "activity_type"
+    t.integer  "notify_to"
+    t.datetime "created_on"
+    t.integer  "is_read"
+  end
+
+  add_index "activity_notifies", ["activity_container_id", "activity_container_type"], :name => "index_an_activity_container_id"
+  add_index "activity_notifies", ["created_on"], :name => "index_an_created_on"
+  add_index "activity_notifies", ["notify_to"], :name => "index_an_notify_to"
+
+  create_table "api_keys", :force => true do |t|
+    t.string   "access_token"
+    t.datetime "expires_at"
+    t.integer  "user_id"
+    t.boolean  "active",       :default => true
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+  end
+
+  add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
+  add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
+
+  create_table "applied_projects", :force => true do |t|
+    t.integer "project_id", :null => false
+    t.integer "user_id",    :null => false
+  end
+
+  create_table "apply_project_masters", :force => true do |t|
+    t.integer  "user_id"
+    t.string   "apply_type"
+    t.integer  "apply_id"
+    t.integer  "status"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "attachments", :force => true do |t|
+    t.integer  "container_id"
+    t.string   "container_type", :limit => 30
+    t.string   "filename",                     :default => "", :null => false
+    t.string   "disk_filename",                :default => "", :null => false
+    t.integer  "filesize",                     :default => 0,  :null => false
+    t.string   "content_type",                 :default => ""
+    t.string   "digest",         :limit => 40, :default => "", :null => false
+    t.integer  "downloads",                    :default => 0,  :null => false
+    t.integer  "author_id",                    :default => 0,  :null => false
+    t.datetime "created_on"
+    t.string   "description"
+    t.string   "disk_directory"
+    t.integer  "attachtype",                   :default => 1
+    t.integer  "is_public",                    :default => 1
+    t.integer  "copy_from"
+    t.integer  "quotes"
+  end
+
+  add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id"
+  add_index "attachments", ["container_id", "container_type"], :name => "index_attachments_on_container_id_and_container_type"
+  add_index "attachments", ["created_on"], :name => "index_attachments_on_created_on"
+
+  create_table "attachmentstypes", :force => true do |t|
+    t.integer "typeId",                 :null => false
+    t.string  "typeName", :limit => 50
+  end
+
+  create_table "auth_sources", :force => true do |t|
+    t.string  "type",              :limit => 30, :default => "",    :null => false
+    t.string  "name",              :limit => 60, :default => "",    :null => false
+    t.string  "host",              :limit => 60
+    t.integer "port"
+    t.string  "account"
+    t.string  "account_password",                :default => ""
+    t.string  "base_dn"
+    t.string  "attr_login",        :limit => 30
+    t.string  "attr_firstname",    :limit => 30
+    t.string  "attr_lastname",     :limit => 30
+    t.string  "attr_mail",         :limit => 30
+    t.boolean "onthefly_register",               :default => false, :null => false
+    t.boolean "tls",                             :default => false, :null => false
+    t.string  "filter"
+    t.integer "timeout"
+  end
+
+  add_index "auth_sources", ["id", "type"], :name => "index_auth_sources_on_id_and_type"
+
+  create_table "biding_projects", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "bid_id"
+    t.integer  "user_id"
+    t.string   "description"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+    t.string   "reward"
+  end
+
+  create_table "bids", :force => true do |t|
+    t.string   "name"
+    t.string   "budget",                                    :null => false
+    t.integer  "author_id"
+    t.date     "deadline"
+    t.text     "description"
+    t.datetime "created_on",                                :null => false
+    t.datetime "updated_on",                                :null => false
+    t.integer  "commit"
+    t.integer  "reward_type"
+    t.integer  "homework_type"
+    t.integer  "parent_id"
+    t.string   "password"
+    t.integer  "is_evaluation"
+    t.integer  "proportion",                :default => 60
+    t.integer  "comment_status",            :default => 0
+    t.integer  "evaluation_num",            :default => 3
+    t.integer  "open_anonymous_evaluation", :default => 1
+  end
+
+  create_table "blog_comments", :force => true do |t|
+    t.integer  "blog_id",                            :null => false
+    t.integer  "parent_id"
+    t.string   "title",           :default => "",    :null => false
+    t.text     "content"
+    t.integer  "author_id"
+    t.integer  "comments_count",  :default => 0,     :null => false
+    t.integer  "last_comment_id"
+    t.datetime "created_on",                         :null => false
+    t.datetime "updated_on",                         :null => false
+    t.boolean  "locked",          :default => false
+    t.integer  "sticky",          :default => 0
+    t.integer  "reply_id"
+    t.datetime "created_at",                         :null => false
+    t.datetime "updated_at",                         :null => false
+  end
+
+  create_table "blogs", :force => true do |t|
+    t.string   "name",             :default => "", :null => false
+    t.text     "description"
+    t.integer  "position",         :default => 1
+    t.integer  "article_count",    :default => 0,  :null => false
+    t.integer  "comments_count",   :default => 0,  :null => false
+    t.integer  "last_comments_id"
+    t.integer  "parent_id"
+    t.integer  "author_id"
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
+  end
+
+  create_table "boards", :force => true do |t|
+    t.integer "project_id",                      :null => false
+    t.string  "name",            :default => "", :null => false
+    t.string  "description"
+    t.integer "position",        :default => 1
+    t.integer "topics_count",    :default => 0,  :null => false
+    t.integer "messages_count",  :default => 0,  :null => false
+    t.integer "last_message_id"
+    t.integer "parent_id"
+    t.integer "course_id"
+  end
+
+  add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id"
+  add_index "boards", ["project_id"], :name => "boards_project_id"
+
+  create_table "bug_to_osps", :force => true do |t|
+    t.integer  "osp_id"
+    t.integer  "relative_memo_id"
+    t.string   "description"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+  end
+
+  create_table "changes", :force => true do |t|
+    t.integer "changeset_id",                               :null => false
+    t.string  "action",        :limit => 1, :default => "", :null => false
+    t.text    "path",                                       :null => false
+    t.text    "from_path"
+    t.string  "from_revision"
+    t.string  "revision"
+    t.string  "branch"
+  end
+
+  add_index "changes", ["changeset_id"], :name => "changesets_changeset_id"
+
+  create_table "changeset_parents", :id => false, :force => true do |t|
+    t.integer "changeset_id", :null => false
+    t.integer "parent_id",    :null => false
+  end
+
+  add_index "changeset_parents", ["changeset_id"], :name => "changeset_parents_changeset_ids"
+  add_index "changeset_parents", ["parent_id"], :name => "changeset_parents_parent_ids"
+
+  create_table "changesets", :force => true do |t|
+    t.integer  "repository_id", :null => false
+    t.string   "revision",      :null => false
+    t.string   "committer"
+    t.datetime "committed_on",  :null => false
+    t.text     "comments"
+    t.date     "commit_date"
+    t.string   "scmid"
+    t.integer  "user_id"
+  end
+
+  add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on"
+  add_index "changesets", ["repository_id", "revision"], :name => "changesets_repos_rev", :unique => true
+  add_index "changesets", ["repository_id", "scmid"], :name => "changesets_repos_scmid"
+  add_index "changesets", ["repository_id"], :name => "index_changesets_on_repository_id"
+  add_index "changesets", ["user_id"], :name => "index_changesets_on_user_id"
+
+  create_table "changesets_issues", :id => false, :force => true do |t|
+    t.integer "changeset_id", :null => false
+    t.integer "issue_id",     :null => false
+  end
+
+  add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true
+
+  create_table "code_review_assignments", :force => true do |t|
+    t.integer "issue_id"
+    t.integer "change_id"
+    t.integer "attachment_id"
+    t.string  "file_path"
+    t.string  "rev"
+    t.string  "rev_to"
+    t.string  "action_type"
+    t.integer "changeset_id"
+  end
+
+  create_table "code_review_project_settings", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "tracker_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "updated_by"
+    t.boolean  "hide_code_review_tab",     :default => false
+    t.integer  "auto_relation",            :default => 1
+    t.integer  "assignment_tracker_id"
+    t.text     "auto_assign"
+    t.integer  "lock_version",             :default => 0,     :null => false
+    t.boolean  "tracker_in_review_dialog", :default => false
+  end
+
+  create_table "code_review_user_settings", :force => true do |t|
+    t.integer  "user_id",           :default => 0, :null => false
+    t.integer  "mail_notification", :default => 0, :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "code_reviews", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "change_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "line"
+    t.integer  "updated_by_id"
+    t.integer  "lock_version",        :default => 0, :null => false
+    t.integer  "status_changed_from"
+    t.integer  "status_changed_to"
+    t.integer  "issue_id"
+    t.string   "action_type"
+    t.string   "file_path"
+    t.string   "rev"
+    t.string   "rev_to"
+    t.integer  "attachment_id"
+    t.integer  "file_count",          :default => 0, :null => false
+    t.boolean  "diff_all"
+  end
+
+  create_table "comments", :force => true do |t|
+    t.string   "commented_type", :limit => 30, :default => "", :null => false
+    t.integer  "commented_id",                 :default => 0,  :null => false
+    t.integer  "author_id",                    :default => 0,  :null => false
+    t.text     "comments"
+    t.datetime "created_on",                                   :null => false
+    t.datetime "updated_on",                                   :null => false
+  end
+
+  add_index "comments", ["author_id"], :name => "index_comments_on_author_id"
+  add_index "comments", ["commented_id", "commented_type"], :name => "index_comments_on_commented_id_and_commented_type"
+
+  create_table "contest_notifications", :force => true do |t|
+    t.text     "title"
+    t.text     "content"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "contesting_projects", :force => true do |t|
+    t.integer  "project_id"
+    t.string   "contest_id"
+    t.integer  "user_id"
+    t.string   "description"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+    t.string   "reward"
+  end
+
+  create_table "contesting_softapplications", :force => true do |t|
+    t.integer  "softapplication_id"
+    t.integer  "contest_id"
+    t.integer  "user_id"
+    t.string   "description"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+    t.string   "reward"
+  end
+
+  create_table "contestnotifications", :force => true do |t|
+    t.integer  "contest_id"
+    t.string   "title"
+    t.string   "summary"
+    t.text     "description"
+    t.integer  "author_id"
+    t.integer  "notificationcomments_count"
+    t.datetime "created_at",                 :null => false
+    t.datetime "updated_at",                 :null => false
+  end
+
+  create_table "contests", :force => true do |t|
+    t.string   "name"
+    t.string   "budget",      :default => ""
+    t.integer  "author_id"
+    t.date     "deadline"
+    t.string   "description"
+    t.integer  "commit"
+    t.string   "password"
+    t.datetime "created_on",                  :null => false
+    t.datetime "updated_on",                  :null => false
+  end
+
+  create_table "course_activities", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "course_id"
+    t.integer  "course_act_id"
+    t.string   "course_act_type"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  create_table "course_attachments", :force => true do |t|
+    t.string   "filename"
+    t.string   "disk_filename"
+    t.integer  "filesize"
+    t.string   "content_type"
+    t.string   "digest"
+    t.integer  "downloads"
+    t.string   "author_id"
+    t.string   "integer"
+    t.string   "description"
+    t.string   "disk_directory"
+    t.integer  "attachtype"
+    t.integer  "is_public"
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+    t.integer  "container_id",   :default => 0
+  end
+
+  create_table "course_groups", :force => true do |t|
+    t.string   "name"
+    t.integer  "course_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "course_infos", :force => true do |t|
+    t.integer  "course_id"
+    t.integer  "user_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "course_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "course_id"
+    t.integer  "course_message_id"
+    t.string   "course_message_type"
+    t.integer  "viewed"
+    t.datetime "created_at",          :null => false
+    t.datetime "updated_at",          :null => false
+    t.string   "content"
+    t.integer  "status"
+  end
+
+  create_table "course_statuses", :force => true do |t|
+    t.integer  "changesets_count"
+    t.integer  "watchers_count"
+    t.integer  "course_id"
+    t.float    "grade",            :default => 0.0
+    t.integer  "course_ac_para",   :default => 0
+    t.datetime "created_at",                        :null => false
+    t.datetime "updated_at",                        :null => false
+  end
+
+  create_table "courses", :force => true do |t|
+    t.integer  "tea_id"
+    t.string   "name"
+    t.integer  "state"
+    t.string   "code"
+    t.integer  "time"
+    t.string   "extra"
+    t.datetime "created_at",                                  :null => false
+    t.datetime "updated_at",                                  :null => false
+    t.string   "location"
+    t.string   "term"
+    t.string   "string"
+    t.string   "password"
+    t.string   "setup_time"
+    t.string   "endup_time"
+    t.string   "class_period"
+    t.integer  "school_id"
+    t.text     "description"
+    t.integer  "status",                       :default => 1
+    t.integer  "attachmenttype",               :default => 2
+    t.integer  "lft"
+    t.integer  "rgt"
+    t.integer  "is_public",       :limit => 1, :default => 1
+    t.integer  "inherit_members", :limit => 1, :default => 1
+    t.integer  "open_student",                 :default => 0
+  end
+
+  create_table "custom_fields", :force => true do |t|
+    t.string  "type",            :limit => 30, :default => "",    :null => false
+    t.string  "name",            :limit => 30, :default => "",    :null => false
+    t.string  "field_format",    :limit => 30, :default => "",    :null => false
+    t.text    "possible_values"
+    t.string  "regexp",                        :default => ""
+    t.integer "min_length",                    :default => 0,     :null => false
+    t.integer "max_length",                    :default => 0,     :null => false
+    t.boolean "is_required",                   :default => false, :null => false
+    t.boolean "is_for_all",                    :default => false, :null => false
+    t.boolean "is_filter",                     :default => false, :null => false
+    t.integer "position",                      :default => 1
+    t.boolean "searchable",                    :default => false
+    t.text    "default_value"
+    t.boolean "editable",                      :default => true
+    t.boolean "visible",                       :default => true,  :null => false
+    t.boolean "multiple",                      :default => false
+  end
+
+  add_index "custom_fields", ["id", "type"], :name => "index_custom_fields_on_id_and_type"
+
+  create_table "custom_fields_projects", :id => false, :force => true do |t|
+    t.integer "custom_field_id", :default => 0, :null => false
+    t.integer "project_id",      :default => 0, :null => false
+  end
+
+  add_index "custom_fields_projects", ["custom_field_id", "project_id"], :name => "index_custom_fields_projects_on_custom_field_id_and_project_id", :unique => true
+
+  create_table "custom_fields_trackers", :id => false, :force => true do |t|
+    t.integer "custom_field_id", :default => 0, :null => false
+    t.integer "tracker_id",      :default => 0, :null => false
+  end
+
+  add_index "custom_fields_trackers", ["custom_field_id", "tracker_id"], :name => "index_custom_fields_trackers_on_custom_field_id_and_tracker_id", :unique => true
+
+  create_table "custom_values", :force => true do |t|
+    t.string  "customized_type", :limit => 30, :default => "", :null => false
+    t.integer "customized_id",                 :default => 0,  :null => false
+    t.integer "custom_field_id",               :default => 0,  :null => false
+    t.text    "value"
+  end
+
+  add_index "custom_values", ["custom_field_id"], :name => "index_custom_values_on_custom_field_id"
+  add_index "custom_values", ["customized_type", "customized_id"], :name => "custom_values_customized"
+
+  create_table "delayed_jobs", :force => true do |t|
+    t.integer  "priority",   :default => 0, :null => false
+    t.integer  "attempts",   :default => 0, :null => false
+    t.text     "handler",                   :null => false
+    t.text     "last_error"
+    t.datetime "run_at"
+    t.datetime "locked_at"
+    t.datetime "failed_at"
+    t.string   "locked_by"
+    t.string   "queue"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
+
+  create_table "discuss_demos", :force => true do |t|
+    t.string   "title"
+    t.text     "body"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "documents", :force => true do |t|
+    t.integer  "project_id",                :default => 0,  :null => false
+    t.integer  "category_id",               :default => 0,  :null => false
+    t.string   "title",       :limit => 60, :default => "", :null => false
+    t.text     "description"
+    t.datetime "created_on"
+    t.integer  "user_id",                   :default => 0
+    t.integer  "is_public",                 :default => 1
+  end
+
+  add_index "documents", ["category_id"], :name => "index_documents_on_category_id"
+  add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
+  add_index "documents", ["project_id"], :name => "documents_project_id"
+
+  create_table "dts", :primary_key => "Num", :force => true do |t|
+    t.string   "Defect",        :limit => 50
+    t.string   "Category",      :limit => 50
+    t.string   "File"
+    t.string   "Method"
+    t.string   "Module",        :limit => 20
+    t.string   "Variable",      :limit => 50
+    t.integer  "StartLine"
+    t.integer  "IPLine"
+    t.string   "IPLineCode",    :limit => 200
+    t.string   "Judge",         :limit => 15
+    t.integer  "Review",        :limit => 1
+    t.string   "Description"
+    t.text     "PreConditions", :limit => 2147483647
+    t.text     "TraceInfo",     :limit => 2147483647
+    t.text     "Code",          :limit => 2147483647
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "id",                                  :null => false
+  end
+
+  create_table "enabled_modules", :force => true do |t|
+    t.integer "project_id"
+    t.string  "name",       :null => false
+    t.integer "course_id"
+  end
+
+  add_index "enabled_modules", ["project_id"], :name => "enabled_modules_project_id"
+
+  create_table "enumerations", :force => true do |t|
+    t.string  "name",          :limit => 30, :default => "",    :null => false
+    t.integer "position",                    :default => 1
+    t.boolean "is_default",                  :default => false, :null => false
+    t.string  "type"
+    t.boolean "active",                      :default => true,  :null => false
+    t.integer "project_id"
+    t.integer "parent_id"
+    t.string  "position_name", :limit => 30
+  end
+
+  add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type"
+  add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id"
+
+  create_table "first_pages", :force => true do |t|
+    t.string   "web_title"
+    t.string   "title"
+    t.text     "description"
+    t.string   "page_type"
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+    t.integer  "sort_type"
+    t.integer  "image_width",  :default => 107
+    t.integer  "image_height", :default => 63
+    t.integer  "show_course",  :default => 1
+    t.integer  "show_contest", :default => 1
+  end
+
+  create_table "forge_activities", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "project_id"
+    t.integer  "forge_act_id"
+    t.string   "forge_act_type"
+    t.integer  "org_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
+  add_index "forge_activities", ["forge_act_id"], :name => "index_forge_activities_on_forge_act_id"
+
+  create_table "forge_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "project_id"
+    t.integer  "forge_message_id"
+    t.string   "forge_message_type"
+    t.integer  "viewed"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+    t.string   "secret_key"
+    t.integer  "status"
+  end
+
+  create_table "forums", :force => true do |t|
+    t.string   "name",                        :null => false
+    t.text     "description"
+    t.integer  "topic_count",  :default => 0
+    t.integer  "memo_count",   :default => 0
+    t.integer  "last_memo_id", :default => 0
+    t.integer  "creator_id",                  :null => false
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
+    t.integer  "sticky"
+    t.integer  "locked"
+  end
+
+  create_table "groups_users", :id => false, :force => true do |t|
+    t.integer "group_id", :null => false
+    t.integer "user_id",  :null => false
+  end
+
+  add_index "groups_users", ["group_id", "user_id"], :name => "groups_users_ids", :unique => true
+
+  create_table "homework_attaches", :force => true do |t|
+    t.integer  "bid_id"
+    t.integer  "user_id"
+    t.datetime "created_at",                        :null => false
+    t.datetime "updated_at",                        :null => false
+    t.string   "reward"
+    t.string   "name"
+    t.text     "description"
+    t.integer  "state"
+    t.integer  "project_id",       :default => 0
+    t.float    "score",            :default => 0.0
+    t.integer  "is_teacher_score", :default => 0
+  end
+
+  add_index "homework_attaches", ["bid_id"], :name => "index_homework_attaches_on_bid_id"
+
+  create_table "homework_commons", :force => true do |t|
+    t.string   "name"
+    t.integer  "user_id"
+    t.text     "description"
+    t.date     "publish_time"
+    t.date     "end_time"
+    t.integer  "homework_type",    :default => 1
+    t.string   "late_penalty"
+    t.integer  "course_id"
+    t.datetime "created_at",                      :null => false
+    t.datetime "updated_at",                      :null => false
+    t.integer  "teacher_priority", :default => 1
+  end
+
+  create_table "homework_detail_manuals", :force => true do |t|
+    t.float    "ta_proportion"
+    t.integer  "comment_status"
+    t.date     "evaluation_start"
+    t.date     "evaluation_end"
+    t.integer  "evaluation_num"
+    t.integer  "absence_penalty",    :default => 1
+    t.integer  "homework_common_id"
+    t.datetime "created_at",                        :null => false
+    t.datetime "updated_at",                        :null => false
+  end
+
+  create_table "homework_detail_programings", :force => true do |t|
+    t.string   "language"
+    t.text     "standard_code",      :limit => 2147483647
+    t.integer  "homework_common_id"
+    t.datetime "created_at",                                                :null => false
+    t.datetime "updated_at",                                                :null => false
+    t.float    "ta_proportion",                            :default => 0.1
+    t.integer  "question_id"
+  end
+
+  create_table "homework_evaluations", :force => true do |t|
+    t.string   "user_id"
+    t.string   "homework_attach_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  create_table "homework_for_courses", :force => true do |t|
+    t.integer "course_id"
+    t.integer "bid_id"
+  end
+
+  add_index "homework_for_courses", ["bid_id"], :name => "index_homework_for_courses_on_bid_id"
+  add_index "homework_for_courses", ["course_id"], :name => "index_homework_for_courses_on_course_id"
+
+  create_table "homework_tests", :force => true do |t|
+    t.text     "input"
+    t.text     "output"
+    t.integer  "homework_common_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+    t.integer  "result"
+    t.text     "error_msg"
+  end
+
+  create_table "homework_users", :force => true do |t|
+    t.string   "homework_attach_id"
+    t.string   "user_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  create_table "invite_lists", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "user_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+    t.string   "mail"
+  end
+
+  create_table "issue_categories", :force => true do |t|
+    t.integer "project_id",                   :default => 0,  :null => false
+    t.string  "name",           :limit => 30, :default => "", :null => false
+    t.integer "assigned_to_id"
+  end
+
+  add_index "issue_categories", ["assigned_to_id"], :name => "index_issue_categories_on_assigned_to_id"
+  add_index "issue_categories", ["project_id"], :name => "issue_categories_project_id"
+
+  create_table "issue_relations", :force => true do |t|
+    t.integer "issue_from_id",                 :null => false
+    t.integer "issue_to_id",                   :null => false
+    t.string  "relation_type", :default => "", :null => false
+    t.integer "delay"
+  end
+
+  add_index "issue_relations", ["issue_from_id", "issue_to_id"], :name => "index_issue_relations_on_issue_from_id_and_issue_to_id", :unique => true
+  add_index "issue_relations", ["issue_from_id"], :name => "index_issue_relations_on_issue_from_id"
+  add_index "issue_relations", ["issue_to_id"], :name => "index_issue_relations_on_issue_to_id"
+
+  create_table "issue_statuses", :force => true do |t|
+    t.string  "name",               :limit => 30, :default => "",    :null => false
+    t.boolean "is_closed",                        :default => false, :null => false
+    t.boolean "is_default",                       :default => false, :null => false
+    t.integer "position",                         :default => 1
+    t.integer "default_done_ratio"
+  end
+
+  add_index "issue_statuses", ["is_closed"], :name => "index_issue_statuses_on_is_closed"
+  add_index "issue_statuses", ["is_default"], :name => "index_issue_statuses_on_is_default"
+  add_index "issue_statuses", ["position"], :name => "index_issue_statuses_on_position"
+
+  create_table "issues", :force => true do |t|
+    t.integer  "tracker_id",                              :null => false
+    t.integer  "project_id",                              :null => false
+    t.string   "subject",              :default => "",    :null => false
+    t.text     "description"
+    t.date     "due_date"
+    t.integer  "category_id"
+    t.integer  "status_id",                               :null => false
+    t.integer  "assigned_to_id"
+    t.integer  "priority_id",                             :null => false
+    t.integer  "fixed_version_id"
+    t.integer  "author_id",                               :null => false
+    t.integer  "lock_version",         :default => 0,     :null => false
+    t.datetime "created_on"
+    t.datetime "updated_on"
+    t.date     "start_date"
+    t.integer  "done_ratio",           :default => 0,     :null => false
+    t.float    "estimated_hours"
+    t.integer  "parent_id"
+    t.integer  "root_id"
+    t.integer  "lft"
+    t.integer  "rgt"
+    t.boolean  "is_private",           :default => false, :null => false
+    t.datetime "closed_on"
+    t.integer  "project_issues_index"
+  end
+
+  add_index "issues", ["assigned_to_id"], :name => "index_issues_on_assigned_to_id"
+  add_index "issues", ["author_id"], :name => "index_issues_on_author_id"
+  add_index "issues", ["category_id"], :name => "index_issues_on_category_id"
+  add_index "issues", ["created_on"], :name => "index_issues_on_created_on"
+  add_index "issues", ["fixed_version_id"], :name => "index_issues_on_fixed_version_id"
+  add_index "issues", ["priority_id"], :name => "index_issues_on_priority_id"
+  add_index "issues", ["project_id"], :name => "issues_project_id"
+  add_index "issues", ["root_id", "lft", "rgt"], :name => "index_issues_on_root_id_and_lft_and_rgt"
+  add_index "issues", ["status_id"], :name => "index_issues_on_status_id"
+  add_index "issues", ["tracker_id"], :name => "index_issues_on_tracker_id"
+
+  create_table "join_in_competitions", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "competition_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
+  create_table "join_in_contests", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "bid_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "journal_details", :force => true do |t|
+    t.integer "journal_id",               :default => 0,  :null => false
+    t.string  "property",   :limit => 30, :default => "", :null => false
+    t.string  "prop_key",   :limit => 30, :default => "", :null => false
+    t.text    "old_value"
+    t.text    "value"
+  end
+
+  add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
+
+  create_table "journal_replies", :id => false, :force => true do |t|
+    t.integer "journal_id"
+    t.integer "user_id"
+    t.integer "reply_id"
+  end
+
+  add_index "journal_replies", ["journal_id"], :name => "index_journal_replies_on_journal_id"
+  add_index "journal_replies", ["reply_id"], :name => "index_journal_replies_on_reply_id"
+  add_index "journal_replies", ["user_id"], :name => "index_journal_replies_on_user_id"
+
+  create_table "journals", :force => true do |t|
+    t.integer  "journalized_id",                 :default => 0,     :null => false
+    t.string   "journalized_type", :limit => 30, :default => "",    :null => false
+    t.integer  "user_id",                        :default => 0,     :null => false
+    t.text     "notes"
+    t.datetime "created_on",                                        :null => false
+    t.boolean  "private_notes",                  :default => false, :null => false
+  end
+
+  add_index "journals", ["created_on"], :name => "index_journals_on_created_on"
+  add_index "journals", ["journalized_id", "journalized_type"], :name => "journals_journalized_id"
+  add_index "journals", ["journalized_id"], :name => "index_journals_on_journalized_id"
+  add_index "journals", ["user_id"], :name => "index_journals_on_user_id"
+
+  create_table "journals_for_messages", :force => true do |t|
+    t.integer  "jour_id"
+    t.string   "jour_type"
+    t.integer  "user_id"
+    t.text     "notes"
+    t.integer  "status"
+    t.integer  "reply_id"
+    t.datetime "created_on",                  :null => false
+    t.datetime "updated_on",                  :null => false
+    t.string   "m_parent_id"
+    t.boolean  "is_readed"
+    t.integer  "m_reply_count"
+    t.integer  "m_reply_id"
+    t.integer  "is_comprehensive_evaluation"
+  end
+
+  create_table "kindeditor_assets", :force => true do |t|
+    t.string   "asset"
+    t.integer  "file_size"
+    t.string   "file_type"
+    t.integer  "owner_id"
+    t.string   "asset_type"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+    t.integer  "owner_type", :default => 0
+  end
+
+  create_table "member_roles", :force => true do |t|
+    t.integer "member_id",      :null => false
+    t.integer "role_id",        :null => false
+    t.integer "inherited_from"
+  end
+
+  add_index "member_roles", ["member_id"], :name => "index_member_roles_on_member_id"
+  add_index "member_roles", ["role_id"], :name => "index_member_roles_on_role_id"
+
+  create_table "members", :force => true do |t|
+    t.integer  "user_id",           :default => 0,     :null => false
+    t.integer  "project_id",        :default => 0
+    t.datetime "created_on"
+    t.boolean  "mail_notification", :default => false, :null => false
+    t.integer  "course_id",         :default => -1
+    t.integer  "course_group_id",   :default => 0
+  end
+
+  add_index "members", ["project_id"], :name => "index_members_on_project_id"
+  add_index "members", ["user_id", "project_id", "course_id"], :name => "index_members_on_user_id_and_project_id", :unique => true
+  add_index "members", ["user_id"], :name => "index_members_on_user_id"
+
+  create_table "memo_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "forum_id"
+    t.integer  "memo_id"
+    t.string   "memo_type"
+    t.integer  "viewed"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "memos", :force => true do |t|
+    t.integer  "forum_id",                         :null => false
+    t.integer  "parent_id"
+    t.string   "subject",                          :null => false
+    t.text     "content",                          :null => false
+    t.integer  "author_id",                        :null => false
+    t.integer  "replies_count", :default => 0
+    t.integer  "last_reply_id"
+    t.boolean  "lock",          :default => false
+    t.boolean  "sticky",        :default => false
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
+    t.integer  "viewed_count",  :default => 0
+  end
+
+  create_table "message_alls", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "message_id"
+    t.string   "message_type"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+  end
+
+  create_table "messages", :force => true do |t|
+    t.integer  "board_id",                         :null => false
+    t.integer  "parent_id"
+    t.string   "subject",       :default => "",    :null => false
+    t.text     "content"
+    t.integer  "author_id"
+    t.integer  "replies_count", :default => 0,     :null => false
+    t.integer  "last_reply_id"
+    t.datetime "created_on",                       :null => false
+    t.datetime "updated_on",                       :null => false
+    t.boolean  "locked",        :default => false
+    t.integer  "sticky",        :default => 0
+    t.integer  "reply_id"
+  end
+
+  add_index "messages", ["author_id"], :name => "index_messages_on_author_id"
+  add_index "messages", ["board_id"], :name => "messages_board_id"
+  add_index "messages", ["created_on"], :name => "index_messages_on_created_on"
+  add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id"
+  add_index "messages", ["parent_id"], :name => "messages_parent_id"
+
+  create_table "news", :force => true do |t|
+    t.integer  "project_id"
+    t.string   "title",          :limit => 60, :default => "", :null => false
+    t.string   "summary",                      :default => ""
+    t.text     "description"
+    t.integer  "author_id",                    :default => 0,  :null => false
+    t.datetime "created_on"
+    t.integer  "comments_count",               :default => 0,  :null => false
+    t.integer  "course_id"
+  end
+
+  add_index "news", ["author_id"], :name => "index_news_on_author_id"
+  add_index "news", ["created_on"], :name => "index_news_on_created_on"
+  add_index "news", ["project_id"], :name => "news_project_id"
+
+  create_table "no_uses", :force => true do |t|
+    t.integer  "user_id",     :null => false
+    t.string   "no_use_type"
+    t.integer  "no_use_id"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  create_table "notificationcomments", :force => true do |t|
+    t.string   "notificationcommented_type"
+    t.integer  "notificationcommented_id"
+    t.integer  "author_id"
+    t.text     "notificationcomments"
+    t.datetime "created_at",                 :null => false
+    t.datetime "updated_at",                 :null => false
+  end
+
+  create_table "onclick_times", :force => true do |t|
+    t.integer  "user_id"
+    t.datetime "onclick_time"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+  end
+
+  create_table "open_id_authentication_associations", :force => true do |t|
+    t.integer "issued"
+    t.integer "lifetime"
+    t.string  "handle"
+    t.string  "assoc_type"
+    t.binary  "server_url"
+    t.binary  "secret"
+  end
+
+  create_table "open_id_authentication_nonces", :force => true do |t|
+    t.integer "timestamp",  :null => false
+    t.string  "server_url"
+    t.string  "salt",       :null => false
+  end
+
+  create_table "open_source_projects", :force => true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.integer  "commit_count",     :default => 0
+    t.integer  "code_line",        :default => 0
+    t.integer  "users_count",      :default => 0
+    t.date     "last_commit_time"
+    t.string   "url"
+    t.date     "date_collected"
+    t.datetime "created_at",                      :null => false
+    t.datetime "updated_at",                      :null => false
+  end
+
+  create_table "option_numbers", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "memo"
+    t.integer  "messages_for_issues"
+    t.integer  "issues_status"
+    t.integer  "replay_for_message"
+    t.integer  "replay_for_memo"
+    t.integer  "follow"
+    t.integer  "tread"
+    t.integer  "praise_by_one"
+    t.integer  "praise_by_two"
+    t.integer  "praise_by_three"
+    t.integer  "tread_by_one"
+    t.integer  "tread_by_two"
+    t.integer  "tread_by_three"
+    t.integer  "changeset"
+    t.integer  "document"
+    t.integer  "attachment"
+    t.integer  "issue_done_ratio"
+    t.integer  "post_issue"
+    t.integer  "score_type"
+    t.integer  "total_score"
+    t.datetime "created_at",          :null => false
+    t.datetime "updated_at",          :null => false
+    t.integer  "project_id"
+  end
+
+  create_table "organizations", :force => true do |t|
+    t.string   "name"
+    t.string   "logo_link"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "phone_app_versions", :force => true do |t|
+    t.string   "version"
+    t.text     "description"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  create_table "poll_answers", :force => true do |t|
+    t.integer  "poll_question_id"
+    t.text     "answer_text"
+    t.integer  "answer_position"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+  end
+
+  create_table "poll_questions", :force => true do |t|
+    t.string   "question_title"
+    t.integer  "question_type"
+    t.integer  "is_necessary"
+    t.integer  "poll_id"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+    t.integer  "question_number"
+  end
+
+  create_table "poll_users", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "poll_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "poll_votes", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "poll_question_id"
+    t.integer  "poll_answer_id"
+    t.text     "vote_text"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+  end
+
+  create_table "polls", :force => true do |t|
+    t.string   "polls_name"
+    t.string   "polls_type"
+    t.integer  "polls_group_id"
+    t.integer  "polls_status"
+    t.integer  "user_id"
+    t.datetime "published_at"
+    t.datetime "closed_at"
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
+    t.text     "polls_description"
+    t.integer  "show_result",       :default => 1
+  end
+
+  create_table "praise_tread_caches", :force => true do |t|
+    t.integer  "object_id",   :null => false
+    t.string   "object_type"
+    t.integer  "praise_num"
+    t.integer  "tread_num"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  create_table "praise_treads", :force => true do |t|
+    t.integer  "user_id",                  :null => false
+    t.integer  "praise_tread_object_id"
+    t.string   "praise_tread_object_type"
+    t.integer  "praise_or_tread"
+    t.datetime "created_at",               :null => false
+    t.datetime "updated_at",               :null => false
+  end
+
+  create_table "principal_activities", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "principal_id"
+    t.integer  "principal_act_id"
+    t.string   "principal_act_type"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  create_table "project_infos", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "user_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "project_scores", :force => true do |t|
+    t.string   "project_id"
+    t.integer  "score"
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
+    t.integer  "issue_num",         :default => 0
+    t.integer  "issue_journal_num", :default => 0
+    t.integer  "news_num",          :default => 0
+    t.integer  "documents_num",     :default => 0
+    t.integer  "changeset_num",     :default => 0
+    t.integer  "board_message_num", :default => 0
+  end
+
+  create_table "project_statuses", :force => true do |t|
+    t.integer "changesets_count"
+    t.integer "watchers_count"
+    t.integer "project_id"
+    t.integer "project_type"
+    t.float   "grade",            :default => 0.0
+    t.integer "course_ac_para",   :default => 0
+  end
+
+  add_index "project_statuses", ["grade"], :name => "index_project_statuses_on_grade"
+
+  create_table "projecting_softapplictions", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "softapplication_id"
+    t.integer  "project_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  create_table "projects", :force => true do |t|
+    t.string   "name",             :default => "",    :null => false
+    t.text     "description"
+    t.string   "homepage",         :default => ""
+    t.boolean  "is_public",        :default => true,  :null => false
+    t.integer  "parent_id"
+    t.datetime "created_on"
+    t.datetime "updated_on"
+    t.string   "identifier"
+    t.integer  "status",           :default => 1,     :null => false
+    t.integer  "lft"
+    t.integer  "rgt"
+    t.boolean  "inherit_members",  :default => false, :null => false
+    t.integer  "project_type"
+    t.boolean  "hidden_repo",      :default => false, :null => false
+    t.integer  "attachmenttype",   :default => 1
+    t.integer  "user_id"
+    t.integer  "dts_test",         :default => 0
+    t.string   "enterprise_name"
+    t.integer  "organization_id"
+    t.integer  "project_new_type"
     t.integer  "gpid"
-  end
-
-  add_index "projects", ["lft"], :name => "index_projects_on_lft"
-  add_index "projects", ["rgt"], :name => "index_projects_on_rgt"
-
-  create_table "projects_trackers", :id => false, :force => true do |t|
-    t.integer "project_id", :default => 0, :null => false
-    t.integer "tracker_id", :default => 0, :null => false
-  end
-
-  add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true
-  add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id"
-
-  create_table "queries", :force => true do |t|
-    t.integer "project_id"
-    t.string  "name",          :default => "",    :null => false
-    t.text    "filters"
-    t.integer "user_id",       :default => 0,     :null => false
-    t.boolean "is_public",     :default => false, :null => false
-    t.text    "column_names"
-    t.text    "sort_criteria"
-    t.string  "group_by"
-    t.string  "type"
-  end
-
-  add_index "queries", ["project_id"], :name => "index_queries_on_project_id"
-  add_index "queries", ["user_id"], :name => "index_queries_on_user_id"
-
-  create_table "relative_memo_to_open_source_projects", :force => true do |t|
-    t.integer  "osp_id"
-    t.integer  "relative_memo_id"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  create_table "relative_memos", :force => true do |t|
-    t.integer  "osp_id"
-    t.integer  "parent_id"
-    t.string   "subject",                                                   :null => false
-    t.text     "content",            :limit => 16777215,                    :null => false
-    t.integer  "author_id"
-    t.integer  "replies_count",                          :default => 0
-    t.integer  "last_reply_id"
-    t.boolean  "lock",                                   :default => false
-    t.boolean  "sticky",                                 :default => false
-    t.boolean  "is_quote",                               :default => false
-    t.datetime "created_at",                                                :null => false
-    t.datetime "updated_at",                                                :null => false
-    t.integer  "viewed_count_crawl",                     :default => 0
-    t.integer  "viewed_count_local",                     :default => 0
-    t.string   "url"
-    t.string   "username"
-    t.string   "userhomeurl"
-    t.date     "date_collected"
-    t.string   "topic_resource"
-  end
-
-  create_table "repositories", :force => true do |t|
-    t.integer "project_id",                  :default => 0,     :null => false
-    t.string  "url",                         :default => "",    :null => false
-    t.string  "login",         :limit => 60, :default => ""
-    t.string  "password",                    :default => ""
-    t.string  "root_url",                    :default => ""
-    t.string  "type"
-    t.string  "path_encoding", :limit => 64
-    t.string  "log_encoding",  :limit => 64
-    t.text    "extra_info"
-    t.string  "identifier"
-    t.boolean "is_default",                  :default => false
-    t.boolean "hidden",                      :default => false
-  end
-
-  add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
-
-  create_table "rich_rich_files", :force => true do |t|
-    t.datetime "created_at",                                 :null => false
-    t.datetime "updated_at",                                 :null => false
-    t.string   "rich_file_file_name"
-    t.string   "rich_file_content_type"
-    t.integer  "rich_file_file_size"
-    t.datetime "rich_file_updated_at"
-    t.string   "owner_type"
-    t.integer  "owner_id"
-    t.text     "uri_cache"
-    t.string   "simplified_type",        :default => "file"
-  end
-
-  create_table "roles", :force => true do |t|
-    t.string  "name",              :limit => 30, :default => "",        :null => false
-    t.integer "position",                        :default => 1
-    t.boolean "assignable",                      :default => true
-    t.integer "builtin",                         :default => 0,         :null => false
-    t.text    "permissions"
-    t.string  "issues_visibility", :limit => 30, :default => "default", :null => false
-  end
-
-  create_table "schools", :force => true do |t|
-    t.string   "name"
-    t.string   "province"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-    t.string   "logo_link"
-    t.string   "pinyin"
-  end
-
-  create_table "seems_rateable_cached_ratings", :force => true do |t|
-    t.integer  "cacheable_id",   :limit => 8
-    t.string   "cacheable_type"
-    t.float    "avg",                         :null => false
-    t.integer  "cnt",                         :null => false
-    t.string   "dimension"
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-  end
-
-  create_table "seems_rateable_rates", :force => true do |t|
-    t.integer  "rater_id",         :limit => 8
-    t.integer  "rateable_id"
-    t.string   "rateable_type"
-    t.float    "stars",                                        :null => false
-    t.string   "dimension"
-    t.datetime "created_at",                                   :null => false
-    t.datetime "updated_at",                                   :null => false
-    t.integer  "is_teacher_score",              :default => 0
-  end
-
-  create_table "settings", :force => true do |t|
-    t.string   "name",       :default => "", :null => false
-    t.text     "value"
-    t.datetime "updated_on"
-  end
-
-  add_index "settings", ["name"], :name => "index_settings_on_name"
-
-  create_table "shares", :force => true do |t|
-    t.date     "created_on"
-    t.string   "url"
-    t.string   "title"
-    t.integer  "share_type"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.integer  "project_id"
-    t.integer  "user_id"
-    t.string   "description"
-  end
-
-  create_table "softapplications", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.integer  "app_type_id"
-    t.string   "app_type_name"
-    t.string   "android_min_version_available"
-    t.integer  "user_id"
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-    t.integer  "contest_id"
-    t.integer  "softapplication_id"
-    t.integer  "is_public"
-    t.string   "application_developers"
-    t.string   "deposit_project_url"
-    t.string   "deposit_project"
-    t.integer  "project_id"
-  end
-
-  create_table "student_work_tests", :force => true do |t|
-    t.integer  "student_work_id"
-    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|
-    t.string   "name"
-    t.text     "description",             :limit => 2147483647
-    t.integer  "homework_common_id"
-    t.integer  "user_id"
-    t.float    "final_score"
-    t.float    "teacher_score"
-    t.float    "student_score"
-    t.float    "teaching_asistant_score"
-    t.integer  "project_id",                                    :default => 0
-    t.datetime "created_at",                                                       :null => false
-    t.datetime "updated_at",                                                       :null => false
-    t.integer  "late_penalty",                                  :default => 0
-    t.integer  "absence_penalty",                               :default => 0
-    t.float    "system_score",                                  :default => 0.0
-    t.boolean  "is_test",                                       :default => false
-  end
-
-  create_table "student_works_evaluation_distributions", :force => true do |t|
-    t.integer  "student_work_id"
-    t.integer  "user_id"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "student_works_scores", :force => true do |t|
-    t.integer  "student_work_id"
-    t.integer  "user_id"
-    t.integer  "score"
-    t.text     "comment"
-    t.integer  "reviewer_role"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "students_for_courses", :force => true do |t|
-    t.integer  "student_id"
-    t.integer  "course_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  add_index "students_for_courses", ["course_id"], :name => "index_students_for_courses_on_course_id"
-  add_index "students_for_courses", ["student_id"], :name => "index_students_for_courses_on_student_id"
-
-  create_table "system_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.string   "content"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.text     "description"
-    t.string   "subject"
-  end
-
-  create_table "taggings", :force => true do |t|
-    t.integer  "tag_id"
-    t.integer  "taggable_id"
-    t.string   "taggable_type"
-    t.integer  "tagger_id"
-    t.string   "tagger_type"
-    t.string   "context",       :limit => 128
-    t.datetime "created_at"
-  end
-
-  add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
-  add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context"
-  add_index "taggings", ["taggable_type"], :name => "index_taggings_on_taggable_type"
-
-  create_table "tags", :force => true do |t|
-    t.string "name"
-  end
-
-  create_table "teachers", :force => true do |t|
-    t.string   "tea_name"
-    t.string   "location"
-    t.integer  "couurse_time"
-    t.integer  "course_code"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-    t.string   "extra"
-  end
-
-  create_table "time_entries", :force => true do |t|
-    t.integer  "project_id",  :null => false
-    t.integer  "user_id",     :null => false
-    t.integer  "issue_id"
-    t.float    "hours",       :null => false
-    t.string   "comments"
-    t.integer  "activity_id", :null => false
-    t.date     "spent_on",    :null => false
-    t.integer  "tyear",       :null => false
-    t.integer  "tmonth",      :null => false
-    t.integer  "tweek",       :null => false
-    t.datetime "created_on",  :null => false
-    t.datetime "updated_on",  :null => false
-  end
-
-  add_index "time_entries", ["activity_id"], :name => "index_time_entries_on_activity_id"
-  add_index "time_entries", ["created_on"], :name => "index_time_entries_on_created_on"
-  add_index "time_entries", ["issue_id"], :name => "time_entries_issue_id"
-  add_index "time_entries", ["project_id"], :name => "time_entries_project_id"
-  add_index "time_entries", ["user_id"], :name => "index_time_entries_on_user_id"
-
-  create_table "tokens", :force => true do |t|
-    t.integer  "user_id",                  :default => 0,  :null => false
-    t.string   "action",     :limit => 30, :default => "", :null => false
-    t.string   "value",      :limit => 40, :default => "", :null => false
-    t.datetime "created_on",                               :null => false
-  end
-
-  add_index "tokens", ["user_id"], :name => "index_tokens_on_user_id"
-  add_index "tokens", ["value"], :name => "tokens_value", :unique => true
-
-  create_table "trackers", :force => true do |t|
-    t.string  "name",          :limit => 30, :default => "",    :null => false
-    t.boolean "is_in_chlog",                 :default => false, :null => false
-    t.integer "position",                    :default => 1
-    t.boolean "is_in_roadmap",               :default => true,  :null => false
-    t.integer "fields_bits",                 :default => 0
-  end
-
-  create_table "user_activities", :force => true do |t|
-    t.string   "act_type"
-    t.integer  "act_id"
-    t.string   "container_type"
-    t.integer  "container_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-    t.integer  "user_id"
-  end
-
-  create_table "user_extensions", :force => true do |t|
-    t.integer  "user_id",                            :null => false
-    t.date     "birthday"
-    t.string   "brief_introduction"
-    t.integer  "gender"
-    t.string   "location"
-    t.string   "occupation"
-    t.integer  "work_experience"
-    t.integer  "zip_code"
-    t.datetime "created_at",                         :null => false
-    t.datetime "updated_at",                         :null => false
-    t.string   "technical_title"
-    t.integer  "identity"
-    t.string   "student_id"
-    t.string   "teacher_realname"
-    t.string   "student_realname"
-    t.string   "location_city"
-    t.integer  "school_id"
-    t.string   "description",        :default => ""
-  end
-
-  create_table "user_feedback_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "journals_for_message_id"
-    t.string   "journals_for_message_type"
-    t.integer  "viewed"
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
-  end
-
-  create_table "user_grades", :force => true do |t|
-    t.integer  "user_id",                     :null => false
-    t.integer  "project_id",                  :null => false
-    t.float    "grade",      :default => 0.0
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-  end
-
-  add_index "user_grades", ["grade"], :name => "index_user_grades_on_grade"
-  add_index "user_grades", ["project_id"], :name => "index_user_grades_on_project_id"
-  add_index "user_grades", ["user_id"], :name => "index_user_grades_on_user_id"
-
-  create_table "user_levels", :force => true do |t|
-    t.integer "user_id"
-    t.integer "level"
-  end
-
-  create_table "user_preferences", :force => true do |t|
-    t.integer "user_id",   :default => 0,     :null => false
-    t.text    "others"
-    t.boolean "hide_mail", :default => false
-    t.string  "time_zone"
-  end
-
-  add_index "user_preferences", ["user_id"], :name => "index_user_preferences_on_user_id"
-
-  create_table "user_score_details", :force => true do |t|
-    t.integer  "current_user_id"
-    t.integer  "target_user_id"
-    t.string   "score_type"
-    t.string   "score_action"
-    t.integer  "user_id"
-    t.integer  "old_score"
-    t.integer  "new_score"
-    t.integer  "current_user_level"
-    t.integer  "target_user_level"
-    t.integer  "score_changeable_obj_id"
-    t.string   "score_changeable_obj_type"
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
-  end
-
-  create_table "user_scores", :force => true do |t|
-    t.integer  "user_id",       :null => false
-    t.integer  "collaboration"
-    t.integer  "influence"
-    t.integer  "skill"
-    t.integer  "active"
-    t.datetime "created_at",    :null => false
-    t.datetime "updated_at",    :null => false
-  end
-
-  create_table "user_statuses", :force => true do |t|
-    t.integer  "changesets_count"
-    t.integer  "watchers_count"
-    t.integer  "user_id"
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-    t.float    "grade",            :default => 0.0
-  end
-
-  add_index "user_statuses", ["changesets_count"], :name => "index_user_statuses_on_changesets_count"
-  add_index "user_statuses", ["grade"], :name => "index_user_statuses_on_grade"
-  add_index "user_statuses", ["watchers_count"], :name => "index_user_statuses_on_watchers_count"
-
-  create_table "users", :force => true do |t|
-    t.string   "login",                           :default => "",    :null => false
-    t.string   "hashed_password",   :limit => 40, :default => "",    :null => false
-    t.string   "firstname",         :limit => 30, :default => "",    :null => false
-    t.string   "lastname",                        :default => "",    :null => false
-    t.string   "mail",              :limit => 60, :default => "",    :null => false
-    t.boolean  "admin",                           :default => false, :null => false
-    t.integer  "status",                          :default => 1,     :null => false
-    t.datetime "last_login_on"
-    t.string   "language",          :limit => 5,  :default => ""
-    t.integer  "auth_source_id"
-    t.datetime "created_on"
-    t.datetime "updated_on"
-    t.string   "type"
-    t.string   "identity_url"
-    t.string   "mail_notification",               :default => "",    :null => false
-    t.string   "salt",              :limit => 64
+  end
+
+  add_index "projects", ["lft"], :name => "index_projects_on_lft"
+  add_index "projects", ["rgt"], :name => "index_projects_on_rgt"
+
+  create_table "projects_trackers", :id => false, :force => true do |t|
+    t.integer "project_id", :default => 0, :null => false
+    t.integer "tracker_id", :default => 0, :null => false
+  end
+
+  add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true
+  add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id"
+
+  create_table "queries", :force => true do |t|
+    t.integer "project_id"
+    t.string  "name",          :default => "",    :null => false
+    t.text    "filters"
+    t.integer "user_id",       :default => 0,     :null => false
+    t.boolean "is_public",     :default => false, :null => false
+    t.text    "column_names"
+    t.text    "sort_criteria"
+    t.string  "group_by"
+    t.string  "type"
+  end
+
+  add_index "queries", ["project_id"], :name => "index_queries_on_project_id"
+  add_index "queries", ["user_id"], :name => "index_queries_on_user_id"
+
+  create_table "relative_memo_to_open_source_projects", :force => true do |t|
+    t.integer  "osp_id"
+    t.integer  "relative_memo_id"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+  end
+
+  create_table "relative_memos", :force => true do |t|
+    t.integer  "osp_id"
+    t.integer  "parent_id"
+    t.string   "subject",                                                   :null => false
+    t.text     "content",            :limit => 16777215,                    :null => false
+    t.integer  "author_id"
+    t.integer  "replies_count",                          :default => 0
+    t.integer  "last_reply_id"
+    t.boolean  "lock",                                   :default => false
+    t.boolean  "sticky",                                 :default => false
+    t.boolean  "is_quote",                               :default => false
+    t.datetime "created_at",                                                :null => false
+    t.datetime "updated_at",                                                :null => false
+    t.integer  "viewed_count_crawl",                     :default => 0
+    t.integer  "viewed_count_local",                     :default => 0
+    t.string   "url"
+    t.string   "username"
+    t.string   "userhomeurl"
+    t.date     "date_collected"
+    t.string   "topic_resource"
+  end
+
+  create_table "repositories", :force => true do |t|
+    t.integer "project_id",                  :default => 0,     :null => false
+    t.string  "url",                         :default => "",    :null => false
+    t.string  "login",         :limit => 60, :default => ""
+    t.string  "password",                    :default => ""
+    t.string  "root_url",                    :default => ""
+    t.string  "type"
+    t.string  "path_encoding", :limit => 64
+    t.string  "log_encoding",  :limit => 64
+    t.text    "extra_info"
+    t.string  "identifier"
+    t.boolean "is_default",                  :default => false
+    t.boolean "hidden",                      :default => false
+  end
+
+  add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
+
+  create_table "rich_rich_files", :force => true do |t|
+    t.datetime "created_at",                                 :null => false
+    t.datetime "updated_at",                                 :null => false
+    t.string   "rich_file_file_name"
+    t.string   "rich_file_content_type"
+    t.integer  "rich_file_file_size"
+    t.datetime "rich_file_updated_at"
+    t.string   "owner_type"
+    t.integer  "owner_id"
+    t.text     "uri_cache"
+    t.string   "simplified_type",        :default => "file"
+  end
+
+  create_table "roles", :force => true do |t|
+    t.string  "name",              :limit => 30, :default => "",        :null => false
+    t.integer "position",                        :default => 1
+    t.boolean "assignable",                      :default => true
+    t.integer "builtin",                         :default => 0,         :null => false
+    t.text    "permissions"
+    t.string  "issues_visibility", :limit => 30, :default => "default", :null => false
+  end
+
+  create_table "schools", :force => true do |t|
+    t.string   "name"
+    t.string   "province"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+    t.string   "logo_link"
+    t.string   "pinyin"
+  end
+
+  create_table "seems_rateable_cached_ratings", :force => true do |t|
+    t.integer  "cacheable_id",   :limit => 8
+    t.string   "cacheable_type"
+    t.float    "avg",                         :null => false
+    t.integer  "cnt",                         :null => false
+    t.string   "dimension"
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
+  end
+
+  create_table "seems_rateable_rates", :force => true do |t|
+    t.integer  "rater_id",         :limit => 8
+    t.integer  "rateable_id"
+    t.string   "rateable_type"
+    t.float    "stars",                                        :null => false
+    t.string   "dimension"
+    t.datetime "created_at",                                   :null => false
+    t.datetime "updated_at",                                   :null => false
+    t.integer  "is_teacher_score",              :default => 0
+  end
+
+  create_table "settings", :force => true do |t|
+    t.string   "name",       :default => "", :null => false
+    t.text     "value"
+    t.datetime "updated_on"
+  end
+
+  add_index "settings", ["name"], :name => "index_settings_on_name"
+
+  create_table "shares", :force => true do |t|
+    t.date     "created_on"
+    t.string   "url"
+    t.string   "title"
+    t.integer  "share_type"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+    t.integer  "project_id"
+    t.integer  "user_id"
+    t.string   "description"
+  end
+
+  create_table "softapplications", :force => true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.integer  "app_type_id"
+    t.string   "app_type_name"
+    t.string   "android_min_version_available"
+    t.integer  "user_id"
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+    t.integer  "contest_id"
+    t.integer  "softapplication_id"
+    t.integer  "is_public"
+    t.string   "application_developers"
+    t.string   "deposit_project_url"
+    t.string   "deposit_project"
+    t.integer  "project_id"
+  end
+
+  create_table "student_work_tests", :force => true do |t|
+    t.integer  "student_work_id"
+    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|
+    t.string   "name"
+    t.text     "description",             :limit => 2147483647
+    t.integer  "homework_common_id"
+    t.integer  "user_id"
+    t.float    "final_score"
+    t.float    "teacher_score"
+    t.float    "student_score"
+    t.float    "teaching_asistant_score"
+    t.integer  "project_id",                                    :default => 0
+    t.datetime "created_at",                                                       :null => false
+    t.datetime "updated_at",                                                       :null => false
+    t.integer  "late_penalty",                                  :default => 0
+    t.integer  "absence_penalty",                               :default => 0
+    t.float    "system_score",                                  :default => 0.0
+    t.boolean  "is_test",                                       :default => false
+  end
+
+  create_table "student_works_evaluation_distributions", :force => true do |t|
+    t.integer  "student_work_id"
+    t.integer  "user_id"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  create_table "student_works_scores", :force => true do |t|
+    t.integer  "student_work_id"
+    t.integer  "user_id"
+    t.integer  "score"
+    t.text     "comment"
+    t.integer  "reviewer_role"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  create_table "students_for_courses", :force => true do |t|
+    t.integer  "student_id"
+    t.integer  "course_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  add_index "students_for_courses", ["course_id"], :name => "index_students_for_courses_on_course_id"
+  add_index "students_for_courses", ["student_id"], :name => "index_students_for_courses_on_student_id"
+
+  create_table "system_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.string   "content"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+    t.text     "description"
+    t.string   "subject"
+  end
+
+  create_table "taggings", :force => true do |t|
+    t.integer  "tag_id"
+    t.integer  "taggable_id"
+    t.string   "taggable_type"
+    t.integer  "tagger_id"
+    t.string   "tagger_type"
+    t.string   "context",       :limit => 128
+    t.datetime "created_at"
+  end
+
+  add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
+  add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context"
+  add_index "taggings", ["taggable_type"], :name => "index_taggings_on_taggable_type"
+
+  create_table "tags", :force => true do |t|
+    t.string "name"
+  end
+
+  create_table "teachers", :force => true do |t|
+    t.string   "tea_name"
+    t.string   "location"
+    t.integer  "couurse_time"
+    t.integer  "course_code"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+    t.string   "extra"
+  end
+
+  create_table "time_entries", :force => true do |t|
+    t.integer  "project_id",  :null => false
+    t.integer  "user_id",     :null => false
+    t.integer  "issue_id"
+    t.float    "hours",       :null => false
+    t.string   "comments"
+    t.integer  "activity_id", :null => false
+    t.date     "spent_on",    :null => false
+    t.integer  "tyear",       :null => false
+    t.integer  "tmonth",      :null => false
+    t.integer  "tweek",       :null => false
+    t.datetime "created_on",  :null => false
+    t.datetime "updated_on",  :null => false
+  end
+
+  add_index "time_entries", ["activity_id"], :name => "index_time_entries_on_activity_id"
+  add_index "time_entries", ["created_on"], :name => "index_time_entries_on_created_on"
+  add_index "time_entries", ["issue_id"], :name => "time_entries_issue_id"
+  add_index "time_entries", ["project_id"], :name => "time_entries_project_id"
+  add_index "time_entries", ["user_id"], :name => "index_time_entries_on_user_id"
+
+  create_table "tokens", :force => true do |t|
+    t.integer  "user_id",                  :default => 0,  :null => false
+    t.string   "action",     :limit => 30, :default => "", :null => false
+    t.string   "value",      :limit => 40, :default => "", :null => false
+    t.datetime "created_on",                               :null => false
+  end
+
+  add_index "tokens", ["user_id"], :name => "index_tokens_on_user_id"
+  add_index "tokens", ["value"], :name => "tokens_value", :unique => true
+
+  create_table "trackers", :force => true do |t|
+    t.string  "name",          :limit => 30, :default => "",    :null => false
+    t.boolean "is_in_chlog",                 :default => false, :null => false
+    t.integer "position",                    :default => 1
+    t.boolean "is_in_roadmap",               :default => true,  :null => false
+    t.integer "fields_bits",                 :default => 0
+  end
+
+  create_table "user_activities", :force => true do |t|
+    t.string   "act_type"
+    t.integer  "act_id"
+    t.string   "container_type"
+    t.integer  "container_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+    t.integer  "user_id"
+  end
+
+  create_table "user_extensions", :force => true do |t|
+    t.integer  "user_id",                            :null => false
+    t.date     "birthday"
+    t.string   "brief_introduction"
+    t.integer  "gender"
+    t.string   "location"
+    t.string   "occupation"
+    t.integer  "work_experience"
+    t.integer  "zip_code"
+    t.datetime "created_at",                         :null => false
+    t.datetime "updated_at",                         :null => false
+    t.string   "technical_title"
+    t.integer  "identity"
+    t.string   "student_id"
+    t.string   "teacher_realname"
+    t.string   "student_realname"
+    t.string   "location_city"
+    t.integer  "school_id"
+    t.string   "description",        :default => ""
+  end
+
+  create_table "user_feedback_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "journals_for_message_id"
+    t.string   "journals_for_message_type"
+    t.integer  "viewed"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+  end
+
+  create_table "user_grades", :force => true do |t|
+    t.integer  "user_id",                     :null => false
+    t.integer  "project_id",                  :null => false
+    t.float    "grade",      :default => 0.0
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
+  end
+
+  add_index "user_grades", ["grade"], :name => "index_user_grades_on_grade"
+  add_index "user_grades", ["project_id"], :name => "index_user_grades_on_project_id"
+  add_index "user_grades", ["user_id"], :name => "index_user_grades_on_user_id"
+
+  create_table "user_levels", :force => true do |t|
+    t.integer "user_id"
+    t.integer "level"
+  end
+
+  create_table "user_preferences", :force => true do |t|
+    t.integer "user_id",   :default => 0,     :null => false
+    t.text    "others"
+    t.boolean "hide_mail", :default => false
+    t.string  "time_zone"
+  end
+
+  add_index "user_preferences", ["user_id"], :name => "index_user_preferences_on_user_id"
+
+  create_table "user_score_details", :force => true do |t|
+    t.integer  "current_user_id"
+    t.integer  "target_user_id"
+    t.string   "score_type"
+    t.string   "score_action"
+    t.integer  "user_id"
+    t.integer  "old_score"
+    t.integer  "new_score"
+    t.integer  "current_user_level"
+    t.integer  "target_user_level"
+    t.integer  "score_changeable_obj_id"
+    t.string   "score_changeable_obj_type"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+  end
+
+  create_table "user_scores", :force => true do |t|
+    t.integer  "user_id",       :null => false
+    t.integer  "collaboration"
+    t.integer  "influence"
+    t.integer  "skill"
+    t.integer  "active"
+    t.datetime "created_at",    :null => false
+    t.datetime "updated_at",    :null => false
+  end
+
+  create_table "user_statuses", :force => true do |t|
+    t.integer  "changesets_count"
+    t.integer  "watchers_count"
+    t.integer  "user_id"
+    t.datetime "created_at",                        :null => false
+    t.datetime "updated_at",                        :null => false
+    t.float    "grade",            :default => 0.0
+  end
+
+  add_index "user_statuses", ["changesets_count"], :name => "index_user_statuses_on_changesets_count"
+  add_index "user_statuses", ["grade"], :name => "index_user_statuses_on_grade"
+  add_index "user_statuses", ["watchers_count"], :name => "index_user_statuses_on_watchers_count"
+
+  create_table "users", :force => true do |t|
+    t.string   "login",                           :default => "",    :null => false
+    t.string   "hashed_password",   :limit => 40, :default => "",    :null => false
+    t.string   "firstname",         :limit => 30, :default => "",    :null => false
+    t.string   "lastname",                        :default => "",    :null => false
+    t.string   "mail",              :limit => 60, :default => "",    :null => false
+    t.boolean  "admin",                           :default => false, :null => false
+    t.integer  "status",                          :default => 1,     :null => false
+    t.datetime "last_login_on"
+    t.string   "language",          :limit => 5,  :default => ""
+    t.integer  "auth_source_id"
+    t.datetime "created_on"
+    t.datetime "updated_on"
+    t.string   "type"
+    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"
-  add_index "users", ["id", "type"], :name => "index_users_on_id_and_type"
-  add_index "users", ["type"], :name => "index_users_on_type"
-
-  create_table "versions", :force => true do |t|
-    t.integer  "project_id",      :default => 0,      :null => false
-    t.string   "name",            :default => "",     :null => false
-    t.string   "description",     :default => ""
-    t.date     "effective_date"
-    t.datetime "created_on"
-    t.datetime "updated_on"
-    t.string   "wiki_page_title"
-    t.string   "status",          :default => "open"
-    t.string   "sharing",         :default => "none", :null => false
-  end
-
-  add_index "versions", ["project_id"], :name => "versions_project_id"
-  add_index "versions", ["sharing"], :name => "index_versions_on_sharing"
-
-  create_table "visitors", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "master_id"
-    t.datetime "updated_on"
-    t.datetime "created_on"
-  end
-
-  add_index "visitors", ["master_id"], :name => "index_visitors_master_id"
-  add_index "visitors", ["updated_on"], :name => "index_visitors_updated_on"
-  add_index "visitors", ["user_id"], :name => "index_visitors_user_id"
-
-  create_table "watchers", :force => true do |t|
-    t.string  "watchable_type", :default => "", :null => false
-    t.integer "watchable_id",   :default => 0,  :null => false
-    t.integer "user_id"
-  end
-
-  add_index "watchers", ["user_id", "watchable_type"], :name => "watchers_user_id_type"
-  add_index "watchers", ["user_id"], :name => "index_watchers_on_user_id"
-  add_index "watchers", ["watchable_id", "watchable_type"], :name => "index_watchers_on_watchable_id_and_watchable_type"
-
-  create_table "web_footer_companies", :force => true do |t|
-    t.string   "name"
-    t.string   "logo_size"
-    t.string   "url"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "web_footer_oranizers", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "wiki_content_versions", :force => true do |t|
-    t.integer  "wiki_content_id",                                       :null => false
-    t.integer  "page_id",                                               :null => false
-    t.integer  "author_id"
-    t.binary   "data",            :limit => 2147483647
-    t.string   "compression",     :limit => 6,          :default => ""
-    t.string   "comments",                              :default => ""
-    t.datetime "updated_on",                                            :null => false
-    t.integer  "version",                                               :null => false
-  end
-
-  add_index "wiki_content_versions", ["updated_on"], :name => "index_wiki_content_versions_on_updated_on"
-  add_index "wiki_content_versions", ["wiki_content_id"], :name => "wiki_content_versions_wcid"
-
-  create_table "wiki_contents", :force => true do |t|
-    t.integer  "page_id",                                          :null => false
-    t.integer  "author_id"
-    t.text     "text",       :limit => 2147483647
-    t.string   "comments",                         :default => ""
-    t.datetime "updated_on",                                       :null => false
-    t.integer  "version",                                          :null => false
-  end
-
-  add_index "wiki_contents", ["author_id"], :name => "index_wiki_contents_on_author_id"
-  add_index "wiki_contents", ["page_id"], :name => "wiki_contents_page_id"
-
-  create_table "wiki_pages", :force => true do |t|
-    t.integer  "wiki_id",                       :null => false
-    t.string   "title",                         :null => false
-    t.datetime "created_on",                    :null => false
-    t.boolean  "protected",  :default => false, :null => false
-    t.integer  "parent_id"
-  end
-
-  add_index "wiki_pages", ["parent_id"], :name => "index_wiki_pages_on_parent_id"
-  add_index "wiki_pages", ["wiki_id", "title"], :name => "wiki_pages_wiki_id_title"
-  add_index "wiki_pages", ["wiki_id"], :name => "index_wiki_pages_on_wiki_id"
-
-  create_table "wiki_redirects", :force => true do |t|
-    t.integer  "wiki_id",      :null => false
-    t.string   "title"
-    t.string   "redirects_to"
-    t.datetime "created_on",   :null => false
-  end
-
-  add_index "wiki_redirects", ["wiki_id", "title"], :name => "wiki_redirects_wiki_id_title"
-  add_index "wiki_redirects", ["wiki_id"], :name => "index_wiki_redirects_on_wiki_id"
-
-  create_table "wikis", :force => true do |t|
-    t.integer "project_id",                :null => false
-    t.string  "start_page",                :null => false
-    t.integer "status",     :default => 1, :null => false
-  end
-
-  add_index "wikis", ["project_id"], :name => "wikis_project_id"
-
-  create_table "workflows", :force => true do |t|
-    t.integer "tracker_id",                  :default => 0,     :null => false
-    t.integer "old_status_id",               :default => 0,     :null => false
-    t.integer "new_status_id",               :default => 0,     :null => false
-    t.integer "role_id",                     :default => 0,     :null => false
-    t.boolean "assignee",                    :default => false, :null => false
-    t.boolean "author",                      :default => false, :null => false
-    t.string  "type",          :limit => 30
-    t.string  "field_name",    :limit => 30
-    t.string  "rule",          :limit => 30
-  end
-
-  add_index "workflows", ["new_status_id"], :name => "index_workflows_on_new_status_id"
-  add_index "workflows", ["old_status_id"], :name => "index_workflows_on_old_status_id"
-  add_index "workflows", ["role_id", "tracker_id", "old_status_id"], :name => "wkfs_role_tracker_old_status"
-  add_index "workflows", ["role_id"], :name => "index_workflows_on_role_id"
-
-  create_table "works_categories", :force => true do |t|
-    t.string   "category"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "zip_packs", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "homework_id"
-    t.string   "file_digest"
-    t.string   "file_path"
-    t.integer  "pack_times",   :default => 1
-    t.integer  "pack_size",    :default => 0
-    t.text     "file_digests"
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-  end
-
-end
+  end
+
+  add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id"
+  add_index "users", ["id", "type"], :name => "index_users_on_id_and_type"
+  add_index "users", ["type"], :name => "index_users_on_type"
+
+  create_table "versions", :force => true do |t|
+    t.integer  "project_id",      :default => 0,      :null => false
+    t.string   "name",            :default => "",     :null => false
+    t.string   "description",     :default => ""
+    t.date     "effective_date"
+    t.datetime "created_on"
+    t.datetime "updated_on"
+    t.string   "wiki_page_title"
+    t.string   "status",          :default => "open"
+    t.string   "sharing",         :default => "none", :null => false
+  end
+
+  add_index "versions", ["project_id"], :name => "versions_project_id"
+  add_index "versions", ["sharing"], :name => "index_versions_on_sharing"
+
+  create_table "visitors", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "master_id"
+    t.datetime "updated_on"
+    t.datetime "created_on"
+  end
+
+  add_index "visitors", ["master_id"], :name => "index_visitors_master_id"
+  add_index "visitors", ["updated_on"], :name => "index_visitors_updated_on"
+  add_index "visitors", ["user_id"], :name => "index_visitors_user_id"
+
+  create_table "watchers", :force => true do |t|
+    t.string  "watchable_type", :default => "", :null => false
+    t.integer "watchable_id",   :default => 0,  :null => false
+    t.integer "user_id"
+  end
+
+  add_index "watchers", ["user_id", "watchable_type"], :name => "watchers_user_id_type"
+  add_index "watchers", ["user_id"], :name => "index_watchers_on_user_id"
+  add_index "watchers", ["watchable_id", "watchable_type"], :name => "index_watchers_on_watchable_id_and_watchable_type"
+
+  create_table "web_footer_companies", :force => true do |t|
+    t.string   "name"
+    t.string   "logo_size"
+    t.string   "url"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "web_footer_oranizers", :force => true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  create_table "wiki_content_versions", :force => true do |t|
+    t.integer  "wiki_content_id",                                       :null => false
+    t.integer  "page_id",                                               :null => false
+    t.integer  "author_id"
+    t.binary   "data",            :limit => 2147483647
+    t.string   "compression",     :limit => 6,          :default => ""
+    t.string   "comments",                              :default => ""
+    t.datetime "updated_on",                                            :null => false
+    t.integer  "version",                                               :null => false
+  end
+
+  add_index "wiki_content_versions", ["updated_on"], :name => "index_wiki_content_versions_on_updated_on"
+  add_index "wiki_content_versions", ["wiki_content_id"], :name => "wiki_content_versions_wcid"
+
+  create_table "wiki_contents", :force => true do |t|
+    t.integer  "page_id",                                          :null => false
+    t.integer  "author_id"
+    t.text     "text",       :limit => 2147483647
+    t.string   "comments",                         :default => ""
+    t.datetime "updated_on",                                       :null => false
+    t.integer  "version",                                          :null => false
+  end
+
+  add_index "wiki_contents", ["author_id"], :name => "index_wiki_contents_on_author_id"
+  add_index "wiki_contents", ["page_id"], :name => "wiki_contents_page_id"
+
+  create_table "wiki_pages", :force => true do |t|
+    t.integer  "wiki_id",                       :null => false
+    t.string   "title",                         :null => false
+    t.datetime "created_on",                    :null => false
+    t.boolean  "protected",  :default => false, :null => false
+    t.integer  "parent_id"
+  end
+
+  add_index "wiki_pages", ["parent_id"], :name => "index_wiki_pages_on_parent_id"
+  add_index "wiki_pages", ["wiki_id", "title"], :name => "wiki_pages_wiki_id_title"
+  add_index "wiki_pages", ["wiki_id"], :name => "index_wiki_pages_on_wiki_id"
+
+  create_table "wiki_redirects", :force => true do |t|
+    t.integer  "wiki_id",      :null => false
+    t.string   "title"
+    t.string   "redirects_to"
+    t.datetime "created_on",   :null => false
+  end
+
+  add_index "wiki_redirects", ["wiki_id", "title"], :name => "wiki_redirects_wiki_id_title"
+  add_index "wiki_redirects", ["wiki_id"], :name => "index_wiki_redirects_on_wiki_id"
+
+  create_table "wikis", :force => true do |t|
+    t.integer "project_id",                :null => false
+    t.string  "start_page",                :null => false
+    t.integer "status",     :default => 1, :null => false
+  end
+
+  add_index "wikis", ["project_id"], :name => "wikis_project_id"
+
+  create_table "workflows", :force => true do |t|
+    t.integer "tracker_id",                  :default => 0,     :null => false
+    t.integer "old_status_id",               :default => 0,     :null => false
+    t.integer "new_status_id",               :default => 0,     :null => false
+    t.integer "role_id",                     :default => 0,     :null => false
+    t.boolean "assignee",                    :default => false, :null => false
+    t.boolean "author",                      :default => false, :null => false
+    t.string  "type",          :limit => 30
+    t.string  "field_name",    :limit => 30
+    t.string  "rule",          :limit => 30
+  end
+
+  add_index "workflows", ["new_status_id"], :name => "index_workflows_on_new_status_id"
+  add_index "workflows", ["old_status_id"], :name => "index_workflows_on_old_status_id"
+  add_index "workflows", ["role_id", "tracker_id", "old_status_id"], :name => "wkfs_role_tracker_old_status"
+  add_index "workflows", ["role_id"], :name => "index_workflows_on_role_id"
+
+  create_table "works_categories", :force => true do |t|
+    t.string   "category"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "zip_packs", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "homework_id"
+    t.string   "file_digest"
+    t.string   "file_path"
+    t.integer  "pack_times",   :default => 1
+    t.integer  "pack_size",    :default => 0
+    t.text     "file_digests"
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
+  end
+
+end
diff --git a/lib/tasks/gitlab.rake b/lib/tasks/gitlab.rake
index ffa81e912..729c9245f 100644
--- a/lib/tasks/gitlab.rake
+++ b/lib/tasks/gitlab.rake
@@ -7,7 +7,7 @@ namespace :gitlab do
       # User.where(username: 'root').find_each do |user|
       s = Trustie::Gitlab::Sync.new
       User.find_each do |user|
-        s.sync_user(user) 
+        s.sync_user(user)
       end
     end
 
diff --git a/lib/trustie/gitlab/manage_member.rb b/lib/trustie/gitlab/manage_member.rb
index d0f74ad5e..b8c2149f4 100644
--- a/lib/trustie/gitlab/manage_member.rb
+++ b/lib/trustie/gitlab/manage_member.rb
@@ -42,11 +42,15 @@ module Trustie
       end
 
       def repository
-        project.repository
+        unless project.nil?
+          project.repository
+        end
       end
 
       def isGitlabProject?
-        repository && repository.gitlab?
+        unless repository.nil?
+          repository && repository.gitlab?
+        end
       end
 
     end
diff --git a/lib/trustie/gitlab/sync.rb b/lib/trustie/gitlab/sync.rb
index d941795ee..fd04f354d 100644
--- a/lib/trustie/gitlab/sync.rb
+++ b/lib/trustie/gitlab/sync.rb
@@ -22,7 +22,10 @@ module Trustie
 
         def sync_user(user)
             u = add_user(user)
-            user.save! if u
+            if user.mail_notification.blank? or user.mail_notification == "only_assigned" or user.mail_notification == "only_my_events"
+              user.mail_notification = "day"
+            end
+            user.save!
         end
 
         def sync_project(project, opt={})
diff --git a/public/images/course/syllabus.png b/public/images/course/syllabus.png
new file mode 100644
index 000000000..32c4bc4cc
Binary files /dev/null and b/public/images/course/syllabus.png differ
diff --git a/public/images/course/syllabus_icon.png b/public/images/course/syllabus_icon.png
new file mode 100644
index 000000000..2b8e17c46
Binary files /dev/null and b/public/images/course/syllabus_icon.png differ
diff --git a/public/images/course/syllabus_setting.png b/public/images/course/syllabus_setting.png
new file mode 100644
index 000000000..6ee7b02fb
Binary files /dev/null and b/public/images/course/syllabus_setting.png differ
diff --git a/public/images/trustie_logo1.png b/public/images/trustie_logo1.png
new file mode 100644
index 000000000..d6c7fc840
Binary files /dev/null and b/public/images/trustie_logo1.png differ
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index d75b33c2f..0aaaff344 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1089,3 +1089,8 @@ a.postRouteLink:hover {text-decoration:underline;}
 
 .ReplyToMessageContainer {border-bottom:1px solid #e3e3e3; width:632px; margin:0px auto; margin-top:15px; min-height:60px;}
 .ReplyToMessageInputContainer {width:582px; float:left;}
+
+/*课程大纲图标样式20151028Tim*/
+.syllabusIcon {background:url("/images/course/syllabus.png") 0px 0px no-repeat; width: 17px; height: 16px; display: inline-block;}
+.syllabusSetting {background:url("/images/course/syllabus.png") 0px -16px no-repeat; width: 20px; height: 16px; display: inline-block;}
+
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index db947bd1b..f753b191b 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -483,8 +483,8 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat;
 .resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000;}
 .resourcesSearchBox {border:1px solid #e6e6e6; width:225px; height:25px; background-color:#ffffff; margin-top:12px; margin-bottom:15px;}
 .searchResourcePopup {border:none; outline:none; background-color:#ffffff; width:184px; height:25px; padding-left:10px; display:inline-block; float:left;}
-.searchIconPopup{width:31px; height:25px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -18px no-repeat; display:inline-block; float:left;}
-.searchIconPopup:hover {cursor: pointer}
+.searchIconPopup{width:31px; height:25px; background-color:#ffffff; background:url(../images/homepage_icon.png) 5px -394px no-repeat; display:inline-block; float:left; cursor: pointer;}
+.searchIconPopup:hover {background:url(../images/homepage_icon.png) 5px -420px no-repeat;}
 .courseSend {width:390px; height:15px; line-height:15px; margin-bottom:10px;display:block;white-space:nowrap;}
 .courseSendCheckbox {padding:0px; margin:0px; width:12px; height:12px; margin-right:10px; display:inline-block; margin-top:2px;}
 .sendCourseName {font-size:12px; color:#5f6060;display:inline-block}
@@ -1309,3 +1309,4 @@ a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; c
 .ul_normal_color li {list-style-position:inside; padding-left:1px; list-style-image:url('../images/news_dot.png')}
 span.author { font-size: 0.9em; color: #888; }
 .ReplyToMessageInputContainer {width: 582px;float: left;}
+
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index df42f783e..0be7a6ff0 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -12,7 +12,7 @@ textarea {resize: none;}
 .pInline {margin:0px; padding:0px; display:inline-block;}
 
 /*常用*/
-select,input,textarea{ border:1px solid #269ac9; background:#fff; color:#000; padding-left:5px;padding-right: 5px; }
+select,input,textarea{ border:1px solid #269ac9; background:#fff; color:#000; padding-left:5px}
 .sub_btn{ cursor:pointer; -moz-border-radius:3px;  -webkit-border-radius:3px; border:1px solid #707070; color:#000;  border-radius:3px; padding:1px 10px; margin-bottom:10px; background:#dbdbdb;}
 .sub_btn:hover{ background:#b5e2fa; color:#000; border:1px solid #3c7fb1;}
 table{ background:#fff;}
@@ -907,3 +907,4 @@ a.resourcesTypeUser {background:url(images/homepage_icon.png) -178px -453px no-r
 
 .list_style ol li{list-style-type: decimal;margin-left: 20px;}
 .list_style ul li{list-style-type: disc;margin-left: 20px;}
+