Merge branch 'szzh' into develop

2015-10-29 17:30:05 +08:00 · 2015-10-29 17:30:05 +08:00 · b2f6d4f2bc
parent d9d536b961 470fb3bfa6
commit b2f6d4f2bc
59 changed files with 938 additions and 215 deletions
--- a/2
+++ b/2
@ -6,7 +6,7 @@ unless RUBY_PLATFORM =~ /w32/
  gem 'iconv'
 end

-gem 'grack', path:'./lib/grack'
+gem 'grack', path:'lib/grack'
 gem 'gitlab', path: 'lib/gitlab-cli'
 gem 'rest-client'
 gem "mysql2", "= 0.3.18"
--- a/app/controllers/blog_comments_controller.rb
+++ b/app/controllers/blog_comments_controller.rb
@ -60,11 +60,17 @@ class BlogCommentsController < ApplicationController
      @article.children.delete
      @article.delete
      redirect_to user_blogs_path(:user_id=>User.current)
+    else#如果是回复被删，
+      if params[:course_id] #如果呆了course_id过来了，那么这是要跳到课程大纲去的
+        @article.delete
+        redirect_to show_course_outline_course_path(:id=>params[:course_id])
      else
        root = @article.root
        @article.delete
        redirect_to user_blog_blog_comment_path(:user_id=>root.author_id,:blog_id=>root.blog_id,:id=>root.id)
      end
+
+    end
  end

  def edit
@ -81,6 +87,7 @@ class BlogCommentsController < ApplicationController

    @content = "> #{ll(Setting.default_language, :text_user_wrote, @blogComment.author.realname)}\n> "
    @temp = BlogComment.new
+    @course_id = params[:course_id]
    @temp.content = "<blockquote>#{ll(Setting.default_language, :text_user_wrote, @blogComment.author.realname)} <br/>#{@blogComment.content.html_safe}</blockquote>".html_safe
    respond_to do | format|
      format.js
@ -89,6 +96,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,13 +111,24 @@ 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
   # redirect_to user_blogs_path(:user_id=>params[:user_id])
    respond_to do |format|
-      format.html { redirect_to user_blog_blog_comment_path(:user_id=>@article.author_id,:blog_id=>@article.blog_id,:id=>@article)}
+      format.html {
+        if params[:course_id] #如果呆了course_id过来了，那么这是要跳到课程大纲去的
+          redirect_to show_course_outline_course_path(:id=>params[:course_id])
+        else
+          redirect_to user_blog_blog_comment_path(:user_id=>@article.author_id,:blog_id=>@article.blog_id,:id=>@article)
+        end
+
+      }
      format.js
    end
  rescue Exception => e #如果上面的代码执行发生异常就捕获
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@ -711,6 +711,39 @@ class CoursesController < ApplicationController
    end
  end

+  #从课程创建的老师那里选择课程大纲
+  def course_outline
+      @teacher = User.find(@course.tea_id)
+      @blog_articles = @teacher.blog.articles
+      respond_to do |format|
+        format.js
+      end
+  end
+
+  #根据关键字搜索，查找方法一样的，但返回内容不一样
+  def search_course_outline
+     @article_title = params[:title]
+     @teacher = User.find(@course.tea_id)
+     @blog_articles = @teacher.blog.articles.like(@article_title)
+     render :json=>@blog_articles.to_json
+  end
+
+  #设置或者更改课程的大纲
+  def set_course_outline
+    @course.outline = params[:outline_id]
+    @course.save
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  #显示课程大纲
+  def show_course_outline
+    @article = BlogComment.find(@course.outline)
+    respond_to do |format|
+      format.html {render :layout => 'base_courses'}
+    end
+  end
  #删除课程
  #删除课程只是将课程的is_delete状态改为false，is_delete为false状态的课程只有管理员可以看到
  def destroy
--- 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
--- 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", :content => role, :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",:content => role, :viewed => false, :status => 1)
+
              members << member
              #user_grades << UserGrade.new(:user_id => user_id, :course_id => @course.id)
              if (params[:membership][:role_ids])
@ -305,6 +313,7 @@ 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)
      end
      respond_to do |format|
@ -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 }
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@ -252,9 +252,12 @@ update
    else
      #Modified by young
      #  (show_error_not_found; return) unless @entries
-      @changesets = @repository.latest_changesets(@path, @rev)
-      @changesets_count = @repository.latest_changesets(@path, @rev).count
-      @changesets_latest_coimmit = @changesets.first
+      g = Gitlab.client
+      @changesets = g.get ("/projects/#{@project.gpid}/repository/commits")
+      # @changesets = @repository.latest_changesets(@path, @rev)
+      # @changesets_count = @repository.latest_changesets(@path, @rev).count
+      @changesets_count = @changesets.count
+      @changesets_latest_coimmit = @changesets[0]
      @properties = @repository.properties(@path, @rev)
      @repositories = @project.repositories
      @course_tag = params[:course]
@ -280,7 +283,9 @@ update
  def changes
    @entry = @repository.entry(@path, @rev)
    (show_error_not_found; return) unless @entry
-    @changesets = @repository.latest_changesets(@path, @rev, Setting.repository_log_display_limit.to_i)
+    g = Gitlab.client
+    @changesets = g.get ("/projects/#{@project.gpid}/repository/commits?#{@rev}")
+    #@changesets = @repository.latest_changesets(@path, @rev, Setting.repository_log_display_limit.to_i)
    @properties = @repository.properties(@path, @rev)
    @changeset = @repository.find_changeset_by_name(@rev)
    render :layout => 'base_projects'
--- 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)
+      @user_activity_id = params[:user_activity_id]
+      @is_in_course = params[:is_in_course]
+      respond_to do |format|
+        format.js
      end
-      }
    end
  end

--- 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]
--- 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
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@ -628,10 +628,10 @@ module CoursesHelper

  #重启、关闭课程按钮
  def set_course_time course
-    id = "finish_course_#{course.id}"
-    linkPath = course_endTime_timeout?(course) ? restartcourse_course_path(course) :  finishcourse_course_path(course, format: :js)
-    desc = course_endTime_timeout?(course) ? l(:label_course_reload) :  l(:label_course_closed)
-    link_to "<span class='pr_close'></span>#{desc}".html_safe, linkPath, :remote => true, :method => :post, :id => id, :confirm => l(:label_course_closed_tips, :desc => desc), :class => "pr_join_a"
+    # id = "finish_course_#{course.id}"
+    # linkPath = course_endTime_timeout?(course) ? restartcourse_course_path(course) :  finishcourse_course_path(course, format: :js)
+    # desc = course_endTime_timeout?(course) ? l(:label_course_reload) :  l(:label_course_closed)
+    # link_to "<span class='pr_close'></span>#{desc}".html_safe, linkPath, :remote => true, :method => :post, :id => id, :confirm => l(:label_course_closed_tips, :desc => desc), :class => "pr_join_a"
  end

  #加入课程、退出课程按钮
--- 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,40 @@ 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
+
+  scope :like, lambda {|arg|
+    if arg.blank?
+      where(nil)
+    else
+      pattern = "%#{arg.to_s.strip.downcase}%"
+      where(" LOWER(title) LIKE :p ", :p => pattern)
+    end
+  }
+
+  #在个人动态里面增加当前动态
+  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
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@ -327,7 +327,7 @@ class CoursesService
          end
        else
            if params[:course_password] == course.password
-                if params[:role] == "10"
+                if params[:role] == "10" || params[:role] == nil
                  members = []
                  members << Member.new(:role_ids => [10], :user_id => current_user.id)
                  course.members << members
--- a/app/views/blog_comments/_simple_ke_reply_form.html.erb
+++ b/app/views/blog_comments/_simple_ke_reply_form.html.erb
@ -17,6 +17,9 @@
    <div nhname='new_message_<%= reply.id%>'>
      <%= form_for @blog_comment, :as => :reply, :url => {:controller => 'blog_comments',:action => 'reply', :id => @blogComment.id}, :html => {:multipart => true, :id => 'new_form'} do |f| %>
          <input type="hidden" name="quote[quote]" id="quote_quote">
+          <% if course_id%>
+              <input type="hidden" name="course_id" id="" value="<%= course_id%>">
+          <% end %>
          <input type="hidden" name="blog_comment[title]" id="reply_subject">
          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="blog_comment[content]"></textarea>
          <div nhname='toolbar_container_<%= reply.id%>' style="float:left; margin-left: 5px; padding-top:3px;"></div>
--- a/app/views/blog_comments/quote.js.erb
+++ b/app/views/blog_comments/quote.js.erb
@ -1,5 +1,5 @@
 if($("#reply_message_<%= @blogComment.id%>").length > 0) {
-    $("#reply_message_<%= @blogComment.id%>").replaceWith("<%= escape_javascript(render :partial => 'simple_ke_reply_form', :locals => {:reply => @blogComment,:temp =>@temp,:subject =>@subject}) %>");
+    $("#reply_message_<%= @blogComment.id%>").replaceWith("<%= escape_javascript(render :partial => 'blog_comments/simple_ke_reply_form', :locals => {:reply => @blogComment,:temp =>@temp,:subject =>@subject,:course_id=>@course_id}) %>");
    $(function(){
        $('#reply_subject').val("<%= raw escape_javascript(@subject) %>");
        $('#quote_quote').val("<%= raw escape_javascript(@temp.content.html_safe) %>");
--- 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%");
+<% end %>
--- 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" %>
--- a/app/views/courses/_course_outlines_list.html.erb
+++ b/app/views/courses/_course_outlines_list.html.erb
@ -0,0 +1,31 @@
+
+<div class="f16 fontBlue fb fl">请选择课程大纲</div>
+  <!--<div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose"></a></div>-->
+  <div class="fl">
+    <form class="blogSearchBox">
+      <input type="text" name="course_outline_search" id="course_outline_search" placeholder="请输入大纲名称搜索" class="blogSearchContent" />
+      <!--<a href="javascript:void(0);" class="searchIconPopup"></a>-->
+      <!--<input class="searchIconPopup" name="commit" onfocus="this.blur();" style="border-style:none" type="submit" value="">-->
+    </form>
+  </div>
+  <span class="f12 c_red fl mb8" id="course_outline_hint" style="display: none">未搜索到对应大纲，请重新输入</span>
+ <%= form_tag(url_for(:controller=>'courses',:action=>'set_course_outline',:id=>course.id),:method=>'post',:remote=>'true')  do %>
+  <div class="blogBlock fl" id="course_outline_list" >
+    <% unless articles.blank? %>
+        <% articles.each do |article|%>
+            <ul class="blogRow">
+              <li class="fl">
+                <input name="outline_id" type="radio" value="<%= article.id%>" class="courseSendCheckbox"/>
+              </li>
+              <li class="blogTitle fl"><%= article.title%></li>
+            </ul>
+            <div class="homeworkPublishTime">发布时间：<%= format_date(article.created_at)%></div>
+        <% end %>
+    <% end %>
+  </div>
+  <div>
+    <div class="courseSendSubmit"><a href="javascript:void(0);" class="sendSourceText" onclick="$(this).parent().parent().submit();">确定</a></div>
+    <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a></div>
+  </div>
+  <div class="cl"></div>
+<% end %>
--- a/app/views/courses/_set_join.js.erb
+++ b/app/views/courses/_set_join.js.erb
@ -23,4 +23,6 @@
    <% else %>
 		alert("未知错误，请稍后再试");
 	<% end %>
+<% else %>
+    location.reload();
 <% end %>
--- a/app/views/courses/course_outline.js.erb
+++ b/app/views/courses/course_outline.js.erb
@ -0,0 +1,9 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'course_outlines_list',:locals => {:articles=>@blog_articles,:course=>@course}) %>');
+showModal('ajax-modal', '300px');
+//$('#ajax-modal').css('height','250px');
+$('#ajax-modal').css('padding-top','0px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before(' <a href="javascript:void(0);" onclick="hideModal()" class="resourceClose" style="margin-left: 285px"></a>');
+$('#ajax-modal').parent().css("top","30%").css("left","50%");
+$('#ajax-modal').parent().addClass("courseOutlinePopup");
+$('#ajax-modal').css("padding-left","16px")//.css("padding-bottom","16px");
--- a/app/views/courses/join.js.erb
+++ b/app/views/courses/join.js.erb
@ -4,7 +4,7 @@ $("#join_in_course_header").html("<%= escape_javascript(join_in_course_header(@c
 <% if @state %>
 <% if @state == 0 %>
 alert("加入成功");
-hidden_join_course_form();
+hideModal();
 $("#try_join_course_link").replaceWith("<a href='<%=url_for(:controller => 'homework_common', :action => 'index',:course=>@course.id, :host=>Setting.host_course)%>' target='_blank' class='blue_n_btn fr mt20'>提交作品</a>");
 window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
 <% elsif @state == 1 %>
--- 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');
--- a/app/views/courses/set_course_outline.js.erb
+++ b/app/views/courses/set_course_outline.js.erb
@ -0,0 +1,5 @@
+hideModal();
+<%if @course.tea_id == User.current.id && @course.outline == 0 %>
+<% else %>
+    $("#course_outline_bar").html('<a href="<%=show_course_outline_course_path(@course) %>" title="课程大纲" class="mr5 syllabusIcon fl"> </a>')
+<%end %>
--- a/app/views/courses/show_course_outline.html.erb
+++ b/app/views/courses/show_course_outline.html.erb
@ -0,0 +1,160 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor",'blog' %>
+
+<script type="text/javascript">
+    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#Container").css("width","1000px");
+    });
+</script>
+<script>
+    function expand_reply(container,btnid){
+        var target = $(container).children();
+        var btn = $(btnid);
+        if(btn.data('init')=='0'){
+            btn.data('init',1);
+            btn.html('收起回复');
+            target.show();
+        }else{
+            btn.data('init',0);
+            btn.html('展开更多');
+            target.hide();
+            target.eq(0).show();
+            target.eq(1).show();
+            target.eq(2).show();
+        }
+    }
+    $(function() {
+        init_activity_KindEditor_data(<%= @article.id%>,null,"85%");
+        showNormalImage('message_description_<%= @article.id %>');
+    });
+</script>
+<div class="postRightContainer ml10" onmouseover="$('#message_setting_<%= @article.id%>').show();" onmouseout="$('#message_setting_<%= @article.id%>').hide();">
+  <div class="postThemeContainer">
+    <div class="postDetailPortrait">
+      <%= link_to image_tag(url_to_avatar(@article.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@article.author) %>
+    </div>
+    <div class="postThemeWrap">
+      <% if @article.author.id == User.current.id%>
+          <!--<div class="homepagePostSetting" id="message_setting_<%#= @article.id%>" >-->
+            <!--<ul>-->
+              <!--<li class="syllabusSettingIcon"  >-->
+              <!--</li>-->
+            <!--</ul>-->
+          <!--</div>-->
+          <a class="syllabusSettingIcon fr" style="width: 100px" onclick="course_outline('<%= @course.id%>')" ><span class="f14 fontGrey2" style="padding-left: 20px">[设置大纲]</span>
+          </a>
+      <%end%>
+      <div class="postDetailTitle fl" style="width: 550px !important;">
+        <a href="javascript:void(0);" class="f14 linkGrey4 fb"  style="overflow:hidden;">主题: <%= @article.title%></a>
+      </div>
+      <div class="cl"></div>
+
+      <div class="postDetailCreater">
+        <% if @article.try(:author).try(:realname) == ' ' %>
+            <%= link_to @article.try(:author), user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
+        <% else %>
+            <%= link_to @article.try(:author).try(:realname), user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
+        <% end %>
+      </div>
+      <div class="postDetailDate mb5"><%= format_time( @article.created_on)%></div>
+      <div class="cl"></div>
+      <div class="memo-content upload_img break_word" id="message_description_<%= @article.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
+        <%= @article.content.html_safe%>
+      </div>
+      <div class="cl"></div>
+      <div class=" fl" style="width: 600px">
+        <%#= link_to_attachments_course @topic, :author => false %>
+        <% if @article.attachments.any?%>
+            <% options = {:author => true, :deletable => false} %>
+            <%= render :partial => 'blog_comments/attachments_links', :locals => {:attachments => @article.attachments, :options => options, :is_float => true} %>
+        <% end %>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <div class="cl"></div>
+  <% count=0 %>
+  <% if @article.parent %>
+      <% count=@article.parent.children.count%>
+  <% else %>
+      <% count=@article.children.count%>
+  <% end %>
+  <div class="homepagePostReply">
+    <% unless count == 0  %>
+        <div class="homepagePostReplyBanner">
+          <div class="homepagePostReplyBannerCount">回复（<%=count %>）</div>
+          <div class="homepagePostReplyBannerTime"></div>
+          <!-- <div class="homepagePostReplyBannerMore">
+        <%# if @reply_count > 2%>
+           <a href="javascript:void(0);" class="replyGrey"  id="reply_btn_<%#= @topic.id%>" onclick="expand_reply('#reply_div_<%#= @topic.id %>','#reply_btn_<%#= @topic.id%>')" data-count="<%#= @reply_count %>" data-init="0" >点击展开更多回复</a>
+        <%# end %>
+      </div>-->
+        </div>
+        <div class="" id="reply_div_<%=  @article.id %>">
+          <%@article.children.reorder('created_on desc').each_with_index  do |reply,i| %>
+              <script type="text/javascript">
+                  $(function(){
+                      showNormalImage('reply_message_description_<%= reply.id %>');
+                  });
+              </script>
+              <div class="homepagePostReplyContainer" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id%>').hide();">
+                <div class="homepagePostReplyPortrait">
+                  <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
+                </div>
+                <div class="homepagePostReplyDes">
+                  <div class="homepagePostReplyPublisher">
+                    <% if reply.try(:author).try(:realname) == ' ' %>
+                        <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
+                    <% else %>
+                        <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
+                    <% end %>
+                  </div>
+                  <div class="homepagePostReplyContent upload_img break_word" id="reply_message_description_<%= reply.id %>">
+                    <%= reply.content.html_safe%>
+                  </div>
+                  <div style="margin-top: -7px; margin-bottom: 5px">
+                    <%= format_time(reply.created_on) %>
+                    <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
+                      <%= link_to(
+                                  l(:button_reply),
+                                  {:controller => 'blog_comments',:action => 'quote',:user_id=>reply.author_id,:blog_id=>reply.blog_id, :id => reply.id,:course_id=>@course.id},
+                                  :remote => true,
+                                  :method => 'get',
+                                  :class => 'fr newsBlue',
+                                  :title => l(:button_reply)) if !@article.locked? && User.current.logged?  %>
+                      <%= link_to(
+                                  l(:button_delete),
+                                  {:controller => 'blog_comments',:action => 'destroy',:user_id=>reply.author_id,:blog_id=>reply.blog_id, :id => reply.id,:course_id=>@course.id},
+                                  :method => :delete,
+                                  :class => 'fr newsGrey mr10',
+                                  :data => {:confirm => l(:text_are_you_sure)},
+                                  :title => l(:button_delete)
+                          ) if reply.author.id == User.current.id %>
+                    </div>
+                  </div>
+                  <p id="reply_message_<%= reply.id%>"></p>
+                </div>
+                <div class="cl"></div>
+              </div>
+          <% end %>
+        </div>
+
+    <% end %>
+    <div class="cl"></div>
+    <% if !@article.locked? && User.current.logged?%>
+        <div class="talkWrapMsg" nhname="about_talk_reply">
+          <em class="talkWrapArrow"></em>
+          <div class="cl"></div>
+          <div class="talkConIpt ml5 mb10" id="reply<%= @article.id %>">
+            <%= form_for :blog_comment, :url => {:action => 'reply',:controller => 'blog_comments',:user_id=>@article.author.id,:blog_id=>@article.blog_id, :id => @article.id}, :html => {:multipart => true, :id => 'message_form'} do |f| %>
+                <input type="hidden" name="course_id" value="<%= @course.id%>">
+                <%= render :partial => 'blog_comments/reply_form', :locals => {:f => f,:user=>@user,:article=>@article} %>
+                <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'canel_message_replay();', :class => " grey_btn fr c_white mt10 mr5" %>
+                <%= link_to l(:button_submit), "javascript:void(0)", :onclick => 'submit_message_replay();', :class => "blue_btn fr c_white mt10", :style => "margin-right: 5px;" %>
+            <% end %>
+            <div class="cl"></div>
+          </div>
+        </div>
+    <% end %>
+  </div>
+</div>
--- 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>
--- 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;'>" +
--- 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");
+$(function() { $('#evaluation_start_time').datepicker(datepickerOptions);
+    $('#evaluation_end_time').datepicker(datepickerOptions);
+});
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@ -54,15 +54,46 @@
        </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">-->
+            <!--<%#= @course.name %>-->
+          <!--</a>-->
+          <!--<%# if @course.is_public == 0%>-->
+                <!--<span class="img_private ">-->
+                  <!--<%#= l(:field_is_private)%>-->
+                <!--</span>-->
+          <!--<%# end %>-->
+          <!--<%#if @course.tea_id == User.current.id && @course.outline == 0 %>-->
+            <!--<span>-->
+              <!--<a href="javascript:void(0)" onclick="course_outline('<%#= @course.id%>');">设置大纲</a>-->
+            <!--</span>-->
+          <!--<%# else%>-->
+            <!--<span>-->
+              <!--<a href="javascript:void(0)" onclick="course_outline('<%#= @course.id%>');">设置大纲</a>-->
+            <!--</span>-->
+          <!--<%# end %>-->
+        <!--</div>-->
        <div >
-          <a class="pr_info_name fl c_dark fb break_word" href="http://<%= Setting.host_course%>/courses/<%= @course.id%>" target="_blank">
+          <a class="pr_info_name fl c_dark fb break_word" href="http://<%= Setting.host_course%>/courses/<%= @course.id%>" target="_blank"></a>
+            <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 "></span>-->
+                <span class="img_private mr5 fl">
                  <%= l(:field_is_private)%>
                </span>
              <% end %>
+              <span id="course_outline_bar">
+              <%if @course.tea_id == User.current.id && (@course.outline == 0 ||  BlogComment.where(:id=>@course.outline).count == 0) %>
+                  <a href="javascript:void(0);" title="设置课程大纲" onclick="course_outline('<%= @course.id%>')" class="mr5 syllabusSetting fl"> </a>
+               <% elsif @course.tea_id == User.current.id && @course.outline != 0 && BlogComment.where(:id=>@course.outline).count != 0%>
+                  <a href="<%=show_course_outline_course_path(@course) %>" title="课程大纲" class="mr5 syllabusIcon fl"> </a>
+                <% elsif @course.tea_id != User.current.id %>
+               <%end %>
+               </span>
+            </div>
         </div>
        <div class="cl"></div>
        <div class="pr_info_foot ">
@ -166,5 +197,50 @@
 <div id="ajax-modal" style="display:none;"></div>
 <%= call_hook :view_layouts_base_body_bottom %>
 </body>
+<script>
+    var blog_artile_list_html = '';
+    $(function(){
+        $(document).on('input','input[name="course_outline_search"]',function(e){
+            throttle(course_outline_search,window,e);
+        })
+        function throttle(method,context,e){
+            clearTimeout(method.tId);
+            method.tId=setTimeout(function(){
+                method.call(context,e);
+            },500);
+        }
+        function course_outline_search(e){
+//            if($(e.target).val().trim() == ''){
+//                return;
+//            }
+            $("#course_outline_hint").hide();
+            $.ajax({
+                url:'<%=search_course_outline_course_path(@course) %>'+"?&title="+ e.target.value,
+                type:'post',
+                success:function(data){
+
+                    if(data.length != 0 ){
+                        $("#course_outline_list").html('');
+                        for(var i =0;i<data.length;i++){
+                            var html = ' <ul class="blogRow"> '+
+                                     ' <li class="fl"> '+
+                                    '<input name="outline_id" type="radio" value="'+data[i].blog_comment.id+'" class="courseSendCheckbox"/>'+
+                                    '</li>'+
+                            '<li class="blogTitle fl">'+data[i].blog_comment.title+'</li>'+
+                            '</ul>'+
+                            '<div class="homeworkPublishTime">发布时间：'+data[i].blog_comment.created_at.match(/(\S*)T/)[1]+'</div>';
+                            $("#course_outline_list").append(html)
+                        }
+
+                    }else{
+                          $("#course_outline_hint").show();
+                    }
+                }
+            })
+        }
+
+    })
+
+</script>

 </html>
--- a/app/views/projects/_new_join.html.erb
+++ b/app/views/projects/_new_join.html.erb
@ -18,13 +18,6 @@

  <script type="text/javascript">
      function clickCanel(){hideModal("#popbox02");}
-      function clickSure()
-      {
-          if ($('#new_join_course').submit())
-          {
-              hideModal("#popbox02");
-          }
-      }
  </script>
 </head>

@ -40,7 +33,7 @@
        <label>请输入课程密码:</label>
        <%= text_field_tag 'course_password', nil, :style=>'width:300px;'%>
        <div class="ni_btn">
-          <a href="javascript:" class="tijiao" onclick="clickSure();" >
+          <a href="javascript:" class="tijiao" onclick="$('#new_join_course').submit();" >
            确&nbsp;&nbsp;定
          </a>
          <a href="javascript:" class="tijiao" onclick="clickCanel();">
--- a/app/views/repositories/_revisions.html.erb
+++ b/app/views/repositories/_revisions.html.erb
@ -1,53 +1,35 @@
-<% show_revision_graph = ( @repository.supports_revision_graph? && path.blank? ) %>
-<%= if show_revision_graph && revisions && revisions.any?
-      indexed_commits, graph_space = index_commits(revisions, @repository.branches) do |scmid|
-        url_for(
-                :controller => 'repositories',
-                :action => 'revision',
-                :id => project,
-                :repository_id => @repository.identifier_param,
-                :rev => scmid)
-      end
-      render :partial => 'revision_graph',
-             :locals => {
-                     :commits => indexed_commits,
-                     :space => graph_space
-             }
-    end %>
 <%= form_tag(
            {:controller => 'repositories', :action => 'diff', :id => project,
             :repository_id => @repository.identifier_param, :path => to_path_param(path)},
             :method => :get
    ) do %>
    <table class="list changesets">
-      <thead><tr>
-        <th>#</th>
-        <th></th>
-        <th></th>
-        <th><%= l(:label_date) %></th>
-        <th><%= l(:field_author) %></th>
-        <th><%= l(:field_comments) %></th>
-      </tr></thead>
+      <!--<thead><tr>-->
+        <!--<th>#</th>-->
+        <!--<th></th>-->
+        <!--<th></th>-->
+        <!--<th><%= l(:label_date) %></th>-->
+        <!--<th><%= l(:field_author) %></th>-->
+        <!--<th><%= l(:field_comments) %></th>-->
+      <!--</tr></thead>-->
      <tbody>
      <% show_diff = revisions.size > 1 %>
      <% line_num = 1 %>
      <% revisions.each do |changeset| %>
          <tr class="changeset <%= cycle 'odd', 'even' %>">
-            <% id_style = (show_revision_graph ? "padding-left:#{(graph_space + 1) * 20}px" : nil) %>
-            <%= content_tag(:td, :class => 'id', :style => id_style) do %>
-                <%= link_to_revision(changeset, @repository) %>
-            <% end %>
-            <td class="checkbox"><%= radio_button_tag('rev', changeset.identifier, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('#cbto-#{line_num+1}').attr('checked',true);") if show_diff && (line_num < revisions.size) %></td>
-            <td class="checkbox"><%= radio_button_tag('rev_to', changeset.identifier, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('#cb-#{line_num}').attr('checked')) {$('#cb-#{line_num-1}').attr('checked',true);}") if show_diff && (line_num > 1) %></td>
-            <td class="committed_on"><%= format_time(changeset.committed_on) %></td>
-            <td class="author"><%= h truncate(changeset.author.to_s, :length => 30) %></td>
-            <td class="comments"><%= textilizable(truncate_at_line_break(changeset.comments)) %></td>
+
+            <td class="id"><%= h truncate(changeset.id.to_s, :length => 20) %></td>
+            <!--<td class="checkbox"><%#= radio_button_tag('rev_to', changeset.id, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('#cb-#{line_num}').attr('checked')) {$('#cb-#{line_num-1}').attr('checked',true);}") if show_diff && (line_num > 1) %></td>-->
+            <td class="committed_on"><%= format_time(changeset.created_at) %></td>
+            <td class="author"><%= h truncate(changeset.author_name.to_s, :length => 30) %></td>
+            <td class="comments"><%= textilizable(truncate_at_line_break(changeset.message)) %></td>
          </tr>
          <% line_num += 1 %>
      <% end %>
      </tbody>
    </table>
    <p style="padding-top: 10px;">
-      <%= submit_tag(l(:label_view_diff), :name => nil, :class=>"c_blue") if show_diff %>
+      <%#= submit_tag(l(:label_view_diff), :name => nil, :class=>"c_blue") if show_diff %>
    </p>
+
 <% end %>
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@ -30,10 +30,10 @@
      <div class="cl"></div>
      <div class="recordBanner mt10">
        <% if @changesets && !@changesets.empty? %>
-            <%= image_tag(url_to_avatar(@changesets_latest_coimmit.user),  :width => "25", :height => "25", :class => "fl portraitRadius mt2 ml4 mr5") %>
-            <span class="fl"><div class="fb fontGrey3 mr5 fl"><%=link_to @changesets_latest_coimmit.user, user_path(@changesets_latest_coimmit.user) %></div>
-                <div class="fl">提交于<%= time_tag(@changesets_latest_coimmit.committed_on) %>：</div>
-                <div class="commit_content_dec fl" title="<%= @changesets_latest_coimmit.comments %>"><%= @changesets_latest_coimmit.comments %></div>
+            <%= image_tag(url_to_avatar(@changesets_latest_coimmit.author_name),  :width => "25", :height => "25", :class => "fl portraitRadius mt2 ml4 mr5") %>
+            <span class="fl"><div class="fb fontGrey3 mr5 fl"><%=link_to @changesets_latest_coimmit.author_name, user_path(@changesets_latest_coimmit.author_name) %></div>
+                <div class="fl">提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>：</div>
+                <div class="commit_content_dec fl" title="<%= @changesets_latest_coimmit.comments %>"><%= @changesets_latest_coimmit.message %></div>
            </span>
        <% end %>
        <span class="fr mr5 "><font class="fb ml2 mr2 vl_branch mt2">
@ -59,15 +59,7 @@
 <!-- 代码修订 -->
 <%= render_properties(@properties) %>

-<% if authorize_for('repositories', 'revisions') %>
-    <% if @changesets && !@changesets.empty? %>
-      <% has_branches = (!@repository.branches.nil? && @repository.branches.length > 0)
-         sep = '' %>
-       <% if @repository.supports_all_revisions? && @path.blank? %>
-          <%= link_to l(:label_view_all_revisions_commits), :action => 'revisions', :id => @project, :repository_id => @repository.identifier_param %>
-       <% end %> |
-     <% end %>
-<% end %>
+
 <a href="https://<%=Setting.host_name %>/forums/1/memos/1232" >如何提交代码</a>

 <% content_for :header_tags do %>
--- 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>
+<% 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%>
-
-      <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%>
+<% 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 %>
--- a/app/views/student_work/_set_score_rule_detail.html.erb
+++ 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>
--- 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">
--- 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>
--- a/app/views/student_work/set_score_rule.js.erb
+++ 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 %>
--- 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>
--- 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} %>
--- a/app/views/users/_user_blog.html.erb
+++ 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>
--- 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%>
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@ -426,10 +426,16 @@
            </p>
            <p>课程名称：<%= ma.course_message.name %></p>
            <p>开课学期：<%= ma.course_message.time.to_s + '年' + ma.course_message.term %></p>
-            <div class="fl">课程描述：</div>
-            <div class="ml60"><%= ma.course_message.description.html_safe %></div>
-            <p>学时总数：<%= ma.course_message.class_period%></p>
+            <p>课程ID：<span style="color:red;"><%= ma.course_message.id %></span></p>
+            <p>课程密码：<span style="color:red;"><%= ma.course_message.password %></span></p>
+            <p>学时总数：<%= ma.course_message.class_period %></p>
            <p>创建时间：<%= format_time(ma.course_message.created_at) %></p>
+            <p>您可以点击左上角的“配置”按钮，修改课程基本信息，添加及删除课程成员。您也可以把课程ID及密码告诉学生和其他成员，让他们输入ID及密码加入课程。</p>
+            <% if ma.course_message.is_public %>
+              <p>您的课程是公开的，所有人都能访问您的课程。若不想设置为公开，您可以在配置中设置。</p>
+            <% else %>
+              <p>您的课程是私有的，非课程成员不能访问您的课程。如果想设置为公开，您可以在配置中设置。</p>
+            <% end %>
          </div>
          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
        </ul>
@ -503,4 +509,104 @@
          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
        </ul>
    <% end %>
+
+    <!--被老师拉入课程-->
+    <% if ma.course_message_type == "JoinCourse" and ma.status == 0 %>
+        <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? %>
+                <% teacher = User.find(ma.course_message_id) %>
+                <p><%= teacher.show_name %>(<%= teacher %>)老师把您加入了课程，详情如下：</p>
+                <p>课程名称：<%= ma.course.name %></p>
+                <p>开课学期：<%= ma.course.time.to_s + '年'+ ma.course.term %></p>
+                <p>课程ID：<%= ma.course.id %></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 == "JoinCourse" and ma.status == 1 %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl">
+            <a href="javascript:void(0);"></a>
+          </li>
+          <li class="homepageNewsPubType fl">
+            <span class="newsBlue homepageNewsPublisher">系统提示</span>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">您增加了新的课程成员：</span>
+          </li>
+          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+            <%= link_to User.find(ma.course_message_id), user_path(ma.course_message_id), :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>您增加了新的课程成员，详情如下：</p>
+                <p>成员：<%= User.find(ma.course_message_id) %></p>
+                <p>课程名称：<%= ma.course.name %></p>
+                <p>开课学期：<%= ma.course.time.to_s + '年'+ ma.course.term %></p>
+                <p>课程ID：<%= ma.course.id %></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>您已被<%= User.find(ma.course_message_id).show_name %>老师移出了课程，详情如下：</p>
+                <p>课程名称：<%= ma.course.name %></p>
+                <p>开课学期：<%= ma.course.time.to_s + '年'+ ma.course.term %></p>
+                <% if !ma.content.nil? %>
+                    <p>担任角色：<%= ma.content %></p>
+                <% end %>
+                <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 %>
--- a/app/views/users/_user_message_forge.html.erb
+++ b/app/views/users/_user_message_forge.html.erb
@ -36,7 +36,7 @@
                        :onmouseout => "message_titile_hide($(this))" %></a>
          </li>
          <div style="display: none" class="message_title_red system_message_style">
-            <% if ma.project.is_public? || User.current.member_of?(ma.project) %>
+            <% if ma.project.is_public? || User.current.member_of?(ma.project) || User.current.admin? %>
                <p>
                  项目名称：<%= ma.project.name %>
                </p>
@ -69,7 +69,7 @@
                        :onmouseout => "message_titile_hide($(this))" %></a>
          </li>
          <div style="display: none" class="message_title_red system_message_style">
-            <% if ma.project.is_public? || User.current.member_of?(ma.project) %>
+            <% if ma.project.is_public? || User.current.member_of?(ma.project) || User.current.admin? %>
                <p>
                  项目名称：<%= ma.project.name %>
                </p>
--- 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>
--- 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>
--- 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>
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@ -375,7 +375,7 @@ zh:
  #     
  label_project_new_description: '项目可以是软件开发项目，也可以是协作研究项目。'
  field_name: 名称
-  field_identifier: 标识
+  field_identifier: 版本库名
  field_enterprise_name: 组织名称
  label_organization_choose: --请选择组织--
  text_length_between: "长度必须在 %{min} 到 %{max} 个字符之间。"
--- a/config/routes.rb
+++ b/config/routes.rb
@ -789,6 +789,10 @@ RedmineApp::Application.routes.draw do
      delete 'join_in/join_group', :to => 'courses#unjoin_group'
      get 'copy_course'
      match 'course_activity', :to => 'courses#course_activity',  :via => :get, :as => "course_activity"
+      get 'course_outline'
+      post 'search_course_outline'
+      post 'set_course_outline'
+      get 'show_course_outline'
    end
    collection do
      match 'join_private_courses', :via => [:get, :post]
--- a/db/migrate/20151028060607_add_column_outline_to_course.rb
+++ b/db/migrate/20151028060607_add_column_outline_to_course.rb
@ -0,0 +1,5 @@
+class AddColumnOutlineToCourse < ActiveRecord::Migration
+  def change
+    add_column :courses,:outline,:integer,:default => 0
+  end
+end
--- a/db/schema.rb
+++ b/db/schema.rb
@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.

-ActiveRecord::Schema.define(:version => 20151022071804) do
+ActiveRecord::Schema.define(:version => 20151028060607) do

  create_table "activities", :force => true do |t|
    t.integer  "act_id",                                  :null => false
@ -443,6 +443,7 @@ ActiveRecord::Schema.define(:version => 20151022071804) do
    t.integer  "is_public",       :limit => 1, :default => 1
    t.integer  "inherit_members", :limit => 1, :default => 1
    t.integer  "open_student",                 :default => 0
+    t.integer  "outline",                      :default => 0
  end

  create_table "custom_fields", :force => true do |t|
@ -527,26 +528,23 @@ ActiveRecord::Schema.define(:version => 20151022071804) do
  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
+  create_table "dts", :force => true do |t|
+    t.string   "IPLineCode"
    t.string   "Description"
-    t.text     "PreConditions", :limit => 2147483647
-    t.text     "TraceInfo",     :limit => 2147483647
-    t.text     "Code",          :limit => 2147483647
+    t.string   "Num"
+    t.string   "Variable"
+    t.string   "TraceInfo"
+    t.string   "Method"
+    t.string   "File"
+    t.string   "IPLine"
+    t.string   "Review"
+    t.string   "Category"
+    t.string   "Defect"
+    t.string   "PreConditions"
+    t.string   "StartLine"
    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "id",                                  :null => false
+    t.datetime "created_at",    :null => false
+    t.datetime "updated_at",    :null => false
  end

  create_table "enabled_modules", :force => true do |t|
@ -815,6 +813,16 @@ ActiveRecord::Schema.define(:version => 20151022071804) do

  add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"

+  create_table "journal_details_copy", :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_copy", ["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"
--- a/lib/trustie/gitlab/manage_member.rb
+++ b/lib/trustie/gitlab/manage_member.rb
@ -42,12 +42,16 @@ module Trustie
      end

      def repository
+        unless project.nil?
          project.repository
        end
+      end

      def isGitlabProject?
+        unless repository.nil?
          repository && repository.gitlab?
        end
+      end

    end

--- 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 (!("day,none,all".include? user.mail_notification) or user.mail_notification.blank?)
+              user.mail_notification = "day"
+            end
+            user.save!
        end

        def sync_project(project, opt={})
--- a/public/images/course/syllabus.png
+++ b/public/images/course/syllabus.png
--- a/public/images/course/syllabus_icon.png
+++ b/public/images/course/syllabus_icon.png
--- a/public/images/course/syllabus_setting.png
+++ b/public/images/course/syllabus_setting.png
--- a/public/images/trustie_logo1.png
+++ b/public/images/trustie_logo1.png
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@ -1223,3 +1223,15 @@ var autoTextarea2 = function (elem,elem2, extra, maxHeight) {
    addEvent(elem2, 'focus', change);
    change();
 };
+
+//课程大纲选择请求
+function course_outline(id){
+    $.get(
+        ' /courses/'+id+'/course_outline'
+    )
+}
+//$(function(){
+//    $('#course_outline_search').on('input',function(){
+//        alert('<%= @course.id%>')
+//    })
+//})
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@ -1089,3 +1089,22 @@ 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;}
+
+/*课程大纲弹框*/
+.courseOutlinePopup {width:400px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;}
+.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;}
+.blogTitle {max-width:240px; font-size:12px; color:#484848; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;}
+.blogBlock {overflow-x:hidden; max-height:200px;min-height: 200px; overflow-y:auto; margin-bottom:5px;}
+.blogRow {width:280px; height:15px; line-height:15px;}
+.blogSearchBox {border:1px solid #e6e6e6;  height:25px; background-color:#ffffff; margin-top:8px; margin-bottom:8px;}/*width:280px;*/
+.blogSearchContent {border:none; outline:none; background-color:#ffffff; width:216px; height:25px; padding-left:10px; display:inline-block; 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;}
+
+.syllabusSettingIcon {background:url(../images/course/syllabus_setting.png) 0px 0px no-repeat; width:20px; height:20px;}
+.syllabusSettingIcon:hover {cursor: pointer}
+
+.pic_files{display:block; background:url(../images/public_icon.png) 0px -578px no-repeat; width:20px; height:15px;}
--- 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;}
+
--- 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;}
+