diff --git a/.gitignore b/.gitignore
index fdb7a3c6b..22d9e17e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ vendor/cache
 /public/images/avatars
 /public/files
 /tags
+/config/initializers/gitlab_config.rb
diff --git a/Gemfile b/Gemfile
index cf6e9f773..3027c16cd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,8 @@ 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"
 gem 'redis-rails'
@@ -45,7 +46,7 @@ group :development, :test do
     gem 'pry-stack_explorer'
     if RUBY_PLATFORM =~ /darwin/
       gem 'puma'
-    end
+  end
   end
 
   gem 'rspec-rails', '~> 3.0'
diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index af501fdf9..33d988e35 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -21,7 +21,6 @@ class AccountController < ApplicationController
 
   # prevents login action to be filtered by check_if_login_required application scope filter
   skip_before_filter :check_if_login_required
-
   # Login request and validation
   def login
     if request.get?
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 477a8e2b9..9e935ae40 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -354,7 +354,7 @@ class AdminController < ApplicationController
     @schools = School.where('1=1')
     end
     @school_count = @schools.count
-    @school_pages = Paginator.new @school_count, per_page_option, params['page'] || 1
+    @school_pages = Paginator.new @school_count, 100, params['page'] || 1
     @schools = paginateHelper @schools,100
     respond_to do |format|
       format.html
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 86c220bd2..6387a97a4 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -38,7 +38,8 @@ class ApplicationController < ActionController::Base
   protect_from_forgery
   def handle_unverified_request
     super
-    cookies.delete(autologin_cookie_name)
+    raise(ActionController::InvalidAuthenticityToken)
+    # cookies.delete(autologin_cookie_name)
   end
 
   before_filter :find_first_page
@@ -381,6 +382,11 @@ class ApplicationController < ActionController::Base
     if allowed
       true
     else
+      if params[:action] == 'show'
+        #更新申请结果反馈消息的状态
+        messages = CourseMessage.where("course_message_type =? and course_id =? and user_id =? and viewed =?", 'CourseRequestDealResult', @course.id, User.current.id, false)
+        messages.update_all(:viewed => true)
+      end
       if @course && @course.archived?
         render_403 :message => :notice_not_authorized_archived_project
       else
@@ -657,7 +663,8 @@ class ApplicationController < ActionController::Base
     if api_request?
       logger.error "Form authenticity token is missing or is invalid. API calls must include a proper Content-type header (text/xml or text/json)."
     end
-    render_error "Invalid form authenticity token."
+    #render_error "Invalid form authenticity token."
+    redirect_to signin_path(:login=>true)
   end
 
   def render_feed(items, options={})
diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index ee953e913..37182dbcf 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -227,6 +227,8 @@ class AttachmentsController < ApplicationController
           format.js
         elsif @attachment.container.is_a?(Message)
           format.html { redirect_to_referer_or new_board_message_path(@attachment.container) }
+        elsif @attachment.container.is_a?(BlogComment)
+          format.html { redirect_to_referer_or user_blog_blog_comment_path(:user_id=>@attachment.container.author.id,:blog_id=>@attachment.container.blog_id,:id=>@attachment.container.id)}
         elsif @course.nil?
           format.html { redirect_to_referer_or forum_memo_path(@attachment.container.forum, @attachment.container) }
         else
diff --git a/app/controllers/blog_comments_controller.rb b/app/controllers/blog_comments_controller.rb
new file mode 100644
index 000000000..b92223edc
--- /dev/null
+++ b/app/controllers/blog_comments_controller.rb
@@ -0,0 +1,150 @@
+class BlogCommentsController < ApplicationController
+  include ApplicationHelper
+  before_filter :find_user
+  def index
+
+  end
+  def create
+    if User.current.logged?
+      @article = BlogComment.new
+      @article.author = User.current
+      @article.blog_id = params[:blog_id]
+      @article.safe_attributes = params[:blog_comment]
+      if request.post?
+        @article.save_attachments(params[:attachments])
+        if @article.save
+          # 更新kindeditor上传的图片资源所有者
+          # if params[:asset_id]
+          #   ids = params[:asset_id].split(',')
+          #   update_kindeditor_assets_owner ids,@article.id,OwnerTypeHelper::BLOGCOMMENT
+          # end
+          render_attachment_warning_if_needed(@article)
+        else
+        end
+        redirect_to user_blogs_path(:user_id=>params[:user_id])
+      else
+        respond_to do |format|
+          format.html {
+            render :layout => 'new_base_user'
+          }
+        end
+      end
+    else
+      redirect_to signin_path
+    end
+  end
+  def new
+    respond_to do |format|
+      format.html {render :layout=>'new_base_user'}
+    end
+  end
+  def show
+    @article = BlogComment.find(params[:id])
+    respond_to do |format|
+      format.html {render :layout=>'new_base_user'}
+    end
+  end
+  def update
+    @article = BlogComment.find(params[:id])
+    @article.safe_attributes = params[:blog_comment]
+    @article.save_attachments(params[:attachments])
+    if @article.save
+      render_attachment_warning_if_needed(@article)
+    else
+    end
+    redirect_to user_blog_blog_comment_path(:user_id=>params[:user_id],:blog_id=>params[:blog_id],:id=>params[:id])
+  end
+  def destroy
+    @article = BlogComment.find(params[:id])
+    if @article.parent_id.nil? #如果是文章被删，那么跳转到用户博客界面，如果带了course_id过来，那么就要跳转到课程首页
+      if params[:course_id] #如果带了课程id过来，说明这是课程大纲，不要删除，只需取消课程大纲就ok了
+        @course = Course.find(params[:course_id])
+        @course.outline = 0
+        @course.save
+        redirect_to course_path(:id=>params[:course_id])
+      else
+        @article.children.delete
+        @article.delete
+        redirect_to user_blogs_path(:user_id=>User.current)
+      end
+
+    else#如果是回复被删，
+      if params[:course_id] #如果带了course_id过来了，那么这是要跳到课程大纲去的
+        @article.delete
+        redirect_to syllabus_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
+    @article = BlogComment.find(params[:id])
+    respond_to do |format|
+      format.html {render :layout=>'new_base_user'}
+    end
+  end
+
+  def quote
+    @blogComment = BlogComment.find(params[:id])
+    @subject = @blogComment.title
+    @subject = "RE: #{@subject}" unless @subject.starts_with?('RE:')
+
+    @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
+    end
+  end
+
+  #回复
+  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
+    @blogComment.author = User.current
+    @blogComment.blog = Blog.find(params[:blog_id])
+    params[:blog_comment][:sticky] = params[:blog_comment][:sticky] || 0
+    params[:blog_comment][:locked] =  params[:blog_comment][:locked] || 0
+    @blogComment.safe_attributes = params[:blog_comment]
+    @blogComment.content = @quote + @blogComment.content
+    @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 {
+        if params[:course_id] #如果呆了course_id过来了，那么这是要跳到课程大纲去的
+          redirect_to syllabus_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 #如果上面的代码执行发生异常就捕获
+    flash[:notice] = e.message
+  end
+
+  private
+  def find_user
+    @user = User.find(params[:user_id])
+  end
+end
diff --git a/app/controllers/blogs_controller.rb b/app/controllers/blogs_controller.rb
new file mode 100644
index 000000000..07bf60464
--- /dev/null
+++ b/app/controllers/blogs_controller.rb
@@ -0,0 +1,47 @@
+class BlogsController < ApplicationController
+  before_filter :find_blog,:except => [:index,:create,:new]
+  before_filter :find_user
+  def index
+    @articls = @user.blog.articles
+    @article = BlogComment.new
+    respond_to do |format|
+      format.html {render :layout=>'new_base_user'}
+    end
+  end
+  def create
+
+  end
+  def new
+
+  end
+  def show
+
+  end
+  def update
+
+  end
+  def destory
+
+  end
+  def edit
+
+  end
+  private
+  def find_blog
+    if params[:blog_id]
+      @blog = Blog.find(params[:blog_id])
+    else
+      render_404
+    end
+    if @blog.nil?
+      #如果某个user的blog不存在，那么就创建一条
+      @blog = Blog.create(:name=>User.find(params[:id]).realname ,
+                   :description=>'',
+                   :author_id=>params[:id])
+    end
+  end
+
+  def find_user
+    @user = User.find(params[:user_id])
+  end
+end
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 7d26b2eca..1a561006a 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -31,27 +31,24 @@ class CoursesController < ApplicationController
 
   def join
     if User.current.logged?
-      cs = CoursesService.new
-      user = User.current
-      join = cs.join_course params,user
-      @state = join[:state]
-      course = join[:course]
+        cs = CoursesService.new
+        @user = User.current
+        join = cs.join_course params,@user
+        @state = join[:state]
+        @course = join[:course]
+      # else
+      #   @course = Course.find_by_id params[:object_id]
+      #   CourseMessage.create(:user_id => @course.tea_id, :course_id => @course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest')
+      #   @state = 6
+      # end
     else
       @state = 5 #未登录
     end
-    # if @state == 1 || @state == 3
-    #   respond_to course_path(course.id)
-    # else
-      respond_to do |format|
-        format.js { render :partial => 'set_join', :locals => {:user => user, :course => course, :object_id => params[:object_id]} }
-      end
-    #end
-
-  rescue Exception => e
-    @state = 4 #已经加入了课程
+    @object_id = params[:object_id]
     respond_to do |format|
-      format.js { render :partial => 'set_join', :locals => {:user => User.current, :course => nil, :object_id => nil} }
+        format.js #{ render :partial => 'set_join', :locals => {:user => @user, :course => @course, :object_id => params[:object_id]} }
     end
+
   end
 
   def unjoin
@@ -110,7 +107,7 @@ class CoursesController < ApplicationController
       courses = Course.visible
       @courses = paginateHelper courses,10
     else
-      courses = Course.visible.where("LOWER(name) like '%#{params[:name].to_s.downcase}%'")
+      courses = Course.visible.where("LOWER(name) like '%#{params[:name].to_s.downcase}%'").order("time desc, created_at desc")
       @courses = paginateHelper courses,10
     end
    @name = params[:name]
@@ -291,14 +288,11 @@ class CoursesController < ApplicationController
   def export_course_member_excel
     @all_members = student_homework_score(0,0,0,"desc")
     filename="#{@course.teacher.lastname.to_s + @course.teacher.firstname.to_s }_#{@course.name}_#{@course.time.to_s + @course.term}#{l(:excel_member_list)}";
-    # 如果是ie 需要转码
-    if(/trident/.match(request.env["HTTP_USER_AGENT"]) != nil)
-      filename= URI::encode(filename)
-    end
+   
     respond_to do |format|
       format.xls {
         send_data(member_to_xls(@all_members,@course.course_groups), :type => "text/excel;charset=utf-8; header=present",
-                  :filename => "#{filename}.xls")
+                  :filename => filename_for_content_disposition("#{filename}.xls"))
       }
     end
   end
@@ -619,6 +613,10 @@ class CoursesController < ApplicationController
     create_course_messages = @course.course_messages.where("user_id =? and course_message_type =? and course_id =? and viewed =?", User.current.id, 'Course', @course.id, 0)
     create_course_messages.update_all(:viewed => true)
 
+    #更新申请结果反馈消息的状态
+    course_request_messages = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =?", User.current.id, @course.id,  'CourseRequestDealResult', false)
+    course_request_messages.update_all(:viewed => true)
+
     course_activities = @course.course_activities
     @canShowRealName = User.current.member_of_course? @course
     @page = params[:page] ? params[:page].to_i + 1 : 0
@@ -713,6 +711,41 @@ class CoursesController < ApplicationController
     end
   end
 
+  #从课程创建的老师那里选择课程大纲
+  def course_outline
+      @teacher = User.find(@course.tea_id)
+      @blog_articles = @teacher.blog.articles
+      @is_in_show_outline_page = params[:is_in_show_outline_page]
+      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
+    @is_in_show_outline_page = params[:is_in_show_outline_page]
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  #显示课程大纲
+  def syllabus
+    @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
diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 057d962c8..dd8dc84c4 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -1,3 +1,4 @@
+#encoding: utf-8
 # Redmine - project management software
 # Copyright (C) 2006-2013  Jean-Philippe Lang
 #
@@ -331,6 +332,9 @@ class FilesController < ApplicationController
      #modify by nwb
      if @project
        @addTag=false
+       if params[:in_project_toolbar]
+         @in_project_toolbar = params[:in_project_toolbar]
+       end
        container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id]))
        attachments = Attachment.attach_filesex(container, params[:attachments], params[:attachment_type])
        render_attachment_warning_if_needed(container)
@@ -362,6 +366,9 @@ class FilesController < ApplicationController
        end
      elsif @course
        @addTag=false
+       if params[:in_course_toolbar]
+         @in_course_toolbar =  params[:in_course_toolbar]
+       end
        attachments = Attachment.attach_filesex(@course, params[:attachments], params[:attachment_type])
 
        if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added')
@@ -378,6 +385,8 @@ class FilesController < ApplicationController
            tag_name = l(:label_media)
          when "4"
            tag_name = l(:label_code)
+         when "6"
+            tag_name = "论文"
          else
            tag_name = ""
          end
diff --git a/app/controllers/gantts_controller.rb b/app/controllers/gantts_controller.rb
index ee132ac29..710bb2f47 100644
--- a/app/controllers/gantts_controller.rb
+++ b/app/controllers/gantts_controller.rb
@@ -42,8 +42,8 @@ class GanttsController < ApplicationController
 
     respond_to do |format|
       format.html { render :action => "show", :layout => 'base_projects' }#by young
-      format.png  { send_data(@gantt.to_image, :disposition => 'inline', :type => 'image/png', :filename => "#{basename}.png") } if @gantt.respond_to?('to_image')
-      format.pdf  { send_data(@gantt.to_pdf, :type => 'application/pdf', :filename => "#{basename}.pdf") }
+      format.png  { send_data(@gantt.to_image, :disposition => 'inline', :type => 'image/png', :filename => filename_for_content_disposition("#{basename}.png")) } if @gantt.respond_to?('to_image')
+      format.pdf  { send_data(@gantt.to_pdf, :type => 'application/pdf', :filename => filename_for_content_disposition("#{basename}.pdf") ) }
     end
   end
 end
diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb
index 5dd5363b9..93459578c 100644
--- a/app/controllers/homework_attach_controller.rb
+++ b/app/controllers/homework_attach_controller.rb
@@ -33,7 +33,7 @@ class HomeworkAttachController < ApplicationController
       format.js
       format.xls {
         send_data(homework_to_xls(@all_homework_list), :type => "text/excel;charset=utf-8; header=present",
-                  :filename => "#{@course.teacher.lastname.to_s + @course.teacher.firstname}_#{@course.name}_#{@course.time.to_s + @course.term}_#{@bid.name}#{l(:excel_homework_list)}(#{l(:excel_not_rated)}).xls")
+                  :filename => filename_for_content_disposition("#{@course.teacher.lastname.to_s + @course.teacher.firstname}_#{@course.name}_#{@course.time.to_s + @course.term}_#{@bid.name}#{l(:excel_homework_list)}(#{l(:excel_not_rated)}).xls") )
       }
     end
   end
@@ -66,7 +66,7 @@ class HomeworkAttachController < ApplicationController
       format.js
       format.xls {
         send_data(homework_to_xls(all_homework_list), :type => "text/excel;charset=utf-8; header=present",
-                  :filename => "#{@course.teacher.lastname.to_s + @course.teacher.firstname}_#{@course.name}_#{@course.time.to_s + @course.term}_#{@bid.name}#{l(:excel_homework_list)}(#{l(:excel_been_rated)}).xls")
+                  :filename => filename_for_content_disposition("#{@course.teacher.lastname.to_s + @course.teacher.firstname}_#{@course.name}_#{@course.time.to_s + @course.term}_#{@bid.name}#{l(:excel_homework_list)}(#{l(:excel_been_rated)}).xls") )
       }
     end
   end
@@ -101,7 +101,7 @@ class HomeworkAttachController < ApplicationController
       format.js
       format.xls {
         send_data(homework_to_xls(all_homework_list), :type => "text/excel;charset=utf-8; header=present",
-                  :filename => "#{@course.teacher.lastname.to_s + @course.teacher.firstname}_#{@course.name}_#{@course.time.to_s + @course.term}_#{@bid.name}#{l(:excel_homework_list)}.xls")
+                  :filename => filename_for_content_disposition("#{@course.teacher.lastname.to_s + @course.teacher.firstname}_#{@course.name}_#{@course.time.to_s + @course.term}_#{@bid.name}#{l(:excel_homework_list)}.xls") )
       }
     end
   end
diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 9e3a4b836..687ef9503 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -6,8 +6,8 @@ class HomeworkCommonController < ApplicationController
 
   include StudentWorkHelper
   before_filter :find_course, :only => [:index,:new,:create]
-  before_filter :find_homework, :only => [:edit,:update,:alert_anonymous_comment,:start_anonymous_comment,:stop_anonymous_comment,:destroy,:start_evaluation_set,:set_evaluation_attr]
-  before_filter :teacher_of_course, :only => [:new, :create, :edit, :update, :destroy, :start_anonymous_comment, :stop_anonymous_comment, :alert_anonymous_comment,:start_evaluation_set,:set_evaluation_attr]
+  before_filter :find_homework, :only => [:edit,:update,:alert_anonymous_comment,:start_anonymous_comment,:stop_anonymous_comment,:destroy,:start_evaluation_set,:set_evaluation_attr,:score_rule_set,:alert_forbidden_anonymous_comment]
+  before_filter :teacher_of_course, :only => [:new, :create, :edit, :update, :destroy, :start_anonymous_comment, :stop_anonymous_comment, :alert_anonymous_comment,:start_evaluation_set,:set_evaluation_attr,:score_rule_set,:alert_forbidden_anonymous_comment]
   before_filter :member_of_course, :only => [:index]
 
   def index
@@ -38,6 +38,7 @@ class HomeworkCommonController < ApplicationController
   def edit
     @user = User.current
     @is_in_course = params[:is_in_course].to_i
+    @course_activity = params[:course_activity].to_i
     respond_to do |format|
       format.html{render :layout => 'new_base_user'}
     end
@@ -47,10 +48,18 @@ class HomeworkCommonController < ApplicationController
     if params[:homework_common]
       @homework.name = params[:homework_common][:name]
       @homework.description = params[:homework_common][:description]
+      if params[:homework_common][:publish_time] == ""
+        @homework.publish_time = Date.today
+      else
+        @homework.publish_time = params[:homework_common][:publish_time]
+      end
       @homework.end_time = params[:homework_common][:end_time] || Time.now
       @homework.course_id = params[:course_id]
 
       homework_detail_manual = @homework.homework_detail_manual || HomeworkDetailManual.new
+      if @homework.publish_time <= Date.today && homework_detail_manual.comment_status == 0
+        homework_detail_manual.comment_status = 1
+      end
       homework_detail_manual.evaluation_start = params[:evaluation_start].blank? ? @homework.end_time + 7 : params[:evaluation_start]
       homework_detail_manual.evaluation_end = params[:evaluation_end].blank? ? homework_detail_manual.evaluation_start + 7 : params[:evaluation_end]
 
@@ -80,8 +89,12 @@ class HomeworkCommonController < ApplicationController
         @homework_detail_programing.save if @homework_detail_programing
         if params[:is_in_course] == "1"
           redirect_to homework_common_index_path(:course => @course.id)
-        else
+        elsif params[:is_in_course] == "0"
           redirect_to user_homeworks_user_path(User.current.id)
+        elsif params[:is_in_course] == "-1" && params[:course_activity] == "0"
+          redirect_to user_path(User.current.id)
+        elsif params[:is_in_course] == "-1" && params[:course_activity] == "1"
+          redirect_to course_path(@course.id)
         end
       end
     end
@@ -93,8 +106,12 @@ class HomeworkCommonController < ApplicationController
         format.html {
           if params[:is_in_course] == "1"
             redirect_to homework_common_index_path(:course => @course.id)
-          else
+          elsif params[:is_in_course] == "0"
             redirect_to user_homeworks_user_path(User.current.id)
+          elsif params[:is_in_course] == "-1" && params[:course_activity] == "0"
+            redirect_to user_path(User.current.id)
+          elsif params[:is_in_course] == "-1" && params[:course_activity] == "1"
+            redirect_to course_path(@course.id)
           end
         }
       end
@@ -130,6 +147,9 @@ class HomeworkCommonController < ApplicationController
     else
       @statue = 3
     end
+    @user_activity_id = params[:user_activity_id].to_i
+    @is_in_course = params[:is_in_course].to_i
+    @course_activity = params[:course_activity].to_i
   end
 
   #关闭匿评
@@ -145,6 +165,9 @@ class HomeworkCommonController < ApplicationController
     # 匿评关闭消息邮件通知
     send_message_anonymous_comment(@homework, m_status = 3)
     Mailer.send_mail_anonymous_comment_close(@homework).deliver
+    @user_activity_id = params[:user_activity_id].to_i
+    @is_in_course = params[:is_in_course].to_i
+    @course_activity = params[:course_activity].to_i
     respond_to do |format|
       format.js
     end
@@ -171,6 +194,22 @@ class HomeworkCommonController < ApplicationController
       @homework.student_works.map { |work| @cur_size += work.student_works_scores.where(:reviewer_role => 3).count}
     end
     @percent = format("%.2f",(@cur_size.to_f / ( @totle_size == 0 ? 1 : @totle_size)) * 100)
+    @user_activity_id = params[:user_activity_id].to_i
+    @is_in_course = params[:is_in_course].to_i
+    @course_activity = params[:course_activity].to_i
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def alert_forbidden_anonymous_comment
+    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] if params[:is_in_course]
+    @course_activity = params[:course_activity] if params[:course_Activity]
     respond_to do |format|
       format.js
     end
@@ -215,6 +254,16 @@ class HomeworkCommonController < ApplicationController
     end
   end
 
+  #评分设置
+  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
   #获取课程
   def find_course
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 923414583..e529dd3b9 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -151,7 +151,7 @@ class IssuesController < ApplicationController
     format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' }
     format.pdf  {
       pdf = issue_to_pdf(@issue, :journals => @journals)
-      send_data(pdf, :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf")
+      send_data(pdf, :type => 'application/pdf', :filename => filename_for_content_disposition("#{@project.identifier}-#{@issue.id}.pdf") )
     }
     end
   end
diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index 6bb61e6a1..4dc2c52f5 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", :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,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/poll_controller.rb b/app/controllers/poll_controller.rb
index a8f2a11f1..ec54ae8a4 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -413,7 +413,7 @@ class PollController < ApplicationController
     respond_to do |format|
       format.xls {
         send_data(poll_to_xls(poll_questions), :type => "text/excel;charset=utf-8; header=present",
-                  :filename => "#{@poll.polls_name}.xls")
+                  :filename => filename_for_content_disposition("#{@poll.polls_name}.xls") )
       }
     end
   end
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index f2f10d5b6..1f252cc24 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -29,12 +29,12 @@ class RepositoriesController < ApplicationController
   menu_item :repository
   menu_item :settings, :only => [:new, :create, :edit, :update, :destroy, :committers]
   default_search_scope :changesets
-  
+
   before_filter :find_project_by_project_id, :only => [:new, :create, :newrepo]
   before_filter :find_repository, :only => [:edit, :update, :destroy, :committers]
-  before_filter :find_project_repository, :except => [:new, :create, :newcreate, :edit, :update, :destroy, :committers, :newrepo]
+  before_filter :find_project_repository, :except => [:new, :create, :newcreate, :edit, :update, :destroy, :committers, :newrepo,:to_gitlab]
   before_filter :find_changeset, :only => [:revision, :add_related_issue, :remove_related_issue]
-  before_filter :authorize , :except => [:newrepo,:newcreate,:fork]
+  before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab]
   accept_rss_auth :revisions
   # hidden repositories filter // 隐藏代码过滤器
   before_filter :check_hidden_repo, :only => [:show, :stats, :revisions, :revision, :diff ]
@@ -42,7 +42,7 @@ class RepositoriesController < ApplicationController
   include RepositoriesHelper
   helper :project_score
   #@root_path = RepositoriesHelper::ROOT_PATH
-  
+
 
   rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed
   def new
@@ -62,8 +62,8 @@ class RepositoriesController < ApplicationController
     end
 
   end
-  
-  
+
+
   def newrepo
     scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first
     @repository = Repository.factory(scm)
@@ -76,23 +76,23 @@ class RepositoriesController < ApplicationController
       render :layout => 'base_projects'
     end
   end
-  
+
   def fork
     @repository_url = params[:repository_url]
-    
+
     # @repository.url
     # system "htpasswd -mb "+@root_path+"user.passwd "+params[:repository][:identifier]+" "+@upasswd
     # system "echo -e '"+params[:project_id]+"-"+params[:repository][:identifier]+"-write:"+
-                 # " "+params[:repository][:identifier]+"'  >> "+@root_path+"group.passwd"
-     system "git clone --bare "+@repository_url
+    # " "+params[:repository][:identifier]+"'  >> "+@root_path+"group.passwd"
+    system "git clone --bare "+@repository_url
     # system "mv "+@project_path+"/hooks/post-update{.sample,}"
     # system "chmod a+x "+@project_path+"/hooks/post-update"
     # system "."+@project_path+"/hooks/post-update"
     # system "echo -e 'Allow from all \n Order Deny,Allow \n "+
-                 # "<Limit PUT POST DELETE PROPPATCH MKCOL COPY MOVE LOCK UNLOCK> \n"+
-                 # "Require group "+params[:project_id]+"-"+params[:repository][:identifier]+"-write  \n "+
-                 # "</Limit> \n ' >>"+
-                 # @project_path+"/.htaccess"
+    # "<Limit PUT POST DELETE PROPPATCH MKCOL COPY MOVE LOCK UNLOCK> \n"+
+    # "Require group "+params[:project_id]+"-"+params[:repository][:identifier]+"-write  \n "+
+    # "</Limit> \n ' >>"+
+    # @project_path+"/.htaccess"
     flash[:notice] = l(:label_notice_fork_successed)
     @repositories = @project.repositories
     render :action => 'show', :layout => 'base_projects'
@@ -115,77 +115,24 @@ update
   }
 
   def create
-    if params[:repository_scm].to_s == 'Gitlab'
-      # add by nwb
-      # 增加对gitlab版本库的支持
-      attrs = pickup_extra_info
-      @repository = Repository.factory('Git')
-      @repository.safe_attributes = params[:repository]
-      if attrs[:attrs_extra].keys.any?
-        @repository.merge_extra_info(attrs[:attrs_extra])
-      end
-      @repository.project = @project
-      if request.post? && @repository.save
-        redirect_to settings_project_url(@project, :tab => 'repositories')
-      else
-        redirect_to settings_project_url(@project, :tab => 'repositories')
-      end
-    else  # 原逻辑
-      ##xianbo
-      @root_path=RepositoriesHelper::ROOT_PATH
-      @repository_name=User.current.login.to_s+"/"+params[:repository][:identifier]+".git"
-      @project_path=@root_path+"htdocs/"+@repository_name
-      @repository_tag=params[:repository][:upassword] || params[:repository][:password]
-      @repo_name=User.current.login.to_s+"_"+params[:repository][:identifier]
-      logger.info "htpasswd -mb "+@root_path+"htdocs/user.passwd "+@repo_name+": "+@repository_tag
-      logger.info "the value of create repository"+@root_path+": "+@repository_name+": "+@project_path+": "+@repo_name
-      attrs = pickup_extra_info
-      if((@repository_tag!="")&&params[:repository_scm]=="Git")
-          params[:repository][:url]=@project_path
-      end
-      ###xianbo
-      @repository = Repository.factory(params[:repository_scm])
-      @repository.safe_attributes = params[:repository]
-      if attrs[:attrs_extra].keys.any?
-        @repository.merge_extra_info(attrs[:attrs_extra])
-      end
-
-      @repository.project = @project
-      if request.post? && @repository.save
-        if(params[:repository_scm]=="Git")
-          system "htpasswd -mb "+@root_path+"htdocs/user.passwd "+@repo_name+" "+@repository_tag
-          system "echo -e '"+@repo_name+"-write:"+
-                     " "+@repo_name+"'  >> "+@root_path+"htdocs/group.passwd"
-          system "mkdir "+@root_path+"htdocs/"+User.current.login.to_s
-          system "git init --bare "+@project_path
-          system "mv "+@project_path+"/hooks/post-update{.sample,}"
-          system "chmod a+x "+@project_path+"/hooks/post-update"
-          system "echo -e 'Allow from all \n Order Deny,Allow \n "+
-                     "<Limit PUT POST DELETE PROPPATCH MKCOL COPY MOVE LOCK UNLOCK> \n"+
-                     "Require group "+@repo_name+"-write  \n "+
-                     "</Limit> \n ' >> "+
-                     @root_path+"htdocs/"+ @repository_name+"/.htaccess"
-          system "cd "+@project_path+" ;git update-server-info"
-
-          File.open(@project_path+"/hooks/post-update", "w+") do |f|
-            f.write(HOOK_TEMPLATE)
-          end
-
-          @repository.update_attributes(:login => User.current.login.to_s)
-        end
-        redirect_to settings_project_url(@project, :tab => 'repositories',:repository_error_message=>@repository.errors.full_messages)
-      else if(@repository_tag.blank?)
-            #render :action => 'newrepo', :layout =>'base_projects'
-             redirect_to settings_project_url(@project, :tab => 'repositories',:repository => "pswd_is_null",:repository_error_message=>@repository.errors.full_messages)
-           else
-             redirect_to settings_project_url(@project, :tab => 'repositories',:repository => @repository,:repository_error_message=>@repository.errors.full_messages)
-           end
-      end
-
-
+    attrs = pickup_extra_info
+    @repository = Repository.factory('Git')
+    @repository.safe_attributes = params[:repository]
+    if attrs[:attrs_extra].keys.any?
+      @repository.merge_extra_info(attrs[:attrs_extra])
+    end
+    @repository.project = @project
+    @repository.type = 'Repository::Gitlab'
+    @repository.url = @repository.identifier
+    if request.post? && @repository.save
+      s = Trustie::Gitlab::Sync.new
+      s.create_project(@project, @repository)
+      redirect_to settings_project_url(@project, :tab => 'repositories')
+    else
+      redirect_to settings_project_url(@project, :tab => 'repositories',:repository_error_message=>@repository.errors.full_messages)
     end
   end
-  
+
   def edit
   end
 
@@ -228,15 +175,17 @@ update
       # Build a hash with repository usernames as keys and corresponding user ids as values
       @repository.committer_ids = params[:committers].values.inject({}) {|h, c| h[c.first] = c.last; h}
       flash[:notice] = l(:notice_successful_update)
-      redirect_to settings_project_url(@project, :tab => 'repositories')
+      respond_to do |format|
+        format.html{
+          render :layout => "base_projects"
+        }
+      end
     elsif request.get?
-    respond_to do |format|
-      format.html{
-        render :layout => "base_projects"
-      }
-    end
-
-
+      respond_to do |format|
+        format.html{
+          render :layout => "base_projects"
+        }
+      end
     end
   end
 
@@ -247,6 +196,16 @@ update
     redirect_to settings_project_url(@project, :tab => 'repositories')
   end
 
+  def to_gitlab
+    @project = Project.find(params[:project_id])
+    @repository = Repository.find(params[:id])
+    s = Trustie::Gitlab::Sync.new
+    s.sync_project(@project, path: params[:repo_name], import_url: @repository.url)
+    @repository.type = 'Repository::Gitlab'
+    @repository.save
+    redirect_to :controller => 'repositories', :action => 'show', :id => @project.id, to: 'gitlab'
+  end
+
   def show
     ## TODO: the below will move to filter, done.
     if !User.current.member_of?(@project)
@@ -256,19 +215,19 @@ update
       end
     end
 
-    if params[:to] == 'gitlab'
-      g = Gitlab.client
-      g.post('/session', body: {email: User.current.mail, password: User.current.hashed_password})
-      redirect_to "http://192.168.41.130:3000/gitlab-org/gitlab-shell/tree/master"
-      return
-    end
+    # unless @repository.gitlab?
+    #   # redirect_to to_gitlab_project_repository_path(@project, @repository)
+    #   render :to_gitlab
+    #   return
+    # end
 
     #if( !User.current.member_of?(@project) || @project.hidden_repo)
     @repository.fetch_changesets if Setting.autofetch_changesets? && @path.empty?
 
+    # :name, :path, :kind, :size, :lastrev, :changeset
     @entries = @repository.entries(@path, @rev)
+    # @trees = g.trees(project, @path)
     @changeset = @repository.find_changeset_by_name(@rev)
-
     #@project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT
     #@ip               = RepositoriesHelper::REPO_IP_ADDRESS
 
@@ -276,15 +235,32 @@ update
       @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
     else
       #Modified by young
-    #  (show_error_not_found; return) unless @entries
-      @changesets = @repository.latest_changesets(@path, @rev)
+      #  (show_error_not_found; return) unless @entries
+      g = Gitlab.client
+      count = 0
+      (0..100).each do |page|
+        if g.commits(@project.gpid,:page => page).count == 0
+          break
+        else
+          count = count + g.commits(@project.gpid,:page => page).count
+        end
+      end
+      @changesets = g.commits(@project.gpid)
+      # @changesets = @repository.latest_changesets(@path, @rev)
+      # @changesets_count = @repository.latest_changesets(@path, @rev).count
+      @changesets_all_count = count
+      @changesets_latest_coimmit = @changesets[0]
       @properties = @repository.properties(@path, @rev)
       @repositories = @project.repositories
       @course_tag = params[:course]
       project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT
       ip = RepositoriesHelper::REPO_IP_ADDRESS
-      @repos_url = "http://"+@repository.login.to_s+"_"+@repository.identifier.to_s+"@"+ip.to_s+
-      @repository.url.slice(project_path_cut, @repository.url.length).to_s
+      gitlab_address = Redmine::Configuration['gitlab_address']
+      if @repository.type.to_s == "Repository::Gitlab"
+        @repos_url = gitlab_address.to_s+"/"+@project.owner.to_s+"/"+@repository.identifier+"."+"git"
+      else
+        @repos_url = "http://"+@repository.login.to_s+"_"+@repository.identifier.to_s+"@"+ip.to_s + @repository.url.slice(project_path_cut, @repository.url.length).to_s
+      end
       if @course_tag == 1
         render :action => 'show', :layout => 'base_courses'
       else
@@ -298,7 +274,11 @@ 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
+    @commits = g.commits(@project.gpid, page:params[:pamge])
+    @commit = g.commit(@project.gpid,@rev)
+    # @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'
@@ -310,10 +290,10 @@ update
                                      per_page_option,
                                      params['page']
     @changesets = @repository.changesets.
-      limit(@changeset_pages.per_page).
-      offset(@changeset_pages.offset).
-      includes(:user, :repository, :parents).
-      all
+        limit(@changeset_pages.per_page).
+        offset(@changeset_pages.offset).
+        includes(:user, :repository, :parents).
+        all
 
     respond_to do |format|
       format.html { render :layout => 'base_projects' }
@@ -327,6 +307,7 @@ update
 
   def entry
     entry_and_raw(false)
+    render :layout => 'base_projects'
   end
 
   def entry_and_raw(is_raw)
@@ -339,8 +320,8 @@ update
     @content = @repository.cat(@path, @rev)
     (show_error_not_found; return) unless @content
     if is_raw ||
-         (@content.size && @content.size > Setting.file_max_size_displayed.to_i.kilobyte) ||
-         ! is_entry_text_data?(@content, @path)
+        (@content.size && @content.size > Setting.file_max_size_displayed.to_i.kilobyte) ||
+        ! is_entry_text_data?(@content, @path)
       # Force the download
       send_opt = { :filename => filename_for_content_disposition(@path.split('/').last) }
       send_type = Redmine::MimeType.of(@path)
@@ -423,8 +404,8 @@ update
       filename = "changeset_r#{@rev}"
       filename << "_r#{@rev_to}" if @rev_to
       send_data @diff.join, :filename => "#{filename}.diff",
-                            :type => 'text/x-patch',
-                            :disposition => 'attachment'
+                :type => 'text/x-patch',
+                :disposition => 'attachment'
     else
       @diff_type = params[:type] || User.current.pref[:diff_type] || 'inline'
       @diff_type = 'inline' unless %w(inline sbs).include?(@diff_type)
@@ -435,7 +416,7 @@ update
         User.current.preference.save
       end
       @cache_key = "repositories/diff/#{@repository.id}/" +
-                      Digest::MD5.hexdigest("#{@path}-#{@rev}-#{@rev_to}-#{@diff_type}-#{current_language}")
+          Digest::MD5.hexdigest("#{@path}-#{@rev}-#{@rev_to}-#{@diff_type}-#{current_language}")
       unless read_fragment(@cache_key)
         @diff = @repository.diff(@path, @rev, @rev_to)
         unless @diff
@@ -462,16 +443,16 @@ update
   def graph
     data = nil
     case params[:graph]
-    when "commits_per_month"
-      data = graph_commits_per_month(@repository)
-    when "commits_per_author"
-      data = graph_commits_per_author(@repository)
-    when "author_commits_per_month"
-      data = graph_author_commits_per_month(@repository)
-    when "author_commits_six_month"
-      data = author_commits_six_month(@repository)
-    when "author_code_six_months"
-      data = author_code_six_month(@repository)
+      when "commits_per_month"
+        data = graph_commits_per_month(@repository)
+      when "commits_per_author"
+        data = graph_commits_per_author(@repository)
+      when "author_commits_per_month"
+        data = graph_author_commits_per_month(@repository)
+      when "author_commits_six_month"
+        data = author_commits_six_month(@repository)
+      when "author_code_six_months"
+        data = author_code_six_month(@repository)
     end
     if data
       headers["Content-Type"] = "image/svg+xml"
@@ -551,14 +532,14 @@ update
     @date_from = @date_to << 11
     @date_from = Date.civil(@date_from.year, @date_from.month, 1)
     commits_by_day = Changeset.count(
-                          :all, :group => :commit_date,
-                          :conditions => ["repository_id = ? AND commit_date BETWEEN ? AND ?", repository.id, @date_from, @date_to])
+        :all, :group => :commit_date,
+        :conditions => ["repository_id = ? AND commit_date BETWEEN ? AND ?", repository.id, @date_from, @date_to])
     commits_by_month = [0] * 12
     commits_by_day.each {|c| commits_by_month[(@date_to.month - c.first.to_date.month) % 12] += c.last }
 
     changes_by_day = Change.count(
-                          :all, :group => :commit_date, :include => :changeset,
-                          :conditions => ["#{Changeset.table_name}.repository_id = ? AND #{Changeset.table_name}.commit_date BETWEEN ? AND ?", repository.id, @date_from, @date_to])
+        :all, :group => :commit_date, :include => :changeset,
+        :conditions => ["#{Changeset.table_name}.repository_id = ? AND #{Changeset.table_name}.commit_date BETWEEN ? AND ?", repository.id, @date_from, @date_to])
     changes_by_month = [0] * 12
     changes_by_day.each {|c| changes_by_month[(@date_to.month - c.first.to_date.month) % 12] += c.last }
 
@@ -566,26 +547,26 @@ update
     12.times {|m| fields << month_name(((Date.today.month - 1 - m) % 12) + 1)}
 
     graph = SVG::Graph::Bar.new(
-      :height => 300,
-      :width => 600,
-      :fields => fields.reverse,
-      :stack => :side,
-      :scale_integers => true,
-      :step_x_labels => 2,
-      :show_data_values => true,
-      :graph_title => l(:label_commits_per_month),
-      :show_graph_title => true
+        :height => 300,
+        :width => 600,
+        :fields => fields.reverse,
+        :stack => :side,
+        :scale_integers => true,
+        :step_x_labels => 2,
+        :show_data_values => true,
+        :graph_title => l(:label_commits_per_month),
+        :show_graph_title => true
     )
 
     # 具状图
     graph.add_data(
-      :data => commits_by_month[0..11].reverse,
-      :title => l(:label_revision_plural)
+        :data => commits_by_month[0..11].reverse,
+        :title => l(:label_revision_plural)
     )
 
     graph.add_data(
-      :data => changes_by_month[0..11].reverse,
-      :title => l(:label_change_plural)
+        :data => changes_by_month[0..11].reverse,
+        :title => l(:label_change_plural)
     )
 
     graph.burn
@@ -610,23 +591,23 @@ update
     fields = fields.collect {|c| c.gsub(%r{<.+@.+>}, '') }
 
     graph = SVG::Graph::BarHorizontal.new(
-      :height => 400,
-      :width => 600,
-      :fields => fields,
-      :stack => :side,
-      :scale_integers => true,
-      :show_data_values => true,
-      :rotate_y_labels => false,
-      :graph_title => l(:label_commits_per_author),
-      :show_graph_title => true
+        :height => 400,
+        :width => 600,
+        :fields => fields,
+        :stack => :side,
+        :scale_integers => true,
+        :show_data_values => true,
+        :rotate_y_labels => false,
+        :graph_title => l(:label_commits_per_author),
+        :show_graph_title => true
     )
     graph.add_data(
-      :data => commits_data,
-      :title => l(:label_revision_plural)
+        :data => commits_data,
+        :title => l(:label_revision_plural)
     )
     graph.add_data(
-      :data => changes_data,
-      :title => l(:label_change_plural)
+        :data => changes_data,
+        :title => l(:label_change_plural)
     )
     graph.burn
   end
@@ -637,7 +618,7 @@ update
     @date_from = @date_to << 12
     @date_from = Date.civil(@date_from.year, @date_from.month,  @date_from.day)
     commits_by_author = Changeset.count(:all, :group => :committer,
-                                         :conditions => ["#{Changeset.table_name}.repository_id = ? AND #{Changeset.table_name}.commit_date BETWEEN ? AND ?", repository.id, @date_from, @date_to])
+                                        :conditions => ["#{Changeset.table_name}.repository_id = ? AND #{Changeset.table_name}.commit_date BETWEEN ? AND ?", repository.id, @date_from, @date_to])
     commits_by_author = commits_by_author.to_a.sort! {|x, y| x.last <=> y.last}.last(25)
 
     fields = commits_by_author.collect {|r| r.first}
diff --git a/app/controllers/school_controller.rb b/app/controllers/school_controller.rb
index 062b0fa34..d20a58b75 100644
--- a/app/controllers/school_controller.rb
+++ b/app/controllers/school_controller.rb
@@ -5,14 +5,18 @@ class SchoolController < ApplicationController
   def upload
     uploaded_io = params[:logo]
     school_id ||= params[:id]
+    s1 = School.find(school_id)
     unless uploaded_io.nil? 
       File.open(Rails.root.join('public', 'images', 'school', school_id.to_s+'.png'), 'wb') do |file|
         file.write(uploaded_io.read)
       end
-      s1 = School.find(school_id)
+
       s1.logo_link  = '/images/school/'+school_id.to_s+'.png'
-      s1.save
+
     end
+    s1.name = params[:name] unless params[:name].blank?
+    s1.province = params[:province] unless params[:province].blank?
+    s1.save
     redirect_to admin_schools_url(:school_name => params[:school_name])
   end  
 
@@ -121,16 +125,18 @@ class SchoolController < ApplicationController
          end
     end
     if(condition == '')
-      @school = School.all
+      @school = School.page((params[:page].to_i || 1) - 1).per(100)
+      @school_count = School.count
     else
-      @school = School.where("name like '%#{chinese.join("")}%' and pinyin like '%#{pinyin.join("")}%'").all
+      @school = School.where("name like '%#{chinese.join("")}%' and pinyin like '%#{pinyin.join("")}%'").page((params[:page].to_i || 1) - 1).per(100)
+      @school_count = School.where("name like '%#{chinese.join("")}%' and pinyin like '%#{pinyin.join("")}%'").count
     end
 
     result = []
     # @school.each do |sc|
     #   result << {:value=>sc.name,:data=>sc.id}
     # end
-   render :json => @school.to_json
+   render :json =>{ :schools => @school,:count=>@school_count}.to_json
   end
 
   #添加学校
diff --git a/app/controllers/stores_controller.rb b/app/controllers/stores_controller.rb
index 85ea85241..0d1755294 100644
--- a/app/controllers/stores_controller.rb
+++ b/app/controllers/stores_controller.rb
@@ -84,7 +84,7 @@ class StoresController < ApplicationController
     respond_to do |format|
       format.xls {
         send_data(homework_to_xls(attachments), :type => "text/excel;charset=utf-8; header=present",
-                  :filename => "#{l(:label_file_lost_list)}.xls")
+                  :filename => filename_for_content_disposition("#{l(:label_file_lost_list)}.xls") )
       }
     end
   end
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index e5e1bf391..9ad46cd69 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -3,11 +3,11 @@ class StudentWorkController < ApplicationController
   include StudentWorkHelper
   require 'bigdecimal'
   require "base64"
-  before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test,:set_score_rule]
+  before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test,:set_score_rule,:forbidden_anonymous_comment]
   before_filter :find_work, :only => [:edit, :update, :show, :destroy, :add_score, :praise_student_work]
   before_filter :member_of_course, :only => [:index, :new, :create, :show, :add_score, :praise_student_work]
   before_filter :author_of_work, :only => [:edit, :update, :destroy]
-  before_filter :teacher_of_course, :only => [:student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :set_score_rule]
+  before_filter :teacher_of_course, :only => [:student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :set_score_rule, :forbidden_anonymous_comment]
 
   ### 
   def program_test
@@ -89,7 +89,9 @@ class StudentWorkController < ApplicationController
       else
         student_in_group = '(' + group_students.map{|user| user.id}.join(',')  + ')'
       end
-      if @is_teacher || @homework.homework_detail_manual.nil?   #老师 || 超级管理员 显示所有列表
+      #老师 || 超级管理员 || 禁用匿评&&作业截止&&已提交作品 显示所有列表
+      if @is_teacher || @homework.homework_detail_manual.nil? ||
+          (@homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)
         @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").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
         @show_all = true
       elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
@@ -108,8 +110,9 @@ 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?   #老师 || 超级管理员 显示所有列表
+      if @is_teacher || @homework.homework_detail_manual.nil? || (@homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)   #老师 || 超级管理员 显示所有列表
         @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
         @show_all = true
       elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
@@ -128,6 +131,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"
@@ -164,6 +168,7 @@ class StudentWorkController < ApplicationController
 
   def create
     if params[:student_work]
+      @submit_result = true
       student_work = StudentWork.find(params[:student_work_id]) if params[:student_work_id]
       student_work ||= StudentWork.new
       student_work.name = params[:student_work][:name]
@@ -179,7 +184,6 @@ class StudentWorkController < ApplicationController
       else
         student_work.late_penalty = 0
       end
-
       if student_work.save
         course_activity = CourseActivity.where("course_act_type='HomeworkCommon' and course_act_id =#{@homework.id}").first
         if course_activity
@@ -191,20 +195,16 @@ class StudentWorkController < ApplicationController
           user_activity.updated_at = Time.now
           user_activity.save
         end
+        @student_work = StudentWork.where(homework_common_id: @homework.id, user_id: User.current.id).first
         respond_to do |format|
-          format.html {
-            flash[:notice] = l(:notice_successful_create)
-            redirect_to student_work_index_url(:homework => @homework.id)
-          }
+          format.js
         end
         return
       end
     end
+    @submit_result = false
     respond_to do |format|
-      format.html {
-        flash[:notice] = l(:notice_failed_create)
-        redirect_to new_student_work_url(:homework => @homework.id)
-      }
+      format.js
     end
   end
 
@@ -221,24 +221,36 @@ class StudentWorkController < ApplicationController
 
   def update
     if params[:student_work]
+      @submit_result = true
       @work.name = params[:student_work][:name]
       @work.description = params[:student_work][:description]
       @work.project_id = params[:student_work][:project]
       @work.save_attachments(params[:attachments])
       render_attachment_warning_if_needed(@work)
       if @work.save
+=begin
         respond_to do |format|
           format.html {
             flash[:notice] = l(:notice_successful_edit)
             redirect_to student_work_index_url(:homework => @homework.id)
           }
+=end
+        @student_work = @work
+        respond_to do |format|
+          format.js
         end
         return
       end
     end
+=begin
     respond_to do |format|
       format.html{redirect_to edit_student_work_url(@work)}
     end
+=end
+    @submit_result = false
+    respond_to do |format|
+      format.js
+    end
   end
 
   def show
@@ -456,11 +468,36 @@ class StudentWorkController < ApplicationController
         student_work.save
       end
     end
-    respond_to do |format|
-      format.html{redirect_to student_work_index_url(:homework => @homework.id)}
+    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
 
+  def forbidden_anonymous_comment
+    @homework.update_column('anonymous_comment', 1)
+    homework_detail_manual = @homework.homework_detail_manual
+    homework_detail_programing = @homework.homework_detail_programing
+    if homework_detail_programing
+      homework_detail_manual.update_column('ta_proportion', 0.4)
+      homework_detail_programing.update_column('ta_proportion', 0.6)
+    else
+      homework_detail_manual.update_column('ta_proportion', 1.0)
+    end
+    @homework.student_works.each do |student_work|
+      set_final_score @homework,student_work
+      student_work.save
+    end
+    @user_activity_id = params[:user_activity_id].to_i
+    @is_in_course = params[:is_in_course].to_i
+    @course_activity = params[:course_activity].to_i
+  end
+
   private
   #获取作业
   def find_homework
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 7adba7cbf..0d9588d24 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -239,6 +239,46 @@ class UsersController < ApplicationController
     end
   end
 
+  #处理加入课程成为教辅教师的请求
+  #status 1 同意 2 拒绝
+  def dealwith_apply_request
+    @msg = CourseMessage.find(params[:msg_id])
+    #CourseMessage content存的是role  7教辅  9 教师
+    case params[:agree]
+      when 'Y'
+        apply_user = User.find(@msg.course_message_id)
+
+        if apply_user.member_of_course?(Course.find(@msg.course_id))
+          #将角色改为老师或者教辅
+          member =  Course.find(@msg.course_id).members.where(:user_id=>apply_user.id).all[0]
+          member.role_ids = [@msg.content] # msg content保存的是申请的职位角色
+          #删除为学生的记录
+          joined = StudentsForCourse.where('student_id = ? and course_id = ?', member.user_id,@msg.course_id)
+          joined.each do |join|
+            join.delete
+          end
+
+          member.course_group_id = 0
+          member.save
+          CourseMessage.create(:user_id => @msg.course_message_id, :course_id => @msg.course_id, :viewed => false,:content=> @msg.content,:course_message_id=>User.current.id,:content=>@msg.content,:course_message_type=>'CourseRequestDealResult',:status=>1)
+          @msg.update_attributes(:status=>1,:viewed=>1)
+        else
+          members = []
+          members << Member.new(:role_ids => [@msg.content.to_i], :user_id => @msg.course_message_id)
+          Course.find(@msg.course_id).members << members
+          CourseMessage.create(:user_id => @msg.course_message_id, :course_id => @msg.course_id, :viewed => false,:content=> @msg.content,:course_message_id=>User.current.id,:content=>@msg.content,:course_message_type=>'CourseRequestDealResult',:status=>1)
+          @msg.update_attributes(:status=>1,:viewed=>1)
+        end
+
+      when 'N'
+        CourseMessage.create(:user_id => @msg.course_message_id, :course_id => @msg.course_id, :viewed => false,:content=> @msg.content,:course_message_id=>User.current.id,:content=>@msg.content,:course_message_type=>'CourseRequestDealResult',:status=>2)
+        @msg.update_attributes(:status=>2,:viewed=>1)
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
 # added by bai
   def show_score
 
@@ -328,7 +368,21 @@ class UsersController < ApplicationController
     if User.current == @user
       @page = params[:page] ? params[:page].to_i + 1 : 0
       user_course_ids =  @user.courses.empty? ? "(-1)" :"(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
-      @homework_commons = HomeworkCommon.where("course_id in #{user_course_ids}").order("created_at desc").limit(10).offset(@page * 10)
+
+      #判断当前用户在当前课程的身份
+      visibleCourse = @user.courses.empty? ? [] : @user.courses.visible
+      homework_ids = []
+      visibleCourse.each do |course|
+        if User.current.allowed_to?(:as_teacher,course)
+          homeworks = HomeworkCommon.where("course_id = #{course.id}")
+          homework_ids << homeworks.pluck(:id) unless homeworks.empty?
+        else
+          homeworks = HomeworkCommon.where("course_id = #{course.id} and publish_time <= '#{Date.today}'")
+          homework_ids << homeworks.pluck(:id) unless homeworks.empty?
+        end
+      end
+      visible_homework_ids = homework_ids.size == 0 ? "(-1)" :"(" + homework_ids.join(",") + ")"
+      @homework_commons = HomeworkCommon.where("id in #{visible_homework_ids}").order("created_at desc").limit(10).offset(@page * 10)
       @is_teacher = User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)
       @is_in_course = params[:is_in_course].to_i || 0
       respond_to do |format|
@@ -453,8 +507,12 @@ class UsersController < ApplicationController
         homework = HomeworkCommon.new
         homework.name = params[:homework_common][:name]
         homework.description = params[:homework_common][:description]
-        homework.end_time = params[:homework_common][:end_time] || Time.now
-        homework.publish_time = Time.now
+        homework.end_time = params[:homework_common][:end_time] || Date.today
+        if params[:homework_common][:publish_time] == ""
+          homework.publish_time = Date.today
+        else
+          homework.publish_time = params[:homework_common][:publish_time]
+        end
         homework.homework_type = params[:homework_type].to_i || 1
         homework.late_penalty = 10
         homework.teacher_priority = 1
@@ -466,7 +524,11 @@ class UsersController < ApplicationController
 
         homework_detail_manual = HomeworkDetailManual.new
         homework_detail_manual.ta_proportion = homework.homework_type == 1 ? 0.6 : 0.3
-        homework_detail_manual.comment_status = 1
+        if homework.publish_time > Date.today
+          homework_detail_manual.comment_status = 0
+        else
+          homework_detail_manual.comment_status = 1
+        end
         homework_detail_manual.evaluation_start = params[:evaluation_start].blank? ? homework.end_time + 7 : params[:evaluation_start]
         homework_detail_manual.evaluation_end = params[:evaluation_end].blank? ? homework_detail_manual.evaluation_start + 7 : params[:evaluation_end]
         homework_detail_manual.evaluation_num = params[:evaluation_num] || 3
@@ -878,6 +940,12 @@ class UsersController < ApplicationController
   end
 
   def show
+    #更新用户申请成为课程老师或教辅消息的状态
+    if params[:course_id] != nil
+      join_course_messages = CourseMessage.where("course_id =? and course_message_type =? and user_id =? and course_message_id =? and viewed =?",
+                                                 params[:course_id],  'JoinCourseRequest', User.current.id, @user.id, false)
+      join_course_messages.update_all(:viewed => true)
+    end
     @page = params[:page] ? params[:page].to_i + 1 : 0
     user_project_ids = @user.projects.visible.empty? ? "(-1)" : "(" + @user.projects.visible.map{|project| project.id}.join(",") + ")"
     user_course_ids = @user.courses.visible.empty? ? "(-1)" : "(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
@@ -903,10 +971,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/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index da6d48b8d..c0351c6da 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -82,14 +82,14 @@ class WikiController < ApplicationController
     @content = @page.content_for_version(params[:version])
     if User.current.allowed_to?(:export_wiki_pages, @project)
       if params[:format] == 'pdf'
-        send_data(wiki_page_to_pdf(@page, @project), :type => 'application/pdf', :filename => "#{@page.title}.pdf")
+        send_data(wiki_page_to_pdf(@page, @project), :type => 'application/pdf', :filename => filename_for_content_disposition("#{@page.title}.pdf") )
         return
       elsif params[:format] == 'html'
         export = render_to_string :action => 'export', :layout => false
-        send_data(export, :type => 'text/html', :filename => "#{@page.title}.html")
+        send_data(export, :type => 'text/html', :filename => filename_for_content_disposition("#{@page.title}.html"))
         return
       elsif params[:format] == 'txt'
-        send_data(@content.text, :type => 'text/plain', :filename => "#{@page.title}.txt")
+        send_data(@content.text, :type => 'text/plain', :filename => filename_for_content_disposition("#{@page.title}.txt") )
         return
       end
     end
@@ -286,7 +286,7 @@ class WikiController < ApplicationController
         send_data(export, :type => 'text/html', :filename => "wiki.html")
       }
       format.pdf {
-        send_data(wiki_pages_to_pdf(@pages, @project), :type => 'application/pdf', :filename => "#{@project.identifier}.pdf")
+        send_data(wiki_pages_to_pdf(@pages, @project), :type => 'application/pdf', :filename => filename_for_content_disposition("#{@project.identifier}.pdf") )
       }
     end
   end
diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb
index 6304055ed..6cc622c49 100644
--- a/app/controllers/words_controller.rb
+++ b/app/controllers/words_controller.rb
@@ -60,6 +60,11 @@ class WordsController < ApplicationController
         course_activity.updated_at = Time.now
         course_activity.save
       end
+      principal_activity = PrincipalActivity.where("principal_act_type='JournalsForMessage' and principal_act_id =#{parent_id}").first
+      if principal_activity
+        principal_activity.updated_at = Time.now
+        principal_activity.save
+      end
       user_activity = UserActivity.where("act_type='JournalsForMessage' and act_id =#{parent_id}").first
       if user_activity
         user_activity.updated_at = Time.now
@@ -243,7 +248,46 @@ class WordsController < ApplicationController
       flash[:error] = feedback.errors.full_messages[0]
       redirect_to course_feedback_url(params[:id])
     end
+  end
 
+  #作业的回复
+  def leave_homework_message
+    if User.current.logged?
+      @user = User.current
+      @homework_common = HomeworkCommon.find(params[:id]);
+      if params[:homework_message].size>0 && User.current.logged? && @user
+        feedback = HomeworkCommon.add_homework_jour(@user, params[:homework_message], params[:id])
+        if (feedback.errors.empty?)
+          if params[:asset_id]
+            ids = params[:asset_id].split(',')
+            update_kindeditor_assets_owner ids,feedback[:id],OwnerTypeHelper::JOURNALSFORMESSAGE
+          end
+
+          course_activity = CourseActivity.where("course_act_type='HomeworkCommon' and course_act_id =#{@homework_common.id}").first
+          if course_activity
+            course_activity.updated_at = Time.now
+            course_activity.save
+          end
+          user_activity = UserActivity.where("act_type='HomeworkCommon' and act_id =#{@homework_common.id}").first
+          if user_activity
+            user_activity.updated_at = Time.now
+            user_activity.save
+          end
+          respond_to do |format|
+            format.js{
+              @user_activity_id = params[:user_activity_id]
+              @is_in_course = params[:is_in_course]
+              @course_activity = params[:course_activity]
+              @homework_common_id = params[:homework_common_id]
+            }
+          end
+        else
+          flash[:error] = feedback.errors.full_messages[0]
+        end
+      end
+    else
+      render_403
+    end
   end
   
   def add_brief_introdution
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ce11bded8..e5cd9b52b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -609,6 +609,17 @@ module ApplicationHelper
     return @result
   end
 
+  # 判断版本库是否初始为gitlab
+  def rep_is_gitlab?(project)
+    rep = Repository.where("project_id =? and type =?", project, "Repository::Gitlab")
+    return rep.blank? ? true :false
+  end
+
+  # 获取单一gitlab项目
+  def gitlab_repository(project)
+    rep = Repository.where("project_id =? and type =?", project.id,"Repository::Gitlab" ).first
+  end
+
   # 判断当前用户是否为项目管理员
   def is_project_manager?(user_id, project_id)
     @result = false
@@ -2296,15 +2307,15 @@ module ApplicationHelper
   end
 
   #获取匿评相关连接代码
-  def homework_anonymous_comment homework
+  def homework_anonymous_comment (homework, is_in_course, user_activity_id = -1, course_activity = -1)
     if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
       link = link_to "启动匿评","javascript:void(0)", :class => "postOptionLink", :title => "作业截止日期之前不可以启动匿评"
     elsif homework.student_works.count >= 2 && homework.homework_detail_manual#作业份数大于2
       case homework.homework_detail_manual.comment_status
       when 1
-        link = link_to '启动匿评',  alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'postOptionLink'
+        link = link_to '启动匿评',  alert_anonymous_comment_homework_common_path(homework,:is_in_course=>is_in_course,:user_activity_id=>user_activity_id,:course_activity=>course_activity), id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'postOptionLink'
       when 2
-        link = link_to '关闭匿评', alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_stop_anonymous_comment", remote: true,:class => 'postOptionLink'
+        link = link_to '关闭匿评', alert_anonymous_comment_homework_common_path(homework,:is_in_course=>is_in_course,:user_activity_id=>user_activity_id,:course_activity=>course_activity), id: "#{homework.id}_stop_anonymous_comment", remote: true,:class => 'postOptionLink'
       when 3
         # link = link_to "匿评结束","javascript:void(0)", :class => "postOptionLink", :title => "匿评结束"
       end
@@ -2355,14 +2366,18 @@ 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 != 1 #匿评作业，且作业状态不是在开启匿评之前
+          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_type == 2 #编程作业不能修改作品
-            link_to "修改作品",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
+          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 && Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")#编程作业不能修改作品
+            link_to "修改作品(#{homework.student_works.count})", new_student_work_path(:homework => homework.id),:class => 'c_blue'
+          elsif Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
+            link_to "修改作品(#{homework.student_works.count})", edit_student_work_path(work.id),:class => 'c_blue'
           else
-            link_to "修改作品",  edit_student_work_path(work.id),:class => 'c_blue'
+            link_to "查看作品(#{homework.student_works.count})", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "作业截止后不可修改作品"
           end
         end
       end
diff --git a/app/helpers/blog_comments_helper.rb b/app/helpers/blog_comments_helper.rb
new file mode 100644
index 000000000..2b0c3e5bd
--- /dev/null
+++ b/app/helpers/blog_comments_helper.rb
@@ -0,0 +1,2 @@
+module BlogCommentsHelper
+end
diff --git a/app/helpers/blogs_helper.rb b/app/helpers/blogs_helper.rb
new file mode 100644
index 000000000..cc0dbd200
--- /dev/null
+++ b/app/helpers/blogs_helper.rb
@@ -0,0 +1,2 @@
+module BlogsHelper
+end
diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index f9fb31969..caca6fb1e 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -36,7 +36,7 @@ module CoursesHelper
   #生成课程老师成员链接
   def course_teacher_link teacher_num
     if User.current.member_of_course?(@course) || User.current.admin?
-      link_to "#{teacher_num}", course_member_path(@course, :role => 1), :class => 'info_foot_num c_blue'
+      link_to "#{teacher_num}", course_member_path(@course, :role => 1), :class => 'info_foot_num c_blue', :id => 'teacher_number'
     else
       content_tag 'span',teacher_num, :class => 'info_foot_num c_blue'
     end
@@ -45,7 +45,7 @@ module CoursesHelper
   #生成课程学生列表连接
   def course_student_link student_num
     if (User.current.logged? && @course.open_student == 1) || (User.current.member_of_course?(@course)) || User.current.admin?
-      link_to "#{student_num}", course_member_path(@course, :role => 2), :class => 'info_foot_num c_blue'
+      link_to "#{student_num}", course_member_path(@course, :role => 2), :class => 'info_foot_num c_blue', :id => "student_number"
     else
       content_tag 'span',student_num, :class => 'info_foot_num c_blue'
     end
@@ -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
 
   #加入课程、退出课程按钮
diff --git a/app/helpers/homework_common_helper.rb b/app/helpers/homework_common_helper.rb
index a03c4ccd7..2d3c72c20 100644
--- a/app/helpers/homework_common_helper.rb
+++ b/app/helpers/homework_common_helper.rb
@@ -57,12 +57,12 @@ module HomeworkCommonHelper
   end
 
   #根据传入作业确定跳转到开启匿评还是关闭匿评功能
-  def alert_anonyoms_path homework,homework_detail_manual
+  def alert_anonyoms_path homework,homework_detail_manual,user_activity_id,is_in_course,course_activity
     link = ""
     if homework_detail_manual.comment_status == 1
-      link = start_anonymous_comment_homework_common_url homework.id
+      link = start_anonymous_comment_homework_common_url homework.id,:user_activity_id=>user_activity_id,:is_in_course=>is_in_course,:course_activity=>course_activity
     elsif homework_detail_manual.comment_status == 2
-      link = stop_anonymous_comment_homework_common_url homework.id
+      link = stop_anonymous_comment_homework_common_url homework.id,:user_activity_id=>user_activity_id,:is_in_course=>is_in_course,:course_activity=>course_activity
     end
     link
   end
diff --git a/app/helpers/owner_type_helper.rb b/app/helpers/owner_type_helper.rb
index c03f2d19e..7119d4f60 100644
--- a/app/helpers/owner_type_helper.rb
+++ b/app/helpers/owner_type_helper.rb
@@ -7,4 +7,5 @@ module OwnerTypeHelper
   BID = 6
   JOURNALSFORMESSAGE = 7
   HOMEWORKCOMMON = 8
+  BLOGCOMMENT=9
 end
\ No newline at end of file
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 41f25d1a3..51d1846d8 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -117,6 +117,22 @@ module ProjectsHelper
     end
   end
 
+  # 获取新增gitlab版本库
+  def rep_gitlab(project)
+    rep = Repository.where("project_id =? and type =?", project, "Repository::Gitlab")
+  end
+
+  # 获取新项目的版本库地址
+  def rep_gitlab_url(project)
+    gitlab_address = Redmine::Configuration['gitlab_address']
+    url = gitlab_address.to_s+"/"+project.owner.to_s+"/"+ rep_gitlab(project).first.identifier+"."+"git"
+  end
+
+  #  # 获取Forge历史版本库
+  def rep_forge(project)
+    rep = Repository.where("project_id =? and type =?", project, "Repository::Git")
+  end
+
   # Added by young
   def course_settings_tabs
     tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural, :course=>'1'},
diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index 710b7488f..f32bef51b 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -25,6 +25,7 @@ module RepositoriesHelper
   end
   PROJECT_PATH_CUT =  40
   REPO_IP_ADDRESS = Setting.host_repository
+  REPO_GITLAB_ADDRESS = "git.trustie.net"
 
   def format_revision(revision)
     if revision.respond_to? :format_identifier
@@ -34,12 +35,21 @@ module RepositoriesHelper
     end
   end
 
+  def repository_creater rep
+    repository_creater = User.find_by_login(rep.login) unless rep.login.nil?
+  end
+
   def truncate_at_line_break(text, length = 255)
     if text
       text.gsub(%r{^(.{#{length}}[^\n]*)\n.+$}m, '\\1...')
     end
   end
 
+  def user_commit_rep(mail)
+    user = User.find_by_mail(mail)
+    user.nil? ? User.find(2) :  User.find_by_mail(mail)
+  end
+
   def render_properties(properties)
     unless properties.nil? || properties.empty?
       content = ''
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 0f728fc00..f7fb9b1aa 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -442,12 +442,7 @@ class Attachment < ActiveRecord::Base
 
 
   def self.attach_filesex(obj, attachments,attachment_type)
-    if obj.is_public?
-      public_status = true
-    else
-      public_status = false
-    end
-    result = obj.save_attachmentsex(attachments, User.current,attachment_type, public_status)
+    result = obj.save_attachmentsex(attachments, User.current,attachment_type)
     obj.attach_saved_attachments
     result
   end
diff --git a/app/models/blog.rb b/app/models/blog.rb
new file mode 100644
index 000000000..bd338cdad
--- /dev/null
+++ b/app/models/blog.rb
@@ -0,0 +1,16 @@
+class Blog < ActiveRecord::Base
+  # attr_accessible :title, :body
+  include Redmine::SafeAttributes
+  belongs_to :user
+  has_many :articles, :class_name => 'BlogComment', :conditions => "#{BlogComment.table_name}.parent_id IS NULL ", :order => "#{BlogComment.table_name}.created_on DESC"
+  has_many :blog_comments, :dependent => :destroy, :order => "#{BlogComment.table_name}.created_on DESC"
+  belongs_to :last_comment, :class_name => 'BlogComment', :foreign_key => :last_comment_id
+  acts_as_tree :dependent => :nullify
+  #acts_as_list :scope => '(user_id = #{user_id} AND parent_id #{user_id ? = "#{parent_id}" : "IS NULL"})'
+  acts_as_watchable
+
+  validates :name, presence: true, length: {maximum: 30}
+  validates :description,  length: {maximum: 255}
+
+  safe_attributes 'name', 'description'
+end
diff --git a/app/models/blog_comment.rb b/app/models/blog_comment.rb
new file mode 100644
index 000000000..27da33121
--- /dev/null
+++ b/app/models/blog_comment.rb
@@ -0,0 +1,59 @@
+class BlogComment < ActiveRecord::Base
+  # attr_accessible :title, :body
+  include Redmine::SafeAttributes
+  belongs_to :blog
+  belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
+
+  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
+  validates_length_of :title, :maximum => 255
+  #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
+
+  def project
+  end
+end
diff --git a/app/models/course.rb b/app/models/course.rb
index 46599dbfc..7288c3b3b 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -50,6 +50,8 @@ class Course < ActiveRecord::Base
   validates_format_of  :name,:with =>/^[^ ]+[a-zA-Z0-9_\u4e00-\u9fa5\s\S]+$/
   validates_length_of :description, :maximum => 10000
   before_save :self_validate
+  # 公开课程变成私有课程，所有资源都变成私有
+  after_update :update_files_public
   after_create :create_board_sync, :act_as_course_activity, :act_as_course_message
   before_destroy :delete_all_members
 
@@ -212,6 +214,14 @@ class Course < ActiveRecord::Base
   def self_validate
 
   end
+  
+  def update_files_public
+    unless self.is_public?
+      self.attachments.each do |a|
+        a.update_attributes(:is_public => false)
+      end
+    end
+  end
 
   # 创建课程讨论区
   def create_board_sync
diff --git a/app/models/course_message.rb b/app/models/course_message.rb
index 65e91141c..11b0165c5 100644
--- a/app/models/course_message.rb
+++ b/app/models/course_message.rb
@@ -18,8 +18,10 @@ class CourseMessage < ActiveRecord::Base
   after_create :add_user_message
 
   def add_user_message
-    if MessageAll.where("message_type = '#{self.class.to_s}' and message_id = '#{self.id}'").first.nil?
-      self.message_alls << MessageAll.new(:user_id => self.user_id)
-    end
+    #unless self.course_message_type == 'JoinCourseRequest'
+      if MessageAll.where("message_type = '#{self.class.to_s}' and message_id = '#{self.id}'").first.nil?
+        self.message_alls << MessageAll.new(:user_id => self.user_id)
+      end
+    #end
   end
 end
diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb
index 796080645..8d421a98f 100644
--- a/app/models/homework_common.rb
+++ b/app/models/homework_common.rb
@@ -12,6 +12,7 @@ class HomeworkCommon < ActiveRecord::Base
   has_many :homework_tests, :dependent => :destroy
   has_many :student_works, :dependent => :destroy, :conditions => "is_test=0"
   has_many :student_works_evaluation_distributions, :through => :student_works #一个作业的分配的匿评列表
+  has_many :journals_for_messages, :as => :jour, :dependent => :destroy
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy #用户活动
   # 课程动态
   has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy
@@ -22,7 +23,8 @@ class HomeworkCommon < ActiveRecord::Base
                 :description => :description,
                 :author => :author,
                 :url => Proc.new {|o| {:controller => 'student_work', :action => 'index', :homework => o.id}}
-  after_create :act_as_activity, :send_mail, :act_as_course_activity, :act_as_course_message
+  after_create :act_as_activity, :send_mail, :act_as_course_message
+  after_save :act_as_course_activity
   after_destroy :delete_kindeditor_assets
 
   def act_as_activity
@@ -32,17 +34,27 @@ class HomeworkCommon < ActiveRecord::Base
   #课程动态公共表记录
   def act_as_course_activity
     if self.course
-      self.course_acts << CourseActivity.new(:user_id => self.user_id,:course_id => self.course_id)
+      if self.homework_detail_manual.comment_status == 0
+        self.course_acts.destroy_all
+      else
+        if self.course_acts.size == 0
+          self.course_acts << CourseActivity.new(:user_id => self.user_id,:course_id => self.course_id)
+        end
+      end
     end
   end
 
   #课程作业消息记录
   def act_as_course_message
     if self.course
-      self.course.members.each do |m|
-        # if m.user_id != self.user_id
+      if self.homework_detail_manual.comment_status == 0
+        self.course_messages.destroy_all
+      else
+        self.course.members.each do |m|
+          # if m.user_id != self.user_id
           self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.course_id, :viewed => false)
-        # end
+          # end
+        end
       end
     end
   end
@@ -53,13 +65,27 @@ class HomeworkCommon < ActiveRecord::Base
   end
 
   def send_mail
-    Mailer.run.homework_added(self)
+    if self.homework_detail_manual.comment_status != 0
+      Mailer.run.homework_added(self)
+    end
   end
 
   def is_program_homework?
     self.homework_type == 2 && self.homework_detail_programing
   end
 
+  ###添加回复
+  def self.add_homework_jour(user, notes, id , options = {})
+    homework = HomeworkCommon.find(id)
+    if options.count == 0
+      jfm = homework.journals_for_messages.build(:user_id => user.id, :notes => notes, :reply_id => 0)
+    else
+      jfm = homework.journals_for_messages.build(options)
+    end
+    jfm.save
+    jfm
+  end
+
   delegate :language_name, :language, :to => :homework_detail_programing
 
 end
diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb
index faab129a6..5e40267cb 100644
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@@ -136,10 +136,8 @@ class JournalsForMessage < ActiveRecord::Base
 
   #用户动态公共表记录
   def act_as_principal_activity
-    if self.jour_type == 'Principal'
-      unless self.user_id == self.jour.id &&  self.user_id != self.reply_id && self.reply_id != 0
-        self.principal_acts << PrincipalActivity.new(:user_id => self.user_id, :principal_id => self.jour_id)
-      end
+    if self.jour_type == 'Principal' && self.m_parent_id.nil?
+      self.principal_acts << PrincipalActivity.new(:user_id => self.user_id, :principal_id => self.jour_id)
     end
   end
 
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index d797f1ce1..8891e6552 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -1009,6 +1009,16 @@ class Mailer < ActionMailer::Base
     end
   end
 
+  def join_course_request(course, user, role)
+    @receive = User.find(course.tea_id)
+    @course = course
+    @user = user
+    @role = role
+    @subject = "#{@user.show_name} #{l(:label_apply_join_course)} #{@course.name} "
+    mail :to => @receive.mail,
+         :subject => @subject
+  end
+
 
 
   private
@@ -1066,4 +1076,5 @@ class Mailer < ActionMailer::Base
     1.upto(len) { |i| newpass << chars[rand(chars.size-1)] }
     return newpass
   end
+
 end
diff --git a/app/models/member.rb b/app/models/member.rb
index 655c79895..ed7ee81e6 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -34,6 +34,7 @@ class Member < ActiveRecord::Base
   after_destroy :delete_ivite_list
 
 
+
   def role
   end
 
diff --git a/app/models/member_role.rb b/app/models/member_role.rb
index 67122a636..4d493cb27 100644
--- a/app/models/member_role.rb
+++ b/app/models/member_role.rb
@@ -35,8 +35,11 @@ class MemberRole < ActiveRecord::Base
     !inherited_from.nil?
   end
 
+  include Trustie::Gitlab::ManageMember
+
   private
 
+
   def remove_member_if_empty
     if member.roles.empty?
       member.destroy
diff --git a/app/models/memo.rb b/app/models/memo.rb
index 33b24db50..7c4fbdcf1 100644
--- a/app/models/memo.rb
+++ b/app/models/memo.rb
@@ -9,7 +9,7 @@ class Memo < ActiveRecord::Base
 	# 若是主题帖，则内容可以是空
 	#validates :content, presence: true, if: Proc.new{|o| !o.parent_id.nil? }
 	validates_length_of :subject, maximum: 50
-	validates_length_of :content, maximum: 5000
+	validates_length_of :content, maximum: 30000
 	validate :cannot_reply_to_locked_topic, :on => :create
 
 	acts_as_tree :counter_cache => :replies_count, :order => "#{Memo.table_name}.created_at ASC"
diff --git a/app/models/project.rb b/app/models/project.rb
index fcc96c404..fd1012fa0 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -770,7 +770,8 @@ class Project < ActiveRecord::Base
     'project_type',
     'dts_test',
     'attachmenttype',
-    'enterprise_name'
+    'enterprise_name',
+    'gpid'
      
 
 
@@ -853,6 +854,10 @@ class Project < ActiveRecord::Base
     end
   end
 
+  def owner
+    User.find(self.user_id)
+  end
+
   private
 
   def after_parent_changed(parent_was)
@@ -1167,5 +1172,7 @@ class Project < ActiveRecord::Base
                       :forge_act_id => self.id,:forge_act_type => "ProjectCreateInfo")
    fa.save!
  end
+
+
 end
 
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 5680f05a7..94b7905c6 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -57,6 +57,11 @@ class Repository < ActiveRecord::Base
   safe_attributes 'url',
     :if => lambda {|repository, user| repository.new_record?}
 
+
+  def gitlab?
+    self.type == 'Repository::Gitlab'
+  end
+
   def repo_create_validation
     unless Setting.enabled_scm.include?(self.class.name.demodulize)
       errors.add(:type, :invalid)
diff --git a/app/models/repository/gitlab.rb b/app/models/repository/gitlab.rb
new file mode 100644
index 000000000..5ec725660
--- /dev/null
+++ b/app/models/repository/gitlab.rb
@@ -0,0 +1,259 @@
+#coding=utf-8
+
+require 'redmine/scm/adapters/git_adapter'
+
+class Repository::Gitlab < Repository
+  
+  attr_protected :root_url
+  validates_presence_of :url
+
+  def self.human_attribute_name(attribute_key_name, *args)
+    attr_name = attribute_key_name.to_s
+    if attr_name == "url"
+      attr_name = "path_to_repository"
+    end
+    super(attr_name, *args)
+  end
+
+  def self.scm_adapter_class
+    Redmine::Scm::Adapters::GitlabAdapter
+  end
+
+  def self.scm_name
+    'Gitlab'
+  end
+
+  def commits(authors, start_date, end_date, branch='master')
+    scm.commits(authors, start_date, end_date,branch).map {|commit|
+      [commit[:author], commit[:num]]
+    }
+  end
+
+  def report_last_commit
+    extra_report_last_commit
+  end
+
+  def extra_report_last_commit
+    return false if extra_info.nil?
+    v = extra_info["extra_report_last_commit"]
+    return false if v.nil?
+    v.to_s != '0'
+  end
+
+  def supports_directory_revisions?
+    true
+  end
+
+  def supports_revision_graph?
+    true
+  end
+
+  def repo_log_encoding
+    'UTF-8'
+  end
+
+  # Returns the identifier for the given git changeset
+  def self.changeset_identifier(changeset)
+    changeset.scmid
+  end
+
+  # Returns the readable identifier for the given git changeset
+  def self.format_changeset_identifier(changeset)
+    changeset.revision[0, 8]
+  end
+
+  def branches
+    scm.branches
+  end
+
+  def tags
+    scm.tags
+  end
+
+  def default_branch
+    scm.default_branch
+  rescue Exception => e
+    logger.error "git: error during get default branch: #{e.message}"
+    nil
+  end
+
+  def find_changeset_by_name(name)
+    if name.present?
+      changesets.where(:revision => name.to_s).first ||
+        changesets.where('scmid LIKE ?', "#{name}%").first
+    end
+  end
+
+  def entries(path=nil, identifier=nil)
+    entries = scm.entries(path, identifier, :report_last_commit => extra_report_last_commit)
+    load_entries_changesets(entries)
+    entries
+  end
+
+  # With SCMs that have a sequential commit numbering,
+  # such as Subversion and Mercurial,
+  # Redmine is able to be clever and only fetch changesets
+  # going forward from the most recent one it knows about.
+  #
+  # However, Git does not have a sequential commit numbering.
+  #
+  # In order to fetch only new adding revisions,
+  # Redmine needs to save "heads".
+  #
+  # In Git and Mercurial, revisions are not in date order.
+  # Redmine Mercurial fixed issues.
+  #    * Redmine Takes Too Long On Large Mercurial Repository
+  #      http://www.redmine.org/issues/3449
+  #    * Sorting for changesets might go wrong on Mercurial repos
+  #      http://www.redmine.org/issues/3567
+  #
+  # Database revision column is text, so Redmine can not sort by revision.
+  # Mercurial has revision number, and revision number guarantees revision order.
+  # Redmine Mercurial model stored revisions ordered by database id to database.
+  # So, Redmine Mercurial model can use correct ordering revisions.
+  #
+  # Redmine Mercurial adapter uses "hg log -r 0:tip --limit 10"
+  # to get limited revisions from old to new.
+  # But, Git 1.7.3.4 does not support --reverse with -n or --skip.
+  #
+  # The repository can still be fully reloaded by calling #clear_changesets
+  # before fetching changesets (eg. for offline resync)
+  def fetch_changesets
+    scm_brs = branches
+    return if scm_brs.nil? || scm_brs.empty?
+
+    h1 = extra_info || {}
+    h  = h1.dup
+    repo_heads = scm_brs.map{ |br| br.scmid }
+    h["heads"] ||= []
+    prev_db_heads = h["heads"].dup
+    if prev_db_heads.empty?
+      prev_db_heads += heads_from_branches_hash
+    end
+    return if prev_db_heads.sort == repo_heads.sort
+
+    h["db_consistent"]  ||= {}
+    if changesets.count == 0
+      h["db_consistent"]["ordering"] = 1
+      merge_extra_info(h)
+      self.save
+    elsif ! h["db_consistent"].has_key?("ordering")
+      h["db_consistent"]["ordering"] = 0
+      merge_extra_info(h)
+      self.save
+    end
+    save_revisions(prev_db_heads, repo_heads)
+  end
+
+  def save_revisions(prev_db_heads, repo_heads)
+    h = {}
+    opts = {}
+    opts[:reverse]  = true
+    opts[:excludes] = prev_db_heads
+    opts[:includes] = repo_heads
+
+    revisions = scm.revisions('', nil, nil, opts)
+    return if revisions.blank?
+
+    # Make the search for existing revisions in the database in a more sufficient manner
+    #
+    # Git branch is the reference to the specific revision.
+    # Git can *delete* remote branch and *re-push* branch.
+    #
+    #  $ git push remote :branch
+    #  $ git push remote branch
+    #
+    # After deleting branch, revisions remain in repository until "git gc".
+    # On git 1.7.2.3, default pruning date is 2 weeks.
+    # So, "git log --not deleted_branch_head_revision" return code is 0.
+    #
+    # After re-pushing branch, "git log" returns revisions which are saved in database.
+    # So, Redmine needs to scan revisions and database every time.
+    #
+    # This is replacing the one-after-one queries.
+    # Find all revisions, that are in the database, and then remove them from the revision array.
+    # Then later we won't need any conditions for db existence.
+    # Query for several revisions at once, and remove them from the revisions array, if they are there.
+    # Do this in chunks, to avoid eventual memory problems (in case of tens of thousands of commits).
+    # If there are no revisions (because the original code's algorithm filtered them),
+    # then this part will be stepped over.
+    # We make queries, just if there is any revision.
+    limit = 100
+    offset = 0
+    revisions_copy = revisions.clone # revisions will change
+    while offset < revisions_copy.size
+      recent_changesets_slice = changesets.find(
+                                     :all,
+                                     :conditions => [
+                                        'scmid IN (?)',
+                                        revisions_copy.slice(offset, limit).map{|x| x.scmid}
+                                      ]
+                                    )
+      # Subtract revisions that redmine already knows about
+      recent_revisions = recent_changesets_slice.map{|c| c.scmid}
+      revisions.reject!{|r| recent_revisions.include?(r.scmid)}
+      offset += limit
+    end
+
+    revisions.each do |rev|
+      transaction do
+        # There is no search in the db for this revision, because above we ensured,
+        # that it's not in the db.
+        save_revision(rev)
+      end
+    end
+    h["heads"] = repo_heads.dup
+    merge_extra_info(h)
+    self.save
+  end
+  private :save_revisions
+
+  def save_revision(rev)
+    parents = (rev.parents || []).collect{|rp| find_changeset_by_name(rp)}.compact
+    changeset = Changeset.create(
+              :repository   => self,
+              :revision     => rev.identifier,
+              :scmid        => rev.scmid,
+              :committer    => rev.author,
+              :committed_on => rev.time,
+              :comments     => rev.message,
+              :parents      => parents
+              )
+    unless changeset.new_record?
+      rev.paths.each { |change| changeset.create_change(change) }
+    end
+    changeset
+  end
+  private :save_revision
+
+  def heads_from_branches_hash
+    h1 = extra_info || {}
+    h  = h1.dup
+    h["branches"] ||= {}
+    h['branches'].map{|br, hs| hs['last_scmid']}
+  end
+
+  def latest_changesets(path,rev,limit=10)
+    revisions = scm.revisions(path, nil, rev, :limit => limit, :all => false)
+    return [] if revisions.nil? || revisions.empty?
+
+    changesets.find(
+      :all,
+      :conditions => [
+        "scmid IN (?)",
+        revisions.map!{|c| c.scmid}
+      ]
+    )
+  end
+
+  def clear_extra_info_of_changesets
+    return if extra_info.nil?
+    v = extra_info["extra_report_last_commit"]
+    write_attribute(:extra_info, nil)
+    h = {}
+    h["extra_report_last_commit"] = v
+    merge_extra_info(h)
+    self.save
+  end
+  private :clear_extra_info_of_changesets
+end
diff --git a/app/models/role.rb b/app/models/role.rb
index f363b52bf..8bf5ebc05 100644
--- a/app/models/role.rb
+++ b/app/models/role.rb
@@ -77,6 +77,27 @@ class Role < ActiveRecord::Base
     self.givable[3..5]
   end
 
+  GUEST     = 10
+  REPORTER  = 20
+  DEVELOPER = 30
+  MASTER    = 40
+  OWNER     = 50
+  def to_gitlab_role
+    case self.position
+    when 1,2
+      GUEST
+    when 5
+      REPORTER
+    when 4
+      DEVELOPER
+    when 3
+      MASTER
+    else
+      GUEST
+    end
+  end
+
+
   # Copies attributes from another role, arg can be an id or a Role
   def copy_from(arg, options={})
     return unless arg.present?
diff --git a/app/models/user.rb b/app/models/user.rb
index d66785460..edc29c015 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -93,6 +93,7 @@ class User < Principal
   has_many :changesets, :dependent => :nullify
   has_one :preference, :dependent => :destroy, :class_name => 'UserPreference'
   has_one :rss_token, :class_name => 'Token', :conditions => "action='feeds'"
+  has_one :blog,  :class_name => 'Blog', :foreign_key => "author_id"
   has_one :api_token, :class_name => 'Token', :conditions => "action='api'"
   belongs_to :auth_source
   belongs_to :ucourse, :class_name => 'Course', :foreign_key => :id  #huang
@@ -217,6 +218,8 @@ class User < Principal
   # 更新邮箱用户或用户名的同事，同步更新邀请信息
   after_update :update_invite_list
 
+  include  Trustie::Gitlab::ManageUser
+
   scope :in_group, lambda {|group|
     group_id = group.is_a?(Group) ? group.id : group.to_i
     where("#{User.table_name}.id IN (SELECT gu.user_id FROM #{table_name_prefix}groups_users#{table_name_suffix} gu WHERE gu.group_id = ?)", group_id)
@@ -255,6 +258,18 @@ class User < Principal
     # count = self.journals_for_messages(:conditions => ["status=?  and is_readed = ? " ,1, 0]).count
   end
 
+  def blog
+    @blog = Blog.where("author_id =  #{self.id}").all[0]
+    if @blog.nil?
+      #如果某个user的blog不存在，那么就创建一条，并且跳转
+      @blog = Blog.create(:name=>(User.find(self.id).realname.blank? ? User.find(self.id).login : User.find(self.id).realname ),
+                                           :description=>'',
+                                           :author_id=>self.id)
+      @blog.save
+    end
+    @blog
+  end
+
   # 查询指派给我的缺陷记录
   def count_new_issue_assign_to
     self.issue_assigns
@@ -345,7 +360,7 @@ class User < Principal
     name
   end
   ## end
-
+  
   #added by nie
   def count_new_journal_reply
     count = self.journal_reply.count
@@ -1066,6 +1081,17 @@ class User < Principal
   end
 
 
+  private
+  def sync_gitlab_user
+    user = self
+    g = Gitlab.client
+    u = g.get("/users?search=#{user.mail}").first
+    unless u
+      u = g.create_user(user.mail, user.password, name: user.show_name, username: user.login, confirm: "true")
+      self.gid = u.id
+      puts "create user #{user.login}"
+    end
+  end
 
 end
 
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index c2944fed5..e566a8f46 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -15,11 +15,11 @@ class CoursesService
     page_no = params[:page] || 1
     if @school_id == "0" || @school_id.nil?
       @courses_all = Course.active.visible.
-        joins("LEFT JOIN #{CourseStatus.table_name} ON #{Course.table_name}.id = #{CourseStatus.table_name}.course_id")
+          joins("LEFT JOIN #{CourseStatus.table_name} ON #{Course.table_name}.id = #{CourseStatus.table_name}.course_id")
     else
       @courses_all = Course.active.visible.
-        joins("LEFT JOIN #{CourseStatus.table_name} ON #{Course.table_name}.id = #{CourseStatus.table_name}.course_id").
-        where("#{Course.table_name}.school_id = ?", @school_id)
+          joins("LEFT JOIN #{CourseStatus.table_name} ON #{Course.table_name}.id = #{CourseStatus.table_name}.course_id").
+          where("#{Course.table_name}.school_id = ?", @school_id)
     end
     @course_count = @courses_all.count
     @course_pages = Redmine::Pagination::Paginator.new @course_count, per_page_option,page_no
@@ -299,23 +299,73 @@ class CoursesService
   #@state == 3 您已经加入了课程
   #@state == 4 您加入的课程不存在
   #@state == 5 您还未登录
+  #@state == 6 申请成功，请等待审核完毕
+  #@state == 7 您已经发送过申请了，请耐心等待
+  #@state == 8 您已经是该课程的教师了
+  #@state == 9 您已经是该课程的教辅了
+  #@state == 10 您已经是该课程的管理员了
   #@state 其他 未知错误，请稍后再试
   def join_course params,current_user
     course = Course.find_by_id params[:object_id]
+
     @state = 10
     if course
       if course_endTime_timeout? course
         @state = 2
       else
-        if current_user.member_of_course?(course)
-          @state = 3
+        if current_user.member_of_course?(course) #如果已经是成员
+          member = course.members.where("user_id=#{current_user.id} and course_id=#{course.id}")[0]
+          roleName = member.roles[0].name if member
+          if params[:course_password] == course.password
+            #如果加入角色为学生 并且当前是学生
+            if params[:role] == "10" && roleName == "Student"
+              @state = 3
+              #如果加入的角色为老师，并且当前已经是老师
+            elsif params[:role] == "9" && roleName == "Teacher"
+              @state = 8
+              #如果加入的角色教辅并且当前为教辅
+            elsif params[:role] == "7" && roleName == "TeachingAsistant"
+              @state = 9
+            elsif roleName == "Manager"
+              @state = 10
+              #如果加入角色为教师或者教辅，并且当前是学生，或者是要成为教辅，当前不是教辅，或者要成为教师，当前不是教师。那么要发送请求
+            elsif (params[:role] != "10" && roleName == "Student") || (params[:role] == "7" && roleName != "TeachingAsistant" ) || (params[:role] == "9" && roleName != "Teacher" )
+              #如果已经发送过消息了，那么就要给个提示
+              if CourseMessage.where("course_message_type = 'JoinCourseRequest' and user_id = #{course.tea_id} and content = #{params[:role]} and course_message_id = #{User.current.id} and course_id = #{course.id} and status = 0 ").count != 0
+                @state = 7
+              else
+                Mailer.run.join_course_request(course, User.current, params[:role])
+                CourseMessage.create(:user_id => course.tea_id, :course_id => course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest',:status=>0)
+                @state = 6
+              end
+              #如果加入角色是学生，但是是当前课程的教师或者教辅
+            elsif params[:role] == "10" && roleName != "Student"
+              member.role_ids = [params[:role]]
+              member.save
+              StudentsForCourse.create(:student_id => current_user.id, :course_id => params[:object_id])
+              @state = 0
+            end
+          else
+            @state = 1
+          end
         else
           if params[:course_password] == course.password
-            members = []
-            members << Member.new(:role_ids => [10], :user_id => current_user.id)
-            course.members << members
-            StudentsForCourse.create(:student_id => current_user.id, :course_id => params[:object_id])
-            @state = 0
+            if params[:role] == "10" || params[:role] == nil
+              members = []
+              members << Member.new(:role_ids => [10], :user_id => current_user.id)
+              course.members << members
+              StudentsForCourse.create(:student_id => current_user.id, :course_id => params[:object_id])
+              @state = 0
+            else
+              #如果已经发送过消息了，那么就要给个提示
+              if CourseMessage.where("course_message_type = 'JoinCourseRequest' and user_id = #{course.tea_id} and content = #{params[:role]} and course_message_id = #{User.current.id} and course_id = #{course.id} and status = 0").count != 0
+                @state = 7
+              else
+                Mailer.run.join_course_request(course, User.current, params[:role])
+                CourseMessage.create(:user_id => course.tea_id, :course_id => course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest',:status=>0)
+                @state = 6
+              end
+            end
           else
             @state = 1
           end
@@ -335,11 +385,11 @@ class CoursesService
     if course.is_public != 0 || current_user.member_of_course?(course)
       bids = course.homework_commons.page(params[:page] || 1).per(20).order('created_at DESC')
       bids = bids.like(params[:name]) if params[:name].present?
-       homeworks = []
-       bids.each do |bid|
-         homeworks <<  show_homework_info(course,bid,current_user,is_course_teacher(current_user,course))
-       end
-       homeworks
+      homeworks = []
+      bids.each do |bid|
+        homeworks <<  show_homework_info(course,bid,current_user,is_course_teacher(current_user,course))
+      end
+      homeworks
     else
       raise '403'
     end
@@ -410,10 +460,10 @@ class CoursesService
       #每个作业中学生最后提交的作业
       homeworks = []
       course.homework_commons.each do |bid|
-         homework_attach = bid.student_works.order('updated_at DESC').first
-         unless homework_attach.nil?
-           homeworks << homework_attach
-         end
+        homework_attach = bid.student_works.order('updated_at DESC').first
+        unless homework_attach.nil?
+          homeworks << homework_attach
+        end
       end
       unless homeworks.count == 0
         homeworks.sort!{|order,newer| newer.updated_at <=> order.updated_at}
@@ -432,21 +482,21 @@ class CoursesService
     result
   end
 
-   # 课程课件
-   def course_attachments params
-     result = []
-     course = Course.find(params[:course_id])
-     attachments = course.attachments.order("created_on ")
-     if !params[:name].nil? && params[:name] != ""
-       attachments.each do |atta|
-         result << atta if atta.filename.include?(params[:name])
+  # 课程课件
+  def course_attachments params
+    result = []
+    course = Course.find(params[:course_id])
+    attachments = course.attachments.order("created_on ")
+    if !params[:name].nil? && params[:name] != ""
+      attachments.each do |atta|
+        result << atta if atta.filename.include?(params[:name])
 
-       end
-     else
-       result = attachments
-     end
-     result
-   end
+      end
+    else
+      result = attachments
+    end
+    result
+  end
 
   # 课程学生列表
   def course_members params
@@ -487,20 +537,20 @@ class CoursesService
   end
 
   def del_assitant_teacher params
-     member =  Member.where("user_id = ? and course_id = ?",params[:user_id],params[:course_id])
-     member.each do |m|
-       m.destroy
-     end
-     user_admin = CourseInfos.where("user_id = ? and course_id = ?",params[:user_id], params[:course_id])
-     if user_admin.size > 0
-       user_admin.each do |user|
-         user.destroy
-       end
-     end
-     joined = StudentsForCourse.where('student_id = ? and course_id = ?', params[:user_id],params[:course_id])
-     joined.each do |join|
-       join.delete
-     end
+    member =  Member.where("user_id = ? and course_id = ?",params[:user_id],params[:course_id])
+    member.each do |m|
+      m.destroy
+    end
+    user_admin = CourseInfos.where("user_id = ? and course_id = ?",params[:user_id], params[:course_id])
+    if user_admin.size > 0
+      user_admin.each do |user|
+        user.destroy
+      end
+    end
+    joined = StudentsForCourse.where('student_id = ? and course_id = ?', params[:user_id],params[:course_id])
+    joined.each do |join|
+      join.delete
+    end
   end
 
   def create_course_notice params ,current_user
@@ -569,11 +619,11 @@ class CoursesService
      :open_anonymous_evaluation => open_anonymous_evaluation,
      #:homework_for_anonymous_comments => homework_for_anonymous_comments,
      :created_on => bid.created_at,:deadline => bid.end_time,
-      :homework_notsubmit_num => bid.course.members.count - bid.student_works.count,
-      :homework_submit_num => bid.student_works.count,
-      :homework_status_student => get_homework_status( bid),:homework_status_teacher =>  homework_status_desc( bid),
-       :student_evaluation_part => get_evaluation_part( bid ,3),
-      :ta_evaluation_part => get_evaluation_part( bid ,2),:homework_anony_type => bid.homework_type == 1 && !bid.homework_detail_manual.nil?}
+     :homework_notsubmit_num => bid.course.members.count - bid.student_works.count,
+     :homework_submit_num => bid.student_works.count,
+     :homework_status_student => get_homework_status( bid),:homework_status_teacher =>  homework_status_desc( bid),
+     :student_evaluation_part => get_evaluation_part( bid ,3),
+     :ta_evaluation_part => get_evaluation_part( bid ,2),:homework_anony_type => bid.homework_type == 1 && !bid.homework_detail_manual.nil?}
 
   end
 
@@ -585,9 +635,9 @@ class CoursesService
     homework_count = bid.homeworks.count  #已提交的作业数量
     student_questions_count = bid.journals_for_messages.where('m_parent_id IS NULL').count
     description = bid.description
-                                          #if is_course_teacher(User.current, course) && @bid.open_anonymous_evaluation == 1 && @bid.homeworks.count >= 2
+    #if is_course_teacher(User.current, course) && @bid.open_anonymous_evaluation == 1 && @bid.homeworks.count >= 2
     state = bid.comment_status
-                                          #end
+    #end
     open_anonymous_evaluation = bid.open_anonymous_evaluation
     {:course_name => course.name,:id => bid.id, :course_teacher => author, :homework_times => many_times, :homework_name => name, :homework_count => homework_count,:student_questions_count => student_questions_count,
      :description => description, :homework_state => state,:open_anonymous_evaluation => open_anonymous_evaluation}
@@ -684,12 +734,12 @@ class CoursesService
         latest_course_dynamics << {:time => latest_news.first.created_on }
       end
       # 课程讨论区
-       latest_message = course.boards.first.topics.page(1).per(2)
-       unless latest_message.first.nil?
-         topic_count = course.boards.nil? ? 0 : course.boards.first.topics.count
-         topics = latest_message.all
-         latest_course_dynamics << {:time => latest_message.first.created_on}
-       end
+      latest_message = course.boards.first.topics.page(1).per(2)
+      unless latest_message.first.nil?
+        topic_count = course.boards.nil? ? 0 : course.boards.first.topics.count
+        topics = latest_message.all
+        latest_course_dynamics << {:time => latest_message.first.created_on}
+      end
       # 课程资源
       # latest_attachment = course.attachments.order("created_on desc").page(1).per(2)
       # unless latest_attachment.first.nil?
@@ -726,29 +776,29 @@ class CoursesService
       unless active_students.empty?
         latest_course_dynamics <<{:time=>"1970-01-01 0:0:0 +0800"}
       end
-        latest_course_dynamic = latest_course_dynamics.first
-        unless latest_course_dynamic.nil?
-          result << {:course_name => course.name,
-                     :current_user_is_member => current_user.member_of_course?(course),
-                     :current_user_is_teacher => is_course_teacher(current_user,course),
-                     :course_id => course.id,
-                     :course_img_url => url_to_avatar(course),
-                     :course_time => course.time,
-                     :course_term => course.term,
-                     :news_count => notices_count,
-                     :homework_count => homework_count,
-                     :topic_count => topic_count,
-                     :news => notices,
-                     :homeworks => homeworkss,
-                     :topics => topics,
-                     :better_students => better_students,
-                     :active_students => active_students,
-                     :message => "",
-                     :course_student_num=>course ? course.members.count : 0,
-                     #:time_from_now=> distance_of_time_in_words(Time.now, latest_course_dynamic[:time].to_time) << "前",
-                     :time_from_now=>time_from_now(latest_course_dynamic[:time].to_time), #.strftime('%Y-%m-%d %H:%M:%S').to_s,
-                     :time=>latest_course_dynamic[:time].to_time}
-        end
+      latest_course_dynamic = latest_course_dynamics.first
+      unless latest_course_dynamic.nil?
+        result << {:course_name => course.name,
+                   :current_user_is_member => current_user.member_of_course?(course),
+                   :current_user_is_teacher => is_course_teacher(current_user,course),
+                   :course_id => course.id,
+                   :course_img_url => url_to_avatar(course),
+                   :course_time => course.time,
+                   :course_term => course.term,
+                   :news_count => notices_count,
+                   :homework_count => homework_count,
+                   :topic_count => topic_count,
+                   :news => notices,
+                   :homeworks => homeworkss,
+                   :topics => topics,
+                   :better_students => better_students,
+                   :active_students => active_students,
+                   :message => "",
+                   :course_student_num=>course ? course.members.count : 0,
+                   #:time_from_now=> distance_of_time_in_words(Time.now, latest_course_dynamic[:time].to_time) << "前",
+                   :time_from_now=>time_from_now(latest_course_dynamic[:time].to_time), #.strftime('%Y-%m-%d %H:%M:%S').to_s,
+                   :time=>latest_course_dynamic[:time].to_time}
+      end
 
     end
     #返回数组集合
@@ -767,9 +817,9 @@ class CoursesService
       sql = "select users.*,ROUND(sum(student_works.final_score),2) score from student_works left outer join users on student_works.user_id = users.id" <<
           " where  homework_common_id in ( select id from homework_commons where homework_commons.course_id = #{params[:course_id]}) GROUP BY student_works.user_id ORDER BY score desc limit #{page*10},10"
       sql_count = " select count(distinct(student_works.user_id) ) " <<
-                 " from student_works left outer join users on student_works.user_id = users.id " <<
-                 " where homework_common_id in " <<
-                 " ( select id from homework_commons where homework_commons.course_id = #{params[:course_id]}) "
+          " from student_works left outer join users on student_works.user_id = users.id " <<
+          " where homework_common_id in " <<
+          " ( select id from homework_commons where homework_commons.course_id = #{params[:course_id]}) "
       max_size  =  ActiveRecord::Base.connection().select_value(sql_count)
       user_list = User.find_by_sql(sql)
     else
diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
index ed43f455a..b316aa406 100644
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@@ -86,6 +86,9 @@
     }
 
     function register(){
+        if($("#loginUpButton").hasClass('loginUpDisableButton')){
+            return;
+        }
         if($login_correct && $mail_correct && $passwd_correct &&  $passwd_comfirm_correct && $("#read_and_confirm").attr("checked") == 'checked'){
             $("#main_reg_form").submit();
         }else{
@@ -125,6 +128,11 @@
         });
 
         $mail.blur(function (event) {
+            if (/^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/.test(this.value) == false){
+                $('#mail_req').html( '<span style="color: red">邮件格式不对</span>').show();
+                $mail_correct = false;
+                return ;
+            }
             if ($(this).is('#user_mail')) {
                 $.get('<%=account_valid_ajax_path%>',
                         { valid: "mail",
@@ -182,6 +190,16 @@
                 $('#main_login_form').submit();
             }
         }
+
+        function changeRegisterBtn(checkbox){
+            if(checkbox.checked == true){
+                $("#loginUpButton").removeClass('loginUpDisableButton');
+                $("#loginUpButton").addClass('loginUpButton');
+            }else{
+                $("#loginUpButton").removeClass('loginUpButton')
+                $("#loginUpButton").addClass('loginUpDisableButton');
+            }
+        }
 </script>
 <div class="loginContentContainer">
   <div class="loginContent">
@@ -270,11 +288,11 @@
           </div>
               <div class="loginSignOption">
                 <div class="fl mt3 mr5">
-                  <input type="checkbox" id="read_and_confirm"/>
+                  <input type="checkbox" id="read_and_confirm" onchange="changeRegisterBtn(this);"/>
                 </div>
                 我已阅读并接受<a href="<%= agreement_path %>" class="newsBlue"><u>Trustie服务协议</u></a>条款</div>
-          <div class="loginUpButton">
-            <a href="javascript:void(0);" class="c_white db" id="regist_btn" onclick="register();">注册</a>
+          <div class="loginUpDisableButton" id="loginUpButton">
+            <a href="javascript:void(0);" class="c_white db" id="regist_btn" onclick="register();" >注册</a>
 
           </div>
           <% end %>
diff --git a/app/views/blog_comments/_attachments_links.html.erb b/app/views/blog_comments/_attachments_links.html.erb
new file mode 100644
index 000000000..ca0f41d16
--- /dev/null
+++ b/app/views/blog_comments/_attachments_links.html.erb
@@ -0,0 +1,41 @@
+<div class="mt10 fl" style="width: 600px">
+  <% for attachment in attachments %>
+      <!--<p style="width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">-->
+          <!--<div style="max-width:55%;white-space: nowrap; overflow: hidden;  text-overflow: ellipsis;float: left;">-->
+      <!--<span title="<%#= attachment.filename%>" id = "attachment_">-->
+        <% if options[:length] %>
+            <span class="pic_files fl "></span>
+          <%= link_to_short_attachment attachment, :class => 'fl FilesName02', :download => true,:length => options[:length] -%>
+         <a class="fl FilesName02"> (<%= number_to_human_size attachment.filesize , :precision => 0 %>)</a>
+          <% if options[:deletable] %>
+              <%#= link_to image_tag('delete.png'), attachment_path(attachment),
+                          :data => {:confirm => l(:text_are_you_sure)},
+                          :method => :delete,
+                          :class => 'delete',
+                          #:remote => true,
+                          #:id => "attachments_" + attachment.id.to_s,
+                          :title => l(:button_delete) %>
+              <span class="pic_del fl ">  <a href="<%=attachment_path(attachment) %>" onclick="confirm(<%=l(:text_are_you_sure) %>)" data-method="delete">   </a></span>
+          <% end %>
+            <div class="cl"></div>
+        <% else %>
+            <span class="pic_files fl "></span>
+          <%= link_to_short_attachment attachment, :class => 'fl FilesName02', :download => true, :length => 45 -%>
+          <a  href="javascript:void(0);" class="fl FilesName02"> (<%= number_to_human_size attachment.filesize , :precision => 0 %>)</a>
+          <% if options[:deletable] %>
+              <a href="<%=attachment_path(attachment) %>" onclick="confirm(<%=l(:text_are_you_sure) %>)" data-method="delete">  <span class="pic_del fl "></span> </a>
+          <% end %>
+            <div class="cl"></div>
+        <% end %>
+  <% end %>
+  <% if defined?(thumbnails) && thumbnails %>
+      <% images = attachments.select(&:thumbnailable?) %>
+      <% if images.any? %>
+          <div class="pro_pic mb10" width="100" height="73">
+            <% images.each do |attachment| %>
+                <div><%= thumbnail_tag(attachment) %></div>
+            <% end %>
+          </div>
+      <% end %>
+  <% end %>
+</div>
diff --git a/app/views/blog_comments/_blog_attachments.erb b/app/views/blog_comments/_blog_attachments.erb
new file mode 100644
index 000000000..48fe91099
--- /dev/null
+++ b/app/views/blog_comments/_blog_attachments.erb
@@ -0,0 +1,78 @@
+<style type="text/css">
+    input.is_public,input.is_public_checkbox{height:12px;}
+    input.is_public_checkbox{margin-left:4px;margin-right:4px;}
+</style>
+<div class="fl">
+<span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
+<% if defined?(container) && container && container.saved_attachments %>
+  <% container.attachments.each_with_index do |attachment, i| %>
+    <span id="attachments_p<%= i %>" class="attachment">
+      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly => 'readonly') %><%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style => "display: inline-block;") %><span class="ispublic-label"><%= l(:field_is_public) %>:</span>
+      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, attachment.is_public == 1 ? true : false, :class => 'is_public') %>
+      <%= if attachment.id.nil?
+            #待补充代码
+          else
+            link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload')
+          end
+      %>
+      <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
+
+      <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
+    </span>
+    <div class="cl"></div>
+  <% end %>
+      <% container.saved_attachments.each_with_index do |attachment, i| %>
+    <span id="attachments_p<%= i %>" class="attachment">
+      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly => 'readonly') %>
+      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style => "display: inline-block;") %>
+      <span class="ispublic-label"><%= l(:field_is_public) %>:</span>
+      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, attachment.is_public == 1 ? true : false, :class => 'is_public') %>
+      <%= if attachment.id.nil?
+            #待补充代码
+          else
+            link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload')
+          end
+      %>
+      <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
+
+      <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
+    </span>
+    <div class="cl"></div>
+  <% end %>
+<% end %>
+</span>
+  <div class="cl"></div>
+  <span class="add_attachment" style="font-weight:normal;">
+    <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
+    <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
+    <%#= button_tag "文件浏览", :type=>"button", :onclick=>"$('#_file').click();",:onmouseover => 'this.focus()',:class => 'sub_btn' %>
+    <a href="javascript:void(0);" onclick="_file.click();" class="AnnexBtn fl mr15">上传附件</a>
+    <%= file_field_tag 'attachments[dummy][file]',
+                       :id => '_file',
+                       :class => 'file_selector',
+                       :multiple => true,
+                       :onchange => 'addInputFiles(this);',
+                       :style => ie8? ? '' : 'display:none',
+                       :data => {
+                               :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
+                               :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
+                               :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+                               :upload_path => uploads_path(:format => 'js', :project => container),
+                               :description_placeholder => l(:label_optional_description),
+                               :field_is_public => l(:field_is_public),
+                               :are_you_sure => l(:text_are_you_sure),
+                               :file_count => l(:label_file_count),
+                               :delete_all_files => l(:text_are_you_sure_all)
+                       } %>
+    <span id="upload_file_count">
+      <%= l(:label_no_file_uploaded) %>
+    </span>
+    (<%= l(:label_max_size) %>:
+    <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
+</span>
+
+  <% content_for :header_tags do %>
+      <%= javascript_include_tag 'attachments' %>
+  <% end %>
+</div>
+
diff --git a/app/views/blog_comments/_edit.html.erb b/app/views/blog_comments/_edit.html.erb
new file mode 100644
index 000000000..d56557ce7
--- /dev/null
+++ b/app/views/blog_comments/_edit.html.erb
@@ -0,0 +1,53 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' ,'blog' %>
+<div class="resources mt10">
+  <div id="new_course_topic">
+    <div class="homepagePostBrief c_grey">
+      <div>
+        <input  type="text" value="<%= article.title%>" name="blog_comment[title]" id="message_subject" class="InputBox  w713" style="width: 720px !important;" maxlength="255"  onkeyup="regexTopicSubject();" placeholder="发布文章，请先输入文章标题" " />
+        <p id="subjectmsg"></p>
+      </div>
+      <div id="topic_editor" style="display: block;">
+        <%if User.current.id == user.id%>
+            <div class="mt10">
+              <%= f.check_box :sticky%>
+              <%= label_tag 'message_sticky', l(:label_board_sticky) %>
+              <%= f.check_box :locked%>
+              <%= label_tag 'message_locked', l(:label_board_locked) %>
+              <div class="cl"></div>
+            </div>
+        <% end %>
+        <div class="mt10">
+          <div id="message_quote" class="wiki" style="width: 92%;word-break: break-all;word-wrap: break-word;margin-left: 40px;"></div>
+          <%= text_area :quote,:quote,:style => 'display:none' %>
+          <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+
+          <%= f.kindeditor :content,:editor_id => 'message_content_editor',
+                           :owner_id => article.nil? ? 0: article.id,
+                           :owner_type => OwnerTypeHelper::BLOGCOMMENT,
+                           :width => '100%',
+                           :height => 300,
+                           :minHeight=>300,
+                           :class => 'talk_text fl',
+                           :input_html => { :id => 'message_content',
+                                            :class => 'talk_text fl',
+                                            :maxlength => 5000 }%>
+          <div class="cl"></div>
+          <p id="message_content_span"></p>
+        </div>
+        <div class="cl"></div>
+        <div class="mt10">
+          <div class="fl" id="topic_attachments">
+            <%= render :partial => 'blog_comments/blog_attachments', :locals => {:container => article} %>
+          </div>
+        </div>
+        <div class="cl"></div>
+        <div class="mt5">
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_article();">确定</a>
+          <span class="fr mr10 mt3">或</span>
+          <a href="<%= user_blog_blog_comment_path(:user_id=>article.author.id,:blog_id=>article.blog_id,:id=>article.id)%>" class="fr mr10 mt3" >取消</a>
+        </div>
+        <div class="cl"></div>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/blog_comments/_new.html.erb b/app/views/blog_comments/_new.html.erb
new file mode 100644
index 000000000..2a2281a40
--- /dev/null
+++ b/app/views/blog_comments/_new.html.erb
@@ -0,0 +1,62 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' ,'blog' %>
+<div class="resources mt10">
+  <div id="new_course_topic">
+    <div class="homepagePostBrief c_grey">
+      <div>
+        <input  type="text" name="blog_comment[title]" id="message_subject" class="InputBox  w713" style="width: 720px !important;" maxlength="255" onfocus="$('#topic_editor').show()" onkeyup="regexTopicSubject();" placeholder="发布文章，请先输入文章标题" " >
+        <p id="subjectmsg"></p>
+      </div>
+      <div id="topic_editor" style="display: none;">
+        <%if User.current.id == user.id%>
+            <div class="mt10">
+              <%= f.check_box :sticky%>
+              <%= label_tag 'message_sticky', l(:label_board_sticky) %>
+              <%= f.check_box :locked%>
+              <%= label_tag 'message_locked', l(:label_board_locked) %>
+              <div class="cl"></div>
+            </div>
+        <% end %>
+        <div class="mt10">
+          <div id="message_quote" class="wiki" style="width: 92%;word-break: break-all;word-wrap: break-word;margin-left: 40px;"></div>
+          <%= text_area :quote,:quote,:style => 'display:none' %>
+          <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+
+          <%= f.kindeditor :content, :editor_id => 'message_content_editor',
+                           :owner_id => article.nil? ? 0: article.id,
+                           :owner_type => OwnerTypeHelper::BLOGCOMMENT,
+                           :width => '100%',
+                           :height => 300,
+                           :minHeight=>300,
+                           :class => 'talk_text fl',
+                           :input_html => { :id => 'message_content',
+                                            :class => 'talk_text fl',
+                                            :maxlength => 5000 }%>
+          <div class="cl"></div>
+          <p id="message_content_span"></p>
+        </div>
+        <div class="cl"></div>
+        <div class="mt10">
+          <div class="fl" id="topic_attachments">
+            <%= render :partial => 'blog_comments/blog_attachments', :locals => {:container => article} %>
+          </div>
+        </div>
+        <div class="cl"></div>
+        <div class="mt5">
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_article();">确定</a>
+          <span class="fr mr10 mt3">或</span>
+          <a href="javascript:void(0);" class="fr mr10 mt3" onclick="reset_article();">取消</a>
+        </div>
+        <div class="cl"></div>
+      </div>
+    </div>
+    <%#= render :partial => 'course_new_topic', :locals => {:f => f,  :topic => @message} %>
+    <!--<li>
+      <div class="ml55 fl" nhname="toolbar_container"></div>
+      <a href="javascript:void(0);"  nhname="cancelbtn" class="grey_btn fr ml10"><%#= l(:button_cancel) %></a>
+      <a href="javascript:void(0);" nhname="submitbtn" class="blue_btn fr " style="margin-left: 55px">
+        <%#= l(:button_submit)%>
+      </a>
+      <div class="cl"></div>
+    </li>-->
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/blog_comments/_reply_form.html.erb b/app/views/blog_comments/_reply_form.html.erb
new file mode 100644
index 000000000..cc4c0e952
--- /dev/null
+++ b/app/views/blog_comments/_reply_form.html.erb
@@ -0,0 +1,35 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<li>
+  <div style="display: none ;" class="fl"><label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label></div>
+      <div style="display: none;"><%= f.text_field :title, { size: 60, id: "message_subject",:class=>"talk_input w585 fl" }.merge({ hidden: "hidden"}) %></div>
+
+  <div class="cl"></div>
+</li>
+<li class="ml60 mb5">
+  <div class="cl"></div>
+</li>
+<li>
+  <div id="message_quote" class="wiki" style="width: 92%;word-break: break-all;word-wrap: break-word;margin-left: 40px;"></div>
+  <!--<label class="fl" >
+    <span class="c_red">*</span>&nbsp;
+    <%#= l(:field_description) %>&nbsp;&nbsp;：
+  </label>-->
+  <%= text_area :quote,:quote,:style => 'display:none' %>
+  <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+         <input type="hidden" name="blog_comment[title]" value="RE:<%= article.title%>">
+        <input type="hidden" name="blog_comment[sticky]" value="0">
+        <input type="hidden" name="blog_comment[locked]" value="0">
+      <%= f.kindeditor :content, :editor_id => 'message_content_editor',
+                       :width => '99%',
+                       :height => 100,
+                       :minHeight=>100,
+                       :input_html => { :id => 'message_content',
+                                        :class => 'talk_text fl',
+                                        :maxlength => 5000 }%>
+  <div class="cl"></div>
+  <p id="message_content_span"></p>
+</li>
+<div class="cl"></div>
+<li >
+  <div class="cl"></div>
+</li>
diff --git a/app/views/blog_comments/_simple_ke_reply_form.html.erb b/app/views/blog_comments/_simple_ke_reply_form.html.erb
new file mode 100644
index 000000000..61669058b
--- /dev/null
+++ b/app/views/blog_comments/_simple_ke_reply_form.html.erb
@@ -0,0 +1,34 @@
+<style type="text/css">
+    /*回复框*/
+    .ReplyToMessageInputContainer .ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
+    .ReplyToMessageInputContainer .ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
+    .ReplyToMessageInputContainer .ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
+    .ReplyToMessageInputContainer .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
+    .ReplyToMessageInputContainer .ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
+    .ReplyToMessageInputContainer .ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
+    .ReplyToMessageInputContainer .ke-outline{border:none;}
+    .ReplyToMessageInputContainer .ke-inline-block{display: none;}
+    .ReplyToMessageInputContainer .ke-container{float:left;}
+</style>
+
+<div class="ReplyToMessageContainer borderBottomNone"id="reply_to_message_<%= reply.id%>">
+  <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
+  <div class="ReplyToMessageInputContainer mb10">
+    <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 id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
+          <div class="cl"></div>
+          <p nhname='contentmsg_<%= reply.id%>'></p>
+      <% end%>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <div class="cl"></div>
+</div>
\ No newline at end of file
diff --git a/app/views/blog_comments/edit.html.erb b/app/views/blog_comments/edit.html.erb
new file mode 100644
index 000000000..a878063db
--- /dev/null
+++ b/app/views/blog_comments/edit.html.erb
@@ -0,0 +1,6 @@
+<% if User.current.logged? && User.current.id == @user.id %>
+    <%= form_for @article, :url =>{:controller=>'blog_comments',:action => 'update',:user_id=>@user.id , :blog_id => @article.id},:method=>'PUT',
+                          :html => {:nhname=>'form',:multipart => true, :id => 'message-form'} do |f| %>
+        <%= render :partial => 'blog_comments/edit', :locals => {:f => f, :article => @article, :edit_mode => true, :user => @user} %>
+    <% end %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/blog_comments/quote.js.erb b/app/views/blog_comments/quote.js.erb
new file mode 100644
index 000000000..088b2cf67
--- /dev/null
+++ b/app/views/blog_comments/quote.js.erb
@@ -0,0 +1,10 @@
+if($("#reply_message_<%= @blogComment.id%>").length > 0) {
+    $("#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) %>");
+        init_activity_KindEditor_data(<%= @blogComment.id%>,null,"85%");
+    });
+}else if($("#reply_to_message_<%= @blogComment.id%>").length >0) {
+    $("#reply_to_message_<%= @blogComment.id%>").replaceWith("<p id='reply_message_<%= @blogComment.id%>'></p>");
+}
\ No newline at end of file
diff --git a/app/views/blog_comments/reply.js.erb b/app/views/blog_comments/reply.js.erb
new file mode 100644
index 000000000..1cb64b2b5
--- /dev/null
+++ b/app/views/blog_comments/reply.js.erb
@@ -0,0 +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}) %>");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+<% end %>
\ No newline at end of file
diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb
new file mode 100644
index 000000000..54c9541f2
--- /dev/null
+++ b/app/views/blog_comments/show.html.erb
@@ -0,0 +1,175 @@
+<%= 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%>" style="display: none">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <li>
+                    <%= link_to(
+                                l(:button_edit),
+                                {:action => 'edit', :id => @article.id},
+                                :class => 'postOptionLink'
+                        ) if User.current && User.current.id == @article.author.id %>
+                  </li>
+                  <li>
+                    <%= link_to(
+                                l(:button_delete),
+                                {:action => 'destroy', :id => @article.id},
+                                :method => :delete,
+                                :data => {:confirm => l(:text_are_you_sure)},
+                                :class => 'postOptionLink'
+                        ) if User.current && User.current.id == @article.author.id %>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+          </div>
+      <%end%>
+      <div class="postDetailTitle fl">
+        <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},
+                                  :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', :id => reply.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| %>
+                <%= render :partial => 'blog_comments/reply_form', :locals => {:f => f,:user=>@user,:article=>@article} %>
+                <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'message_content_editor.html("");', :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>
\ No newline at end of file
diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb
new file mode 100644
index 000000000..33a3201c0
--- /dev/null
+++ b/app/views/blogs/_article.html.erb
@@ -0,0 +1,172 @@
+<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">
+      <% 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 %>
+            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
+        <% end %>
+        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" %>
+        <% else %>
+            <%= link_to activity.title.subject.to_s.html_safe, user_blog_blog_comment_path(:user_id=>activity.author_id, :blog_id=>activity.blog.id,:id=>activity), :class=> "postGrey"%>
+        <% end %>
+      </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 class="homepagePostDate">
+        发帖时间：<%= format_time(activity.created_on) %>
+      </div>
+
+      <div class="homepagePostIntro break_word upload_img list_style" id="activity_description_<%= user_activity_id%>">
+        <% if activity.parent_id.nil? %>
+            <%= activity.content.to_s.html_safe%>
+        <% else %>
+            <%= activity.parent.content.to_s.html_safe%>
+        <% end %>
+      </div>
+      <div class="cl"></div>
+      <div class=" fl" style="width: 600px">
+        <% if activity.attachments.any?%>
+            <% options = {:author => true, :deletable => false } %>
+            <%= render :partial => 'blog_comments/attachments_links', :locals => {:attachments => activity.attachments, :options => options, :is_float => true} %>
+        <% end %>
+      </div>
+      <div class="homepagePostSetting" id="act-<%= user_activity_id %>" style="visibility: hidden">
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <ul class="homepagePostSettiongText">
+              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <% count=0 %>
+  <% if activity.parent %>
+      <% count=activity.parent.children.count%>
+  <% else %>
+      <% count=activity.children.count%>
+  <% end %>
+  <div class="homepagePostReply">
+    <div class="topBorder" style="display: <%= count<=0 && !activity.locked ? '': '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>
+
+    <% activity= activity.parent ? activity.parent : activity%>
+    <% replies_all_i = 0 %>
+    <%  if count > 0 %>
+        <div class="" id="reply_div_<%= user_activity_id %>">
+          <ul>
+            <% activity.children.reorder("created_on desc").each do |reply|%>
+                <script type="text/javascript">
+                    $(function(){
+                        showNormalImage('reply_content_<%= reply.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(reply.author), :width => "33", :height => "33"), user_path(reply.author_id,:host=>Setting.host_user), :alt => "用户头像" %>
+                  </div>
+                  <div class="homepagePostReplyDes">
+                    <div class="homepagePostReplyPublisher mt-4">
+                      <% 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 %>
+                      <%= format_time(reply.created_on) %>
+                    </div>
+                    <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= reply.id %>">
+                      <%= reply.content.html_safe %>
+                    </div>
+                  </div>
+                  <div class="cl"></div>
+                </li>
+            <% end %>
+          </ul>
+        </div>
+    <% end %>
+
+    <% if !activity.locked?  %>
+        <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', :id => activity.id, :blog_id => activity.blog.id, :user_id => activity.author_id},:method => "post",:remote=>true) do |f|%>
+                  <input type="hidden" name="quote[quote]" value="">
+                  <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; margin-left: 5px; padding-top:3px;"></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 class="cl"></div>
+            </div>
+            <div class="cl"></div>
+          </div>
+          <div class="cl"></div>
+        </div>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/blogs/_article_list.html.erb b/app/views/blogs/_article_list.html.erb
new file mode 100644
index 000000000..e397da2cc
--- /dev/null
+++ b/app/views/blogs/_article_list.html.erb
@@ -0,0 +1,101 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor", '/assets/kindeditor/pasteimg', "init_activity_KindEditor" %>
+<style type="text/css">
+    /*回复框*/
+    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
+    .homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}
+    .homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}
+    .homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}
+    .homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}
+    .homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}
+    .homepagePostReplyInputContainer .ke-outline {border: none;}
+    .homepagePostReplyInputContainer .ke-inline-block {display: none;}
+    .homepagePostReplyInputContainer .ke-container {float: left;}
+</style>
+<script type="text/javascript">
+    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#Container").css("width","1000px");
+    });
+    function reset_article(){
+        $("#message_subject").val("");
+        $("#subjectmsg").text("");
+        document.getElementById("blog_comment_sticky").checked=false;
+        document.getElementById("blog_comment_locked").checked=false;
+        $("#topic_attachments").html("<%= escape_javascript(render :partial => 'blog_comments/blog_attachments', :locals => {:container => BlogComment.new})%>");
+        message_content_editor.html("");
+        $("#topic_editor").slideToggle();
+    }
+    <%# if @is_new%>
+//    $(function(){
+//        $("#message_subject").focus();
+//    });
+    <%#end%>
+</script>
+
+<div class="homepageRight mt0 ml10">
+  <div class="homepageRightBanner">
+    <div class="NewsBannerName">
+      <%= @user.name%>的博客
+    </div>
+  </div>
+  <% if User.current.logged? && User.current.id == @user.id %>
+      <%= labelled_form_for @article, :url =>{:controller=>'blog_comments',:action => 'create',:user_id=>user.id , :blog_id => blog.id},
+                            :html => {:nhname=>'form',:multipart => true, :id => 'message-form'} do |f| %>
+          <%= render :partial => 'blog_comments/new', :locals => {:f => f, :article => @article, :edit_mode => false, :user => @user} %>
+      <% end %>
+  <% end %>
+
+  <% if topics%>
+      <% topics.each do |topic| %>
+          <script>
+              function expand_reply(container, btnid) {
+                  var target = $(container);
+                  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 expand_reply_input(id) {
+                  $(id).toggle();
+              }
+
+              $(function () {
+                  init_activity_KindEditor_data(<%= topic.id%>, null, "87%");
+                  showNormalImage('activity_description_<%= topic.id %>');
+                  /*var description_images=$("div#activity_description_<%#= topic.id %>").find("img");
+                   if (description_images.length>0) {
+                   for (var i=0; i<description_images.length; i++){
+                   var image=$(description_images[i]);
+                   var element=$("<a></a>").attr("href",image.attr('src'));
+                   image.wrap(element);
+                   }
+                   }
+                   $('#activity_description_<%#= topic.id %> a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false});*/
+              });
+          </script>
+          <% if topic %>
+              <%= render :partial => 'blogs/article', :locals => {:activity => topic, :user_activity_id => topic.id} %>
+          <% end %>
+      <% end %>
+
+      <%# if topics.count == 10 %>
+          <!--<div id="show_more_course_topic" class="loadMore mt10 f_grey">展开更多<%#= link_to "", boards_topic_path(@board, :course_id => @board.course.id ,:page => page), :id => "more_topic_link", :remote => "true", :class => "none" %></div>-->
+      <%# end %>
+  <% end%>
+</div>
+
+<script type="text/javascript">
+    $("#show_more_course_topic").mouseover(function () {
+        $("#more_topic_link").click();
+    });
+</script>
diff --git a/app/views/blogs/index.html.erb b/app/views/blogs/index.html.erb
new file mode 100644
index 000000000..0e69d1654
--- /dev/null
+++ b/app/views/blogs/index.html.erb
@@ -0,0 +1,187 @@
+<style type="text/css">
+    div.talk_new .ke-container{margin-left:2px;}
+    .break_word {width:100%;}
+</style>
+<script type="text/javascript">
+    //头部导航
+    var menuids=["TopUserNav"] //Enter id(s) of SuckerTree UL menus, separated by commas
+    function buildsubmenus(){
+        for (var i=0; i<menuids.length; i++){
+            var div = document.getElementById(menuids[i]);
+            if(div == undefined)continue;
+            var ultags=div.getElementsByTagName("ul");
+            for (var t=0; t<ultags.length; t++){
+                ultags[t].parentNode.getElementsByTagName("a")[0].className="subfolderstyle";
+                ultags[t].parentNode.onmouseover=function(){
+                    this.getElementsByTagName("ul")[0].style.display="block";
+                }
+                ultags[t].parentNode.onmouseout=function(){
+                    this.getElementsByTagName("ul")[0].style.display="none";
+                }
+            }
+        }
+    }
+
+    if (window.addEventListener)
+        window.addEventListener("load", buildsubmenus, false)
+    else if (window.attachEvent)
+        window.attachEvent("onload", buildsubmenus)
+</script>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<%#= javascript_include_tag "/assets/kindeditor/kindeditor-min" %>
+
+
+<%= render :partial => 'blogs/article_list', :locals => {:blog=>@user.blog,:topics => @user.blog.articles.reorder("#{BlogComment.table_name}.sticky desc,#{BlogComment.table_name}.created_on desc"), :page => 0, :user => @user} %>
+
+
+<script type="text/javascript">//侧导航
+
+function nh_check_field(params){
+    var result=true;
+    if(params.subject!=undefined){
+        if($.trim(params.subject.val()) == ""){
+            params.subjectmsg.html('主题不能为空');
+            params.subjectmsg.css({color:'#ff0000'});
+            result=false;
+        }else{
+            params.subjectmsg.html('填写正确');
+            params.subjectmsg.css({color:'#008000'});
+        }
+        params.subjectmsg.show();
+    }
+
+    if(params.content!=undefined){
+        if(params.content.isEmpty()){
+            result=false;
+        }
+        if(params.content.html()!=params.textarea.html() || params.issubmit==true){
+            params.textarea.html(params.content.html());
+            params.content.sync();                           //用上面那句ie11提交到服务器居然木有值
+            if(params.content.isEmpty()){
+                params.contentmsg.html('内容不能为空');
+                params.contentmsg.css({color:'#ff0000'});
+            }else{
+                params.contentmsg.html('填写正确');
+                params.contentmsg.css({color:'#008000'});
+            }
+            params.contentmsg.show();
+        }
+    }
+
+    return result;
+}
+function nh_init_board(params){
+    //发帖/编辑/回复按钮的click
+    params.showbtn.click(function(){
+        params.textarea.removeAttr('placeholder');
+        if(params.textarea.data('init') == undefined){
+            //初始化编辑器
+            var editor = params.kindutil.create(params.textarea, {
+//                allowPreviewEmoticons : false,
+//                allowImageUpload : false,
+                autoHeightMode : true,
+                resizeType : 1,minWidth:"1px",width:"560px",height:"150px",
+                allowFileManager:true,uploadJson:"/kindeditor/upload",
+                fileManagerJson:"/kindeditor/filemanager",
+                afterChange:function(){//按键事件
+                    nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
+//                    var edit = this.edit;
+//                    var body = edit.doc.body;
+//                    edit.iframe.height(minHeight);
+//                    this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight) + 30, minHeight));
+                },
+                afterCreate:function(){
+                    this.loadPlugin("autoheight");
+                    var userAgent = navigator.userAgent.toLowerCase();
+                    if(/trident/.test(userAgent)){
+                        $("div.talk_new .ke-container").css({'margin-left':'0px'});
+                    }
+//                    var toolbar = $("div[class='ke-toolbar']",params.about_talk);
+//                    $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
+//                    params.toolbar_container.append(toolbar);
+                }
+            }).loadPlugin('paste');
+
+            //主题输入框按键事件
+            params.inputsubject.keyup(function(){
+                nh_check_field({subject:params.inputsubject,subjectmsg:params.subjectmsg});
+            })
+            //表单提交
+            params.form.submit(function(){
+                var is_checked = nh_check_field({
+                    issubmit:true,
+                    subject:params.inputsubject,
+                    subjectmsg:params.subjectmsg,
+                    content:editor,
+                    contentmsg:params.contentmsg,
+                    textarea:params.textarea
+                });
+                if(is_checked){
+                    //return true 居然不提交 fuck your sister
+                    $(this)[0].submit();
+//                    return true;
+                }
+                return false;
+            });
+            //提交按钮click
+            params.submitbtn.click(function(){
+                params.form.submit();
+            });
+            //取消按钮click
+            params.cancelbtn.click(function(){
+                params.about_talk.toggle();//显示/隐藏编辑区
+                if(params.about_talk.is(':hidden')){//隐藏时reset表单数据
+                    params.form[0].reset();
+                    if(params.type=='reply'){
+                        params.textarea.empty();
+                    }else{
+                        params.textarea.html(params.init_content_val.val());
+                    }
+                    var str = params.textarea.html();
+                    str=str.replace(new RegExp(/&lt;/g),'<');
+                    str=str.replace(new RegExp(/&gt;/g),'>');
+                    editor.html(str);
+                    params.subjectmsg.hide();
+                    params.contentmsg.hide();
+                    if(params.quote_show!=undefined)params.quote_show.empty();
+                    if(params.quote_input!=undefined)params.quote_input.empty();
+                }else{
+                    if(params.type=='reply'){
+                        params.textarea.show();
+                        params.textarea.focus();
+                        params.textarea.hide();
+                        //params.jumphref.attr('href','#'+params.form.attr('id'));
+                        //params.jumphref[0].click();
+                    }else{
+                        params.textarea.show();
+                        params.textarea.focus();
+                        params.textarea.hide();
+//                      params.inputsubject.focus();
+                    }
+                }
+            });
+            params.textarea.data('init','1');//标记为已经初始化
+        }
+        params.cancelbtn.click();//显示/隐藏编辑区
+    });
+    if(params.type == 'reply'){
+        params.showbtn_child.click(function(){
+            if(params.textarea.data('init') == undefined){
+                params.showbtn.click();
+            }else{
+                params.cancelbtn.click();
+                if(params.about_talk.is(':hidden')){
+                    params.cancelbtn.click();
+                }
+            }
+            var parent_topic_id =  $(this).data('topic-id');
+            if(parent_topic_id!=undefined)$("input[name='parent_topic']",params.form).val(parent_topic_id);
+            var ref_str = params.get_ref_str_call($(this));
+            params.quote_show.html(ref_str);
+            params.quote_input.html(ref_str);
+        });
+    }
+}
+
+
+</script>
diff --git a/app/views/blogs/show.html.erb b/app/views/blogs/show.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/boards/_course_message_edit.html.erb b/app/views/boards/_course_message_edit.html.erb
index 16807afb0..caa389945 100644
--- a/app/views/boards/_course_message_edit.html.erb
+++ b/app/views/boards/_course_message_edit.html.erb
@@ -12,5 +12,5 @@
     </div>
   </div>
   <%= render :partial => 'boards/course_new',
-             :locals => {:f => f, :edit_mode => edit_mode, :topic => topic} %>
+             :locals => {:f => f, :edit_mode => edit_mode, :topic => topic, :course => course} %>
 </div>
\ No newline at end of file
diff --git a/app/views/comments/create.js.erb b/app/views/comments/create.js.erb
index 7892ed773..ea904a63f 100644
--- a/app/views/comments/create.js.erb
+++ b/app/views/comments/create.js.erb
@@ -1,3 +1,3 @@
-$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
 
 init_activity_KindEditor_data('<%= @user_activity_id%>',"","87%");
diff --git a/app/views/common/_file.html.erb b/app/views/common/_file.html.erb
index d4c0875c2..97443beea 100644
--- a/app/views/common/_file.html.erb
+++ b/app/views/common/_file.html.erb
@@ -8,7 +8,7 @@
       <a href="#L<%= line_num %>" style="padding-top: 0px;"><%= line_num %></a>
     </th>
     <td class="line-code">
-      <pre style="width:880px;word-wrap: break-word; word-break: normal; "><%= line.html_safe %></pre>
+      <pre style="width:auto;white-space: nowrap; "><%= line.html_safe %></pre>
     </td>
   </tr>
   <% line_num += 1 %>
diff --git a/app/views/courses/_course_activity.html.erb b/app/views/courses/_course_activity.html.erb
index aa99236df..a54e0667e 100644
--- a/app/views/courses/_course_activity.html.erb
+++ b/app/views/courses/_course_activity.html.erb
@@ -68,20 +68,31 @@
                 }
             }
 
-            function expand_reply_input(id) {
-                $(id).toggle();
-            }
-
             $(function () {
                 init_activity_KindEditor_data(<%= activity.id%>, null, "87%");
                 showNormalImage('activity_description_<%= activity.id %>');
+                if($("#intro_content_<%= activity.id %>").height() > 360) {
+                    $("#intro_content_show_<%= activity.id %>").show();
+                }
+                $("#intro_content_show_<%= activity.id %>").click(function(){
+                    $("#activity_description_<%= activity.id %>").toggleClass("maxh360");
+                    $("#activity_description_<%= activity.id%>").toggleClass("lh18");
+                    $("#intro_content_show_<%= activity.id %>").hide();
+                    $("#intro_content_hide_<%= activity.id %>").show();
+                });
+                $("#intro_content_hide_<%= activity.id %>").click(function(){
+                    $("#activity_description_<%= activity.id %>").toggleClass("maxh360");
+                    $("#activity_description_<%= activity.id%>").toggleClass("lh18");
+                    $("#intro_content_hide_<%= activity.id %>").hide();
+                    $("#intro_content_show_<%= activity.id %>").show();
+                });
             });
         </script>
             <% if activity && activity.course_act%>
                 <% act = activity.course_act %>
                 <% case activity.course_act_type.to_s %>
                 <% when 'HomeworkCommon' %>
-                    <%= render :partial => 'users/course_homework', :locals => {:activity => act, :user_activity_id => activity.id} %>
+                    <%= render :partial => 'users/course_homework', :locals => {:activity => act, :user_activity_id => activity.id, :course_activity => 1} %>
                 <% when 'News' %>
                     <%= render :partial => 'users/course_news', :locals => {:activity => act, :user_activity_id => activity.id} %>
                 <% when 'Message' %>
diff --git a/app/views/courses/_course_outlines_list.html.erb b/app/views/courses/_course_outlines_list.html.erb
new file mode 100644
index 000000000..42ce30113
--- /dev/null
+++ b/app/views/courses/_course_outlines_list.html.erb
@@ -0,0 +1,32 @@
+
+<div class="f16 fontBlue fb fl">请选择课程大纲</div>
+  <!--<div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose"></a></div>-->
+  <div class="fl">
+    <div 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="">-->
+    </div>
+  </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 %>
+    <input name="is_in_show_outline_page" value="<%= show_page %>" type="hidden" />
+  <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="if($('input[name=outline_id]:radio:checked').length != 0 ) { $(this).parent().parent().submit(); }else{ return false;}">确定</a></div>
+    <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a></div>
+  </div>
+  <div class="cl"></div>
+<% end %>
diff --git a/app/views/courses/_join_private_course.html.erb b/app/views/courses/_join_private_course.html.erb
index 8e1e1c421..873144afe 100644
--- a/app/views/courses/_join_private_course.html.erb
+++ b/app/views/courses/_join_private_course.html.erb
@@ -4,33 +4,33 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>快速进入课程通道</title>
   <style>
-      body{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
-      div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margin:0; padding:0;}
-      div,img,tr,td{ border:0;}
-      table,tr,td{border:0; cellspacing:0; cellpadding:0;}
-      ul,li{ list-style-type:none}
-      .cl{ clear:both; overflow:hidden; }
-      a{ text-decoration:none; }
-      a:hover{}
+      #popbox{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
+      #popbox div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margin:0; padding:0;}
+      #popbox div,img,tr,td{ border:0;}
+      #popbox table,tr,td{border:0; cellspacing:0; cellpadding:0;}
+      #popbox ul,li{ list-style-type:none}
+      #popbox .cl{ clear:both; overflow:hidden; }
+      #popbox a{ text-decoration:none; }
+      #popbox a:hover{}
 
       .alert_box {width:488px;height:550px;position:fixed;z-index:1002;left:50%;top:40%;margin:-215px 0 0 -300px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81; padding:5px; overflow:auto; }
       #popbox{width:488px;height:368px;}
       .alert .C{width:476px;height:296px;position:absolute;left:5px;top:5px;  }
-      .C_top{ margin-top:20px; width:368px; height:100px; background:#e9e9e9; padding:0px 60px; }
-      .C_top h2{ color:#1c1d1d; font-size:24px; font-style:normal; font-weight:normal;}
-      .C_top p{ color:#a9aaaa; line-height:22px;}
-      .C_form{ margin:20px 0 0 60px;}
-      .C_form ul li{ font-size:14px; color:#3f3a39; line-height:30px; }
-      .C_form ul li input{ margin-left:20px; border:0px; border:1px solid #e1e1e1; color:#898989; padding-left:5px; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; padding: 0 !important; }
-      .C_form ul li.mB5{ color:#898989; font-size:12px; padding-left:97px;}
-      .width190{ width:190px; height:26px; border-color:#e1e1e1;}
-      .C_form a{ font-size:12px; color:#15bccf; float:left; display:block; height:40px; width:200px;  margin-top:25px;}
-      .C_form a:hover{ text-decoration:underline;}
-      .C_form a.btn_join{ display:block; width:100px; height:36px; padding-top:4px; text-align: center; background:#269ac9; color:#fff; font-size:14px; margin:20px 20px 0 95px;}
-      .C_form a.btn_join:hover{ background:#297fb8; text-decoration: none;}
-      .C_form a.btn_cancel{ display:block; width:100px; height:36px; padding-top:4px; text-align: center; background:#c1c1c1; color:#fff; font-size:14px; margin:20px 20px 0 95px;}
-      .C_form a.btn_cancel:hover{ background:#717171; text-decoration: none;}
-      .IDType {border:1px solid #e1e1e1; outline: none; width: 65px; height: 25px;}
+      #popbox .C_top{ margin-top:20px; width:368px; height:100px; background:#e9e9e9; padding:0px 60px; }
+      #popbox .C_top h2{ color:#1c1d1d; font-size:24px; font-style:normal; font-weight:normal;}
+      #popbox .C_top p{ color:#a9aaaa; line-height:22px;}
+      #popbox .C_form{ margin:20px 0 0 60px;}
+      #popbox .C_form ul li{ font-size:14px; color:#3f3a39; line-height:30px; }
+      #popbox .C_form ul li input{ margin-left:20px; border:0px; border:1px solid #e1e1e1; color:#898989; padding-left:5px; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; padding: 0 !important; }
+      #popbox .C_form ul li.mB5{ color:#898989; font-size:12px; padding-left:97px;}
+      #popbox .width190{ width:190px; height:26px; border-color:#e1e1e1;}
+      #popbox .C_form a{ font-size:12px; color:#15bccf; float:left; display:block; height:40px; width:200px;  margin-top:25px;}
+      #popbox .C_form a:hover{ text-decoration:underline;}
+      #popbox .C_form a.btn_join{ display:block; width:100px; height:36px; padding-top:4px; text-align: center; background:#269ac9; color:#fff; font-size:14px; margin:20px 20px 0 95px;}
+      #popbox .C_form a.btn_join:hover{ background:#297fb8; text-decoration: none;}
+      #popbox .C_form a.btn_cancel{ display:block; width:100px; height:36px; padding-top:4px; text-align: center; background:#c1c1c1; color:#fff; font-size:14px; margin:20px 20px 0 95px;}
+      #popbox .C_form a.btn_cancel:hover{ background:#717171; text-decoration: none;}
+      #popbox .IDType {border:1px solid #e1e1e1; outline: none; width: 65px; height: 25px;}
   </style>
   <script type="text/javascript">
       function submit_form(obj)
@@ -62,22 +62,29 @@
             <li>
               <input type="text" style="display: none"/> <!--阻止表单自动填充 -->
               <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
-              <span class="tips" style="width: 72px; display: inline-block;">课&nbsp;程&nbsp;ID：</span>
+              <span class="tips" style="width: 68px; display: inline-block;">课&nbsp;程&nbsp;ID：</span>
               <input class=" width190" name="object_id" id="object_id" type="text" value="" >
               <input type="text" style="display: none"/>
             </li>
             <li class="mB5">课程ID是所在课程网址中显示的序号</li>
             <li>
-              <span class="tips">密&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;码：</span>
+              <span class="tips" style="width: 68px; display: inline-block;">密&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;码：</span>
               <input class=" width190" type="password" name="course_password" id="course_password" value="" >
             </li>
             <li style="margin-top: 30px;">
               <span style="margin-right: 20px;">身&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;份：</span>
-              <select class="IDType">
-                <option>教师</option>
-                <option>教辅</option>
-                <option>学生</option>
-              </select>
+              <% if User.current.logged? && User.current.extensions &&  User.current.extensions.identity == 0%>
+                  <select name="role" class="IDType">
+                    <option value="9">教师</option>
+                    <option value="7">教辅</option>
+                    <option value="10">学生</option>
+                  </select>
+              <%else%>
+                  <select name="role" class="IDType">
+                    <option value="10">学生</option>
+                    <option value="7">教辅</option>
+                  </select>
+              <%end%>
             </li>
             <li>
               <a href="javascript:" class="btn_join" style="margin-left: 50px;" onclick="submit_form(this);">
diff --git a/app/views/courses/_set_join.js.erb b/app/views/courses/_set_join.js.erb
index 5476e7ff0..dbdf3d7f3 100644
--- a/app/views/courses/_set_join.js.erb
+++ b/app/views/courses/_set_join.js.erb
@@ -1,4 +1,4 @@
-<% if object_id%>
+<% if object_id && @state != 6%>
     $("#join_in_course_header").html("<%= escape_javascript(join_in_course_header(course, user)) %>");
 <% end %>
 <% if @state %>
@@ -18,7 +18,11 @@
         alert("您加入的课程不存在");
     <% elsif @state == 5 %>
         alert("您还未登录");
+    <% elsif @state == 6 %>
+        alert("申请成功，请等待审核")
     <% else %>
 		alert("未知错误，请稍后再试");
 	<% end %>
+<% else %>
+    location.reload();
 <% end %>
diff --git a/app/views/courses/_term_select.html.erb b/app/views/courses/_term_select.html.erb
new file mode 100644
index 000000000..e295e7c94
--- /dev/null
+++ b/app/views/courses/_term_select.html.erb
@@ -0,0 +1,41 @@
+<div id="popbox02">
+  <div class="ni_con">
+    <p class="f14 mt5 c_black">
+      当前课程的学期信息不能修改。如果您希望为本课程新建学期，请根据需要执行以下两种操作之一（目前复制学期正在改进中，将尽快上线）。选择前请参考按钮右侧的说明：
+    </p>
+    <div class="cl"></div>
+    <div class="mt15 grey_c lh22">
+      <a href="javascript:" class="term_btn fl" onclick="newTerm();">
+        新建学期
+      </a>
+      新建学期将为您创建一个新的课程学期，新学期不包括之前学期的任何内容。
+    </div>
+    <div class="cl"></div>
+    <div class="mt15 grey_c lh22">
+      <!--<a href="javascript:" class="term_btn fl" onclick="copyTerm();">
+        复制学期
+      </a>-->
+      <div class="disable_btn fl">
+        <span style="display: inline-block">复制学期</span>
+        <span style="display: inline-block">(开发中...)</span>
+      </div>
+      复制学期将为您创建一个新的课程学期，新学期将继承本学期的相关资源，具体您稍后可以选择。
+    </div>
+    <div class="cl"></div>
+    <div class="f12 mt15">
+        <a href="https://forge.trustie.net/forums/1/memos/1363" class="fl c_red">
+          如何复制之前学期的资源？
+        </a>
+        <a href="javascript:void(0)" class="fr exit" onclick="clickCanel();">退&nbsp;&nbsp;出</a>
+    </div>
+  </div>
+</div>
+
+<script type="text/javascript">
+    function newTerm(){
+        window.location.href = '<%= new_course_path(:host=> Setting.host_course)%>';
+    }
+    function copyTerm(){
+        window.location.href = '<%= copy_course_course_path(@course.id)%>';
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/courses/course_outline.js.erb b/app/views/courses/course_outline.js.erb
new file mode 100644
index 000000000..490361a24
--- /dev/null
+++ 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,:show_page=>@is_in_show_outline_page}) %>');
+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");
diff --git a/app/views/courses/join.js.erb b/app/views/courses/join.js.erb
new file mode 100644
index 000000000..8102098d5
--- /dev/null
+++ b/app/views/courses/join.js.erb
@@ -0,0 +1,42 @@
+<% if @object_id && @state != 6 && @state !=4 %>
+$("#join_in_course_header").html("<%= escape_javascript(join_in_course_header(@course, @user)) %>");
+<% end %>
+<% if @state %>
+<% if @state == 0 %>
+alert("加入成功");
+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 %>
+alert("密码错误");
+<% elsif @state == 2 %>
+alert("课程已过期\n请联系课程管理员重启课程。(在配置课程处)");
+<% elsif @state == 3 %>
+alert("您已经加入了课程");
+window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
+<% elsif @state == 4 %>
+alert("您加入的课程不存在");
+<% elsif @state == 5 %>
+alert("您还未登录");
+<% elsif @state == 6 %>
+alert("申请成功，请等待审核");
+hidden_join_course_form();
+<% elsif @state == 7%>
+  alert("您已经发送过申请了，请耐心等待");
+hidden_join_course_form();
+<% elsif @state == 8%>
+alert("您已经是该课程的教师了");
+hidden_join_course_form();
+window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
+<% elsif @state == 9%>
+alert("您已经是该课程的教辅了");
+hidden_join_course_form();
+window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
+<% elsif @state == 10%>
+alert("您已经是该课程的管理员了");
+hidden_join_course_form();
+window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
+<% else %>
+alert("未知错误，请稍后再试");
+<% end %>
+<% end %>
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/courses/set_course_outline.js.erb b/app/views/courses/set_course_outline.js.erb
new file mode 100644
index 000000000..e920005cd
--- /dev/null
+++ b/app/views/courses/set_course_outline.js.erb
@@ -0,0 +1,8 @@
+hideModal();
+<%if @course.tea_id == User.current.id && @course.outline == 0 %>
+<% else %>
+    $("#course_outline_bar").html('<a href="<%=syllabus_course_path(@course) %>" title="课程大纲" class="mr5 syllabusIcon fl"> </a>')
+<%end %>
+<%#if @is_in_show_outline_page && @is_in_show_outline_page == 'Y'%>
+    window.location.href='<%=syllabus_course_path(@course) %>';
+<%# end %>
diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb
index a462db79d..a90be14ea 100644
--- a/app/views/courses/settings.html.erb
+++ b/app/views/courses/settings.html.erb
@@ -36,8 +36,8 @@
           <div class="cl"></div>
           <li  class="ml45 mb10">
             <label><span class="c_red">*</span>&nbsp;<%= l(:label_course_term)%>&nbsp;&nbsp;：</label>
-            <%= select_tag :time,options_for_select(course_time_option(@course.time),@course.time), {}  %>
-            <%= select_tag :term,options_for_select(course_term_option,@course.term || cur_course_term),{}  %>
+            <%= select_tag :time,options_for_select(course_time_option(@course.time),@course.time), {:id=>"time_selected"}  %>
+            <%= select_tag :term,options_for_select(course_term_option,@course.term || cur_course_term),{:id=>"term_selected"}  %>
           </li>
           <div class="cl"></div>
           <li class="ml45 mb10">
@@ -92,4 +92,17 @@
     </div>
   </div><!---成员结束-->
 </div><!--talknew end-->
-<div class="cl"></div>
\ No newline at end of file
+<div class="cl"></div>
+<script type="text/javascript">
+  function select() {
+      $('#ajax-modal').html('<%= escape_javascript(render :partial => 'courses/term_select') %>');
+      showModal('ajax-modal', '500px');
+      $('#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","").css("left","");
+      $('#ajax-modal').parent().addClass("anonymos");
+  }
+  $("#time_selected").click(select);
+  $("#term_selected").click(select);
+</script>
\ No newline at end of file
diff --git a/app/views/courses/syllabus.html.erb b/app/views/courses/syllabus.html.erb
new file mode 100644
index 000000000..bb3421cba
--- /dev/null
+++ b/app/views/courses/syllabus.html.erb
@@ -0,0 +1,212 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor",'blog' %>
+<style type="text/css">
+    /*回复框*/
+    div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
+    span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
+    span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
+    div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
+    span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
+    span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
+    div.ke-toolbar .ke-outline{border:none;}
+    .ke-inline-block{display: none;}
+    div.ke-container{float:left;}
+</style>
+<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,"87%");
+        showNormalImage('message_description_<%= @article.id %>');
+    });
+</script>
+<div class="postRightContainer ml10" >
+  <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 User.current &&  @article.author.id == User.current.id%>
+          <div class="homepagePostSetting" id="message_setting_<%= @article.id%>" >
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <li>
+                    <a class="postOptionLink " onclick="course_outline('<%= @course.id%>','Y')" >重设大纲</a>
+                  </li>
+                  <li>
+                    <%= link_to(
+                                '取消大纲',
+                                {:controller => 'blog_comments',:action => 'destroy',:user_id=>BlogComment.find(@course.outline).author_id,:blog_id=>BlogComment.find(@course.outline).blog_id, :id => @course.outline,:course_id=>@course.id},
+                                :method => :delete,
+                                :data => {:confirm => '您确定要取消么？'},
+                                :class => 'postOptionLink'
+                        ) if User.current && User.current.id == @article.author.id %>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+          </div>
+          <!--<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>-->
+        <div class="homepagePostReplyContainer borderBottomNone minHeight48">
+          <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= @article.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@article.author_id), :alt => "用户头像" %></div>
+          <div class="homepagePostReplyInputContainer" style="margin-top: 8px">
+            <div nhname='new_message_<%= @article.id%>' style="display:none;">
+              <%= form_for 'blog_comment',:url =>  {:action => 'reply',:controller => 'blog_comments',:user_id=>@article.author.id,:blog_id=>@article.blog_id, :id => @article.id},:method => "post",:html => {:multipart => true, :id => 'message_form'} do |f|%>
+                  <input type="hidden" name="course_id" value="<%= @course.id%>"
+                <input type="hidden" name="blog_comment[title]" value="RE:<%= @article.title%>">
+                  <input type="hidden" name="blog_comment[sticky]" value="0">
+                  <input type="hidden" name="quote[quote]" value="">
+                  <input type="hidden" name="blog_comment[locked]" value="0">
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @article.id%>' name="blog_comment[content]"></textarea>
+                  <div nhname='toolbar_container_<%= @article.id%>' style="float:left; margin-left: 5px;"></div>
+                  <a id="new_message_submit_btn_<%= @article.id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
+                  <div class="cl"></div>
+                  <p nhname='contentmsg_<%= @article.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/files/_attachement_list.html.erb b/app/views/files/_attachement_list.html.erb
index 50d14b7ee..01e5dca5f 100644
--- a/app/views/files/_attachement_list.html.erb
+++ b/app/views/files/_attachement_list.html.erb
@@ -1,4 +1,54 @@
-<div>
+
+<% checkBox = (@course.present? && @course.is_public?) ? 'public' : 'private'%>
+<button name="button" class="sub_btn" onclick="_file.click()" onmouseover="this.focus()" style="<%= ie8? ? 'display:none' : ''%>" type="button" ><%= l(:label_browse) %></button>
+<% if @course %>
+    <%= file_field_tag 'attachments[dummy][file]',
+                       :id => '_file',
+                       :class => ie8? ? '':'file_selector',
+                       :multiple => true,
+                       :onchange => 'addInputFilesCourseSource(this,"'+ checkBox.to_s+'");',
+                       :style => ie8? ? '': 'display:none',
+                       :data => {
+                               :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
+                               :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
+                               :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+                               :upload_path => uploads_path(:format => 'js'),
+                               :description_placeholder => l(:label_optional_description),
+                               :field_is_public => l(:field_is_public),
+                               :are_you_sure => l(:text_are_you_sure),
+                               :file_count => l(:label_file_count),
+                               :delete_all_files => l(:text_are_you_sure_all)
+                       } %>
+<% else %>
+    <%= file_field_tag 'attachments[dummy][file]',
+                       :id => '_file',
+                       :class => ie8? ? '':'file_selector',
+                       :multiple => true,
+                       :onchange => 'addInputFiles(this);',
+                       :style => ie8? ? '': 'display:none',
+                       :data => {
+                               :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
+                               :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
+                               :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+                               :upload_path => uploads_path(:format => 'js'),
+                               :description_placeholder => l(:label_optional_description),
+                               :field_is_public => l(:field_is_public),
+                               :are_you_sure => l(:text_are_you_sure),
+                               :file_count => l(:label_file_count),
+                               :delete_all_files => l(:text_are_you_sure_all)
+                       } %>
+<% end %>
+
+<!--<input type="submit" name="" value="上传文件" class="f_l ml10" style="width:80px; height:26px;">-->
+
+  <span id="upload_file_count">
+      <%= l(:label_no_file_uploaded)%>
+    </span>
+  (<%= l(:label_max_size) %>:
+  <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
+<div class="cl">
+
+  <div>
         <span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
 <% if defined?(container) && container && container.saved_attachments %>
   <% container.attachments.each_with_index do |attachment, i| %>
@@ -20,30 +70,5 @@
   <% end %>
 <% end %>
 </span>
-</div>
-
-<button name="button" class="sub_btn" onclick="_file.click()" onmouseover="this.focus()" style="<%= ie8? ? 'display:none' : ''%>" type="button" ><%= l(:label_browse) %></button>
-<%= file_field_tag 'attachments[dummy][file]',
-                   :id => '_file',
-                   :class => ie8? ? '':'file_selector',
-                   :multiple => true,
-                   :onchange => 'addInputFiles(this);',
-                   :style => ie8? ? '': 'display:none',
-                   :data => {
-                           :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
-                           :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
-                           :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
-                           :upload_path => uploads_path(:format => 'js'),
-                           :description_placeholder => l(:label_optional_description),
-                           :field_is_public => l(:field_is_public),
-                           :are_you_sure => l(:text_are_you_sure),
-                           :file_count => l(:label_file_count),
-                           :delete_all_files => l(:text_are_you_sure_all)
-                   } %>
-<!--<input type="submit" name="" value="上传文件" class="f_l ml10" style="width:80px; height:26px;">-->
-
-  <span id="upload_file_count">
-      <%= l(:label_no_file_uploaded)%>
-    </span>
-  (<%= l(:label_max_size) %>:
-  <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/files/_course_file.html.erb b/app/views/files/_course_file.html.erb
index 8283e15b7..4176b72d0 100644
--- a/app/views/files/_course_file.html.erb
+++ b/app/views/files/_course_file.html.erb
@@ -26,6 +26,9 @@
             case 4:
                 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show',:locals => {:course => @course,:course_attachment_type => 4}) %>');
                 break;
+            case 6:
+                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show',:locals => {:course => @course,:course_attachment_type => 6}) %>');
+                break;
             default:
                 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show',:locals => {:course => @course,:course_attachment_type => 5}) %>');
         }
@@ -77,6 +80,7 @@
             <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(2);">软件</a>&nbsp;|&nbsp;
             <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(3);">媒体</a>&nbsp;|&nbsp;
             <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(4);">代码</a>&nbsp;|&nbsp;
+            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(6);">论文</a>&nbsp;|&nbsp;
             <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(5);">其他</a>
           </p>
       <% end %>
diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb
index 3c6d545db..4cc249c20 100644
--- a/app/views/files/_course_list.html.erb
+++ b/app/views/files/_course_list.html.erb
@@ -39,7 +39,7 @@
                           </span>
                         <% else %>
                           <span id="is_public_<%= file.id %>">
-                            <a class="f_l re_open c_blue">私有</a>
+                            <span class="f_l re_open c_blue">私有</span>
                           </span>
                         <% end %>
 
diff --git a/app/views/files/_new_style_attachment_list.html.erb b/app/views/files/_new_style_attachment_list.html.erb
new file mode 100644
index 000000000..af679c4d3
--- /dev/null
+++ b/app/views/files/_new_style_attachment_list.html.erb
@@ -0,0 +1,33 @@
+<span class="add_attachment" data-containerid="<%= container.id %>">
+<% checkBox = (@course.present? && @course.is_public?) ? 'public' : 'private'%>
+<button name="button" class="sub_btn" onclick="_file<%=container.id %>.click()" onmouseover="this.focus()" style="<%= ie8? ? 'display:none' : ''%>" type="button" ><%= l(:label_browse) %></button>
+  <%= file_field_tag 'attachments[dummy][file]',
+                     :id => "_file#{container.id}",
+                     :class => ie8? ? '':'file_selector',
+                     :multiple => true,
+                     :onchange => "addInputFiles_board(this, '#{container.id}');",
+                     :style => ie8? ? '': 'display:none',
+                     :data => {
+                             :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
+                             :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
+                             :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+                             :upload_path => uploads_path(:format => 'js'),
+                             :description_placeholder => l(:label_optional_description),
+                             :field_is_public => l(:field_is_public),
+                             :are_you_sure => l(:text_are_you_sure),
+                             :file_count => l(:label_file_count),
+                             :delete_all_files => l(:text_are_you_sure_all)
+                     } %>
+</span>
+<!--<input type="submit" name="" value="上传文件" class="f_l ml10" style="width:80px; height:26px;">-->
+
+<span id="upload_file_count<%=container.id %>">
+      <%= l(:label_no_file_uploaded)%>
+    </span>
+(<%= l(:label_max_size) %>:
+<%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
+<div class="cl"></div>
+<div>
+     <span id="attachments_fields<%= container.id %>" data-containerid="<%= container.id %>" xmlns="http://www.w3.org/1999/html">
+</span>
+</div>
\ No newline at end of file
diff --git a/app/views/files/_upload_course_files.erb b/app/views/files/_upload_course_files.erb
new file mode 100644
index 000000000..9c7021383
--- /dev/null
+++ b/app/views/files/_upload_course_files.erb
@@ -0,0 +1,42 @@
+
+<div id="popbox_upload" class="mb10" style="margin-top: -30px;color:#15bccf;  font-size:16px;">
+  <div class="upload_con">
+    <h2 style="text-align: center"><%= l(:label_upload_files)%></h2>
+    <div class="upload_box">
+      <%= error_messages_for 'attachment' %>
+      <div id="network_issue" style="color: red; display: none;"><%= l(:label_file_upload_error_messages)%></div>
+
+      <%= form_tag(course_files_path(course), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %>
+          <input type="hidden" name="in_course_toolbar" value="Y">
+          <!--<p class="c_grey fr mt10 mr5">-->
+          <div class="c_dark">
+            <input name="course_attachment_type" type="radio" value="1" checked class="c_dark" >课件</input>&nbsp;<span class="c_grey">|</span>&nbsp;
+            <input name="course_attachment_type" type="radio" value="2" class="c_dblue">软件</input>&nbsp;<span  class="c_grey">|</span>&nbsp;
+            <input name="course_attachment_type" type="radio" value="3" class="c_dblue">媒体</input>&nbsp;<span  class="c_grey">|</span>&nbsp;
+            <input name="course_attachment_type" type="radio" value="4" class="c_dblue">代码</input>&nbsp;<span  class="c_grey">|</span>&nbsp;
+            <input name="course_attachment_type" type="radio" value="6" class="c_dblue">论文</input>&nbsp;<span  class="c_grey">|</span>&nbsp;
+            <input name="course_attachment_type" type="radio" value="5" class="c_dblue">其他</input></a>
+          </div>
+          <div class="cl"></div>
+          <div>
+          <%= render :partial => 'files/new_style_attachment_list',:locals => {:container => course} %>
+          </div>
+          <div class="cl"></div>
+          <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="hideModal();"><%= l(:button_cancel)%></a>
+          <a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%= l(:button_confirm)%></a>
+
+      <% end %>
+    </div>
+
+  </div>
+  <% content_for :header_tags do %>
+      <%= javascript_include_tag 'attachments' %>
+  <% end %>
+</div>
+
+<script>
+    function submit_resource()
+    {
+        $('#submit_resource').parent().submit();
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/files/_upload_show.html.erb b/app/views/files/_upload_show.html.erb
index e11a4bf38..21cd94d8d 100644
--- a/app/views/files/_upload_show.html.erb
+++ b/app/views/files/_upload_show.html.erb
@@ -1,7 +1,7 @@
 
-  <div id="popbox_upload" class="box_h3 mb10" style="margin-top: -30px">
+  <div id="popbox_upload" class=" mb10" style="margin-top: -30px;color:#15bccf;  font-size:16px;">
   <div class="upload_con">
-    <h2><%= l(:label_upload_files)%></h2>
+    <h2 style="text-align: center"><%= l(:label_upload_files)%></h2>
     <div class="upload_box">
       <%= error_messages_for 'attachment' %>
       <div id="network_issue" style="color: red; display: none;"><%= l(:label_file_upload_error_messages)%></div>
diff --git a/app/views/files/_upload_show_project.html.erb b/app/views/files/_upload_show_project.html.erb
index 25a03b347..53c57b3c6 100644
--- a/app/views/files/_upload_show_project.html.erb
+++ b/app/views/files/_upload_show_project.html.erb
@@ -1,16 +1,17 @@
 
-<div id="popbox_upload" class="box_h3 mb10" style="margin-top: -30px">
+<div id="popbox_upload" class="mb10" style="margin-top: -30px;color:#15bccf; font-size:16px;">
   <div class="upload_con">
-    <h2><%= l(:label_upload_files)%></h2>
+    <h2 style="text-align: center"><%= l(:label_upload_files)%></h2>
     <div class="upload_box">
       <%= error_messages_for 'attachment' %>
       <div id="network_issue" style="color: red; display: none;"><%= l(:label_file_upload_error_messages)%></div>
 
       <%= form_tag(project_files_path(project), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %>
           <!-- <label style="margin-top:3px;"><#%= l(:label_file_upload)%></label>   -->
-          <%= render :partial => 'attachement_list',:locals => {:project => project} %>
+          <input type="hidden" name="in_project_toolbar" value="Y">
+          <%= render :partial => 'files/attachement_list',:locals => {:project => project} %>
           <div class="cl"></div>
-          <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="closeModal();"><%= l(:button_cancel)%></a>
+          <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="hideModal();"><%= l(:button_cancel)%></a>
           <a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%= l(:button_confirm)%></a>
       <% end %>
     </div>
diff --git a/app/views/files/create.js.erb b/app/views/files/create.js.erb
index 81810344e..9de7aa042 100644
--- a/app/views/files/create.js.erb
+++ b/app/views/files/create.js.erb
@@ -22,27 +22,36 @@ $("#attachments_fields").children().remove();
 $("#upload_file_count").text("未上传文件");
 $('#upload_file_div').slideToggle('slow');
   <% if @project %>
-    closeModal();
-    $("#resource_list").html('<%= j(render partial:  "project_file_new" ,locals: {project: @project}) %>');
-    $("#project_files_count_info").html("<%= @all_attachments.count%>");
-    $("#project_files_count_nav").html("(<%= @all_attachments.count%>)")
-//    添加文件上传成功提示
-    <% unless params[:attachments].nil? %>
-        var div = $('<div id="addBox" class="flash notice">文件上传成功！</div>');
-        $("#course_list").prepend(div);
-        setTimeout( function(){div.remove();},3000)
+    hideModal();
+    <%if @in_project_toolbar%>
+        window.location.href = '<%= project_files_path(@project)%>'
+    <%else%>
+
+        $("#resource_list").html('<%= j(render partial:  "project_file_new" ,locals: {project: @project}) %>');
+        $("#project_files_count_info").html("<%= @all_attachments.count%>");
+        $("#project_files_count_nav").html("(<%= @all_attachments.count%>)")
+    //    添加文件上传成功提示
+        <% unless params[:attachments].nil? %>
+            var div = $('<div id="addBox" class="flash notice">文件上传成功！</div>');
+            $("#course_list").prepend(div);
+            setTimeout( function(){div.remove();},3000)
+        <% end %>
     <% end %>
   <%elsif  @course%>
-    closeModal();
-    $("#resource_list").html('<%= j(render partial:  "course_file" ,locals: {course: @course}) %>');
-    $("#courses_files_count_info").html("<%= @all_attachments.count%>");
-    $("#courses_files_count_nav").html("(<%= @all_attachments.count%>)")
-    //    添加文件上传成功提示,
-    <% unless params[:attachments].nil? %>
-        var div = $('<div id="addBox" class="flash notice">文件上传成功！</div>');
-        $("#course_list").prepend(div);
-        setTimeout( function(){div.remove();},3000)
-    <% end %>
+    hideModal();
+    <%if @in_course_toolbar %>
+        window.location.href='<%= course_files_path(@course)%>'
+    <%else%>
+        $("#resource_list").html('<%= j(render partial:  "course_file" ,locals: {course: @course}) %>');
+        $("#courses_files_count_info").html("<%= @all_attachments.count%>");
+        $("#courses_files_count_nav").html("(<%= @all_attachments.count%>)")
+        //    添加文件上传成功提示,
+        <% unless params[:attachments].nil? %>
+            var div = $('<div id="addBox" class="flash notice">文件上传成功！</div>');
+            $("#course_list").prepend(div);
+            setTimeout( function(){div.remove();},3000)
+        <% end %>
+    <%end%>
   <% end %>
 <% end %>
 $(document).ready(img_thumbnails);
diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb
index 782efbb22..3dad88868 100644
--- a/app/views/files/index.html.erb
+++ b/app/views/files/index.html.erb
@@ -247,7 +247,7 @@
             tagId = id;
             taggableType = type;
             width = parseInt(domEle.css('width').replace('px', '')) >= 100 ? parseInt(domEle.css('width').replace('px', '')) : 100
-            domEle.html('<input name=""  id="renameTagName" maxlength="<%=Setting.tags_max_length%>" minlength="<%= Setting.tags_min_length%>" style="width:' + width + 'px;" value="' + name + '"/>');
+            domEle.html('<input name=""  id="renameTagName" maxlength="120" minlength="1" style="width:' + width + 'px;" value="' + name + '"/>');
             domEle.parent().css("border", "1px solid #ffffff");
             $("#renameTagName").focus();
         }
@@ -295,8 +295,8 @@
 //               }else{ //否则就要更新tag名称了
 ////                    if(confirm("是否将标签改为 "+ $("#renameTagName").val().trim())){  去掉询问
 //                          $.post(
-//                                    '<%= update_tag_name_path %>',
-//                                    {"taggableId": tagId, "taggableType": taggableType, "tagName": tagName, "renameName": $("#renameTagName").val().trim(),"courseId":<%= @course.id%>}
+//                                    '<%#= update_tag_name_path %>',
+//                                    {"taggableId": tagId, "taggableType": taggableType, "tagName": tagName, "renameName": $("#renameTagName").val().trim(),"courseId":<%#= @course.id%>}
 //                          )
 ////                   }else{
 ////                       ele.parent().css("border","");
diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb
index 8314c3902..5bbc52db2 100644
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@@ -1,96 +1,5 @@
 <%= javascript_include_tag 'new_user','/assets/kindeditor/pasteimg','/assets/kindeditor/kindeditor' %>
-<script>
-    function add_class(id){
-        if($("#"+id).hasClass("sortArrowActiveD")){
-            $("#"+id).removeClass("sortArrowActiveD");
-            $("#"+id).addClass("sortArrowActiveU");
-            $.ajax({
-                type: 'GET',
-                url: '<%= forums_path+"/"+@forum.id.to_s %>' + '.js?' + id + '=asc&page='+<%= @topic_pages.page%>
 
-            });
-        }else if($("#"+id).hasClass("sortArrowActiveU")){
-            $("#"+id).removeClass("sortArrowActiveU");
-            $("#"+id).addClass("sortArrowActiveD");
-            $.ajax({
-               type: 'GET',
-                url: '<%= forums_path+"/"+@forum.id.to_s %>' + '.js?' + id + '=desc&page='+<%= @topic_pages.page%>
-
-            });
-        }else{
-            $("#"+id).addClass("sortArrowActiveD");
-            $.ajax({
-                type: 'GET',
-                url: '<%= forums_path+"/"+@forum.id.to_s %>' + '.js?' + id + '=desc&page='+<%= @topic_pages.page%>
-
-           });
-        }
-    }
-    $(function() {
-        $("#complex").click(function(){
-            $("#reorder_popu").removeClass("sortArrowActiveU");
-            $("#reorder_popu").removeClass("sortArrowActiveD");
-            $("#reorder_time").removeClass("sortArrowActiveD");
-            $("#reorder_time").removeClass("sortArrowActiveU");
-            add_class("reorder_complex");
-        });
-        $("#popu").click(function () {
-            $("#reorder_complex").removeClass("sortArrowActiveD");
-            $("#reorder_complex").removeClass("sortArrowActiveU");
-            $("#reorder_time").removeClass("sortArrowActiveD");
-            $("#reorder_time").removeClass("sortArrowActiveU");
-            add_class("reorder_popu");
-        });
-        $("#time").click(function () {
-            $("#reorder_complex").removeClass("sortArrowActiveD");
-            $("#reorder_complex").removeClass("sortArrowActiveU");
-            $("#reorder_popu").removeClass("sortArrowActiveU");
-            $("#reorder_popu").removeClass("sortArrowActiveD");
-            add_class("reorder_time");
-        });
-        <% if @errors %>
-            $('#create_memo_div').slideToggle();$('#create_memo_btn').slideToggle();
-            $("#error").html('<%= @errors.html_safe %>').show();
-        <% end %>
-    });
-
-    function check_and_submit(){
-        if(!check_memo_name()){
-            return;
-        }
-        if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.html().trim() != "" ){
-            memo_content.sync();
-            $("#new_memo").submit();
-        }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.html().trim() == ""){
-            $("#error").html("主题和内容不能为空").show();
-        }
-        else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.html().trim() != "" ){
-            $("#error").html("主题不能为空").show();
-        }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.html().val().trim() == ""){
-            $("#error").html("内容不能为空").show();
-        }
-    }
-
-    function check_memo_name(){
-        if($("#memo_subject").val().trim().length > 50){
-            $("#error").html("主题 过长（最长为 50 个字符）").show();
-            return false;
-        }
-//        if(memo_content.html().trim().length > 5000){
-//            $("#error").html("内容 过长（最长为 5000 个字符）").show();
-//            return false;
-//        }
-        return true;
-    }
-
-    function create_cancle(){
-        $('#create_memo_div').slideToggle();
-        $('#create_memo_btn').slideToggle();
-        $('#memo_subject').val('');
-        memo_content.html('')
-        $('#error').html('').hide();
-    }
-</script>
 <div class="postRightContainer">
   <div id="create_memo_div" style="display: none">
     <div id="error" class="red fl mb10" style="display: none">error</div>
@@ -141,4 +50,97 @@
   <!--</div>-->
   <!--<div class="cl"></div>-->
 </div>
-</div>
\ No newline at end of file
+</div>
+<script>
+    function add_class(id){
+        if($("#"+id).hasClass("sortArrowActiveD")){
+            $("#"+id).removeClass("sortArrowActiveD");
+            $("#"+id).addClass("sortArrowActiveU");
+            $.ajax({
+                type: 'GET',
+                url: '<%= forums_path+"/"+@forum.id.to_s %>' + '.js?' + id + '=asc&page='+<%= @topic_pages.page%>
+
+            });
+        }else if($("#"+id).hasClass("sortArrowActiveU")){
+            $("#"+id).removeClass("sortArrowActiveU");
+            $("#"+id).addClass("sortArrowActiveD");
+            $.ajax({
+                type: 'GET',
+                url: '<%= forums_path+"/"+@forum.id.to_s %>' + '.js?' + id + '=desc&page='+<%= @topic_pages.page%>
+
+            });
+        }else{
+            $("#"+id).addClass("sortArrowActiveD");
+            $.ajax({
+                type: 'GET',
+                url: '<%= forums_path+"/"+@forum.id.to_s %>' + '.js?' + id + '=desc&page='+<%= @topic_pages.page%>
+
+            });
+        }
+    }
+    $(function() {
+        $("#complex").click(function(){
+            $("#reorder_popu").removeClass("sortArrowActiveU");
+            $("#reorder_popu").removeClass("sortArrowActiveD");
+            $("#reorder_time").removeClass("sortArrowActiveD");
+            $("#reorder_time").removeClass("sortArrowActiveU");
+            add_class("reorder_complex");
+        });
+        $("#popu").click(function () {
+            $("#reorder_complex").removeClass("sortArrowActiveD");
+            $("#reorder_complex").removeClass("sortArrowActiveU");
+            $("#reorder_time").removeClass("sortArrowActiveD");
+            $("#reorder_time").removeClass("sortArrowActiveU");
+            add_class("reorder_popu");
+        });
+        $("#time").click(function () {
+            $("#reorder_complex").removeClass("sortArrowActiveD");
+            $("#reorder_complex").removeClass("sortArrowActiveU");
+            $("#reorder_popu").removeClass("sortArrowActiveU");
+            $("#reorder_popu").removeClass("sortArrowActiveD");
+            add_class("reorder_time");
+        });
+        <% if @errors %>
+        $('#create_memo_div').slideToggle();$('#create_memo_btn').slideToggle();
+        $("#error").html('<%= @errors.html_safe %>').show();
+        <% end %>
+    });
+
+    function check_and_submit(){
+        if(!check_memo_name()){
+            return;
+        }
+        if($("textarea[name='memo[subject]']").val().trim() != "" && !memo_content.isEmpty() ){
+            memo_content.sync();
+            $("#new_memo").submit();
+        }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.isEmpty()){
+            $("#error").html("主题和内容不能为空").show();
+        }
+        else if($("textarea[name='memo[subject]']").val().trim() == "" && !memo_content.isEmpty() ){
+            $("#error").html("主题不能为空").show();
+        }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.isEmpty()){
+            $("#error").html("内容不能为空").show();
+        }
+    }
+
+    function check_memo_name(){
+        if($("#memo_subject").val().trim().length > 50){
+            $("#error").html("主题 过长（最长为 50 个字符）").show();
+            return false;
+        }
+        if(memo_content.html().length > 30000){
+            $("#error").html("内容 过长（最长为 30000 个字符）").show();
+            $("html,body").animate({scrollTop:$("#error").offset().top},1000)
+            return false;
+        }
+        return true;
+    }
+
+    function create_cancle(){
+        $('#create_memo_div').slideToggle();
+        $('#create_memo_btn').slideToggle();
+        $('#memo_subject').val('');
+        memo_content.html('')
+        $('#error').html('').hide();
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/homework_common/_alert_anonyoms.html.erb b/app/views/homework_common/_alert_anonyoms.html.erb
index 73f240b02..3b1f6f692 100644
--- a/app/views/homework_common/_alert_anonyoms.html.erb
+++ b/app/views/homework_common/_alert_anonyoms.html.erb
@@ -34,7 +34,7 @@
         </p>
     <% end %>
     <div class="ni_btn">
-      <a href="javascript:" class="tijiao" onclick="clickOK('<%= alert_anonyoms_path @homework,@homework_detail_manual%>');" style="margin-bottom: 20px;" >
+      <a href="javascript:" class="tijiao" onclick="clickOK('<%= alert_anonyoms_path @homework,@homework_detail_manual,@user_activity_id,@is_in_course,@course_activity%>');" style="margin-bottom: 20px;" >
         确&nbsp;&nbsp;定
       </a>
       <a href="javascript:" class="tijiao" onclick="clickCanel();" style="margin-bottom: 20px;">
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/alert_forbidden_anonymous_comment.js.erb b/app/views/homework_common/alert_forbidden_anonymous_comment.js.erb
new file mode 100644
index 000000000..5177f4d92
--- /dev/null
+++ b/app/views/homework_common/alert_forbidden_anonymous_comment.js.erb
@@ -0,0 +1,6 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/alert_forbidden_anonymous', :locals => {:user_activity_id => @user_activity_id,:is_in_course => @is_in_course,:course_activity => @course_activity}) %>');
+showModal('ajax-modal', '500px');
+$('#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","30%").css("left","30%").css("position","fixed");
\ No newline at end of file
diff --git a/app/views/homework_common/edit.html.erb b/app/views/homework_common/edit.html.erb
index 5fc11728b..ac772171d 100644
--- a/app/views/homework_common/edit.html.erb
+++ b/app/views/homework_common/edit.html.erb
@@ -1,12 +1,24 @@
 <script type="text/javascript">
     function reset_homework(){
         $("#homework_name").val("");
+        $("#homework_publish_time").val("");
         $("#homework_end_time").val("");
         $("#course_id").val($("#option_select").val());
         $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new })%>");
         homework_description_editor.html("");
         $("#homework_editor").toggle();
     }
+    function cancel_edit(){
+        <% if @is_in_course == 1 %>
+            window.location.href='<%=homework_common_index_path(:course => @course.id) %>';
+        <% elsif @is_in_course == 0 %>
+            window.location.href='<%=user_homeworks_user_path(User.current.id) %>';
+        <% elsif @is_in_course == -1 && @course_activity == 0 %>
+            window.location.href='<%=user_path(User.current.id) %>';
+        <% elsif @is_in_course == -1 && @course_activity == 1 %>
+            window.location.href='<%=course_path(@course.id) %>';
+        <% end %>
+    }
 </script>
 <div class="homepageRightBanner mb10">
   <div class="NewsBannerName">编辑作业</div>
@@ -17,6 +29,7 @@
 <div class="HomeWork mb10">
   <%= form_for @homework do |f| %>
       <input type="text" name="is_in_course" class="none" value="<%= @is_in_course%>"/>
+      <input type="text" name="course_activity" class="none" value="<%= @course_activity%>"/>
       <div id="HomeWorkCon">
         <%= render :partial => 'users/user_homework_form', :locals => { :homework => @homework,:f => f,:edit_mode => true } %>
       </div>
diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb
index 3d8752dd8..3b3877228 100644
--- a/app/views/homework_common/index.html.erb
+++ b/app/views/homework_common/index.html.erb
@@ -1,6 +1,7 @@
   <script type="text/javascript">
     function reset_homework(){
         $("#homework_name").val("");
+        $("#homework_publish_time").val("");
         $("#homework_end_time").val("");
         $("#course_id").val($("#option_select").val());
         $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new,:has_program => true })%>");
diff --git a/app/views/homework_common/score_rule_set.js.erb b/app/views/homework_common/score_rule_set.js.erb
new file mode 100644
index 000000000..a3afb0c9a
--- /dev/null
+++ b/app/views/homework_common/score_rule_set.js.erb
@@ -0,0 +1,6 @@
+$('#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 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
diff --git a/app/views/homework_common/start_anonymous_comment.js.erb b/app/views/homework_common/start_anonymous_comment.js.erb
index b0424bf7a..ea63ea12c 100644
--- a/app/views/homework_common/start_anonymous_comment.js.erb
+++ b/app/views/homework_common/start_anonymous_comment.js.erb
@@ -1,12 +1,19 @@
 <% if @statue == 1%>
-alert('启动成功');
-$("#<%= @homework.id %>_start_anonymous_comment").replaceWith('<%= escape_javascript(link_to "关闭匿评", alert_anonymous_comment_homework_common_path(@homework), remote: true, id:"#{@homework.id}_stop_anonymous_comment",:class => "postOptionLink")%>');
+    alert('启动成功');
+    <% if @user_activity_id == -1 %>
+        $("#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%");
+    <% else %>
+        $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@course_activity}) %>");
+        init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+    <% end %>
+/*$("#<%#= @homework.id %>_start_anonymous_comment").replaceWith('<%#= escape_javascript(link_to "关闭匿评", alert_anonymous_comment_homework_common_path(@homework), remote: true, id:"#{@homework.id}_stop_anonymous_comment",:class => "postOptionLink")%>');*/
 <% elsif @statue == 2 %>
-alert('启动失败\n作业总数大于等于2份时才能启动匿评');
+    alert('启动失败\n作业总数大于等于2份时才能启动匿评');
 <% elsif @statue == 3%>
-alert("已开启匿评，请务重复开启");
+    alert("已开启匿评，请务重复开启");
 <% elsif @statue == 4%>
-alert("您没有权限开启匿评");
+    alert("您没有权限开启匿评");
 <% elsif @statue == 5%>
-alert("作业提交截止之后才能启动匿评");
+    alert("作业提交截止之后才能启动匿评");
 <% end %>
\ No newline at end of file
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/homework_common/stop_anonymous_comment.js.erb b/app/views/homework_common/stop_anonymous_comment.js.erb
index 4725d5731..214a157dc 100644
--- a/app/views/homework_common/stop_anonymous_comment.js.erb
+++ b/app/views/homework_common/stop_anonymous_comment.js.erb
@@ -1,2 +1,10 @@
-$("#<%= @homework.id %>_stop_anonymous_comment").replaceWith('');
-alert('关闭成功');
\ No newline at end of file
+alert('关闭成功');
+<% if @user_activity_id == -1 %>
+$("#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%");
+<% else %>
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@course_activity}) %>");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+<% end %>
+/*
+$("#<%#= @homework.id %>_stop_anonymous_comment").replaceWith('');*/
diff --git a/app/views/issues/add_journal.js.erb b/app/views/issues/add_journal.js.erb
index 7c56aea6e..0b1c02b88 100644
--- a/app/views/issues/add_journal.js.erb
+++ b/app/views/issues/add_journal.js.erb
@@ -1,3 +1,3 @@
-$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id}) %>");
 
 init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
\ No newline at end of file
diff --git a/app/views/layouts/_new_feedback.html.erb b/app/views/layouts/_new_feedback.html.erb
index 66d25a4b1..ffec82bce 100644
--- a/app/views/layouts/_new_feedback.html.erb
+++ b/app/views/layouts/_new_feedback.html.erb
@@ -21,9 +21,11 @@
               </a>
           <% end %>
         </div>
-        <div class="mt5">
-          <a target="hiddentab" href="http://wpa.qq.com/msgrd?v=1&uin=1554253403&site=qq&menu=yes" style="color: #269ac9;">
-            <%= l(:label_technical_support) %>白&nbsp;&nbsp;&nbsp;羽</a>
+        <div class="mt5" style="color: #269ac9;cursor: default">
+          <!--<a target="hiddentab" href="http://wpa.qq.com/msgrd?v=1&uin=1554253403&site=qq&menu=yes" style="color: #269ac9;">-->
+            <%#= l(:label_technical_support) %>
+          <!--白&nbsp;&nbsp;&nbsp;羽</a> http://shang.qq.com/wpa/qunwpa?idkey=4fe2d63a4527cddce038f04f0b1d728a62082074fb4a74870a5444ee1a6910ad-->
+           <p style="text-align: center"> 请加入师姐师兄答疑群</p>  <p style="text-align: center">QQ群号：173184401</p>
         </div>
       </div>
       <div class="side_bottom"></div>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 9b1dfbb7f..39de4faeb 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -54,16 +54,51 @@
         </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">
-            <%= @course.name %>
-          </a>
-          <% if @course.is_public == 0%>
-                <span class="img_private ">
+          <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>-->
+                <span class="img_private mr5 fl">
                   <%= l(:field_is_private)%>
                 </span>
-          <% end %>
-        </div>
+              <% end %>
+              <span id="course_outline_bar">
+              <%if User.current && @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 User.current && @course.tea_id == User.current.id && @course.outline != 0 && BlogComment.where(:id=>@course.outline).count != 0%>
+                  <a href="<%=syllabus_course_path(@course) %>" title="课程大纲" class="mr5 syllabusIcon fl"> </a>
+                <% elsif User.current && @course.tea_id != User.current.id && !@course.is_public? && User.current.member_of_course?(@course)  && @course.outline != 0%>
+                  <a href="<%=syllabus_course_path(@course) %>" title="课程大纲" class="mr5 syllabusIcon fl"> </a>
+                <% elsif User.current && @course.tea_id != User.current.id && @course.is_public? && @course.outline != 0%>
+                  <a href="<%=syllabus_course_path(@course) %>" title="课程大纲" class="mr5 syllabusIcon fl"> </a>
+                <%else%>
+               <%end %>
+               </span>
+            </div>
+         </div>
         <div class="cl"></div>
         <div class="pr_info_foot ">
           <%= l(:label_account_identity_teacher)%>（<%= course_teacher_link teacher_num %>）
@@ -103,7 +138,10 @@
         <div class="subNav">
           <%= link_to l(:label_course_file), course_files_path(@course), :class => "f14 c_blue02" %>
           <%= link_to "(#{course_file_num})", course_files_path(@course), :class => "subnav_num c_orange",:id=>'courses_files_count_nav' %>
-          <%= link_to( "+#{l(:label_upload_files)}", course_files_path(@course), :class => 'subnav_green ml95 c_white') if is_teacher %>
+          <% if is_teacher %>
+              <!--link_to( "+#{l(:label_upload_files)}", course_files_path(@course), :class => 'subnav_green ml95 c_white')-->
+              <a class="subnav_green ml95 c_white" href="javascript:void(0);" onclick="course_files_upload();">+上传资源 </a>
+          <% end %>
         </div>
         <div class="subNav">
           <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f14 c_blue02" %>
@@ -166,5 +204,60 @@
 <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_list").html('');
+                          $("#course_outline_hint").show();
+                    }
+                }
+            })
+        }
+
+    })
+
+    function course_files_upload(){
+            $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_course_files',:locals => {:course => @course,:course_attachment_type => 1}) %>');
+            showModal('ajax-modal', '513px');
+            $('#ajax-modal').siblings().remove();
+            $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+            $('#ajax-modal').parent().css("top","").css("left","");
+            $('#ajax-modal').parent().addClass("popbox_polls");
+    }
+
+</script>
 
 </html>
\ No newline at end of file
diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index d32fbf4ed..e03ac2fc5 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -61,14 +61,14 @@
        function addTag(){
            if(<%=@forum.creator.id == User.current.id%>) {
                if ($("input[name='addTag']").val().trim() != ""   ) {
-                   if($("input[name='addTag']").val().trim().length <= 14) {
+                   if($("input[name='addTag']").val().trim().length <= 120) {
                        $.get(
                                        '<%= add_forum_tag_forum_path(@forum)%>' + "?tag_str=" + $("input[name='addTag']").val(),
                                {}
                        );
                        $("input[name='addTag']").val('');
                    }else{
-                       alert("标签名字长度不能超过14个字符");
+                       alert("标签名字长度不能超过120个字符");
                    }
                }
            }
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 02085b95a..d2186118d 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -12,8 +12,8 @@
   <%= favicon %>
   <%= javascript_heads %>
   <%= heads_for_theme %>
-  <%= stylesheet_link_tag 'public', 'pleft', 'project','prettify','jquery/jquery-ui-1.9.2','header' %>
-  <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move' %>
+  <%= stylesheet_link_tag 'public', 'pleft', 'project','prettify','jquery/jquery-ui-1.9.2','header','repository' %>
+  <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','attachments' %>
   <%= call_hook :view_layouts_base_html_head %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
@@ -76,7 +76,7 @@
 
         <!--参数-->
         <div class="pr_info_foot">
-          <%= l(:label_member) %>（<%= link_to "#{@project.members.count}", project_member_path(@project), :class => 'info_foot_num c_blue' %>）
+          <%= l(:label_member) %>（<%= link_to "#{@project.members.count}", project_member_path(@project), :class => 'info_foot_num c_blue', :id => 'project_members_number' %>）
           <span>|&nbsp;</span>
           <%= l(:label_user_watcher) %>（<%= link_to "#{@project.watcher_users.count}", {:controller=>"projects", :action=>"watcherlist", :id => @project.id}, :class => 'info_foot_num c_blue'  %>）
           <% attaments_num = @project.attachments.count+Attachment.where(["`container_type` = 'Version' and `container_id` in (?)",@project.versions.map{ |v| v.id}]).all.count  %>
@@ -223,6 +223,16 @@
                   }
           );
       }
+
+      function project_files_upload()
+      {
+          $('#ajax-modal').html('<%= escape_javascript(render :partial => 'projects/upload_project_files_on_navbar',:locals => {:container => @project}) %>');
+          showModal('ajax-modal', '513px');
+          $('#ajax-modal').siblings().remove();
+          $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+          $('#ajax-modal').parent().css("top","40%").css("left","36%");
+          $('#ajax-modal').parent().addClass("popbox_polls");
+      }
   </script>
 </div>
 <div id="fade" class="black_overlay">123</div>
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index f3adb0155..1eddeb517 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -46,7 +46,7 @@
         </div>
         <div class="fl ml10">
           <p class="homepageImageName hidden db mb5">
-            <%= @user.realname %>
+            <%= @user.realname.blank? ? @user.login : @user.realname %>
           </p>
           <% if (@user.user_extensions && (@user.user_extensions.identity != 2) ) %>
               <span class="<%= @user.user_extensions.gender == 1 ? 'homepageImageSexWomen' : 'homepageImageSexMan' %> "></span>
@@ -71,27 +71,38 @@
           <textarea class="homepageSignatureTextarea none" placeholder="请编辑签名" id="user_brief_introduction_edit" onblur="edit_user_introduction('<%= edit_brief_introduction_user_path(@user.id)%>');"><%= @user.user_extensions.brief_introduction %></textarea>
         </div>
         <div>
+          <div class="homepageImageBlock">
+            <div>
+              <%= link_to(@user.blog.blog_comments.where("#{BlogComment.table_name}.parent_id is null").count,
+                          {:controller => 'blogs', :action => 'index', :user_id => @user.id }, :class => 'homepageImageNumber',:id => 'user_score') %>
+            </div>
+            <div class="homepageImageText">
+
+              <%= link_to('博客',
+                          {:controller => 'blogs', :action => 'index', :user_id => @user.id }, :class => 'homepageImageNumber',:id => 'user_score') %>
+            </div>
+          </div>
+          <div class="homepageVerDiv"></div>
           <div class="homepageImageBlock">
             <div id="watch_user_number_div">
               <%= link_to User.watched_by(@user.id).count.to_s, {:controller=>"users", :action=>"user_watchlist",:id=>@user.id},:class=>"homepageImageNumber" %>
             </div>
-            <div class="homepageImageText">关注</div>
+            <div class="homepageImageText">
+              <%= link_to '关注', {:controller=>"users", :action=>"user_watchlist",:id=>@user.id},:class=>"homepageImageNumber" %>
+            </div>
           </div>
           <div class="homepageVerDiv"></div>
           <div class="homepageImageBlock">
             <div id="fans_user_number_div">
               <%= link_to @user.watcher_users.count.to_s, {:controller=>"users", :action=>"user_fanslist",:id=>@user.id},:class=>"homepageImageNumber", :id => "user_fans_number"%>
             </div>
-            <div class="homepageImageText">粉丝</div>
-          </div>
-          <div class="homepageVerDiv"></div>
-          <div class="homepageImageBlock">
-            <div>
-              <%= link_to(format("%.2f" ,get_option_number(@user,1).total_score ).to_i,
-                          {:controller => 'users', :action => 'show_new_score', :remote => true, :id => @user.id }, :class => 'homepageImageNumber',:id => 'user_score') %>
+            <div class="homepageImageText">
+
+              <%= link_to '粉丝', {:controller=>"users", :action=>"user_fanslist",:id=>@user.id},:class=>"homepageImageNumber", :id => "user_fans_number"%>
             </div>
-            <div class="homepageImageText">积分</div>
           </div>
+
+
           <div class="cl"></div>
         </div>
       </div>
@@ -103,7 +114,21 @@
           <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses').slideToggle();">课程</a>
           <% if is_current_user%>
               <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
-                  <%=link_to "", new_course_path(:host=> Setting.host_course), :class => "homepageMenuSetting fr", :title => "新建课程"%>
+                  <div class="courseMenu" id="courseMenu">
+                    <ul>
+                      <li class="courseMenuIcon" id="courseMenuIcon">
+                        <ul class="topnav_course_menu" id="topnav_course_menu">
+                          <li>
+                            <%= link_to "新建课程", new_course_path(:host=> Setting.host_course), :class => "menuGrey"%>
+                          </li>
+                          <!--<li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>-->
+                          <li>
+                            <%= link_to "加入课程",join_private_courses_courses_path,:remote => true,:class => "menuGrey",:method => "post"%>
+                          </li>
+                        </ul>
+                      </li>
+                    </ul>
+                  </div>
               <% else%>
                   <%=link_to "", join_private_courses_courses_path, :class => "homepageMenuSetting fr",:remote => true, :title => "加入课程"%>
               <% end%>
@@ -201,5 +226,13 @@
     <div class="cl"></div>
   </div><!--floatbox end-->
 </div>
+<script type="text/javascript">
+    $("#courseMenu").mouseenter(function(){
+        $("#topnav_course_menu").show();
+    });
+    $("#courseMenu").mouseleave(function(){
+        $("#topnav_course_menu").hide();
+    });
+</script>
 </body>
 </html>
diff --git a/app/views/mailer/join_course_request.html.erb b/app/views/mailer/join_course_request.html.erb
new file mode 100644
index 000000000..61b7eaa6f
--- /dev/null
+++ b/app/views/mailer/join_course_request.html.erb
@@ -0,0 +1,14 @@
+<div class="mail_box" style="border:1px solid #c8c8c8; width:570px; height: auto; padding:15px; margin-top:10px; margin-bottom:10px;">
+  <ul style="list-style-type:none; margin:0; padding:0;">
+
+    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
+		<span style="float: left; width: 526px">
+        	<p><span style="color:#1b55a7; font-weight:bold;"><%= @user.show_name %></span> 请求成为课程：<span style="color:#1b55a7; font-weight:bold;"><%=link_to @course.name, course_url(@course) %></span>的<%= @role.eql?('9') ? '老师': '教辅' %> </p>
+            <p><%=link_to user_message_url(@receive),user_message_url(@receive)%></p>
+        </span>
+    </li>
+
+  </ul>
+
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+</div>
diff --git a/app/views/mailer/join_course_request.text.erb b/app/views/mailer/join_course_request.text.erb
new file mode 100644
index 000000000..62e2315c5
--- /dev/null
+++ b/app/views/mailer/join_course_request.text.erb
@@ -0,0 +1,4 @@
+<%= @user.show_name %>申请成为课程<%= @course.name %>的<%= @role.eql?('9') ? '老师': '教辅' %>
+<%=link_to user_message_url(@receive),user_message_url(@receive)%>
+
+
diff --git a/app/views/members/create.js.erb b/app/views/members/create.js.erb
index 976f5c724..8a6500572 100644
--- a/app/views/members/create.js.erb
+++ b/app/views/members/create.js.erb
@@ -4,6 +4,7 @@
     <% else%>
         $('#pro_st_tbc_03').html('<%= escape_javascript(render :partial => 'projects/settings/new_members') %>');
         hideOnLoad();
+        $("#project_members_number").html("<%= @project.members.count %>");
         alert("<%= @succes_message%>");
     <% end%>
 <%elsif @course%>
@@ -11,6 +12,8 @@
         alert("<%= @create_member_error_messages%>");
     <% else%>
         $('#course_members_setting').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');
+        $("#teacher_number").html("<%= searchTeacherAndAssistant(@course).count %>");
+        $("#student_number").html("<%= studentCount(@course) %>");
         alert("添加成功");
     <% end%>
     hideOnLoad();
diff --git a/app/views/members/destroy.js.erb b/app/views/members/destroy.js.erb
index b6f206e05..b331f15a4 100644
--- a/app/views/members/destroy.js.erb
+++ b/app/views/members/destroy.js.erb
@@ -1,7 +1,10 @@
   <%if @project%>
     $('#pro_st_tbc_03').html('<%= escape_javascript(render :partial => 'projects/settings/new_members') %>');
+    $("#project_members_number").html("<%= @project.members.count %>");
 //    $('#tab-content-members').html('<%#= escape_javascript(render :partial => 'projects/settings/members') %>');
   <%elsif @course%>
     $('#course_members_setting').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');
+    $("#teacher_number").html("<%= searchTeacherAndAssistant(@course).count %>")
+    $("#student_number").html("<%= studentCount(@course) %>");
   <%end%>
 hideOnLoad();
diff --git a/app/views/members/update.js.erb b/app/views/members/update.js.erb
index c5ef983e7..7c27e39fc 100644
--- a/app/views/members/update.js.erb
+++ b/app/views/members/update.js.erb
@@ -2,6 +2,8 @@
 $('#pro_st_tbc_03').html('<%= escape_javascript(render :partial => 'projects/settings/new_members') %>');
 <%elsif @course%>
 $('#course_members_setting').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');
+$("#teacher_number").html("<%= searchTeacherAndAssistant(@course).count %>")
+$("#student_number").html("<%= studentCount(@course) %>");
 <%end%>
 hideOnLoad();
 
diff --git a/app/views/memos/edit.html.erb b/app/views/memos/edit.html.erb
index 7ab460555..b2b7d73f0 100644
--- a/app/views/memos/edit.html.erb
+++ b/app/views/memos/edit.html.erb
@@ -2,22 +2,23 @@
 <script>
 
   function check_and_submit(){
-      if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.html().trim() != "" ){
+      if($("textarea[name='memo[subject]']").val().trim() != "" && !memo_content.isEmpty() ){
           if($("textarea[name='memo[subject]']").val().trim().length > 50 ){
               $("#error").html('主题不能超过50个字符').show();
               return;
           }
-//          if(memo_content.html().trim().length > 5000 ){
-//              $("#error").html('内容不能超过5000个字符').show();
-//              return;
-//          }
+          if(memo_content.html().length > 30000){
+              $("#error").html("内容 过长（最长为 30000 个字符）").show();
+              $("html,body").animate({scrollTop:$("#error").offset().top},1000)
+              return false;
+          }
           memo_content.sync();
           $("#edit_memo").submit();
-      }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.html().trim() != "" ){
+      }else if($("textarea[name='memo[subject]']").val().trim() == "" && !memo_content.isEmpty() ){
           $("#error").html("主题不能为空").show();
-      }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.html().trim() == ""){
+      }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.isEmpty()){
           $("#error").html("内容不能为空").show();
-      }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.html().trim() == ""){
+      }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.isEmpty()){
           $("#error").html("主题和内容不能为空").show();
       }
   }
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 79142c441..f4a1675b1 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -115,7 +115,7 @@
                     <%= 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 %>">
+              <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
                 <%= reply.content.html_safe%>
               </div>
               <div style="margin-top: -7px; margin-bottom: 5px">
diff --git a/app/views/messages/edit.html.erb b/app/views/messages/edit.html.erb
index 0817594ab..624174b14 100644
--- a/app/views/messages/edit.html.erb
+++ b/app/views/messages/edit.html.erb
@@ -30,7 +30,7 @@
                       :method => :post}
     } do |f| %>
         <%= render :partial => 'boards/course_message_edit',
-                   :locals => {:f => f, :edit_mode => true, :topic => @message} %>
+                   :locals => {:f => f, :edit_mode => true, :topic => @message, :course => @message.course} %>
 
     <% end %>
 <% end %>
diff --git a/app/views/messages/reply.js.erb b/app/views/messages/reply.js.erb
index 4cd1a86d6..ac80de3b4 100644
--- a/app/views/messages/reply.js.erb
+++ b/app/views/messages/reply.js.erb
@@ -1,6 +1,6 @@
 <%if @project%>
-    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
+    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>");
 <%elsif @course%>
-    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
+    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>");
 <%end%>
 init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
\ No newline at end of file
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 4a2fe446d..be178607f 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -17,7 +17,7 @@
         <ul class="setting_left">
           <li>登录名&nbsp;:&nbsp;<span style="color:red;">*</span></li>
           <li>邮箱&nbsp;:&nbsp;<span style="color:red;">*</span></li>
-          <li>身份&nbsp;:&nbsp;</li>
+          <li>身份&nbsp;:&nbsp;<span style="color:red;">*</span></li>
           <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">姓(First Name)&nbsp;:&nbsp;<span style="color:red;">*</span></li>
           <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">名(Last Name)&nbsp;:&nbsp;<span style="color:red;">*</span></li>
           <li nhname="tag" nh_tag_2="true" style="display:none;">组织名&nbsp;:&nbsp;<span style="color:red;">*</span></li>
@@ -34,7 +34,10 @@
           <li><%= f.text_field :mail,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210"%></li>
 
           <li>
-            <select onchange="showtechnical_title(this.value);" name="identity" id="userIdentity" class="location" class="w70" style="height:28px;margin-left:2px;">
+            <select onchange="showtechnical_title(this.value);" required = true, nh_required="1" name="identity" id="userIdentity" class="location" class="w70" style="height:28px;margin-left:2px;">
+              <option value="-1">
+                <%= l(:label_account_identity_choose) %>
+              </option>
               <option value="0">
                 <%= l(:label_account_identity_teacher) %>
               </option>
@@ -61,6 +64,7 @@
                 <%= text_field_tag :no, nil, :placeholder => l(:label_account_identity_studentID),:style=>"60px" %></span>
               <% end %>
             </span>
+            <span id="identity_hint" style="display: none"></span>
           </li>
 
           <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;"><%= f.text_field :lastname,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210" %>
@@ -170,7 +174,7 @@
           <li><input id="new_password_confirmation" name="new_password_confirmation" class="w210" type="password" required="true" nh_required="1"></li>
           <li class="ml2">
             <a href="javascript:;" id="my_password_form_link" class="blue_btn fl">确认</a>
-            <!--<input type="submit" id="my_password_form_btn" style="display:none;"/>-->
+            <input type="submit" id="my_password_form_btn" style="display:none;"/>
             <!--<a href="javascript:void(0);" class="grey_btn ml10 fl">取消</a>-->
           </li>
         </ul>
@@ -542,19 +546,41 @@
       });
   }
   var lastSearchCondition = '';
+  var page = 1; //唯一控制页码 变量
+  var count = 0; //查询结果的总量
+  var maxPage = 0 ;//最大页面值
   $(function() {
-//      $("input[name='province']").keydown(function(e){
-//          if(e.keyCode == 13 && $("#search_school_result_list").css('display') == 'block'){
-//             str = $("#search_school_result_list").children().eq(0).attr('onclick').match(/\(.*\)/)[0]
-//
-//             str = str.replace(/\(/,'').replace(/\)/,'');
-//             arr = str.split(',');
-//             id = arr[1].replace(/\'/,'')
-//             name = arr.replace(/\'/,'')
-//             changeValue(name,id);
-//              return false;
-//          }
-//      });
+      $("#search_school_result_list").scroll(function(e){
+          nScrollHight = $(this)[0].scrollHeight;
+          nScrollTop = $(this)[0].scrollTop;
+          var nDivHight = $(this).height();
+          if(nScrollTop + nDivHight >= nScrollHight) //到底部了，
+          {
+              //判断页码是否是最大值，如果是的，就不去请求了
+              if(page >= maxPage){
+                  return;
+              }else{  //如果不是，那就请求下一页，请求数据处理
+                  page ++;
+                  $.ajax({
+                      url: '<%= url_for(:controller => 'school',:action => 'on_search') %>' + '?name=' + $("input[name='province']").val() + '&page=' + page,
+                      type: 'post',
+                      success: function (data) {
+                          schoolsResult = data.schools;
+                          if (schoolsResult.length != undefined && schoolsResult.length != 0) {
+                              var i = 0;
+                              for (; i < schoolsResult.length; i++) {
+                                  link = '<a onclick="window.changeValue(\'' + schoolsResult[i].school.name.replace(/\s/g, " ") + '\',\'' + schoolsResult[i].school.id + '\')" href="javascript:void(0)">' + schoolsResult[i].school.name + '</a><br/>';
+                                  $("#search_school_result_list").append(link);
+                              }
+                          } else {
+
+                          }
+                      }
+                  });
+              }
+
+          }
+      });
       //查询学校
       $("input[name='province']").on('input', function (e) {
           throttle(shcool_search_fn,window,e);
@@ -568,20 +594,25 @@
       }
 
       function shcool_search_fn(e){
-          $("input[name='occupation']").val(''); //一旦有输入就清空id。
-          if($(e.target).val().trim() == lastSearchCondition && $(e.target).val().trim() != ''){
+
+          if($(e.target).val().trim() == lastSearchCondition && $(e.target).val().trim() != ''){//如果输入框没有改变或者输入框为空就返回
               return;
           }
+          $("input[name='occupation']").val(''); //一旦有输入就清空id。
           lastSearchCondition = $(e.target).val().trim();
+          page = 1; //有新的搜索，页面重置为1
           $.ajax({
-              url: '<%= url_for(:controller => 'school',:action => 'on_search') %>' + '?name=' + e.target.value,
+              url: '<%= url_for(:controller => 'school',:action => 'on_search') %>' + '?name=' + e.target.value+'&page='+page,
               type: 'post',
               success: function (data) {
-                  if(data.length != undefined && data.length != 0) {
+                  schoolsResult = data.schools;
+                  count = data.count;
+                  maxPage = Math.ceil(count/100) //最大页码值
+                  if(schoolsResult.length != undefined && schoolsResult.length != 0) {
                       var i = 0;
                       $("#search_school_result_list").html('');
-                      for (; i < data.length; i++) {
-                          link = '<a onclick="window.changeValue(\'' + data[i].school.name.replace(/\s/g," ") + '\',\'' + data[i].school.id + '\')" href="javascript:void(0)">' + data[i].school.name + '</a><br/>';
+                      for (; i < schoolsResult.length; i++) {
+                          link = '<a onclick="window.changeValue(\'' + schoolsResult[i].school.name.replace(/\s/g," ") + '\',\'' + schoolsResult[i].school.id + '\')" href="javascript:void(0)">' + schoolsResult[i].school.name + '</a><br/>';
                           $("#search_school_result_list").append(link);
                       }
                       $("#search_school_result_list").css('left', $(e.target).offset().left);
@@ -590,7 +621,7 @@
                       $("#search_school_result_list").show();
                       if($(e.target).val().trim() != '') {
                           str = e.target.value.length > 8 ?  e.target.value.substr(0, 6)+"..." : e.target.value;
-                          $("#hint").html('找到了' + data.length + '个包含"' + str + '"的高校');
+                          $("#hint").html('找到了' + count + '个包含"' + str + '"的高校');
                           $("#hint").show();
                       }else{
                           $("#hint").hide();
@@ -610,45 +641,46 @@
               $("#search_school_result_list").hide();
               $("#hint").hide();
           }
-      })
-      $("input[name='province']").on('focus', function (e) {
-          if($(e.target).val() == ''){  //
-              return;
-          }
-          if( $("input[name='occupation']").val() != ''){ //如果已经有id了。肯定存在，不用去找了。
-              return;
-          }
-          $.ajax({
-              url: '<%= url_for(:controller => 'school',:action => 'on_search') %>' + '?name=' + e.target.value,
-              type: 'post',
-              success: function (data) {
-                  if(data.length != undefined && data.length != 0) {
-                      var i = 0;
-                      $("#search_school_result_list").html('');
-                      for (; i < data.length; i++) {
-                          link = '<a onclick="window.changeValue(\'' + data[i].school.name.replace(/\s/g," ") + '\',\'' + data[i].school.id + '\')" href="javascript:void(0)">' + data[i].school.name + '</a><br/>';
-                          $("#search_school_result_list").append(link);
-                      }
-                      $("#search_school_result_list").css('left', $(e.target).offset().left);
-                      $("#search_school_result_list").css('top', $(e.target).offset().top + 28);
-                      $("#search_school_result_list").css("position", "absolute");
-                      $("#search_school_result_list").show();
-                      if ($(e.target).val().trim() != '') {
-                          str = e.target.value.length > 8 ? e.target.value.substr(0, 6) + "..." : e.target.value;
-                          $("#hint").html('找到了' + data.length + '个包含"' + str + '"的高校');
-                          $("#hint").show();
-                      } else {
-                          $("#hint").hide();
-                      }
-                  }else {
-                      $("#search_school_result_list").html('');
-                      str = e.target.value.length > 4 ?  e.target.value.substr(0, 4)+"..." : e.target.value;
-                      $("#hint").html('没有找到包含"'+str+'"的高校，<a style="color:#64bdd9" onclick="add_school(\''+ e.target.value+'\');" href="javascript:void(0);">创建高校</a>');
-                      $("#hint").show();
-                  }
-              }
-          });
       });
+//      $("input[name='province']").on('focus', function (e) {
+//          if($(e.target).val() == ''){  //
+//              return;
+//          }
+//          if( $("input[name='occupation']").val() != ''){ //如果已经有id了。肯定存在，不用去找了。
+//              return;
+//          }
+//
+//          $.ajax({
+//              url: '<%#= url_for(:controller => 'school',:action => 'on_search') %>' + '?name=' + e.target.value,
+//              type: 'post',
+//              success: function (data) {
+//                  if(data.length != undefined && data.length != 0) {
+//                      var i = 0;
+//                      $("#search_school_result_list").html('');
+//                      for (; i < data.length; i++) {
+//                          link = '<a onclick="window.changeValue(\'' + data[i].school.name.replace(/\s/g," ") + '\',\'' + data[i].school.id + '\')" href="javascript:void(0)">' + data[i].school.name + '</a><br/>';
+//                          $("#search_school_result_list").append(link);
+//                      }
+//                      $("#search_school_result_list").css('left', $(e.target).offset().left);
+//                      $("#search_school_result_list").css('top', $(e.target).offset().top + 28);
+//                      $("#search_school_result_list").css("position", "absolute");
+//                      $("#search_school_result_list").show();
+//                      if ($(e.target).val().trim() != '') {
+//                          str = e.target.value.length > 8 ? e.target.value.substr(0, 6) + "..." : e.target.value;
+//                          $("#hint").html('找到了' + data.length + '个包含"' + str + '"的高校');
+//                          $("#hint").show();
+//                      } else {
+//                          $("#hint").hide();
+//                      }
+//                  }else {
+//                      $("#search_school_result_list").html('');
+//                      str = e.target.value.length > 4 ?  e.target.value.substr(0, 4)+"..." : e.target.value;
+//                      $("#hint").html('没有找到包含"'+str+'"的高校，<a style="color:#64bdd9" onclick="add_school(\''+ e.target.value+'\');" href="javascript:void(0);">创建高校</a>');
+//                      $("#hint").show();
+//                  }
+//              }
+//          });
+//      });
 
 //    $("#province").leanModal({top: 100, closeButton: ".modal_close"});
 
@@ -673,6 +705,11 @@
     $("#users_tb_2").click();
     <% end %>
     $('#my_account_form_link').click(function(e){
+        if($("#userIdentity").val() == -1 ) {
+            $("#identity_hint").html('<span style="color:red">请选择身份</span>').show();
+            e.stopImmediatePropagation();
+            return;
+        }
         if( $("input[name='province']").val().trim() != '' && $("input[name='occupation']").val().trim() == ''){  //学校名字和id不对的话
             $("#hint").html('<span style="color:red">学校必须是从下拉列表中选择的,不能手动修改</span>').show();
             e.stopImmediatePropagation();
diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb
index 915637ec5..ec8562885 100644
--- a/app/views/projects/_development_group.html.erb
+++ b/app/views/projects/_development_group.html.erb
@@ -34,15 +34,23 @@
     <%= link_to "(#{attaments_num})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %>
   <% end %>
   <% if User.current.member_of?(@project) %>
-    <%= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %>
+    <%#= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %>
+   <a class="subnav_green m195" href="javascript:void(0);" onclick="project_files_upload();">+上传资源</a>
   <% end %>
 </div>
 <% end %>
 <%# --版本库被设置成私有、module中设置不显示、没有创建版本库 三种情况不显示-- %>
 <% if visible_repository?(@project) %>
   <div class="subNav">
-    <%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
+    <% if rep_is_gitlab?(@project) %>
+        <%= link_to l(:project_module_repository), {:controller => 'projects', :action => 'settings', :id => @project.id, :tab=>'repositories'},  :class => "f14 c_blue02" %>
+    <% else %>
+        <%= link_to l(:project_module_repository),({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => gitlab_repository(@project).identifier}), :class => "f14 c_blue02" %>
+    <% end %>
     <a class="subnav_num">(<%= @project.repositories.count %>)</a>
+    <% if (User.current.admin? || User.current.allowed_to?({:controller => 'projects', :action => 'settings'}, @project)) && rep_is_gitlab?(@project) %>
+        <%= link_to "+"+l(:project_gitlab_create_repository), url_for(:controller => 'projects', :action => 'settings', :id => @project.id, :tab=>'repositories') , :class => "subnav_green" %>
+    <% end %>
   </div>
 <% end %>
 <!-- more -->
diff --git a/app/views/projects/_upload_project_files_list.html.erb b/app/views/projects/_upload_project_files_list.html.erb
new file mode 100644
index 000000000..59da30012
--- /dev/null
+++ b/app/views/projects/_upload_project_files_list.html.erb
@@ -0,0 +1,35 @@
+<span class="add_attachment" data-containerid="<%= container.id %>">
+<% checkBox = (@course.present? && @course.is_public?) ? 'public' : 'private'%>
+<button name="button" class="sub_btn" onclick="_file<%=container.id %>.click()" onmouseover="this.focus()" style="<%= ie8? ? 'display:none' : ''%>" type="button" ><%= l(:label_browse) %></button>
+    <%= file_field_tag 'attachments[dummy][file]',
+                       :id => "_file#{container.id}",
+                       :class => ie8? ? '':'file_selector',
+                       :multiple => true,
+                       :onchange => "addInputFiles_board(this, '#{container.id}');",
+                       :style => ie8? ? '': 'display:none',
+                       :data => {
+                               :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
+                               :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
+                               :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+                               :upload_path => uploads_path(:format => 'js'),
+                               :description_placeholder => l(:label_optional_description),
+                               :field_is_public => l(:field_is_public),
+                               :are_you_sure => l(:text_are_you_sure),
+                               :file_count => l(:label_file_count),
+                               :delete_all_files => l(:text_are_you_sure_all)
+                       } %>
+
+<!--<input type="submit" name="" value="上传文件" class="f_l ml10" style="width:80px; height:26px;">-->
+</span>
+<span id="upload_file_count<%=container.id %>">
+      <%= l(:label_no_file_uploaded)%>
+    </span>
+(<%= l(:label_max_size) %>:
+<%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
+<div class="cl">
+
+  <div>
+        <span id="attachments_fields<%= container.id %>" data-containerid="<%= container.id %>" xmlns="http://www.w3.org/1999/html">
+</span>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/projects/_upload_project_files_on_navbar.html.erb b/app/views/projects/_upload_project_files_on_navbar.html.erb
new file mode 100644
index 000000000..591e159f1
--- /dev/null
+++ b/app/views/projects/_upload_project_files_on_navbar.html.erb
@@ -0,0 +1,30 @@
+
+<div id="popbox_upload" class="mb10" style="margin-top: -30px;color:#15bccf; font-size:16px;">
+  <div class="upload_con">
+    <h2 style="text-align: center"><%= l(:label_upload_files)%></h2>
+    <div class="upload_box">
+      <%= error_messages_for 'attachment' %>
+      <div id="network_issue" style="color: red; display: none;"><%= l(:label_file_upload_error_messages)%></div>
+
+      <%= form_tag(project_files_path(container), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %>
+          <!-- <label style="margin-top:3px;"><#%= l(:label_file_upload)%></label>   -->
+          <input type="hidden" name="in_project_toolbar" value="Y">
+          <%= render :partial => 'projects/upload_project_files_list',:locals => {:container => container} %>
+          <div class="cl"></div>
+          <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="hideModal();"><%= l(:button_cancel)%></a>
+          <a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%= l(:button_confirm)%></a>
+      <% end %>
+    </div>
+
+  </div>
+  <% content_for :header_tags do %>
+      <%= javascript_include_tag 'attachments' %>
+  <% end %>
+</div>
+
+<script>
+    function submit_resource()
+    {
+        $('#submit_resource').parent().submit();
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb
index 0859e5e19..43535153d 100644
--- a/app/views/projects/settings/_new_repositories.html.erb
+++ b/app/views/projects/settings/_new_repositories.html.erb
@@ -7,99 +7,90 @@
 <%= str = error_messages_for 'repository' %>
 <% project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT %>
 <% ip = RepositoriesHelper::REPO_IP_ADDRESS %><!--Added by tanxianbo For formatting project's path-->
+<%# 提示 %>
+<% if @project.repositories.count>1 %>
+    <div class="flash notice">
+      项目管理员您好！近日平台完成了版本库升级，以后每个项目将唯一的对应一个版本库。请您按照以下步骤完成项目版本库的更新：
+      <p>1. 点击下面的"创建版本库按钮"，为本项目创建一个新的版本库；</p>
+      <p>2. 从本项目的历史版本库中选择一个您将使用的版本库，将其完整的克隆(clone)到本地(需要提供您之前设置的版本库口令)，然后推送(push)到新建的版本库(注意不能仅推送代码，否则之前各开发者的提交记录将丢失)。</p>
+      <p>3. 本项目的历史版本库将在您新建版本库的一周内自动隐藏，如果您以后需要这些版本库，请与网站联系，我们将为您提供这些版本库的所有数据。</p>
+    </div>
+<% end %>
+<%# 新建版本库 %>
+<% if @project.repositories.count == 0 || rep_is_gitlab?(@project) %>
+    <div style="padding-bottom: 40px">
+      <a href="javascript:viod(0)" class="pic_add fl mr5" onclick="pro_st_show_ku();"></a>
+      <a href="javascript:viod(0)" class="c_blue fl" onclick="pro_st_show_ku();">
+        <% course_tag = @project.project_type %>
+        <% if User.current.allowed_to?(:manage_repository, @project) %>
+            <!--newrepo_project_repository_path(@project, :course => course_tag) -->
+            <%= link_to l(:label_repository_new_repos),"#" , :onclick=>"pro_st_show_ku();", :class => 'c_blue fl' %></p>
+        <% end %>
+      </a>
+      <div class="cl"></div>
+
+      <%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form',:method=>"post",:autocomplete=>'off'} do |f| %>
+          <div id="pro_st_edit_ku" class="pro_st_edit_ku">
+            <ul>
+              <li style="display: none">
+                <label class="label02"><%=l(:label_scm)%>：</label>
+                <%= select_tag('repository_scm',
+                               options_for_select(["Git"],@repository.class.name.demodulize),
+                               :data => {:remote => true, :method => 'get'}) %>
+                <% if @repository && ! @repository.class.scm_available %>
+                    <span class="c_grey"><%= l(:text_scm_command_not_available) %></span>
+                <% end %>
+              </li>
+              <li >
+                <input type="text" style="display: none"/> <!--阻止表单自动填充 -->
+                <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
+                <span class="f14"><span class="c_red">*</span><%=l(:label_repository_name)%>：</span>
+                <%= f.text_field :identifier, :disabled =>@repository.nil? || @repository.identifier_frozen? ? true:false,:label=>"", :no_label => true %>
+                <% unless @repository.identifier_frozen? %>
+                    <span class="c_grey"><%=l(:text_length_between,:min=>1,:max=>254)<<l(:text_project_identifier_info) %></span>
+                <% end %>
+              </li>
+              <div class="cl"></div>
+            </ul>
+            <a href="#" onclick="$('#repository-form').submit();" class="blue_btn fl  "><%=l(:lable_project_rep_create) %></a>
+            <a href="<%= settings_project_path(@project, :tab => 'repositories')%>" class="grey_btn fl "><%=l(:button_cancel)%></a>
+          </div><!--pro_st_edit_issues end-->
+      <% end %>
+    </div>
+<% end %>
+
+
 <% if @project.repositories.any? %>
+    <%= render :partial => 'projects/settings/rep_gitlab', :locals => {:project => @project, :ip => "ip", :project_path_cut => "project_path_cut" } %>
+    <%#= render :partial => 'projects/settings/rep_forge', :locals => {:project => @project, :ip => "ip", :project_path_cut => "project_path_cut" } %>
+    <div class="rep_history_title">历史版本库</div>
     <table class="pro_table">
       <tbody>
-      <tr class="pro_table_tit">
-        <td class=" w150"><%= l(:field_identifier) %></td>
-        <td class="w150"> <%= l(:field_repository_is_default) %></td>
-        <td class="w150"><%= l(:label_scm) %> </td>
-        <td class="w150" ><%= l(:label_repository_path) %> </td>
-        <td class="w150"> </td>
-        <td class="w150"> </td>
-      </tr>
-      <% @project.repositories.sort.each do |repository| %>
-          <tr class="<%= cycle 'pro_table_on', '' %>">
-            <td><a href="javascript:viod(0)" title="<%= repository.identifier %>">
-              <%= link_to  truncate(repository.identifier), ({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => repository.identifier_param} if repository.identifier.present?) %></a></td>
-            <td> <%= checked_image repository.is_default? %></td>
-            <td><%=h repository.scm_name %></td>
+      <% rep_forge(@project).sort.each do |repository| %>
+          <tr class="<%= cycle 'pro_table_on_forge', '' %>">
+            <td class="w150"><span class="rep_history_grey" title="<%= repository.identifier %>">
+              <%= repository.identifier %></span></td>
+            <td class="w150"><span class="rep_history_grey"><%=h repository.scm_name %></span></td>
             <%if repository.scm_name=="Git"%>
-                <td style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" title="http://<%=  repository.login.to_s %>_<%= repository.identifier.to_s%>@<%= ip %>
-         <%=h repository.url.slice(project_path_cut, repository.url.length) %>"> <%=truncate( 'http://' <<  repository.login.to_s << '_'<<   repository.identifier.to_s << '@'<< ip.to_s << h( repository.url.slice(project_path_cut, repository.url.length)),:length=>20)%></td><!--Modified by tanxianbo-->
+                <% rep_url = "http://" + repository.login.to_s + '_'+ repository.identifier.to_s + "@" + ip.to_s + h( repository.url.slice(project_path_cut, repository.url.length)) %>
+                <td class="w362 pl5" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis; text-align: left">
+                <span class="rep_history_grey">
+                  <textarea id="copy_rep_content2_<%= repository.id %>" class="cloneUrl2 fl" type="input" ><%= rep_url %></textarea>
+                  <a href="javascript:void(0);" onclick="jsCopy2(<%= repository.id %>)"><span class="vl_copy2" title="点击复制版本库地址"></span></a>
+                  <%#= rep_url %>
+                </span>
+                </td><!--Modified by tanxianbo-->
             <%else %>
-                <td style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" ><%=h truncate(repository.url,:length=>10) %></td>
+                <td class="w360" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" ><%=h truncate(repository.url,:length=>10) %></td>
             <% end %>
-            <td><a href="javascript:viod(0)" class="c_blue" >
-              <% if repository.scm_name=="Git"%>
-                  <%if User.current.allowed_to?(:manage_repository, @project) %>
-                      <%= link_to(l(:label_user_plural), committers_repository_path(repository)) %>
-                  <% end %>
-              <% end %>
-            </a></td>
-            <td>
-              <% if repository.login.to_s==User.current.login.to_s %>
-                  <%= delete_new_link repository_path(repository) %>
-              <% end %></td>
           </tr>
       <% end %>
       </tbody>
     </table>
 <% else %>
-    <p class="nodata"><%= l(:label_repository_no_data) %></p>
+    <p class="nodata">温馨提示：<%= l(:label_repository_no_data) %></p>
 <% end %>
 
-<%# 新建版本库 %>
-<% if @project.repositories.count == 0 %>
-    <a href="javascript:viod(0)" class="pic_add fl mr5" onclick="pro_st_show_ku();"></a>
-    <a href="javascript:viod(0)" class="c_blue fl" onclick="pro_st_show_ku();">
-      <% course_tag = @project.project_type %>
-      <% if User.current.allowed_to?(:manage_repository, @project) %>
-          <!--newrepo_project_repository_path(@project, :course => course_tag) -->
-          <%= link_to l(:label_repository_new_repos),"#" , :onclick=>"pro_st_show_ku();", :class => 'c_blue fl' %></p>
-      <% end %>
-    </a>
-    <div class="cl"></div>
 
-    <%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form',:method=>"post",:autocomplete=>'off'} do |f| %>
-        <div id="pro_st_edit_ku" class="pro_st_edit_ku">
-          <ul>
-            <li >
-              <label class="label02"><%=l(:label_scm)%>：</label>
-              <%= select_tag('repository_scm',
-                             options_for_select(["Git"],@repository.class.name.demodulize),
-                             :data => {:remote => true, :method => 'get'})%>
-              <% if @repository && ! @repository.class.scm_available %>
-                  <span class="c_grey"><%= l(:text_scm_command_not_available) %></span>
-              <% end %>
-            </li>
 
-            <% unless judge_main_repository(@project) %>
-                <li>
-                  <label class="label02"><%=l(:field_repository_is_default)%>：</label>
-                  <%= f.check_box :is_default, :label => "", :no_label => true %></p>
-                </li>
-            <% end %>
-            <li >
-              <input type="text" style="display: none"/> <!--阻止表单自动填充 -->
-              <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
-              <label class="label02"><span class="c_red">*</span><%=l(:label_repository_name)%>：</label>
-              <%= f.text_field :identifier, :disabled =>@repository.nil? || @repository.identifier_frozen? ? true:false,:label=>"", :no_label => true %>
-              <% unless @repository.identifier_frozen? %>
-                  <span class="c_grey"><%=l(:text_length_between,:min=>1,:max=>254)<<l(:text_project_identifier_info) %></span>
-              <% end %>
-            </li>
-            <li >
-              <label class="label02"><span class="c_red">*</span><%=l(:label_password)%></label>
-              <%= f.password_field :upassword, :label=> "", :no_label => true%>
-              <span class="c_grey"><%= l(:label_upassword_info)%></span>
-            </li>
-            <div class="cl"></div>
-          </ul>
-          <a href="#" onclick="$('#repository-form').submit();" class="blue_btn fl ml110"><%=l(:button_save)%></a>
-          <a href="<%= settings_project_path(@project, :tab => 'repositories')%>" class="grey_btn fl ml10"><%=l(:button_cancel)%></a>
-        </div><!--pro_st_edit_issues end-->
-    <% end %>
-
-<% end %>
 
diff --git a/app/views/projects/settings/_rep_forge.html.erb b/app/views/projects/settings/_rep_forge.html.erb
new file mode 100644
index 000000000..e25849c38
--- /dev/null
+++ b/app/views/projects/settings/_rep_forge.html.erb
@@ -0,0 +1,38 @@
+<table class="pro_table">
+  <tbody>
+  <tr class="pro_table_tit">历史版本</tr>
+  <tr class="pro_table_tit">
+    <td class=" w150"><%= l(:field_identifier) %></td>
+    <td class="w150"> <%= l(:field_repository_is_default) %></td>
+    <td class="w150"><%= l(:label_scm) %> </td>
+    <td class="w150" ><%= l(:label_repository_path) %> </td>
+    <td class="w150"> </td>
+    <td class="w150"> </td>
+  </tr>
+  <% rep_forge(project).sort.each do |repository| %>
+      <tr class="<%= cycle 'pro_table_on', '' %>">
+        <td><a href="javascript:viod(0)" title="<%= repository.identifier %>">
+          <%= link_to  truncate(repository.identifier), ({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => repository.identifier_param} if repository.identifier.present?) %></a></td>
+        <td> <%= checked_image repository.is_default? %></td>
+        <td><%=h repository.scm_name %></td>
+        <%if repository.scm_name=="Git"%>
+            <td style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" title="http://<%=  repository.login.to_s %>_<%= repository.identifier.to_s%>@<%= ip %>
+         <%=h repository.url.slice(project_path_cut, repository.url.length) %>"> <%=truncate( 'http://' <<  repository.login.to_s << '_'<<   repository.identifier.to_s << '@'<< ip.to_s << h( repository.url.slice(project_path_cut, repository.url.length)),:length=>20)%></td><!--Modified by tanxianbo-->
+        <%else %>
+            <td style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" ><%=h truncate(repository.url,:length=>10) %></td>
+        <% end %>
+        <td><a href="javascript:viod(0)" class="c_blue" >
+          <% if repository.scm_name=="Git"%>
+              <%if User.current.allowed_to?(:manage_repository, @project) %>
+                  <%= link_to(l(:label_user_plural), committers_repository_path(repository)) %>
+              <% end %>
+          <% end %>
+        </a></td>
+        <td>
+          <% if repository.login.to_s==User.current.login.to_s %>
+              <%= delete_new_link repository_path(repository) %>
+          <% end %></td>
+      </tr>
+  <% end %>
+  </tbody>
+</table>
\ No newline at end of file
diff --git a/app/views/projects/settings/_rep_gitlab.html.erb b/app/views/projects/settings/_rep_gitlab.html.erb
new file mode 100644
index 000000000..1de706b5d
--- /dev/null
+++ b/app/views/projects/settings/_rep_gitlab.html.erb
@@ -0,0 +1,26 @@
+<% rep_gitlab(project).sort.each do |repository| %>
+
+    <table class="pro_table">
+      <tbody>
+      <tr class="pro_table_tit">
+        <td class=" w150"><%= l(:field_identifier) %></td>
+        <td class="w150"><%= l(:label_scm) %> </td>
+        <td class="w362" ><%= l(:label_repository_path) %> </td>
+      </tr>
+
+      <tr class="<%= cycle 'pro_table_on', '' %>">
+        <td><a href="javascript:viod(0)" title="<%= repository.identifier %>">
+          <%= link_to  truncate(repository.identifier), ({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => repository.identifier_param} if repository.identifier.present?) %></a>
+        </td>
+        <td><%=h repository.scm_name %></td>
+        <%if repository.scm_name=="Gitlab"%>
+            <td style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" title="<%= rep_gitlab_url(project) %>">
+              <%=truncate(rep_gitlab_url(project), :length => 360) %>
+            </td>
+        <%else %>
+            <td style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" ><%=h truncate(repository.url,:length=>10) %></td>
+        <% end %>
+      </tr>
+<% end %>
+</tbody>
+</table>
\ No newline at end of file
diff --git a/app/views/repositories/_breadcrumbs.html.erb b/app/views/repositories/_breadcrumbs.html.erb
index db570d948..84111afeb 100644
--- a/app/views/repositories/_breadcrumbs.html.erb
+++ b/app/views/repositories/_breadcrumbs.html.erb
@@ -1,32 +1,13 @@
-<%= link_to @repository.identifier.present? ? h(@repository.identifier) : 'root',
-            {:action => 'show', :id => @project,
-            :repository_id => @repository.identifier_param,
-            :path => nil, :rev => @rev },
-            :class=>"fl c_blue f14 fb" %>
-<%
-   dirs = path.split('/')
-   if 'file' == kind
-     filename = dirs.pop
-   end
-   link_path = ''
-   dirs.each do |dir|
-     next if dir.blank?
-     link_path << '/' unless link_path.empty?
-     link_path << "#{dir}"
-%>
-    / <%= link_to h(dir), :action => 'show', :id => @project, :repository_id => @repository.identifier_param,
-                  :path => to_path_param(link_path), :rev => @rev  %>
-<% end %>
-<% if filename %>
-    / <%= link_to h(filename),
-                  :action => 'changes', :id => @project, :repository_id => @repository.identifier_param,
-                  :path => to_path_param("#{link_path}/#{filename}"), :rev => @rev %>
-<% end %>
-<%
-   # @rev is revsion or Git and Mercurial branch or tag.
-   # For Mercurial *tip*, @rev and @changeset are nil.
-   rev_text = @changeset.nil? ? @rev : format_revision(@changeset)
-%>
-<p class="fl f14 fb c_grey02"><%= "@ #{h rev_text}" unless rev_text.blank? %></p>
+<div class="git_usr_title">
+  <span><%= link_to @repository.identifier.present? ? h(@repository.identifier) : 'root',
+                    {:action => 'show', :id => @project,
+                     :repository_id => @repository.identifier_param,
+                     :path => nil, :rev => @rev },
+                     :class => "repository-title-dec"
+  %>
+    /
+    <%=link_to @project.owner, user_path(@project.owner), :class => "repository-title-dec" %>
+  </span>
+</div>
 
 <% html_title(with_leading_slash(path)) -%>
diff --git a/app/views/repositories/_dir_list.html.erb b/app/views/repositories/_dir_list.html.erb
index 26ba05bb6..771d4d1ec 100644
--- a/app/views/repositories/_dir_list.html.erb
+++ b/app/views/repositories/_dir_list.html.erb
@@ -1,17 +1,6 @@
 <div class="autoscroll">
 <table class="list entries" id="browser">
-<thead>
-<tr id="root">
-<th><%= l(:field_name) %></th>
-<th><%= l(:field_filesize) %></th>
-<% if @repository.report_last_commit %>
-<th><%= l(:label_revision)  %></th>
-<th><%= l(:label_age)       %></th>
-<th><%= l(:field_author)    %></th>
-<th><%= l(:field_comments)  %></th>
-<% end %>
-</tr>
-</thead>
+
 <tbody>
 <%= render :partial => 'dir_list_content' %>
 </tbody>
diff --git a/app/views/repositories/_dir_list_content.html.erb b/app/views/repositories/_dir_list_content.html.erb
index e595a77dd..81706c25e 100644
--- a/app/views/repositories/_dir_list_content.html.erb
+++ b/app/views/repositories/_dir_list_content.html.erb
@@ -7,6 +7,7 @@
 <td style="padding-left: <%=18 * depth%>px;" class="<%=
            @repository.report_last_commit ? "filename" : "filename_no_report" %>">
 <% if entry.is_dir? %>
+<%# 展开文件目录 %>
 <span class="expander" onclick="scmEntryClick('<%= tr_id %>', '<%= escape_javascript(url_for(
                        :action => 'show',
                        :id     => @project,
@@ -17,10 +18,11 @@
                        :parent_id => tr_id)) %>');">&nbsp;</span>
 <% end %>
 <%=  link_to h(ent_name),
-          {:action => (entry.is_dir? ? 'show' : 'changes'), :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(ent_path), :rev => @rev},
+          {:action => (entry.is_dir? ? 'show' : 'entry'), :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(ent_path), :rev => @rev},
           :class => (entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}")%>
 </td>
-<td class="size"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>
+<!--<td class="size"><%#= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>-->
+  <!--<td class="size"><%#= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>-->
 <% if @repository.report_last_commit %>
 <td class="revision"><%= link_to_revision(entry.changeset, @repository) if entry.changeset %></td>
 <td class="age"><%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td>
diff --git a/app/views/repositories/_form.html.erb b/app/views/repositories/_form.html.erb
index bc5a060db..8c169d7be 100644
--- a/app/views/repositories/_form.html.erb
+++ b/app/views/repositories/_form.html.erb
@@ -31,12 +31,7 @@
   <%= f.text_field :login, :size => 30 %>
   <input type="text" hidden="hidden">
 </p>
-<p>
-  <%= f.password_field :password, :size => 30, :name => 'ignore',
-                       :value => ((@repository.new_record? || @repository.password.blank?) ? '' : ('x'*15)),
-                       :onfocus => "this.value=''; this.name='repository[password]';",
-                       :onchange => "this.name='repository[password]';" %>
-</p>
+
 </div>
 <!--Ended by tanxianbo-->
 <p>
diff --git a/app/views/repositories/_form_create.html.erb b/app/views/repositories/_form_create.html.erb
index d8c30143e..11dce9cd4 100644
--- a/app/views/repositories/_form_create.html.erb
+++ b/app/views/repositories/_form_create.html.erb
@@ -26,7 +26,6 @@ border:none
   <em class="info error"><%= l(:text_scm_command_not_available) %></em>
 <% end %>
 </p>
-<p><%= f.check_box :is_default, :label => :field_repository_is_default %></p>
 
 <p>
   <input id="googleinputcache"  size="30" type="text">
@@ -36,8 +35,6 @@ border:none
   	 <%= l(:text_repository_identifier_info).html_safe %></em>
 <% end %></p>
 <!-- <p><%#= f.text_field :url, :size => 60, :required => true,:readonly=>true, :class=>'textbg'%></p> -->
-<p><%= f.password_field :upassword, :required =>true, :label=> :field_password %>
-	<em class="info"><%= l(:label_upassword_info)%></em></p>
 </div>
 <p>
   <%= submit_tag(@repository.new_record? ? l(:button_create) : l(:button_save)) %>
diff --git a/app/views/repositories/_navigation.html.erb b/app/views/repositories/_navigation.html.erb
index d8ce218eb..c3e154f17 100644
--- a/app/views/repositories/_navigation.html.erb
+++ b/app/views/repositories/_navigation.html.erb
@@ -1,34 +1,33 @@
-<% content_for :header_tags do %>
-    <%= javascript_include_tag 'repository_navigation' %>
-<% end %>
-<a  href="javascript:void(0);" class="pic_stats fl ml20 mt3"></a>
-<%= link_to l(:label_statistics),
+<!--<a  href="javascript:void(0);" class="pic_stats fl ml20 mt3"></a>-->
+<%#= link_to l(:label_statistics),
             {:action => 'stats', :id => @project, :repository_id => @repository.identifier_param},
             :class => 'mt3 c_blue fl' if @repository.supports_all_revisions? %>
+<div class="repositorytitle mr15">
+  <% content_for :header_tags do %>
+      <%= javascript_include_tag 'repository_navigation' %>
+  <% end %>
 
-<%= form_tag({:action => controller.action_name,
-              :id => @project,
-              :repository_id => @repository.identifier_param,
-              :path => to_path_param(@path),
-              :rev => nil},
-             {:method => :get, :id => 'revision_selector', :class => "fl c_grey02 ml5"}) do -%>
-    <!-- Branches Dropdown -->
-    <% if !@repository.branches.nil? && @repository.branches.length > 0 -%>
-        | <%= l(:label_branch) %>:
-        <%= select_tag :branch,
-                       options_for_select([''] + @repository.branches, @rev),
-                       :id => 'branch' %>
-    <% end -%>
 
-    <% if !@repository.tags.nil? && @repository.tags.length > 0 -%>
-        | <%= l(:label_tag) %>:
-        <%= select_tag :tag,
-                       options_for_select([''] + @repository.tags, @rev),
-                       :id => 'tag' %>
-    <% end -%>
 
-    <% if @repository.supports_all_revisions? %>
-        | <%= l(:label_revision) %>:
-        <%= text_field_tag 'rev', @rev, :size => 8 %>
-    <% end %>
-<% end -%>
+  <%= form_tag({:action => controller.action_name,
+                :id => @project,
+                :repository_id => @repository.identifier_param,
+                :path => to_path_param(@path),
+                :rev => nil},
+               {:method => :get, :id => 'revision_selector'}) do -%>
+      <!-- Branches Dropdown -->
+      <% if !@repository.branches.nil? && @repository.branches.length > 0 -%>
+          <%= l(:label_branch) %>:
+          <%= select_tag :branch, options_for_select([''] + @repository.branches, @rev), :id => 'branch' %>
+      <% end -%>
+
+      <% if !@repository.tags.nil? && @repository.tags.length > 0 -%>
+          <%= select_tag :tag, options_for_select([''] + @repository.tags, @rev), :id => 'tag', :style=>" display:none" %>
+      <% end -%>
+
+      <% if @repository.supports_all_revisions? %>
+          <%= hidden_field_tag 'rev', @rev, :size => 8 %>
+      <% end %>
+  <% end -%>
+
+</div>
diff --git a/app/views/repositories/_revisions.html.erb b/app/views/repositories/_revisions.html.erb
index 891952559..837096c89 100644
--- a/app/views/repositories/_revisions.html.erb
+++ b/app/views/repositories/_revisions.html.erb
@@ -1,53 +1,51 @@
-<% 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>
-          </tr>
-          <% line_num += 1 %>
+          <div class="col-md-10 col-sm-12">
+            <ul class="bordered-list">
+              <li class="commit js-toggle-container">
+                <div class="commit-row-title">
+                  <strong class="str-truncated">
+                    <a class="commit-row-message"><%= textilizable(truncate_at_line_break(changeset.message)) %></a>
+                  </strong>
+                  <div class="pull-right" title="修订号">
+                    <%= h truncate(changeset.short_id.to_s, :length => 20) %>
+                  </div>
+                  <div class="notes_count">
+                  </div>
+                </div>
+                <div class="commit-row-info">
+                  <a class="commit-author-link has_tooltip"> <span class="commit-author-name">
+                    <%= image_tag(url_to_avatar(user_commit_rep(changeset.author_email)),  :width => "20", :height => "20", :class => "fl portraitRadius mt2 ml4 mr5") %>
+                    <%= link_to user_commit_rep(changeset.author_email), user_path(user_commit_rep(changeset.author_email)), :length => 30 %></span></a>
+                  提交于
+                  <div class="committed_ago">
+                    <time class="time_ago js-timeago"  title="<%= changeset.created_at %>"><%= time_tag(changeset.created_at) %> 前</time> &nbsp;
+                  </div>
+                </div>
+              </li>
+            </ul>
+          </div>
       <% 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 %>
diff --git a/app/views/repositories/_summary.html.erb b/app/views/repositories/_summary.html.erb
new file mode 100644
index 000000000..3bd86cd45
--- /dev/null
+++ b/app/views/repositories/_summary.html.erb
@@ -0,0 +1,37 @@
+<div class="overall-summary overall-summary-bottomless">
+
+  <div class="stats-switcher-viewport js-stats-switcher-viewport">
+    <div class="stats-switcher-wrapper">
+      <ul class="numbers-summary">
+        <li class="commits">
+          <a data-pjax="" href="/redmine/redmine/commits/0.6-stable">
+            <span class="octicon octicon-history"></span>
+            <span class="num text-emphasized">
+              <%=link_to @changesets.count, {:action => 'changes', :path => to_path_param(@path), :id => @project, :repository_id => @repository.identifier_param, :rev => @rev}, :class => "num text-emphasized c_blue" %>
+            </span>
+            commits
+          </a>
+        </li>
+
+        <li>
+          <span class="octicon image-type"></span>
+          <span class="num text-emphasized" style="color: #269AC9">
+            <%= @repository.branches.count %>
+          </span>
+          branches
+        </li>
+
+        <li>
+            <span class="octicon octicon-organization"></span>
+            <span class="num text-emphasized">
+               <%=link_to @repository.committers.count, committers_repository_path(@repository), :class => "c_blue" %>
+            </span>
+            contributors
+        </li>
+      </ul>
+
+
+    </div>
+  </div>
+
+</div>
\ No newline at end of file
diff --git a/app/views/repositories/changes.html.erb b/app/views/repositories/changes.html.erb
index 302c839ba..428799f07 100644
--- a/app/views/repositories/changes.html.erb
+++ b/app/views/repositories/changes.html.erb
@@ -1,18 +1,20 @@
 <%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
 
-<div class="contextual">
-  <%= render :partial => 'navigation' %>
+<div class="project_r_h">
+  <div class="fl"><h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2></div>
 </div>
 
-<h3><%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => (@entry ? @entry.kind : nil), :revision => @rev } %></h3>
+<div class="repository_con " style="line-height:1.9;">
+  <%= render :partial => 'navigation' %>
+  <div class="cl"></div>
+</div>
 
 <%= render :partial => 'link_to_functions' %>
 
 <%= render_properties(@properties) %>
 
-<div class="mt40">
-<%= render(:partial => 'revisions',
-           :locals => {:project => @project, :path => @path, :revisions => @changesets, :entry => @entry }) unless @changesets.empty? %>
+<div class="mt10">
+    <%= render(:partial => 'revisions', :locals => {:project => @project, :path => @path, :revisions => @commits, :entry => @entry }) unless @commits.empty? %>
 </div>
 <% content_for :header_tags do %>
 <%=   stylesheet_link_tag "scm" %>
diff --git a/app/views/repositories/committers.html.erb b/app/views/repositories/committers.html.erb
index ccb037e09..93350889d 100644
--- a/app/views/repositories/committers.html.erb
+++ b/app/views/repositories/committers.html.erb
@@ -1,4 +1,8 @@
-<h3><%= l(:label_repository) %></h3>
+<div class="project_r_h">
+  <div class="fl">
+    <h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2>
+  </div>
+</div>
 
 <%= simple_format(l(:text_repository_usernames_mapping)) %>
 
diff --git a/app/views/repositories/diff.html.erb b/app/views/repositories/diff.html.erb
index a3afebfff..4e40bd5e8 100644
--- a/app/views/repositories/diff.html.erb
+++ b/app/views/repositories/diff.html.erb
@@ -1,4 +1,7 @@
-<h3><%= l(:label_revision) %> <%= @diff_format_revisions %> <%=h @path %></h3>
+<div class="project_r_h">
+  <div class="fl"><h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2></div>
+</div>
+<h3><%= l(:label_revision_path) %> ：<%=h @path %></h3>
 
 <!-- Choose view type -->
 <%= form_tag({:action => 'diff', :id => @project,
diff --git a/app/views/repositories/entry.html.erb b/app/views/repositories/entry.html.erb
index 5aea99dcc..bb2fa6dae 100644
--- a/app/views/repositories/entry.html.erb
+++ b/app/views/repositories/entry.html.erb
@@ -1,15 +1,17 @@
 <%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
+<div style="padding-left: 8px; padding-top: 10px;">
+  <div class="contextual">
+    <%= render :partial => 'navigation' %>
+  </div>
 
-<div class="contextual">
-  <%= render :partial => 'navigation' %>
+  <h3><%= l(:label_revision_path) %> ：<%= @path %></h3>
+
+  <%= render :partial => 'link_to_functions' %>
+
+  <%= render :partial => 'common/file', :locals => {:filename => @path, :content => @content} %>
+
+  <% content_for :header_tags do %>
+      <%= stylesheet_link_tag "scm" %>
+  <% end %>
 </div>
 
-<h3><%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h3>
-
-<%= render :partial => 'link_to_functions' %>
-
-<%= render :partial => 'common/file', :locals => {:filename => @path, :content => @content} %>
-
-<% content_for :header_tags do %>
-<%= stylesheet_link_tag "scm" %>
-<% end %>
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 28a260178..9601e5188 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -1,83 +1,65 @@
 <%= call_hook(:view_repositories_show_contextual, {:repository => @repository, :project => @project}) %>
 <div class="project_r_h">
-  <h2 class="project_h2">版本库</h2>
+  <div class="fl"><h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2></div>
 </div>
 <div class="repository_con" style="line-height:1.9;">
-  <div class="repositorytitle" style="float:left;">
-    <%= render :partial => 'breadcrumbs',
-              :locals => {:path => @path, :kind => 'dir', :revision => @rev} %>
-    <%= render :partial => 'navigation' %>
-  </div>
-  <!--contextual end-->
-  <div class="cl"></div>
-  <div class=" c_dark f14">
-    <p>
-      <% if @repository.type.to_s=="Repository::Git" %>
-          <%= @repos_url %>
-      <% else %>
-          <%= h @repository.url %>
-      <% end %>
-    </p>
+  <% if @entries.nil? %>
+      <%# 未提交代码提示 %>
+      <div class=" repository-url light-well">
+        <% if @entries.nil? && authorize_for('repositories', 'browse') %>
+            <div class="page-title">
+              该版本库还没有上传代码!
+            </div>
+        <% end %>
+        <% if @repository.type.to_s=="Repository::Gitlab" %>
+            版本库地址：<%= @repos_url %>
+        <% else %>
+            版本库地址：<%= h @repository.url %>
+        <% end %>
+        <!-- added by bai -->
+        <div class="cl"></div>
+      </div>
+  <% else %>
+      <%= render :partial => 'navigation' %>
+      <div class="fl c_grey02 mt5 mr5">克隆网址:</div>
+      <textarea id="copy_rep_content" class="cloneUrl mt5 fl" type="input" placeholder="http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git"><%=@repository.type.to_s=="Repository::Gitlab" ? @repos_url.to_s.lstrip : @repository.url %></textarea>
+      <a href="javascript:void(0);" class="clone_btn mt5" onclick="jsCopy()"><span class="vl_copy" title="点击复制版本库地址"></span></a>
+      <div class="fl mt5 ml15"><a href="javascript:void(0);" class="vl_btn fb" onclick="zip()"><span class="vl_zip"></span>ZIP</a> </div>
+      <div class="fr mt5"><a href="javascript:void(0);" class="vl_btn fb" onclick="zip()"><span class="vl_fork"></span>Fork</a> <span href="javascript:void(0);" class="vl_btn_2 fb">0</span> </div>
+      <div class="cl"></div>
+      <div class="recordBanner mt10">
+        <% if @changesets && !@changesets.empty? %>
+            <%= image_tag(url_to_avatar(user_commit_rep(@changesets_latest_coimmit.author_email)),  :width => "25", :height => "25", :class => "fl portraitRadius mt2 ml4 mr5") %>
+            <span class="fl"><div class="fb fontGrey3 mr5 fl"><%=link_to user_commit_rep(@changesets_latest_coimmit.author_email), user_path(user_commit_rep(@changesets_latest_coimmit.author_email)) %></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">
+            <%= @repository.branches.count %></font> 个分支
+        </span>
 
-    <p class="mb10 break_word">
-      (<%= l(:label_all_revisions) %><%= @repositories.sort.collect { |repo|
-      link_to h(repo.name),
-              {:controller => 'repositories', :action => 'show',
-               :id => @project, :repository_id => repo.identifier_param, :rev => nil, :path => nil},
-               :class => 'repository' + (repo == @repository ? ' selected' : ''),
-               :class => "mb10 break_word c_orange" }.join('&nbsp|&nbsp').html_safe %>)
-    </p>
-  </div>
+        <span class="fr mr5"><font class="fb ml2 mr2 vl_commit">
+            <%=link_to @changesets_all_count, {:action => 'changes', :path => to_path_param(@path), :id => @project, :repository_id => @repository.identifier_param, :rev => @rev} %></font> 提交
+        </span>
+      </div>
+  <% end %>
 </div>
+<!--contextual end-->
+
 <% if !@entries.nil? && authorize_for('repositories', 'browse') %>
+    <%# 数据统计 %>
+    <%#= render :partial => 'summary' %>
+    <%# end %>
     <%= render :partial => 'dir_list' %>
 <% end %>
 <%= render_properties(@properties) %>
 
 <!-- 代码修订 -->
-<% if authorize_for('repositories', 'revisions') %>
-    <%# if @changesets && !@changesets.empty? %>
-        <h3>
-          <%= l(:label_latest_revision_plural) %>
-        </h3>
-        <%= render :partial => 'revisions',
-                 :locals => {:project => @project, :path => @path,
-                             :revisions => @changesets, :entry => nil} %>
-    <%# end %>
+<%= render_properties(@properties) %>
 
-    <p style="padding-top: 10px;">
-      <% has_branches = (!@repository.branches.nil? && @repository.branches.length > 0)
-         sep = '' %>
-      <% if @repository.supports_all_revisions? && @path.blank? %>
-          <%= link_to l(:label_view_all_revisions), {:action => 'revisions', :id => @project,
-                                                     :repository_id => @repository.identifier_param},
-                      :class => "orange_u_btn" %>
-          <% sep = '|' %>
-      <% end %>
-      <% if @repository.supports_directory_revisions? && (has_branches || !@path.blank? || !@rev.blank?) %>
-          <%= sep %>
-          <%= link_to l(:label_view_revisions),
-                      {:action => 'changes',
-                       :path => to_path_param(@path),
-                       :id => @project,
-                       :repository_id => @repository.identifier_param,
-                       :rev => @rev},
-                       :class => "orange_u_btn" %>
-      <% end %>
-    </p>
-    <% if @repository.supports_all_revisions? %>
-        <% content_for :header_tags do %>
-            <%= auto_discovery_link_tag(
-                        :atom, params.merge(
-                        {:format => 'atom', :action => 'revisions',
-                         :id => @project, :page => nil, :key => User.current.rss_key})) %>
-        <% end %>
-    <% end %>
-<% end %>
 
-<!-- added by bai -->
-<p class="fb mt10"><a href="http://<%=Setting.host_name %>/forums/1/memos/1232" class=" c_blue ">点击查看如何提交代码</a></p>
-<div class="cl"></div>
+<a href="https://<%=Setting.host_name %>/forums/1/memos/1232" >如何提交代码</a>
 
 <% content_for :header_tags do %>
     <%= stylesheet_link_tag "scm" %>
diff --git a/app/views/repositories/to_gitlab.html.erb b/app/views/repositories/to_gitlab.html.erb
new file mode 100644
index 000000000..d06c087ed
--- /dev/null
+++ b/app/views/repositories/to_gitlab.html.erb
@@ -0,0 +1,12 @@
+<div class="repository-update-dec">
+  <p class="c_orange">
+    <%= l(:label_repository_migrate_dec) %>
+  </p>
+<%= form_for(@repository, url: to_gitlab_project_repository_path(@project, @repository)) do |f| %>
+<input type="text" name="repo_name"/>
+    <button type="submit">转换到新版本</button>
+<% end %>
+<span class="c_grey">
+  <%= l(:label_repository_name_dec) %>
+</span>
+</div>
\ No newline at end of file
diff --git a/app/views/school/upload_logo.html.erb b/app/views/school/upload_logo.html.erb
index 023069dd0..01071fb81 100644
--- a/app/views/school/upload_logo.html.erb
+++ b/app/views/school/upload_logo.html.erb
@@ -11,7 +11,7 @@ function showPreview(source) {
 }
 </script>
 
-<%= form_tag(upload_school_path(@school.id),method: "post",  multipart: true) do %>
+<%= form_tag(upload_school_path(@school.id),method: "post",  multipart: true,:id => "school_form") do %>
 	<%#= text_field_tag 'school'%>
     <div style="padding:15px; border: 1px solid #dddddd;">
       <input type="hidden" value="<%= @school_name%>" name="school_name">
@@ -19,16 +19,58 @@ function showPreview(source) {
       <a type="button" onclick="$('#file').click();" style="margin: 86px 0 0 15px;float: left;padding: 2px 5px;border: 1px solid #eaeaea;cursor: pointer;text-decoration: none;width: 55px;">上传图片</a>
       <%= file_field_tag 'logo',:style => "display:none;", :id => "file", :onchange => "showPreview(this)"%>
       <div style="clear: both;"></div>
-      <div class="mt15">学校名称：<input type="text" placeholder="现在对应的学校名称" class="schoolName ml4"/></div>
+      <div class="mt15">学校名称：<input type="text" name="name" placeholder="现在对应的学校名称" value="<%= @school.name%>" class="schoolName ml4"/></div>
       <div class="mt10">学校省份：
-        <select class="provinceSelect"><option value="0" selected="true" style="display: none;"></option><option value="湖南省">湖南省</option><option value="北京市">北京市</option><option value="天津市">天津市</option><option value="河北省">河北省</option><option value="山西省">山西省</option><option value="内蒙古自治区">内蒙古自治区</option><option value="辽宁省">辽宁省</option><option value="吉林省">吉林省</option><option value="黑龙江省">黑龙江省</option><option value="上海市">上海市</option><option value="江苏省">江苏省</option><option value="浙江省">浙江省</option><option value="安徽省">安徽省</option><option value="福建省">福建省</option><option value="江西省">江西省</option><option value="山东省">山东省</option><option value="河南省">河南省</option><option value="湖北省">湖北省</option><option value="广东省">广东省</option><option value="广西壮族自治区">广西壮族自治区</option><option value="海南省">海南省</option><option value="重庆市">重庆市</option><option value="四川省">四川省</option><option value="贵州省">贵州省</option><option value="云南省">云南省</option><option value="西藏自治区">西藏自治区</option><option value="陕西省">陕西省</option><option value="甘肃省">甘肃省</option><option value="青海省">青海省</option><option value="宁夏回族自治区">宁夏回族自治区</option><option value="新疆维吾尔自治区">新疆维吾尔自治区</option><option value="香港">香港</option><option value="澳门">澳门</option><option value="台湾">台湾</option></select>
+        <select class="provinceSelect" name="province">
+          <option value="">--请选择省份--</option>
+          <option value="北京市" <%= @school.province == '北京市' ? 'selected':'' %>>北京</option>
+          <option value="上海市" <%= @school.province == '上海市' ? 'selected':'' %>>上海</option>
+          <option value="广东省" <%= @school.province == '广东省' ? 'selected':'' %>>广东</option>
+          <option value="江苏省" <%= @school.province == '江苏省' ? 'selected':'' %>>江苏</option>
+          <option value="浙江省" <%= @school.province == '浙江省' ? 'selected':'' %>>浙江</option>
+          <option value="重庆市" <%= @school.province == '重庆市' ? 'selected':'' %>>重庆</option>
+          <option value="安徽省" <%= @school.province == '安徽省' ? 'selected':'' %>>安徽</option>
+          <option value="福建省" <%= @school.province == '福建省' ? 'selected':'' %>>福建</option>
+          <option value="甘肃省" <%= @school.province == '甘肃省' ? 'selected':'' %>>甘肃</option>
+          <option value="广西省" <%= @school.province == '广西省' ? 'selected':'' %>>广西</option>
+          <option value="贵州省" <%= @school.province == '贵州省' ? 'selected':'' %>>贵州</option>
+          <option value="海南省" <%= @school.province == '海南省' ? 'selected':'' %>>海南</option>
+          <option value="河北省" <%= @school.province == '河北省' ? 'selected':'' %>>河北</option>
+          <option value="黑龙江省" <%= @school.province == '黑龙江省' ? 'selected':'' %>>黑龙江</option>
+          <option value="河南省" <%= @school.province == '河南省' ? 'selected':'' %>>河南</option>
+          <option value="湖北省" <%= @school.province == '湖北省' ? 'selected':'' %>>湖北</option>
+          <option value="湖南省" <%= @school.province == '湖南省' ? 'selected':'' %>>湖南</option>
+          <option value="江西省" <%= @school.province == '江西省' ? 'selected':'' %>>江西</option>
+          <option value="吉林省" <%= @school.province == '吉林省' ? 'selected':'' %>>吉林</option>
+          <option value="辽宁省" <%= @school.province == '辽宁省' ? 'selected':'' %>>辽宁</option>
+          <option value=" 内蒙古自治区" <%= @school.province == ' 内蒙古自治区' ? 'selected':'' %>>内蒙古</option>
+          <option value="宁夏回族自治区" <%= @school.province == '宁夏回族自治区' ? 'selected':'' %>>宁夏</option>
+          <option value="青海省" <%= @school.province == '青海省' ? 'selected':'' %>>青海</option>
+          <option value="山东省" <%= @school.province == '山东省' ? 'selected':'' %>>山东</option>
+          <option value="山西省" <%= @school.province == '山西省' ? 'selected':'' %>>山西</option>
+          <option value="陕西省" <%= @school.province == '陕西省' ? 'selected':'' %>>陕西</option>
+          <option value="四川省" <%= @school.province == '四川省' ? 'selected':'' %>>四川</option>
+          <option value="天津市" <%= @school.province == '天津市' ? 'selected':'' %>>天津</option>
+          <option value=" 新疆维吾尔自治区" <%= @school.province == ' 新疆维吾尔自治区' ? 'selected':'' %>>新疆</option>
+          <option value="西藏自治区" <%= @school.province == '西藏自治区' ? 'selected':'' %>>西藏</option>
+          <option value="云南省" <%= @school.province == '云南省' ? 'selected':'' %>>云南</option>
+          <option value="香港" <%= @school.province == '香港' ? 'selected':'' %>>香港特别行政区</option>
+          <option value="澳门" <%= @school.province == '澳门' ? 'selected':'' %>>澳门特别行政区</option>
+          <option value="台湾" <%= @school.province == '台湾' ? 'selected':'' %>>台湾</option>
+          <option value="海外" <%= @school.province == '海外' ? 'selected':'' %>>海外</option>
+        </select>
       </div>
       <div style="margin-top: 10px;">
-        <input type="button" value="提交" class="mr5 submit_btn" />
-        <input type="button" value="取消" class="cancel_btn" />
+        <input type="button" value="提交" onclick="submit_edit_school($(this));" class="mr5 submit_btn_s" />
+        <input type="button" value="取消" onclick="history.go(-1);" class="cancel_btn" />
         <%#= submit_tag('提交',:class=>'mr5') %>
         <%#= submit_tag('取消') %>
       </div>
     </div>
 <% end %>
+<script>
+  function submit_edit_school(dom){
+    $("#school_form").submit();
+  }
+</script>
 
diff --git a/app/views/student_work/_add_score.html.erb b/app/views/student_work/_add_score.html.erb
index 961f351de..0258b3b83 100644
--- a/app/views/student_work/_add_score.html.erb
+++ b/app/views/student_work/_add_score.html.erb
@@ -16,7 +16,7 @@
             <%= render :partial => 'student_work/student_work_attachment_form', :locals => {:work => work,:score => score} %>
           </div>
       <%end%>
-      <a href="javascript:void(0);" class="blue_n_btn fr evaluation_submit" onclick="$(this).parent().parent().submit();$('#about_hwork_<%= @work.id%>').html('');">提交</a>
+      <a href="javascript:void(0);" class="blue_n_btn fr evaluation_submit" onclick="$(this).parent().parent().submit();$('#about_hwork_<%= work.id%>').html('');">提交</a>
       <div class="cl"></div>
     </li>
 <% end%>
\ No newline at end of file
diff --git a/app/views/student_work/_alert_forbidden_anonymous.html.erb b/app/views/student_work/_alert_forbidden_anonymous.html.erb
new file mode 100644
index 000000000..55f21048f
--- /dev/null
+++ b/app/views/student_work/_alert_forbidden_anonymous.html.erb
@@ -0,0 +1,16 @@
+<div id="popbox02">
+  <div class="ni_con">
+    <h2>禁用匿评</h2>
+    <p>
+      禁用匿评后学生将不能对作品进行互评，且匿评不能再开启，是否确定禁用匿评？
+    </p>
+    <div class="ni_btn">
+      <a href="javascript:" class="tijiao" onclick="clickOK('<%= forbidden_anonymous_comment_student_work_path(:homework=>@homework, :user_activity_id => user_activity_id, :course_activity => course_activity)%>');" style="margin-bottom: 20px;" >
+        确&nbsp;&nbsp;定
+      </a>
+      <a href="javascript:" class="tijiao" onclick="clickCanel();" style="margin-bottom: 20px;">
+        取&nbsp;&nbsp;消
+      </a>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb
index 9a21e109b..4ed0a538a 100644
--- a/app/views/student_work/_evaluation_un_title.html.erb
+++ b/app/views/student_work/_evaluation_un_title.html.erb
@@ -1,6 +1,6 @@
 <ul class="hworkUl">
   <li class="hworkList340 hworkH30 <%= @homework.homework_type == 2 ? '' : 'width385'%>">
-    <span class="c_dark f14 fb fl <%= @homework.homework_type == 2 ? 'mr60 ml80' : 'mr95 ml100'%>">作品名称</span>
+    <span class="c_dark f14 fb fl <%= @homework.homework_type == 2 ? 'mr90 ml50' : 'mr140 ml50'%>">作品名称</span>
     <span class="c_dark f14 fb fl mr50">姓名</span>
     <span class="c_dark f14 fb fl">学号</span>
   </li>
@@ -35,12 +35,14 @@
       </li>
   <% end%>
 
-  <li class="hworkList50 hworkH30">
-    <%= link_to "匿评",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%>
-    <% if @show_all && @order == "student_score"%>
-        <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
-    <% end%>
-  </li>
+  <% if @homework.anonymous_comment == 0%>
+      <li class="hworkList50 hworkH30">
+        <%= link_to "匿评",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%>
+        <% if @show_all && @order == "student_score"%>
+            <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
+        <% end%>
+      </li>
+  <% end %>
 
   <li class="hworkList50 hworkH30">
     <%= link_to "成绩",@show_all ? student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%>
diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb
index 832350e3e..ebe3d4cc6 100644
--- a/app/views/student_work/_evaluation_un_work.html.erb
+++ b/app/views/student_work/_evaluation_un_work.html.erb
@@ -28,7 +28,7 @@
   <li class="hworkList130 c_grey" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
     <% if student_work.created_at && @homework.end_time%>
         <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
-        <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %>
+        <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %>
             <span class="c_red">[迟交]</span>
         <% end %>
     <% end %>
@@ -47,7 +47,8 @@
       </li>
   <% end%>
 
-  <li class="hworkList50 <%= score_color student_work.student_score%> student_score_info">
+  <% if @homework.anonymous_comment == 0%>
+    <li class="hworkList50 <%= score_color student_work.student_score%> student_score_info">
     <%= student_work.student_score.nil? ? "--" : format("%.1f",student_work.student_score)%>
     <% unless student_work.student_score.nil?%>
         <span class="linkBlue">
@@ -61,7 +62,7 @@
         </div>
     <% end%>
   </li>
-
+  <% end %>
   <!-- 成绩 -->
   <% score = student_work.respond_to?("score") ? student_work.score : (student_work.final_score || 0) - student_work.absence_penalty - student_work.late_penalty%>
   <li class="hworkList50 <%= score_color score%> student_final_scor_info">
@@ -79,5 +80,6 @@
         </div>
     <% end%>
   </li>
+  <li class="hworkTip" style="display: none"><em></em><span></span><font class="fontGrey2">点击查看详情</font></li>
 </ul>
 
diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb
index 4a6a4eb68..81d868a50 100644
--- a/app/views/student_work/_evaluation_work.html.erb
+++ b/app/views/student_work/_evaluation_work.html.erb
@@ -1,62 +1,63 @@
-<!-- 匿评作品列表，显示某一个作品的信息 -->
-<ul class="hworkListRow" id="student_work_<%= student_work.id%>">
-  <% is_my_work = student_work.user == User.current%>
-  <li class="hworkList340 width525">
-    <ul>
-      <% if is_my_work%>
-          <li class="hworkPortrait mt15 mr10">
-            <%= image_tag(url_to_avatar(student_work.user),width:"40", height: "40") %>
-          </li>
-          <li class="hworkName mt15 mr15 width285">
-            <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
-            <div>
-              <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%>
-            </div>
-          </li>
-          <li onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
-            <ul class="mt10 fl">
-              <li class="hworkStName mr10 mt16" title="姓名">
-                <%= student_work.user.show_name%>
-              </li>
-              <li class="hworkStID mt16" title="学号">
-                <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
-              </li>
-            </ul>
-          </li>
-      <% else%>
-          <li class="hworkPortrait mt15 mr10">
-            <%= image_tag(url_to_avatar(""),width:"40", height: "40") %>
-          </li>
-          <li class="hworkName mt15 mr15 width285">
-            <div>
-              <%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%>
-            </div>
-          </li>
-          <li onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
-            <ul class="mt10 fl">
-              <li class="hworkStName mr10 mt16" title="姓名">
-                匿名
-              </li>
-              <li class="hworkStID mt16" title="学号">
-                --
-              </li>
-            </ul>
-          </li>
-      <% end%>
-
-    </ul>
-  </li>
-  <li class="hworkList130 c_grey" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
-    <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
-    <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %>
-        <span class="c_red">[迟交]</span>
-    <% end %>
-  </li>
-
-  <!-- 成绩 -->
-  <% my_score = student_work_score(student_work,User.current) %>
-  <li class="hworkList50 <%= my_score.nil? ? 'c_grey' : score_color(my_score.score)%> mr10">
-    <%= my_score.nil? ? "--" : format("%.1f",my_score.score)%>
-  </li>
-</ul>
-
+<!-- 匿评作品列表，显示某一个作品的信息 -->
+<ul class="hworkListRow" id="student_work_<%= student_work.id%>">
+  <% is_my_work = student_work.user == User.current%>
+  <li class="hworkList340 width525">
+    <ul>
+      <% if is_my_work%>
+          <li class="hworkPortrait mt15 mr10">
+            <%= image_tag(url_to_avatar(student_work.user),width:"40", height: "40") %>
+          </li>
+          <li class="hworkName mt15 mr15 width285">
+            <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
+            <div>
+              <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%>
+            </div>
+          </li>
+          <li onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+            <ul class="mt10 fl">
+              <li class="hworkStName mr10 mt16" title="姓名">
+                <%= student_work.user.show_name%>
+              </li>
+              <li class="hworkStID mt16" title="学号">
+                <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
+              </li>
+            </ul>
+          </li>
+      <% else%>
+          <li class="hworkPortrait mt15 mr10">
+            <%= image_tag(url_to_avatar(""),width:"40", height: "40") %>
+          </li>
+          <li class="hworkName mt15 mr15 width285">
+            <div>
+              <%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%>
+            </div>
+          </li>
+          <li onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+            <ul class="mt10 fl">
+              <li class="hworkStName mr10 mt16" title="姓名">
+                匿名
+              </li>
+              <li class="hworkStID mt16" title="学号">
+                --
+              </li>
+            </ul>
+          </li>
+      <% end%>
+
+    </ul>
+  </li>
+  <li class="hworkList130 c_grey" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+    <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
+    <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %>
+        <span class="c_red">[迟交]</span>
+    <% end %>
+  </li>
+
+  <!-- 成绩 -->
+  <% my_score = student_work_score(student_work,User.current) %>
+  <li class="hworkList50 <%= my_score.nil? ? 'c_grey' : score_color(my_score.score)%> mr10">
+    <%= my_score.nil? ? "--" : format("%.1f",my_score.score)%>
+  </li>
+  <li class="hworkTip" style="display: none"><em></em><span></span><font class="fontGrey2">点击查看详情</font></li>
+</ul>
+
diff --git a/app/views/student_work/_programing_work_show.html.erb b/app/views/student_work/_programing_work_show.html.erb
index b5ff8f064..fd541c643 100644
--- a/app/views/student_work/_programing_work_show.html.erb
+++ b/app/views/student_work/_programing_work_show.html.erb
@@ -3,21 +3,21 @@
   <ul>
     <li class="fl" >
       <span class="tit_fb">上交时间：</span>
-      <%=format_time @work.created_at %>
+      <%=format_time work.created_at %>
     </li>
 
-    <% if @work.user == User.current && @homework.homework_detail_manual.comment_status == 1 %>
+    <% if work.user == User.current && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") %>
         <!-- 我的作业 && 匿评作业 && 未开启匿评，显示编辑和删除按钮 -->
         <li class="fr" >
-          <%= link_to("", student_work_path(@work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del")  %>
+          <%= link_to("", student_work_path(work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del")  %>
         </li>
         <li class="fr" >
           <%= link_to "",new_student_work_path(:homework => @homework.id),:class => "pic_edit"%>
         </li>
     <% end%>
-    <% if @homework.homework_detail_manual.comment_status == 3 && @work.user != User.current%>
+    <% if @homework.homework_detail_manual.comment_status == 3 && work.user != User.current%>
         <!-- 匿评结束阶段，显示点赞按钮 -->
-        <li class="fr" id="student_work_praise_<%= @work.id%>">
+        <li class="fr" id="student_work_praise_<%= work.id%>">
           <%= render :partial => 'student_work_praise' %>
         </li>
     <% end%>
@@ -26,7 +26,7 @@
     <li >
       <span class="tit_fb ">编程代码：</span>
       <div class="showHworkP break_word">
-        <%= text_format(@work.description) if @work.description%>
+        <%= text_format(work.description) if work.description%>
       </div>
       <div class="cl"></div>
     </li>
@@ -37,10 +37,10 @@
             测试结果：
           </span>
           <div class="show_hwork_p break_word">
-            <% @work.student_work_tests.each_with_index do |test, index| %>
+            <% work.student_work_tests.each_with_index do |test, index| %>
                 <div class="ProResultTop">
                   <p class="c_blue fl">
-                    第<%= @work.student_work_tests.count - index%>次测试
+                    第<%= work.student_work_tests.count - index%>次测试
                   </p>
                   <span class="fr c_grey">
                     <%= test.created_at.to_s(:db) %>
@@ -79,24 +79,24 @@
     <% end%>
 
     <li >
-      <% if @is_teacher || (@homework.homework_detail_manual.comment_status == 2 && @work.user != User.current )%>
+      <% if @is_teacher || (@homework.homework_detail_manual.comment_status == 2 && work.user != User.current )%>
           <!-- 老师 || 开启匿评状态 && 不是当前用户自己的作品 -->
-          <div id="add_student_score_<%= @work.id%>" class="mt10 evaluation">
-            <%= render :partial => 'add_score',:locals => {:work => @work,:score => @score}%>
+          <div id="add_student_score_<%= work.id%>" class="mt10 evaluation">
+            <%= render :partial => 'add_score',:locals => {:work => work,:score => score}%>
           </div>
       <% end%>
       <div class="cl"></div>
     </li>
   </ul>
 
-  <div class="ping_box fl" id="score_list_<%= @work.id%>" style="<%= @work.student_works_scores.empty? ? 'padding:0px;' : ''%>">
-    <%@student_work_scores.each do |score|%>
-        <div id="work_score_<%= score.id%>">
-          <%= render :partial => 'student_work_score',:locals => {:score => score,:is_last => score == @student_work_scores.last}%>
+  <div class="ping_box fl" id="score_list_<%= work.id%>" style="<%= work.student_works_scores.empty? ? 'padding:0px;' : ''%>">
+    <%student_work_scores.each do |student_score|%>
+        <div id="work_score_<%= student_score.id%>">
+          <%= render :partial => 'student_work_score',:locals => {:score => student_score,:is_last => student_score == student_work_scores.last}%>
         </div>
     <% end%>
   </div>
   <!---ping_box end--->
-  <a href="javascript:void(0);" class="fr linkBlue mt5 mb5" onclick="$('#about_hwork_<%= @work.id%>').html('');">收起</a>
+  <a href="javascript:void(0);" class="fr linkBlue mt5 mb5" onclick="$('#about_hwork_<%= work.id%>').html('');">收起</a>
   <div class="cl"></div>
 </div>
\ No newline at end of file
diff --git a/app/views/student_work/_set_score_rule.html.erb b/app/views/student_work/_set_score_rule.html.erb
index 7deed7fb8..26e3b06cb 100644
--- a/app/views/student_work/_set_score_rule.html.erb
+++ b/app/views/student_work/_set_score_rule.html.erb
@@ -1,63 +1,9 @@
-<%= form_for('new_form',:url =>  {:controller => 'student_work',:action => 'set_score_rule',:homework => homework.id},:method => "post") do |f|%>
-    <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..4739fba47
--- /dev/null
+++ b/app/views/student_work/_set_score_rule_detail.html.erb
@@ -0,0 +1,63 @@
+<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>
+  <% if homework.anonymous_comment == 0 %>
+      <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>
+  <% end %>
+  <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();clickCanel();">确定</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/_show.html.erb b/app/views/student_work/_show.html.erb
index cfc4129a8..286d5eb39 100644
--- a/app/views/student_work/_show.html.erb
+++ b/app/views/student_work/_show.html.erb
@@ -3,21 +3,21 @@
   <ul>
     <li class="fl" >
       <span class="tit_fb">上交时间：</span>
-      <%=format_time @work.created_at %>
+      <%=format_time work.created_at %>
     </li>
 
-    <% if @work.user == User.current && @homework.homework_detail_manual.comment_status == 1 %>
+    <% if work.user == User.current && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") %>
         <!-- 我的作业 && 匿评作业 && 未开启匿评，显示编辑和删除按钮 -->
         <li class="fr" >
-          <%= link_to("", student_work_path(@work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del")  %>
+          <%= link_to("", student_work_path(work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del")  %>
         </li>
         <li class="fr" >
-          <%= link_to "",edit_student_work_path(@work),:class => "pic_edit"%>
+          <%= link_to "",edit_student_work_path(work),:class => "pic_edit"%>
         </li>
     <% end%>
-    <% if @homework.homework_detail_manual.comment_status == 3 && @work.user != User.current%>
+    <% if @homework.homework_detail_manual.comment_status == 3 && work.user != User.current%>
         <!-- 匿评结束阶段，显示点赞按钮 -->
-        <li class="fr" id="student_work_praise_<%= @work.id%>">
+        <li class="fr" id="student_work_praise_<%= work.id%>">
           <%= render :partial => 'student_work_praise' %>
         </li>
     <% end%>
@@ -25,50 +25,50 @@
 
     <!--<li ><span class="tit_fb"> 参与人员：</span>程梦雯&nbsp;&nbsp;王强</li>-->
 
-    <% if @work.project%>
+    <% if work.project%>
         <li >
           <span class="tit_fb"> 关联项目：</span>
-          <%= link_to( @work.project.name, project_path(@work.project.id), :class => "linkBlue" )%>
+          <%= link_to( work.project.name, project_path(work.project.id), :class => "linkBlue" )%>
         </li>
     <% end%>
 
     <li >
       <span class="tit_fb ">内容：</span>
       <div class="showHworkP break_word">
-        <%= text_format(@work.description) if @work.description%>
+        <%= text_format(work.description) if work.description%>
       </div>
       <div class="cl"></div>
     </li>
     <li >
       <span class="tit_fb"> 附件：</span>
-      <% if @work.attachments.empty?%>
+      <% if work.attachments.empty?%>
           <span style="color: #999999">尚未提交附件</span>
       <% else%>
           <div class="fl" style="width: 90%;">
-            <%= render :partial => 'work_attachments_status', :locals => {:attachments => @work.attachments, :status => @homework.homework_detail_manual.comment_status} %>
+            <%= render :partial => 'work_attachments_status', :locals => {:attachments => work.attachments, :status => @homework.homework_detail_manual.comment_status} %>
           </div>
       <% end%>
       <div class="cl"></div>
     </li>
     <li >
-      <% if @is_teacher || (@homework.homework_detail_manual.comment_status == 2 && @work.user != User.current )%>
+      <% if @is_teacher || (@homework.homework_detail_manual.comment_status == 2 && work.user != User.current )%>
           <!-- 老师 || 开启匿评状态 && 不是当前用户自己的作品 -->
-          <div id="add_student_score_<%= @work.id%>" class="mt10 evaluation">
-            <%= render :partial => 'add_score',:locals => {:work => @work,:score => @score}%>
+          <div id="add_student_score_<%= work.id%>" class="mt10 evaluation">
+            <%= render :partial => 'add_score',:locals => {:work => work,:score => score}%>
           </div>
       <% end%>
       <div class="cl"></div>
     </li>
   </ul>
 
-  <div class="ping_box fl" id="score_list_<%= @work.id%>" style="<%= @work.student_works_scores.empty? ? 'padding:0px;' : ''%>">
-    <%@student_work_scores.each do |score|%>
-        <div id="work_score_<%= score.id%>">
-          <%= render :partial => 'student_work_score',:locals => {:score => score,:is_last => score == @student_work_scores.last}%>
+  <div class="ping_box fl" id="score_list_<%= work.id%>" style="<%= work.student_works_scores.empty? ? 'padding:0px;' : ''%>">
+    <%student_work_scores.each do |student_score|%>
+        <div id="work_score_<%= student_score.id%>">
+          <%= render :partial => 'student_work_score',:locals => {:score => student_score,:is_last => student_score == student_work_scores.last}%>
         </div>
     <% end%>
   </div>
   <!---ping_box end--->
-  <a href="javascript:void(0);" class="fr linkBlue mt5 mb5" onclick="$('#about_hwork_<%= @work.id%>').html('');">收起</a>
+  <a href="javascript:void(0);" class="fr linkBlue mt5 mb5" onclick="$('#about_hwork_<%= work.id%>').html('');">收起</a>
   <div class="cl"></div>
 </div>
\ No newline at end of file
diff --git a/app/views/student_work/_student_work_attachment_form.html.erb b/app/views/student_work/_student_work_attachment_form.html.erb
index 7802f6eb6..265ff9be7 100644
--- a/app/views/student_work/_student_work_attachment_form.html.erb
+++ b/app/views/student_work/_student_work_attachment_form.html.erb
@@ -1,35 +1,35 @@
-<div class="fl">
-  <span id="attachments_fields<%= work.id%>" xmlns="http://www.w3.org/1999/html">
-  </span>
-  <div class="cl"></div>
-  <span class="add_attachment" style="font-weight:normal;">
-    <%= button_tag "文件浏览", :type=>"button", :onclick=>"$('#_file#{work.id}').click();",:onmouseover => 'this.focus()',:class => 'sub_btn' %>
-    <%= file_field_tag 'attachments[dummy][file]',
-                       :id => "_file#{work.id}",
-                       :class => 'file_selector',
-                       :multiple => true,
-                       :onchange => "addInputFiles_board(this, '#{work.id}');",
-                       :style => 'display:none',
-                       :data => {
-                               :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
-                               :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
-                               :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
-                               :upload_path => uploads_path(:format => 'js'),
-                               :description_placeholder => l(:label_optional_description),
-                               :field_is_public => l(:field_is_public),
-                               :are_you_sure => l(:text_are_you_sure),
-                               :file_count => l(:label_file_count),
-                               :delete_all_files => l(:text_are_you_sure_all),
-                               :containerid => "#{work.id}"
-                       } %>
-    <span id="upload_file_count<%= work.id%>">
-      <%= l(:label_no_file_uploaded) %>
-    </span>
-    (<%= l(:label_max_size) %>:
-    <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
-  </span>
-  <% content_for :header_tags do %>
-      <%= javascript_include_tag 'attachments' %>
-  <% end %>
-</div>
-
+<div class="fl">
+  <span id="attachments_fields<%= work.id%>" xmlns="http://www.w3.org/1999/html">
+  </span>
+  <div class="cl"></div>
+  <span class="add_attachment" style="font-weight:normal;">
+    <%= button_tag "文件浏览", :type=>"button", :onclick=>"$('#_file#{work.id}').click();",:onmouseover => 'this.focus()',:class => 'sub_btn mb0' %>
+    <%= file_field_tag 'attachments[dummy][file]',
+                       :id => "_file#{work.id}",
+                       :class => 'file_selector',
+                       :multiple => true,
+                       :onchange => "addInputFiles_board(this, '#{work.id}');",
+                       :style => 'display:none',
+                       :data => {
+                               :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
+                               :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
+                               :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+                               :upload_path => uploads_path(:format => 'js'),
+                               :description_placeholder => l(:label_optional_description),
+                               :field_is_public => l(:field_is_public),
+                               :are_you_sure => l(:text_are_you_sure),
+                               :file_count => l(:label_file_count),
+                               :delete_all_files => l(:text_are_you_sure_all),
+                               :containerid => "#{work.id}"
+                       } %>
+    <span id="upload_file_count<%= work.id%>">
+      <%= l(:label_no_file_uploaded) %>
+    </span>
+    (<%= l(:label_max_size) %>:
+    <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
+  </span>
+  <% content_for :header_tags do %>
+      <%= javascript_include_tag 'attachments' %>
+  <% end %>
+</div>
+
diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb
index 197fecac9..64f097114 100644
--- a/app/views/student_work/_student_work_list.html.erb
+++ b/app/views/student_work/_student_work_list.html.erb
@@ -1,9 +1,12 @@
-<div class="fl" style="border-bottom:1px solid #eaeaea; padding-bottom:10px; width:720px;">
+<div class="fl" style="padding-bottom:10px; width:720px;">
   <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">
@@ -12,6 +15,7 @@
       </div>
       <%= select_tag(:student_work_in_group,options_for_select(course_group_list(@course),@group), {:class => "classSplit"}) unless course_group_list(@course).empty?  %>
   <% end%>
+  <span class="fr c_grey"> <a href="javascript:void(0);" class="linkGrey2" id="homework_info_show" style="display: none">[ 显示作业信息 ]</a> </span>
 </div>
 <div class="cl"></div>
 
@@ -31,6 +35,14 @@
         <%= render :partial => "evaluation_un_work", :locals => {:student_work => student_work}%>
     <% end%>
     <div class="cl"></div>
-    <div id="about_hwork_<%= student_work.id%>"></div>
+    <div id="about_hwork_<%= student_work.id%>">
+      <% if student_work.user == User.current && !@is_evaluation %>
+        <% if @homework.homework_type == 2%>
+            <%=render :partial => 'programing_work_show', :locals=> {:work => student_work, :score =>student_work_score(student_work,User.current),:student_work_scores => student_work.student_works_scores.order("updated_at desc")} %>
+        <% else %>
+            <%=render :partial => 'show' , :locals=> {:work => student_work, :score =>student_work_score(student_work,User.current),:student_work_scores => student_work.student_works_scores.order("updated_at desc")} %>
+        <% end %>
+      <% end %>
+    </div>
     <div class="cl"></div>
 <% end%>
\ No newline at end of file
diff --git a/app/views/student_work/_work_attachments.html.erb b/app/views/student_work/_work_attachments.html.erb
index a75f68f70..098bb94d0 100644
--- a/app/views/student_work/_work_attachments.html.erb
+++ b/app/views/student_work/_work_attachments.html.erb
@@ -2,7 +2,7 @@
     <div id="attachment_<%= attachment.id%>">
       <%= link_to_short_attachment attachment, :class => 'link_file_a fl', :download => true -%>
       <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :format => 'js'), :method => 'delete', :remote => true, :title => '删除', :class => 'remove-upload fl', :confirm => l(:text_are_you_sure)) if attachment.id && User.current == attachment.author %>
-      <span class="ml5 fl">(<%= number_to_human_size attachment.filesize %>)</span>
+      <span class="postAttSize fl ">(<%= number_to_human_size attachment.filesize %>)</span>
       <div class="cl"></div>
     </div>
 <% end -%>
diff --git a/app/views/student_work/_work_information.html.erb b/app/views/student_work/_work_information.html.erb
new file mode 100644
index 000000000..f8a55a03d
--- /dev/null
+++ b/app/views/student_work/_work_information.html.erb
@@ -0,0 +1,33 @@
+<div id="popbox02">
+  <div class="ni_con">
+    <span class="f16 fontBlue fb">请您确认刚刚上传的作品信息</span>
+    <p class="f14 mt5">
+      <span class="fb">作品名称：</span><%=@student_work.name%>
+    </p>
+    <p class="f14 mt5">
+      <span class="fb">作品描述：</span><%=@student_work.description%>
+    </p>
+    <p class="mt5">
+      <span class="fl fb mr30">附</span><span class="fb fl">件：</span>
+      <% if @student_work.attachments.empty? %>
+        <span class="fl c_red"><%= "无附件"%></span>
+      <% else %>
+        <div class="fl grey_c">
+          <%= render :partial => 'work_attachments_status', :locals => {:attachments => @student_work.attachments, :status => 2} %>
+        </div>
+      <% end %>
+    </p>
+    <div class="cl"></div>
+    <div class="ni_btn mt10">
+      <a href="javascript:" class="tijiao" onclick="clickOK();" style="margin-bottom: 15px; margin-left: 55px;" >
+        确&nbsp;&nbsp;定
+      </a>
+    </div>
+  </div>
+</div>
+
+<script type="text/javascript">
+  function clickOK() {
+      window.location.href = '<%= student_work_index_url(:homework => @homework.id)%>';
+  }
+</script>
\ No newline at end of file
diff --git a/app/views/student_work/create.js.erb b/app/views/student_work/create.js.erb
new file mode 100644
index 000000000..42b1db8b8
--- /dev/null
+++ b/app/views/student_work/create.js.erb
@@ -0,0 +1,16 @@
+<% if @submit_result%>
+    $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/work_information') %>');
+    showModal('ajax-modal', '500px');
+    $('#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","").css("left","");
+    $('#ajax-modal').parent().addClass("anonymos");
+<% else %>
+    window.location.href = '<%= new_student_work_url(:homework => @homework.id)%>';
+<% end %>
+
+function clickCanel() {
+    hideModal('#popbox02');
+    window.location.href = '<%= student_work_index_url(:homework => @homework.id)%>';
+}
\ No newline at end of file
diff --git a/app/views/student_work/edit.html.erb b/app/views/student_work/edit.html.erb
index 25a65f039..517a238b0 100644
--- a/app/views/student_work/edit.html.erb
+++ b/app/views/student_work/edit.html.erb
@@ -26,7 +26,7 @@
   <div class="cl"></div>
 
   <div class="HomeWorkCon mt15">
-    <%= labelled_form_for @work,:html => { :multipart => true }   do |f|%>
+    <%= labelled_form_for @work,:html => { :multipart => true },:remote=>true   do |f|%>
         <div class=" c_red mb10">
           提示：作品名称和描述中不要出现真实的姓名信息
         </div>
@@ -52,7 +52,7 @@
         </div>
 
         <div class="mt5">
-          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="edit_student_work(<%= @work.id%>);">确定</a>
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="popupRegex();edit_student_work(<%= @work.id%>);">确定</a>
           <span class="fr mr10 mt3">或</span>
           <%= link_to "取消",  student_work_index_path(:homework => @homework), :class => "fr mr10 mt3"%>
         </div>
@@ -60,3 +60,12 @@
     <% end%>
   </div><!----HomeWorkCon end-->
 </div>
+<script type="text/javascript">
+    function popupRegex(){
+        $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
+        showModal('ajax-modal', '500px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').parent().css("top","").css("left","");
+        $('#ajax-modal').parent().addClass("anonymos");
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/student_work/forbidden_anonymous_comment.js.erb b/app/views/student_work/forbidden_anonymous_comment.js.erb
new file mode 100644
index 000000000..a72c29509
--- /dev/null
+++ b/app/views/student_work/forbidden_anonymous_comment.js.erb
@@ -0,0 +1,7 @@
+<% if @user_activity_id == -1 %>
+$("#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%");
+<% else %>
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@course_activity}) %>");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+<% end %>
\ No newline at end of file
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index e28cdb1e2..b0e70c9b0 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -20,7 +20,7 @@
 
   //设置评分规则
   function set_score_rule(){
-      $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/set_score_rule',:locals => {:homework => @homework}) %>');
+      $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/set_score_rule',:locals => {:homework => @homework,:student_path => true}) %>');
       showModal('ajax-modal', '350px');
       $('#ajax-modal').siblings().remove();
       $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
@@ -28,6 +28,33 @@
       $('#ajax-modal').parent().css("top","25%").css("left","35%").css("position","fixed");
   }
 
+  $(function(){
+      $("#homework_info_hidden").click(function(){
+          $("#homeworkInformation").hide();
+          $("#homework_info_hidden").hide();
+          $("#homework_info_show").show();
+      });
+      $("#homework_info_show").click(function(){
+          $("#homework_info_show").hide();
+          $("#homeworkInformation").show();
+          $("#homework_info_hidden").show();
+      });
+
+      if($("#homework_description").height() > 54) {
+          $("#homeworkDetailShow").show();
+      }
+      $("#homeworkDetailShow").click(function(){
+          $("#homeworkDetail").toggleClass("max_h54");
+          $("#homeworkDetailShow").hide();
+          $("#homeworkDetailHide").show();
+      });
+      $("#homeworkDetailHide").click(function(){
+          $("#homeworkDetail").toggleClass("max_h54");
+          $("#homeworkDetailHide").hide();
+          $("#homeworkDetailShow").show();
+      });
+  });
+
 </script>
 
 <div class="homepageRight mt0 ml10">
@@ -91,6 +118,79 @@
       <div class="cl"></div>
     </div>
 
+    <div class="homeworkInfo" id="homeworkInformation">
+      <div class="">
+        <div class="homepagePostTitle fl hidden m_w460" title="<%= @homework.name %>"><%= @homework.name %></div>
+        <% if @homework.homework_detail_manual%>
+            <% if @homework.homework_detail_manual.comment_status == 0 %>
+                <span class="grey_homework_btn_cir ml5">未发布</span>
+            <% elsif @homework.homework_detail_manual.comment_status == 1%>
+                <% if @homework.anonymous_comment == 0%>
+                    <span class="grey_homework_btn_cir ml5">未开启匿评</span>
+                <% else %>
+                    <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
+                <% end %>
+                <span class="green_homework_btn_cir ml5">作品提交中</span>
+            <% elsif @homework.homework_detail_manual.comment_status == 2%>
+                <% if @homework.anonymous_comment == 0%>
+                    <span class="green_homework_btn_cir ml5">匿评中</span>
+                <% else %>
+                    <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
+                <% end %>
+                <span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
+            <% elsif @homework.homework_detail_manual.comment_status == 3%>
+                <% if @homework.anonymous_comment == 0%>
+                    <span class="grey_homework_btn_cir ml5">匿评已结束</span>
+                <% else %>
+                    <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
+                <% end %>
+                <span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
+            <% end%>
+        <% end%>
+        <span class="fr c_grey"> <a href="javascript:void(0);" class="linkGrey2" id="homework_info_hidden">[ 隐藏作业信息 ]</a> </span>
+        <div class="cl"></div>
+        <div class="fontGrey2 db mb5">发布者：<%= @homework.user.show_name %></div>
+        <div class="homeworkDetail upload_img break_word list_style max_h54" id="homeworkDetail">
+          <div id="homework_description"><%= @homework.description.html_safe %></div>
+        </div>
+        <div id="homeworkDetailShow" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
+        <div id="homeworkDetailHide" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
+        <div class="cl"></div>
+        <div>
+          <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => @homework.attachments} %>
+          <div class="cl"></div>
+        </div>
+        <div class="mt5">
+          <div class="fontGrey2 db fl">截止时间：<%= @homework.end_time %>&nbsp;23:59</div>
+          <% if @homework.homework_detail_manual.comment_status == 0 %>
+            <div class="fontGrey2 db fl ml10">发布时间：<%= @homework.publish_time %>&nbsp;00:00</div>
+          <% end %>
+          <% if @homework.homework_detail_manual%>
+              <% if @homework.homework_detail_manual.comment_status == 1%>
+                  <% end_time = @homework.end_time.to_time.to_i + 24*60*60 - 1 %>
+                  <% if end_time >= Time.now.to_i %>
+                    <div class="fontGrey2 db fr">提交剩余时间： <span class="c_red"><%= (end_time - Time.now.to_i) / (24*60*60) %></span> 天
+                        <span class="c_red"><%= ((end_time - Time.now.to_i) % (24*60*60)) / (60*60)%></span> 小时
+                        <span class="c_red"><%= (((end_time - Time.now.to_i) % (24*60*60)) % (60*60)) / 60%></span> 分</div>
+                  <% else %>
+                      <div class="fontGrey2 db fr c_red">提交已截止</div>
+                  <% end %>
+              <% elsif @homework.homework_detail_manual.comment_status == 2%>
+                  <% end_time = @homework.homework_detail_manual.evaluation_end.to_time.to_i + 24*60*60 - 1 %>
+                  <% if end_time >= Time.now.to_i %>
+                    <div class="fontGrey2 db fr">匿评剩余时间： <span class="c_red"><%= (end_time - Time.now.to_i) / (24*60*60)%></span> 天
+                        <span class="c_red"><%= ((end_time - Time.now.to_i) % (24*60*60)) / (60*60)%></span> 小时
+                        <span class="c_red"><%= (((end_time - Time.now.to_i) % (24*60*60)) % (60*60)) / 60%></span> 分</div>
+                  <% else %>
+                      <div class="fontGrey2 db fr c_red">匿评已截止</div>
+                  <% end %>
+              <% end%>
+          <% end%>
+          <div class="cl"></div>
+        </div>
+      </div>
+    </div>
+
     <div class="hworkListContainer">
       <div class="ctt2">
         <div class="dis" id="homework_student_work_list">
diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb
index 09544d004..fdf1e31a3 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>
@@ -69,7 +73,7 @@
                  :url => {:controller => 'student_work',
                           :action => 'create',
                           :homework => @homework.id
-                 }) do |f|%>
+                 },:remote=>true ) do |f| %>
         <div class=" c_red mb10">
           提示：作品名称和描述中不要出现真实的姓名信息
         </div>
@@ -107,11 +111,20 @@
         </div>
 
         <div class="mt5">
-          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="new_student_work();">确定</a>
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="popupRegex();new_student_work();">确定</a>
           <span class="fr mr10 mt3">或</span>
           <%= link_to "取消",  user_homeworks_user_path(User.current.id), :class => "fr mr10 mt3"%>
         </div>
         <div class="cl"></div>
     <% end%>
   </div><!----HomeWorkCon end-->
-</div>
\ No newline at end of file
+</div>
+<script type="text/javascript">
+  function popupRegex(){
+      $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
+      showModal('ajax-modal', '500px');
+      $('#ajax-modal').siblings().remove();
+      $('#ajax-modal').parent().css("top","").css("left","");
+      $('#ajax-modal').parent().addClass("anonymos");
+  }
+</script>
\ No newline at end of file
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/student_work/show.js.erb b/app/views/student_work/show.js.erb
index e6b99c146..d61c4b9a1 100644
--- a/app/views/student_work/show.js.erb
+++ b/app/views/student_work/show.js.erb
@@ -3,9 +3,9 @@ if($("#about_hwork_<%= @work.id%>").children().length > 0){
 }
 else{
   <% if @homework.homework_type == 2%>
-    $("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'programing_work_show') %>");
+    $("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'programing_work_show',:locals => {:work =>@work,:score =>@score,:student_work_scores => @student_work_scores}) %>");
   <% else%>
-    $("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'show') %>");
+    $("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'show',:locals => {:work =>@work,:score =>@score,:student_work_scores => @student_work_scores}) %>");
   <% end%>
   $('#score_<%= @work.id%>').peSlider({range: 'min'});
 }
\ No newline at end of file
diff --git a/app/views/student_work/update.js.erb b/app/views/student_work/update.js.erb
new file mode 100644
index 000000000..79733db31
--- /dev/null
+++ b/app/views/student_work/update.js.erb
@@ -0,0 +1,16 @@
+<% if @submit_result%>
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/work_information') %>');
+showModal('ajax-modal', '500px');
+$('#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","").css("left","");
+$('#ajax-modal').parent().addClass("anonymos");
+<% else %>
+window.location.href = '<%= edit_student_work_url(@work)%>';
+<% end %>
+
+function clickCanel() {
+    hideModal('#popbox02');
+    window.location.href = '<%= student_work_index_url(:homework => @homework.id)%>';
+}
\ 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 2d3bc68de..38a4d6edd 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -1,5 +1,5 @@
 <% is_teacher = User.current.allowed_to?(:as_teacher,activity.course) %>
-<div class="resources mt10">
+<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
       <%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), user_path(activity.user_id), :alt => "用户头像" %>
@@ -13,15 +13,32 @@
         <% end %> TO <!--+"(课程名称)" -->
         <%= link_to activity.course.name.to_s+" | 课程作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course), :class => "newsBlue ml15"%>
       </div>
-      <div class="homepagePostTitle hidden m_w530 fl"> <!--+"(作业名称)"-->
+      <div class="homepagePostTitle hidden m_w505 fl"> <!--+"(作业名称)"-->
         <%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id,:host=> Setting.host_course), :class => "postGrey"%>
       </div>
-      <% if activity.homework_detail_manual.comment_status == 1%>
-          <span class="grey_btn_cir ml10">未开启匿评</span>
-      <% elsif activity.homework_detail_manual.comment_status == 2%>
-          <span class="green_btn_cir ml10">匿评中</span>
-      <% elsif activity.homework_detail_manual.comment_status == 3%>
-          <span class="grey_btn_cir ml10">匿评已结束</span>
+      <% if activity.homework_detail_manual%>
+          <% if activity.homework_detail_manual.comment_status == 1%>
+              <% if activity.anonymous_comment == 0%>
+                  <span class="grey_homework_btn_cir ml5">未开启匿评</span>
+              <% else %>
+                  <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
+              <% end %>
+              <span class="green_homework_btn_cir ml5">作品提交中</span>
+          <% elsif activity.homework_detail_manual.comment_status == 2%>
+              <% if activity.anonymous_comment == 0%>
+                  <span class="green_homework_btn_cir ml5">匿评中</span>
+              <% else %>
+                  <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
+              <% end %>
+              <span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
+          <% elsif activity.homework_detail_manual.comment_status == 3%>
+              <% if activity.anonymous_comment == 0%>
+                  <span class="grey_homework_btn_cir ml5">匿评已结束</span>
+              <% else %>
+                  <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
+              <% end %>
+              <span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
+          <% end%>
       <% end%>
       <div class="homepagePostSubmitContainer">
         <div class="homepagePostSubmit">
@@ -41,34 +58,126 @@
             </div>
         <% end %>
 
-        <div class="homepagePostDeadline">截止时间：<%= activity.end_time.to_s %></div>
+        <div class="homepagePostDeadline">截止时间：<%= activity.end_time.to_s %>&nbsp;23:59</div>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style" id="activity_description_<%= user_activity_id%>">
-        <%= activity.description.html_safe %>
+      <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.description.html_safe %>
+        </div>
       </div>
-      <%# if is_teacher%>
-          <!--<div class="homepagePostSetting">
+      <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>
+        <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => activity.attachments} %>
+        <div class="cl"></div>
+      </div>
+      <% if is_teacher%>
+          <% comment_status = activity.homework_detail_manual.comment_status %>
+          <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 => -1,:course_activity=>course_activity), :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 => -1,:course_activity=>course_activity),: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%>
-                  </li>
-                  <li>
-                    <%#= homework_anonymous_comment activity %>
+                    <%= link_to("评分设置", score_rule_set_homework_common_path(activity,:user_activity_id => user_activity_id, :is_in_course => 0),:class => "postOptionLink", :remote => true) %>
                   </li>
+                  <% if activity.anonymous_comment == 0 %>
+                      <li>
+                        <%= 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,-1,user_activity_id,course_activity %>
+                      </li>
+                  <% end %>
+                  <% if activity.anonymous_comment == 0 && (comment_status == 0 || comment_status == 1)%>
+                      <li>
+                        <%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(activity,:user_activity_id => user_activity_id,:course_activity=>course_activity),:class => "postOptionLink", :remote => true)%>
+                      </li>
+                  <% end %>
                 </ul>
               </li>
             </ul>
           </div>
-      <%# end%>-->
+      <% end%>
       </div>
     <div class="cl"></div>
   </div>
+
+  <% count=activity.journals_for_messages.count %>
+  <div class="homepagePostReply">
+    <div class="topBorder" style="display: <%= count>0 ? 'none': '' %>"></div>
+    <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
+      <div class="homepagePostReplyBannerCount">
+        回复（<%= count %>）
+      </div>
+      <div class="homepagePostReplyBannerTime"></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.journals_for_messages.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.user), :width => "33", :height => "33", :class =>"mt8"), user_path(comment.user_id), :alt => "用户头像" %>
+                  </div>
+                  <div class="homepagePostReplyDes">
+                    <div class="homepagePostReplyPublisher">
+                      <% if comment.try(:user).try(:realname) == ' ' %>
+                          <%= link_to comment.try(:user), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
+                      <% else %>
+                          <%= link_to comment.try(:user).try(:realname), user_path(comment.user_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.notes.html_safe %></div>
+                  </div>
+                  <div class="cl"></div>
+                </li>
+            <% end %>
+          </ul>
+        </div>
+    <% end %>
+
+    <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"),  :alt => "用户头像" %></div>
+      <div class="homepagePostReplyInputContainer mb10">
+        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+          <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'leave_homework_message', :id => activity.id},:method => "post", :remote => true) do |f|%>
+              <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %>
+              <%= hidden_field_tag 'course_activity',params[:course_activity],:value =>course_activity %>
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="homework_message"></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>
+  </div>
 </div>
\ No newline at end of file
diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb
index 28cb368d6..27549f6d9 100644
--- a/app/views/users/_course_journalsformessage.html.erb
+++ b/app/views/users/_course_journalsformessage.html.erb
@@ -67,7 +67,7 @@
                       <% end %>
                       <%= format_time(comment.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= comment.id %>">
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
                       <%= comment.notes.html_safe %></div>
                     <% fetch_user_leaveWord_reply(comment).each do |reply| unless fetch_user_leaveWord_reply(comment).nil? %>
                         <script type="text/javascript">
@@ -94,7 +94,7 @@
                                 <% end %>
                                 <%= format_time reply.created_on %>
                               </div>
-                            <div class="homepagePostReplyContent break_word list_style upload_img" style="max-width: 580px;" id="reply_to_content_<%= reply.id %>">
+                            <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" style="max-width: 580px;" id="reply_to_content_<%= reply.id %>">
                               <%= reply.notes.html_safe %></div>
                               <div class="cl"></div>
                           </div>
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index d9574dc0b..4996f7730 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -30,14 +30,19 @@
       <div class="homepagePostDate">
         发帖时间：<%= format_time(activity.created_on) %>
       </div>
-
-      <div class="homepagePostIntro break_word upload_img list_style" id="activity_description_<%= user_activity_id%>">
-        <% if activity.parent_id.nil? %>
-            <%= activity.content.to_s.html_safe%>
-        <% else %>
-            <%= activity.parent.content.to_s.html_safe%>
-        <% end %>
+      <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%>">
+          <% if activity.parent_id.nil? %>
+              <%= activity.content.to_s.html_safe%>
+          <% else %>
+              <%= activity.parent.content.to_s.html_safe%>
+          <% end %>
+        </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 class="homepagePostSetting" id="act-<%= user_activity_id %>" style="visibility: hidden">
         <ul>
           <li class="homepagePostSettingIcon">
@@ -99,7 +104,7 @@
                       <% end %>
                       <%= format_time(reply.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= reply.id %>">
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
                       <%= reply.content.html_safe %>
                     </div>
                   </div>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index bc0306ee9..f9087f057 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -18,9 +18,15 @@
       <div class="homepagePostDate">
         发布时间：<%= format_time(activity.created_on) %>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style" id="activity_description_<%= user_activity_id %>">
-        <%= activity.description.html_safe %>
+      <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.description.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>
@@ -65,7 +71,7 @@
                       <% end %>
                       <%= format_time(comment.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= comment.id %>">
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
                       <%= comment.comments.html_safe %></div>
                   </div>
                   <div class="cl"></div>
diff --git a/app/views/users/_course_poll.html.erb b/app/views/users/_course_poll.html.erb
index 8bbdadc1a..48ab5d2f2 100644
--- a/app/views/users/_course_poll.html.erb
+++ b/app/views/users/_course_poll.html.erb
@@ -29,7 +29,15 @@
       <div class="homepagePostDate">
         发布时间：<%= format_time(activity.published_at) %>
       </div>
-      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>"><%=activity.polls_description.html_safe.to_s%></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.polls_description.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 class="homepagePostSetting" id="act-<%= user_activity_id %>" style="visibility: hidden">
         <ul>
           <li class="homepagePostSettingIcon">
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index 5db13a350..c5b777286 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -33,29 +33,41 @@
           <%=format_time(activity.created_on) %>
         </div>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style" id="activity_description_<%= user_activity_id %>">
-        <% if activity.description? %>
-            <%= textAreailizable activity, :description, :attachments => activity.attachments %>
-        <% end %>
-        <%#= activity.description.html_safe %>
+      <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%>">
+          <% if activity.description? %>
+              <%= textAreailizable activity, :description, :attachments => activity.attachments %>
+          <% end %>
+        </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 class="mt10" style="font-weight:normal;">
         <% if activity.attachments.any? %>
             <% activity.attachments.each do |attachment| %>
                 <div class="break_word">
+                  <span class="fl">
                   <span title="<%= attachment.filename %>" id="attachment_">
-                    <%= link_to_short_attachment attachment,:length=> 58, :class => 'homepagePostFileAtt newsBlue', :download => true -%>
+                    <%= link_to_short_attachment attachment,:length=> 58, :class => 'link_file_a fl newsBlue', :download => true -%>
                   </span>
                   <% if attachment.is_text? %>
                       <%= link_to image_tag('magnifier.png'),
                                   :controller => 'attachments',
                                   :action => 'show',
                                   :id => attachment,
+                                  :class => 'fl',
                                   :filename => attachment.filename %>
                   <% end %>
+                  </span>
                   <span class="postAttSize">(
                     <%= number_to_human_size attachment.filesize %>)
                   </span>
+                  <span class="author" title="<%= attachment.author%>">
+                    <%= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author),:class => "c_orange" %>,
+                    <%= format_time(attachment.created_on) %>
+                  </span>
                 </div>
             <% end %>
         <% end %>
@@ -102,7 +114,7 @@
                       <% end %>
                       <%= format_time(reply.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= reply.id %>">
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
                       <% if reply.details.any? %>
                           <% details_to_strings(reply.details).each do |string| %>
                               <p><%= string %></p>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index 4b83cb906..14c37096e 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -26,13 +26,19 @@
       <div class="homepagePostDate">
         时间：<%= format_time(activity.created_on) %>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style" id="activity_description_<%= user_activity_id%>">
-        <% if activity.parent_id.nil? %>
-            <%= activity.content.to_s.html_safe%>
-        <% else %>
-            <%= activity.parent.content.to_s.html_safe%>
-        <% end %>
+      <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%>">
+          <% if activity.parent_id.nil? %>
+              <%= activity.content.to_s.html_safe%>
+          <% else %>
+              <%= activity.parent.content.to_s.html_safe%>
+          <% end %>
+        </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>
@@ -79,7 +85,7 @@
                       <% end %>
                       <%= format_time(reply.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= reply.id %>">
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
                       <%= reply.content.html_safe %></div>
                   </div>
                   <div class="cl"></div>
diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index f134e8f42..6f47e3535 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -5,7 +5,7 @@
     <!--</p>-->
 <% else %>
     <% attachments.each do |attach| %>
-        <ul class="resourcesList">
+        <ul class="resourcesList" onmouseover="$(this).children().css('background-color', '#e1e1e1')" onmouseout="$(this).children().css('background-color', 'white')">
           <li class="resourcesListCheckbox fl">
             <input name="checkbox1[]" type="checkbox" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="resourcesCheckbox" />
           </li>
@@ -21,5 +21,7 @@
           <li class="resourcesListTime fl"><%= format_date(attach.created_on) %></li>
           <li style="display: none"><%= attach.id %></li>
         </ul>
+        <ul class="resourcesListDashLine"></ul>
+
     <% end %>
 <% end %>
diff --git a/app/views/users/_show_user_resource.html.erb b/app/views/users/_show_user_resource.html.erb
index 6d985687c..6c3216f11 100644
--- a/app/views/users/_show_user_resource.html.erb
+++ b/app/views/users/_show_user_resource.html.erb
@@ -16,6 +16,19 @@
             $(this).addClass("referenceTypeActive");
         });
     });
+
+// 点击 checkbox选中引用的资源的时候，保存该资源的id到session里去
+function store_seleted_resource(dom){
+    if(dom.attr('checked') == 'checked' ){
+        $.get(
+                        '<%= store_selected_resource_user_path %>'+'?save=y&res_id='+dom.val()
+        )
+    }else {
+        $.get(
+                        '<%= store_selected_resource_user_path %>'+'?save=n&res_id='+dom.val()
+        )
+    }
+}
 </script>
 <!--<div class="referenceResourcesPopup">-->
   <div>
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index cc8a6c0f2..669953afa 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -11,7 +11,6 @@
     .ke-inline-block{display: none;}
     div.ke-container{float:left;}
 </style>
-<% first_user_activity = user_activities.first.id unless user_activities.first.nil? %>
 <% user_activities.each do |user_activity|
   if user_activities %>
         <script>
@@ -39,6 +38,21 @@
             $(function() {
                 init_activity_KindEditor_data(<%= user_activity.id%>, null, "87%");
                 showNormalImage('activity_description_<%= user_activity.id %>');
+                if($("#intro_content_<%= user_activity.id %>").height() > 360) {
+                    $("#intro_content_show_<%= user_activity.id %>").show();
+                }
+                $("#intro_content_show_<%= user_activity.id %>").click(function(){
+                    $("#activity_description_<%= user_activity.id %>").toggleClass("maxh360");
+                    $("#activity_description_<%= user_activity.id%>").toggleClass("lh18");
+                    $("#intro_content_show_<%= user_activity.id %>").hide();
+                    $("#intro_content_hide_<%= user_activity.id %>").show();
+                });
+                $("#intro_content_hide_<%= user_activity.id %>").click(function(){
+                    $("#activity_description_<%= user_activity.id %>").toggleClass("maxh360");
+                    $("#activity_description_<%= user_activity.id%>").toggleClass("lh18");
+                    $("#intro_content_hide_<%= user_activity.id %>").hide();
+                    $("#intro_content_show_<%= user_activity.id %>").show();
+                });
             });
         </script>
         <% unless user_activity.act_type == "ProjectCreateInfo" %>
@@ -48,13 +62,13 @@
             <% if act  %>
                 <% case user_activity.act_type.to_s %>
                 <% when 'HomeworkCommon' %>
-                    <%= render :partial => 'course_homework', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
+                    <%= render :partial => 'course_homework', :locals => {:activity => act,:user_activity_id =>user_activity.id,:course_activity => 0} %>
                 <% when 'News' %>
-                    <%= render :partial => 'course_news', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
+                    <%= render :partial => 'course_news', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
                 <% when 'Message'%>
-                    <%= render :partial => 'course_message', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
+                    <%= render :partial => 'course_message', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
                 <% when 'Poll' %>
-                    <%= render :partial => 'course_poll', :locals => {:activity => act, :user_activity_id => user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
+                    <%= render :partial => 'course_poll', :locals => {:activity => act, :user_activity_id => user_activity.id} %>
                 <% when 'Course'%>
                     <%= render :partial => 'users/course_create', :locals => {:activity => act, :user_activity_id => act.id} %>
                 <% end %>
@@ -63,11 +77,11 @@
             <% if act  %>
                 <% case user_activity.act_type.to_s %>
                 <% when 'Issue' %>
-                    <%= render :partial => 'project_issue', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
+                    <%= render :partial => 'project_issue', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
                 <% when 'Message' %>
-                    <%= render :partial => 'project_message', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
+                    <%= render :partial => 'project_message', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
                 <% when 'ProjectCreateInfo'%>
-                    <%= render :partial => 'project_create', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
+                    <%= render :partial => 'project_create', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
                 <% end %>
             <% end %>
         <% when 'Principal' %>
@@ -77,9 +91,16 @@
                     <%= 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} %>
+            <%= render :partial => 'project_create', :locals => {:activity => user_activity,:user_activity_id =>user_activity.id} %>
         <% end %>
     <% end %>
 <% end %>
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
new file mode 100644
index 000000000..0c2a28e5c
--- /dev/null
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -0,0 +1,190 @@
+<% is_teacher = User.current.allowed_to?(:as_teacher,homework_common.course) %>
+<div class="HomeWork mb10" id="homework_common_<%= homework_common.id %>">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait">
+      <%=link_to image_tag(url_to_avatar(homework_common.user),width:"50px", height: "50px"), user_activities_path(homework_common.user.id)%>
+    </div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo mt-4">
+        <%= link_to homework_common.user.show_name, user_activities_path(homework_common.user_id), :class => "newsBlue mr15"%>
+        TO
+        <%= link_to homework_common.course.name, course_path(homework_common.course_id), :class => "newsBlue ml15"%>
+      </div>
+          <span class="homepagePostTitle hidden m_w505 fl">
+            <%= link_to homework_common.name,student_work_index_path(:homework => homework_common.id),:class => "postGrey"%>
+          </span>
+
+      <% if homework_common.homework_detail_manual%>
+          <% if homework_common.homework_detail_manual.comment_status == 0 %>
+              <span class="grey_homework_btn_cir ml5">未发布</span>
+          <% elsif homework_common.homework_detail_manual.comment_status == 1%>
+              <% if homework_common.anonymous_comment == 0%>
+                  <span class="grey_homework_btn_cir ml5">未开启匿评</span>
+              <% else %>
+                  <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
+              <% end %>
+              <span class="green_homework_btn_cir ml5">作品提交中</span>
+          <% elsif homework_common.homework_detail_manual.comment_status == 2%>
+              <% if homework_common.anonymous_comment == 0%>
+                  <span class="green_homework_btn_cir ml5">匿评中</span>
+              <% else %>
+                  <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
+              <% end %>
+              <span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
+          <% elsif homework_common.homework_detail_manual.comment_status == 3%>
+              <% if homework_common.anonymous_comment == 0%>
+                  <span class="grey_homework_btn_cir ml5">匿评已结束</span>
+              <% else %>
+                  <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
+              <% end %>
+              <span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
+          <% end%>
+      <% end%>
+
+      <div class="homepagePostSubmitContainer">
+        <div class="homepagePostSubmit">
+          <%= user_for_homework_common homework_common,is_teacher %>
+        </div>
+        <% if homework_common.homework_type == 2 && is_teacher%>
+            <div class="homepagePostSubmit">
+              <%= link_to "模拟答题", new_user_commit_homework_users_path(homework_id: homework_common.id, is_test: true), class: 'c_blue test-program-btn', title: '教师可以通过模拟答题设置作业的标准答案' %>
+            </div>
+        <% end %>
+        <% if homework_common.homework_type == 2%>
+            <div class="homepagePostDeadline mr15">
+              语言：
+              <%= homework_common.language_name%>
+            </div>
+        <% end %>
+        <div class="homepagePostDeadline">
+          <%= l(:label_end_time)%>：<%= homework_common.end_time%>&nbsp;23:59
+        </div>
+        <% if homework_common.homework_detail_manual.comment_status == 0 %>
+            <div class="homepagePostDeadline ml15">
+              <%= l(:label_publish_time)%>：<%= homework_common.publish_time%>&nbsp;00:00
+            </div>
+        <% end %>
+      </div>
+      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="homework_description_<%= homework_common.id%>">
+        <div id="intro_content_<%= homework_common.id%>">
+          <%= homework_common.description.html_safe %>
+        </div>
+      </div>
+      <div class="cl"></div>
+      <div id="intro_content_show_<%= homework_common.id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
+      <div id="intro_content_hide_<%= homework_common.id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
+      <div class="cl"></div>
+      <div>
+        <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => homework_common.attachments} %>
+        <div class="cl"></div>
+      </div>
+      <% if is_teacher%>
+          <% comment_status = homework_common.homework_detail_manual.comment_status%>
+          <div class="homepagePostSetting">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <li>
+                    <%= link_to l(:button_edit),edit_homework_common_path(homework_common,:is_in_course => is_in_course,:course_activity=>-1), :class => "postOptionLink"%>
+                  </li>
+                  <li>
+                    <%= link_to(l(:label_bid_respond_delete), homework_common_path(homework_common,:is_in_course => is_in_course,:course_activity=>-1),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink")  %>
+                  </li>
+                  <li>
+                    <%= link_to("评分设置", score_rule_set_homework_common_path(homework_common, :is_in_course => is_in_course),:class => "postOptionLink", :remote => true) %>
+                  </li>
+                  <% if homework_common.anonymous_comment == 0 &&(comment_status == 0 || comment_status == 1)%>
+                    <li>
+                        <%= link_to("匿评设置", start_evaluation_set_homework_common_path(homework_common),:class => "postOptionLink", :remote => true)%>
+                    </li>
+                  <% end %>
+                  <% if homework_common.anonymous_comment == 0%>
+                    <li>
+                        <%= homework_anonymous_comment(homework_common, is_in_course) %>
+                    </li>
+                  <% end %>
+                  <% if homework_common.anonymous_comment == 0 && (comment_status == 0 || comment_status == 1)%>
+                      <li>
+                        <%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(homework_common,:is_in_course => is_in_course),:class => "postOptionLink", :remote => true)%>
+                      </li>
+                  <% end %>
+                </ul>
+              </li>
+            </ul>
+          </div>
+      <% end%>
+    </div>
+    <div class="cl"></div>
+  </div>
+
+  <% count=homework_common.journals_for_messages.count %>
+  <div class="homepagePostReply">
+    <div class="topBorder" style="display: <%= count>0 ? 'none': '' %>"></div>
+    <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
+      <div class="homepagePostReplyBannerCount">
+        回复（<%= count %>）
+      </div>
+      <div class="homepagePostReplyBannerTime"></div>
+      <%if count>3 %>
+          <div class="homepagePostReplyBannerMore">
+            <a id="reply_btn_<%=homework_common.id%>" onclick="expand_reply('#reply_div_<%= homework_common.id %> li','#reply_btn_<%=homework_common.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_<%= homework_common.id %>">
+          <ul>
+            <% homework_common.journals_for_messages.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.user), :width => "33", :height => "33", :class =>"mt8"), user_path(comment.user_id), :alt => "用户头像" %>
+                  </div>
+                  <div class="homepagePostReplyDes">
+                    <div class="homepagePostReplyPublisher">
+                      <% if comment.try(:user).try(:realname) == ' ' %>
+                          <%= link_to comment.try(:user), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
+                      <% else %>
+                          <%= link_to comment.try(:user).try(:realname), user_path(comment.user_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.notes.html_safe %></div>
+                  </div>
+                  <div class="cl"></div>
+                </li>
+            <% end %>
+          </ul>
+        </div>
+    <% end %>
+
+    <div class="homepagePostReplyContainer borderBottomNone minHeight48">
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= homework_common.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"),  :alt => "用户头像" %></div>
+      <div class="homepagePostReplyInputContainer mb10">
+        <div nhname='new_message_<%= homework_common.id%>' style="display:none;">
+          <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'leave_homework_message', :id => homework_common.id},:method => "post", :remote => true) do |f|%>
+              <%= hidden_field_tag 'homework_common_id',params[:homework_common_id],:value =>homework_common.id %>
+              <%= hidden_field_tag 'is_in_course',params[:is_in_course],:value =>is_in_course %>
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= homework_common.id%>' name="homework_message"></textarea>
+              <div nhname='toolbar_container_<%= homework_common.id%>' style="float:left;padding-top:3px; margin-left: 5px;"></div>
+              <a id="new_message_submit_btn_<%= homework_common.id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+              <div class="cl"></div>
+              <p nhname='contentmsg_<%= homework_common.id%>'></p>
+          <% end%>
+        </div>
+        <div class="cl"></div>
+      </div>
+      <div class="cl"></div>
+    </div>
+  </div>
+</div><!----HomeWork end-->
\ No newline at end of file
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index 6167e4e10..6d929ac5f 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -21,6 +21,10 @@
       <input  type="text" name="homework_common[end_time]" id="homework_end_time" placeholder="截止日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= homework.end_time%>"  >
       <%= calendar_for('homework_end_time')%>
     </div>
+    <div class="calendar_div fl ml10">
+      <input  type="text" name="homework_common[publish_time]" id="homework_publish_time" placeholder="发布日期(可选)" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= homework.publish_time%>"  >
+      <%= calendar_for('homework_publish_time')%>
+    </div>
   </div>
   <div class="cl"></div>
   <p id="homework_end_time_span" class="c_red mt5"></p>
@@ -52,8 +56,9 @@
       <% if edit_mode %>
           <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_homework('edit_homework_common_<%= homework.id%>');">确定</a>
           <span class="fr mr10 mt3">或</span>
-          <%= link_to "取消",user_homeworks_user_path(User.current.id),:class => "fr mr10 mt3"%>
-      <% else %>
+          <%#= link_to "取消",user_homeworks_user_path(User.current.id),:class => "fr mr10 mt3"%>
+          <a href="javascript:void(0);" class="fr mr10 mt3" onclick="cancel_edit();">取消</a>
+    <% else %>
           <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_homework('new_homework_common');">发送</a>
           <span class="fr mr10 mt3">或</span>
           <a href="javascript:void(0);" class=" fr mr10 mt3" onclick="reset_homework();">取消</a>
diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb
index 44f992bb4..2e530d489 100644
--- a/app/views/users/_user_homework_list.html.erb
+++ b/app/views/users/_user_homework_list.html.erb
@@ -1,83 +1,56 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor" %>
+<style type="text/css">
+    /*回复框*/
+    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
+    .homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}
+    .homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}
+    .homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}
+    .homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}
+    .homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}
+    .homepagePostReplyInputContainer .ke-outline {border: none;}
+    .homepagePostReplyInputContainer .ke-inline-block {display: none;}
+    .homepagePostReplyInputContainer .ke-container {float: left;}
+</style>
 <% homework_commons.each do |homework_common|%>
-    <% is_teacher = User.current.allowed_to?(:as_teacher,homework_common.course) %>
-    <div class="HomeWork mb10">
-      <div class="homepagePostBrief">
-        <div class="homepagePostPortrait">
-          <%=link_to image_tag(url_to_avatar(homework_common.user),width:"50px", height: "50px"), user_activities_path(homework_common.user.id)%>
-        </div>
-        <div class="homepagePostDes">
-          <div class="homepagePostTo mt-4">
-            <%= link_to homework_common.user.show_name, user_activities_path(homework_common.user_id), :class => "newsBlue mr15"%>
-            TO
-            <%= link_to homework_common.course.name, course_path(homework_common.course_id), :class => "newsBlue ml15"%>
-          </div>
-          <span class="homepagePostTitle hidden m_w530 fl">
-            <%= link_to homework_common.name,student_work_index_path(:homework => homework_common.id),:class => "postGrey"%>
-          </span>
+    <script type="text/javascript">
+        $(function() {
+            init_activity_KindEditor_data(<%= homework_common.id%>, null, "87%");
+            showNormalImage('homework_description_<%= homework_common.id%>');
+            if($("#intro_content_<%= homework_common.id%>").height() > 360) {
+                $("#intro_content_show_<%= homework_common.id%>").show();
+            }
+            $("#intro_content_show_<%= homework_common.id%>").click(function(){
+                $("#homework_description_<%= homework_common.id%>").toggleClass("maxh360");
+                $("#homework_description_<%= homework_common.id%>").toggleClass("lh18");
+                $("#intro_content_show_<%= homework_common.id%>").hide();
+                $("#intro_content_hide_<%= homework_common.id%>").show();
+            });
+            $("#intro_content_hide_<%= homework_common.id%>").click(function(){
+                $("#homework_description_<%= homework_common.id%>").toggleClass("maxh360");
+                $("#homework_description_<%= homework_common.id%>").toggleClass("lh18");
+                $("#intro_content_hide_<%= homework_common.id%>").hide();
+                $("#intro_content_show_<%= homework_common.id%>").show();
+            });
+        });
 
-          <% if homework_common.homework_detail_manual%>
-            <% if homework_common.homework_detail_manual.comment_status == 1%>
-              <span class="grey_btn_cir ml10">未开启匿评</span>
-            <% elsif homework_common.homework_detail_manual.comment_status == 2%>
-              <span class="green_btn_cir ml10">匿评中</span>
-            <% elsif homework_common.homework_detail_manual.comment_status == 3%>
-              <span class="grey_btn_cir ml10">匿评已结束</span>
-            <% end%>
-          <% end%>
-
-          <div class="homepagePostSubmitContainer">
-            <div class="homepagePostSubmit">
-              <%= user_for_homework_common homework_common,is_teacher %>
-            </div>
-            <% if homework_common.homework_type == 2 && is_teacher%>
-                <div class="homepagePostSubmit">
-                  <%= link_to "模拟答题", new_user_commit_homework_users_path(homework_id: homework_common.id, is_test: true), class: 'c_blue test-program-btn', title: '教师可以通过模拟答题设置作业的标准答案' %>
-                </div>
-            <% end %>
-            <% if homework_common.homework_type == 2%>
-                <div class="homepagePostDeadline mr15">
-                    语言：
-                    <%= homework_common.language_name%>
-                </div>
-            <% end %>
-            <div class="homepagePostDeadline">
-              <%= l(:label_end_time)%>：<%= homework_common.end_time%>
-            </div>
-          </div>
-          <div class="homepagePostIntro upload_img break_word list_style">
-            <%= homework_common.description.html_safe %>
-          </div>
-          <div>
-            <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => homework_common.attachments} %>
-            <div class="cl"></div>
-          </div>
-          <% if is_teacher%>
-          <%# if false%>
-              <div class="homepagePostSetting">
-                <ul>
-                  <li class="homepagePostSettingIcon">
-                    <ul class="homepagePostSettiongText">
-                      <li>
-                        <%= link_to l(:button_edit),edit_homework_common_path(homework_common,:is_in_course => is_in_course), :class => "postOptionLink"%>
-                      </li>
-                      <li>
-                        <%= 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("匿评设置", start_evaluation_set_homework_common_path(homework_common),:class => "postOptionLink", :remote => true) if homework_common.homework_detail_manual.comment_status == 1%>
-                      </li>
-                      <li>
-                        <%= homework_anonymous_comment homework_common %>
-                      </li>
-                    </ul>
-                  </li>
-                </ul>
-              </div>
-          <% end%>
-        </div>
-        <div class="cl"></div>
-      </div>
-    </div><!----HomeWork end-->
+        function expand_reply(container,btnid){
+            var target = $(container);
+            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();
+            }
+        }
+    </script>
+    <%= render :partial => 'users/user_homework_detail', :locals => {:homework_common => homework_common,:is_in_course => is_in_course} %>
 <% end%>
 <% if homework_commons.count == 10%>
     <% if is_in_course == 1%>
diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb
index 43ec2a0c2..33e08f4e8 100644
--- a/app/views/users/_user_journalsformessage.html.erb
+++ b/app/views/users/_user_journalsformessage.html.erb
@@ -60,7 +60,7 @@
                       <% end %>
                       <%= format_time(comment.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= user_activity_id %>">
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= user_activity_id %>">
                       <%= comment.notes.html_safe %>
                     </div>
                     <% end %>
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index 86b44f66d..da649663d 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -37,7 +37,7 @@
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
     <% end %>
-    <% if ma.course_message_type == "HomeworkCommon" %>
+    <% if ma.course_message_type == "HomeworkCommon" && ma.status.nil?%>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
           <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
@@ -45,12 +45,12 @@
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
             <% if !User.current.allowed_to?(:as_teacher, ma.course_message.course) && cur_user_works_for_homework(ma.course_message).nil? %>
-                <%= link_to ma.course_message.name, new_student_work_path(:homework => ma.course_message.id),
+                <%= link_to "作业题目：" + ma.course_message.name, new_student_work_path(:homework => ma.course_message.id),
                             :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
                             :onmouseover =>"message_titile_show($(this),event)",
                             :onmouseout => "message_titile_hide($(this))" %>
             <% else %>
-                <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
+                <%= link_to "作业题目：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
                             :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
                             :onmouseover => "message_titile_show($(this),event)",
                             :onmouseout => "message_titile_hide($(this))" %>
@@ -62,27 +62,34 @@
                   <%= User.current.lastname + User.current.firstname %>老师您好！
                   <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.show_name + "老师")%>刚刚发布了一个作业：
                 </p>
-                <p>课程名称：<%= ma.course_message.course.name %>
-                  (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</p>
-                <p>作业标题：<span style="color:Red"><%= ma.course_message.name %></span></p>
-                <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;24点</span></p>
-                <p>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>&nbsp;&nbsp;24点</span></p>
-                <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点</span></p>
-                <p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
-                <p>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></p>
+                <ul class="ul_normal_color">
+                  <li>课程名称：<%= ma.course_message.course.name %>
+                    (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
+                  <li>作业标题：<span style="color:Red"><%= ma.course_message.name %></span></li>
+                  <li>发布时间：<span style="color:Red;"><%= DateTime.parse(ma.course_message.created_at.to_s).strftime('%Y-%m-%d %H:%M').to_s %></span></li>
+                  <li>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;23:59</span></li>
+                  <li>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>&nbsp;23:59</span></li>
+                  <li>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;23:59</span></li>
+                  <li>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></li>
+                  <li>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></li>
+                </ul>
                 <p>
                   您可以修改作业内容、评分规则、匿评过程等，谢谢！
                 </p>
             <% else %>
                 <p><%= User.current.lastname + User.current.firstname %>同学您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业：</p>
-                <p>课程名称：<%= ma.course_message.course.name %>
-                  (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</p>
-                <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
-                <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;24点</span></p>
-                <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点</span></p>
-                <p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
+                <ul class="ul_normal_color">
+                  <li>课程名称：<%= ma.course_message.course.name %>
+                    (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
+                  <li>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></li>
+                  <li>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;23:59</span></li>
+                  <li>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>&nbsp;&nbsp;23:59</span></li>
+                  <li>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;23:59</span></li>
+                  <li>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></li>
+                  <li>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></li>
+                </ul>
                 <p>
-                  请抓紧时间提交自己的作品，谢谢！
+                  请抓紧时间提交您的作品，谢谢！
                 </p>
             <% end %>
           </div>
@@ -96,7 +103,7 @@
             user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :title => "#{ma.course_message.user.lastname + ma.course_message.user.firstname}老师" %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布的作业：</span></li>
           <li class="homepageHomeworkContent fl">
-            <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
+            <%= link_to "作业题目：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
                         :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
                         :onmouseover => "message_titile_show($(this),event)",
                         :onmouseout => "message_titile_hide($(this))" %>
@@ -107,22 +114,16 @@
                   <%= User.current.lastname + User.current.firstname %>同学您好！
                   <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师发布的作业截止日期快到了：
                 </p>
-                <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</p>
-                <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
-                <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;24点</span></p>
-                <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点</span></p>
-                <p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
-                <p>请同学们抓紧时间提交自己的作品，谢谢！</p>
-            <% else %>
-                <p><%= User.current.lastname + User.current.firstname %>老师您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师发布的作业截止日期快到了：</p>
-                <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</p>
-                <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
-                <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;24点</span></p>
-                <p>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>&nbsp;&nbsp;24点</span></p>
-                <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点</span></p>
-                <p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
-                <p>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></p>
-                <p>您可以修改作业内容、评分规则、匿评过程等，谢谢！</p>
+                <ul class="ul_normal_color">
+                  <li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
+                  <li>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></li>
+                  <li>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;23:59</span></li>
+                  <li>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>&nbsp;&nbsp;23:59</span></li>
+                  <li>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;23:59</span></li>
+                  <li>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></li>
+                  <li>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></li>
+                  <p>请抓紧时间提交您的作品，谢谢！</p>
+                </ul>
             <% end %>
           </div>
           <li class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp; 截止时间快到了！</li>
@@ -150,14 +151,15 @@
               <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师' : '同学' %>您好！
               <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>开启了匿评，作业详情如下：
             </p>
-            <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</p>
-            <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
-            <p>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></p>
-            <p>
-              匿评截止：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点</span>
-            </p>
+            <ul class="ul_normal_color">
+              <li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
+              <li>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></li>
+              <li>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></li>
+              <li>匿评截止：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;23:59</span></li>
+            </ul>
             <% unless User.current.allowed_to?(:as_teacher, ma.course_message.course)%>
-              <p>请您尽早完成匿评！如果您在规定时间内未完成匿评，一次将被扣<%= ma.course_message.homework_detail_manual.absence_penalty %>分。</p>
+              <p>请您尽早完成匿评！如果您在截止日期前未完成匿评，您的最终成绩将被扣除<%= ma.course_message.homework_detail_manual.absence_penalty %>分乘以缺评份数。</p>
+              <p>例如，您缺评了两份作品，则您的最终成绩将被扣除 <%= ma.course_message.homework_detail_manual.absence_penalty %> * 2 = <%= ma.course_message.homework_detail_manual.absence_penalty * 2 %>分</p>
             <% end%>
           </div>
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
@@ -180,8 +182,10 @@
               <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师':'同学'%>您好！
               <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>关闭了匿评，作业详情如下：
             </p>
-            <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</p>
-            <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
+            <ul class="ul_grey">
+              <li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
+              <li>作业标题：<%= ma.course_message.name %></li>
+            </ul>
           </div>
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
@@ -206,14 +210,14 @@
             <p>
               <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher, ma.course_message.course) ? '老师':'同学'%>您好！
               <%= User.current.eql?(ma.course_message.user) ?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname + "老师") %>启动作业匿评失败！
-              <p> 失败原因：提交作品的人数低于2人</p>
-            </p>
-            <p>作业详情如下：</p>
-            <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年' + ma.course_message.course.term %>)</p>
-            <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
-            <p>
-              提交截止：<span style="color:Red;"><%= ma.course_message.end_time%>&nbsp;&nbsp;24点</span>
+
             </p>
+            <ul class="ul_normal_color">
+              <li>失败原因：<span style="color:red;">提交作品的人数低于2人</span></li>
+              <li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年' + ma.course_message.course.term %>)</li>
+              <li>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></li>
+              <li>提交截止：<span style="color:Red;"><%= ma.course_message.end_time%>&nbsp;&nbsp;23:59</span></li>
+            </ul>
           </div>
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
@@ -300,21 +304,18 @@
                     <%= User.current.show_name %>同学您好！
                     <%= ma.course_message.reviewer_role == 3? "匿名用户" : (ma.course_message.user.show_name + "老师")%><%= ma.status == 0? "评阅了您的作品":"重新评阅了您的作品"%>。详情如下：
                   </p>
-                  <p>课程名称：<%= ma.course.name %>(<%= ma.course.time.to_s + '年'+ ma.course.term %>)</p>
-                  <p>作业标题：<span style="color:Red;"><%=ma.course_message.student_work.homework_common.name %></span></p>
-                  <% content = ma.content.gsub("作业评分：","").split("&nbsp;&nbsp;&nbsp; 评语：")%>
+                  <ul class="ul_normal_color">
+                    <li>课程名称：<%= ma.course.name %>(<%= ma.course.time.to_s + '年'+ ma.course.term %>)</li>
+                    <li>作业标题：<span style="color:Red;"><%=ma.course_message.student_work.homework_common.name %></span></li>
+                    <% content = ma.content.gsub("作业评分：","").split("&nbsp;&nbsp;&nbsp; 评语：")%>
+                    <li>作品评分：<span style="color:Red;"><%= content[0] %>分</span></li>
+                    <% if content.size > 1 %>
+                        <div class="fl" style="width:74px;"><li>作品评语：</li></div>
+                        <div style="margin-left:74px"><span style="color:Red;"><%= content[1] %></span></div>
+                    <% end %>
+                  </ul>
                   <p>
-                    作品评分：<%= content[0] %>
-                  </p>
-                  <% if content.size > 1 %>
-                      <div class="fl">作品评语：</div>
-                      <div class="ml60"><%= content[1] %></div>
-                  <% end %>
-                  <p>
-                    本次作业将在<%= ma.course_message.student_work.homework_common.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点结束匿评，到时您将可以看到所有其他同学的作品啦！大家可以进一步互相学习。
-                  </p>
-                  <p>
-                    期待您取得更大的进步！
+                    本次作业将在<%= ma.course_message.student_work.homework_common.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;23:59结束匿评，到时您将可以看到所有其他同学的作品啦！大家可以进一步互相学习。  期待您取得更大的进步！
                   </p>
                 </div>
             <% end %>
@@ -350,7 +351,7 @@
               </li>
               <li class="homepageNewsPubType fl">
                 <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname +
-                                    "#{ma.course_message.user.members.where("course_id=?", ma.course.id).first.roles.first.name=='Student'?"同学":"老师"}",
+                                    "#{ma.course_message.user.allowed_to?(:as_teacher, ma.course)?"老师":"同学"}",
                             user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
                 <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">回复了作品评论：</span>
               </li>
@@ -362,14 +363,14 @@
               <div style="display: none" class="message_title_red system_message_style">
                 <p>
                   <%= User.current.show_name %>老师您好！
-                  <%= ma.course_message.user.show_name%><%= ma.course_message.user.allowed_to?(:as_teacher, ma.course)?"老师":"学生"%>回复了您的作品评论。详情如下：
+                  <%= ma.course_message.user.show_name%><%= ma.course_message.user.allowed_to?(:as_teacher, ma.course)?"老师":"同学"%>回复了您的作品评论。详情如下：
                 </p>
-                <div class="fl">回复内容：</div>
-                <div class="ml60"><%= ma.course_message.notes  %></div>
-                <div class="fl">您的评论：</div>
-                <div class="ml60"><%= ma.course_message.jour.comment  %></div>
-                <p>课程名称：<%= ma.course.name %>(<%= ma.course.time.to_s + '年'+ ma.course.term %>)</p>
-                <p>作业标题：<span style="color:Red;"><%=ma.course_message.jour.student_work.homework_common.name %></span></p>
+                <ul class="ul_normal_color">
+                  <li>回复内容：<span style="color:red;"><%= ma.course_message.notes  %></span></li>
+                  <li>您的评论：<span style="color:red;"><%= ma.course_message.jour.comment  %></span></li>
+                  <li>课程名称：<%= ma.course.name %>(<%= ma.course.time.to_s + '年'+ ma.course.term %>)</li>
+                  <li>作业标题：<span style="color:Red;"><%=ma.course_message.jour.student_work.homework_common.name %></span></li>
+                </ul>
               </div>
               <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
             </ul>
@@ -378,12 +379,13 @@
     <!-- 作业迟交，不能参与匿评提醒消息 -->
     <% if ma.course_message_type == "StudentWork" && !ma.course_message.homework_common.nil? %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"></a></li>
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.homework_common.user), :width => "30", :height => "30"), user_path(ma.course_message.homework_common.user) %></a></li>
           <li class="homepageNewsPubType fl">
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">迟交作业，不能参与作业匿评！</span>
+            <%=link_to ma.course_message.homework_common.user.show_name+"老师", user_path(ma.course_message.homework_common.user), :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 "由于迟交作业，您及您的作品都不能参与作业的匿评", student_work_index_path(:homework => ma.course_message.homework_common_id),
+          <li class="homepageHomeworkContent fl"><a href="javascript:void(0);" class="newsGrey">
+            <%= link_to "作业题目：" + ma.course_message.homework_common.name, student_work_index_path(:homework => ma.course_message.homework_common_id),
                         :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
                         :onmouseover => "message_titile_show($(this),event)",
                         :onmouseout => "message_titile_hide($(this))" %></a>
@@ -393,11 +395,16 @@
               <%= User.current.lastname + User.current.firstname %>
               <%= User.current.allowed_to?(:as_teacher,ma.course_message.homework_common.course) ? '老师':'同学'%>您好！由于迟交作业，您及您的作品都不能参与以下作业的匿评。作业详情如下：
             </p>
-            <p>课程名称：<%= ma.course_message.homework_common.course.name %>(<%= ma.course_message.homework_common.course.time.to_s + '年' + ma.course_message.homework_common.course.term %>)</p>
-            <p>作业标题：<span style="color:Red;"><%=ma.course_message.homework_common.name %></span></p>
-            <p>提交截止：<span style="color:Red;"><%=ma.course_message.homework_common.end_time %>&nbsp;24:00</span></p>
-            <p>提交时间：<span style="color:Red;"><%=format_time(ma.course_message.created_at) %></span></p>
+            <ul class="ul_grey">
+              <li>课程名称：<%= ma.course_message.homework_common.course.name %>(<%= ma.course_message.homework_common.course.time.to_s + '年' + ma.course_message.homework_common.course.term %>)</li>
+              <li>作业标题：<%= ma.course_message.homework_common.name %></li>
+              <li>提交截止：<%= ma.course_message.homework_common.end_time %>&nbsp;23:59</li>
+              <li>提交时间：<%= format_time(ma.course_message.created_at) %></li>
+              <li>迟交扣分：<%= ma.course_message.homework_common.late_penalty %>分</li>
+            </ul>
+            <p>如需获得最终成绩，请您联系主讲老师对您的作品进行单独评分!</p>
           </div>
+          <li class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp;您迟交了作品！</li>
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
     <% end %>
@@ -420,10 +427,185 @@
             </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>
+    <% end %>
+    <% if ma.course_message_type == "JoinCourseRequest" %>
+        <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="homepageHomeworkContent fl"><a href="javascript:void(0);" class="newsGrey">
+            <%= link_to User.find(ma.course_message_id).name+"申请成为课程\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content == '9'  ? "教师" : "教辅"}", user_path(User.find(ma.course_message_id), :course_id => ma.course_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">
+            <p>
+              <%= User.current.lastname + User.current.firstname %>老师您好！您有了新的课程成员申请，信息如下：
+            </p>
+            <p>真实姓名：<%= User.find(ma.course_message_id).realname %></p>
+            <p>申请课程：<%= Course.find(ma.course_id).name%></p>
+            <div class="fl">课程描述：</div>
+            <div class="ml60"><%= Course.find(ma.course_id).description.html_safe %></div>
+            <p>申请职位：<%= ma.content == '9'  ? "教师" : "教辅"%></p>
+          </div>
+          <li class="homepageHomeworkContentWarn fl">
+            <span id="deal_info_<%=ma.id%>">
+              <% if ma.status == 0 || ma.status.nil?%>
+                <%= link_to '同意',dealwith_apply_request_user_path(User.current,:agree=>'Y',:msg_id=>ma.id),:remote=>'true'%>
+                  |
+                  <%= link_to '拒绝',dealwith_apply_request_user_path(User.current,:agree=>'N',:msg_id=>ma.id),:remote=>'true'%>
+             <% elsif ma.status == 1%> <!-- 同意 -->
+                 您已经同意了该申请
+             <% elsif ma.status == 2%> <!-- 拒绝 -->
+                 您已经拒绝了该申请
+             <%end %>
+             </span>
+          </li>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+    <% if ma.course_message_type == "CourseRequestDealResult" %>
+        <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  ma.status == 1 ?
+                    '您申请成为课程"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'申请已通过'
+                     :
+                    '您申请成为课程"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'的申请被拒绝', course_path(Course.find(ma.course_id)),
+                        :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
+                        :onmouseover => "message_titile_show($(this),event)",
+                        :onmouseout => "message_titile_hide($(this))" %></a>
+             </span>
+          </li>
+          <div style="display: none" class="message_title_red system_message_style">
+            <p>
+              <%= User.current.lastname + User.current.firstname %>老师您好！您已成功加入课程<%= Course.find(ma.course_id).name%>。
+            </p>
+            <p>申请课程：<%= Course.find(ma.course_id).name%></p>
+            <div class="fl">课程描述：</div>
+            <div class="ml60"><%= Course.find(ma.course_id).description.html_safe %></div>
+            <p>申请职位：<%= ma.content == '9'  ? "教师" : "教辅"%></p>
+          </div>
+          <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).login+"("+(User.find(ma.course_message_id).realname ?  User.find(ma.course_message_id).realname : User.find(ma.course_message_id).login) +")", 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).login+"("+(User.find(ma.course_message_id).realname ?  User.find(ma.course_message_id).realname : User.find(ma.course_message_id).login) +")" %></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>
diff --git a/app/views/users/_user_message_forge.html.erb b/app/views/users/_user_message_forge.html.erb
index 9a9bec10d..94890a368 100644
--- 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>
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/dealwith_apply_request.js.erb b/app/views/users/dealwith_apply_request.js.erb
new file mode 100644
index 000000000..e31c0be85
--- /dev/null
+++ b/app/views/users/dealwith_apply_request.js.erb
@@ -0,0 +1,11 @@
+$("#deal_info_<%=@msg.id%>").html(
+<% if @msg.status == 0 || @msg.status.nil?%>
+<%= link_to '同意',dealwith_apply_request_user_path(User.current,:agree=>'Y',:msg_id=>@msg.id),:remote=>'true'%>
+'|'
+<%= link_to '拒绝',dealwith_apply_request_user_path(User.current,:agree=>'N',:msg_id=>@msg.id),:remote=>'true'%>
+<% elsif @msg.status == 1%>
+        '您已经同意了该申请'
+<% elsif @msg.status == 2%>
+        '您已经拒绝了该申请'
+<%end %>
+);
\ No newline at end of file
diff --git a/app/views/users/import_resources_to_homework.js.erb b/app/views/users/import_resources_to_homework.js.erb
index 61fcd294d..804b4ec44 100644
--- a/app/views/users/import_resources_to_homework.js.erb
+++ b/app/views/users/import_resources_to_homework.js.erb
@@ -1,13 +1,13 @@
 <% unless @attachments.empty?%>
-    <% @attachments.each_with_index do |attachment, i| %>
+    <% @attachments.each do |attachment| %>
     $("#attachments_fields").append(
-    '<span id="attachments_p<%= i %>">'+
-    '<%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => "filename link_file", :readonly=>"readonly")%>'+
-    '<%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => "description", :style=>"display: inline-block;") %>'+
+    '<span id="attachments_p<%= attachment.id %>">'+
+    '<%= text_field_tag("attachments[p#{attachment.id}][filename]", attachment.filename, :class => "upload_filename link_file", :readonly=>"readonly")%>'+
+    '<%= text_field_tag("attachments[p#{attachment.id}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => "description", :style=>"display: inline-block;") %>'+
         '<span class="ispublic-label"><%= l(:field_is_public)%>:</span>'+
-    '<%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => "is_public")%>'+
-    '<%= link_to("&nbsp;".html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => "js"), :method => "delete", :remote => true, :class => "remove-upload") unless attachment.id.nil? %>'+
-    '<%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>'+
+    '<%= check_box_tag("attachments[p#{attachment.id}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => "is_public")%>'+
+    '<%= link_to("&nbsp;".html_safe, attachment_path(attachment, :attachment_id => "p#{attachment.id}", :format => "js"), :method => "delete", :remote => true, :class => "remove-upload") unless attachment.id.nil? %>'+
+    '<%= hidden_field_tag "attachments[p#{attachment.id}][token]", "#{attachment.token}" %>'+
     '</span>'+
     '<div class="cl"></div>')
 
diff --git a/app/views/users/new_user_commit_homework.html.erb b/app/views/users/new_user_commit_homework.html.erb
index c3a736058..0e2648509 100644
--- a/app/views/users/new_user_commit_homework.html.erb
+++ b/app/views/users/new_user_commit_homework.html.erb
@@ -112,7 +112,7 @@
                <div class="cl"></div>
           </div>
           <% if test.status.to_i == -2 %>
-            <div class="ProResultCon "><%= test.results.first %></div>
+            <div class="ProResultCon"><pre><%= test.results.first %></pre></div>
           <% else %>
             <div class="ProResultTable " >
               <ul class="ProResultUl " >
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_commit_homework.html.erb b/app/views/users/user_commit_homework.html.erb
index a7416cf40..6f14ce05d 100644
--- a/app/views/users/user_commit_homework.html.erb
+++ b/app/views/users/user_commit_homework.html.erb
@@ -86,7 +86,7 @@
                <div class="cl"></div>
           </div>
           <% if test.status.to_i == -2 %>
-            <div class="ProResultCon "><%= test.results.first %></div>
+            <div class="ProResultCon"><pre><%= test.results.first %></pre></div>
           <% else %>
             <div class="ProResultTable " >
               <ul class="ProResultUl " >
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index 8b9f4cb0a..121450d4d 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -1,6 +1,7 @@
 <script type="text/javascript">
   function reset_homework(){
       $("#homework_name").val("");
+      $("#homework_publish_time").val("");
       $("#homework_end_time").val("");
       $("#course_id").val($("#option_select").val());
       $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new,:has_program => true })%>");
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/app/views/words/leave_homework_message.js.erb b/app/views/words/leave_homework_message.js.erb
new file mode 100644
index 000000000..08fed725c
--- /dev/null
+++ b/app/views/words/leave_homework_message.js.erb
@@ -0,0 +1,7 @@
+<% if @user_activity_id %>
+    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework_common,:user_activity_id =>@user_activity_id,:course_activity => @course_activity}) %>");
+    init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+<% elsif @homework_common_id && @is_in_course %>
+    $("#homework_common_<%= @homework_common_id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework_common,:is_in_course => @is_in_course}) %>");
+    init_activity_KindEditor_data(<%= @homework_common_id%>,"","87%");
+<% end %>
diff --git a/config/application.rb b/config/application.rb
index 83ba21b05..6e4a2983a 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -41,7 +41,7 @@ module RedmineApp
 
     config.active_record.store_full_sti_class = true
     config.active_record.default_timezone = :local
-
+    config.time_zone = 'Beijing'
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'
@@ -69,6 +69,12 @@ module RedmineApp
 
     config.action_view.sanitized_allowed_tags = 'div', 'p', 'span', 'img', 'embed'
 
+    config.before_initialize do
+    end
+
+    config.after_initialize do
+    end
+
     if File.exists?(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
       instance_eval File.read(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
     end
diff --git a/config/configuration.yml b/config/configuration.yml
index 2ac986927..3790045aa 100644
--- a/config/configuration.yml
+++ b/config/configuration.yml
@@ -200,6 +200,9 @@ default:
   repository_root_path: '/tmp/htdocs'
   judge_server: 'http://judge.trustie.net/'
 
+  # Git's url
+  gitlab_address: 'http://gitfast.trustie.net'
+
 # specific configuration options for production environment
 # that overrides the default ones
 production:
diff --git a/config/initializers/gitlab_config.rb b/config/initializers/gitlab_config.rb
new file mode 100644
index 000000000..c82b2edff
--- /dev/null
+++ b/config/initializers/gitlab_config.rb
@@ -0,0 +1,9 @@
+Gitlab.configure do |config|
+  # config.endpoint       = 'http://192.168.41.130:3000/trustie/api/v3' # API endpoint URL, default: ENV['GITLAB_API_ENDPOINT']
+  # config.private_token  = 'cK15gUDwvt8EEkzwQ_63'       # user's private token, default: ENV['GITLAB_API_PRIVATE_TOKEN']
+  config.endpoint       = 'http://gitfast.trustie.net/api/v3' # API endpoint URL, default: ENV['GITLAB_API_ENDPOINT']
+  config.private_token  = 'fPc_gBmEiSANve8TCfxW'       # user's private token, default: ENV['GITLAB_API_PRIVATE_TOKEN']
+  # Optional
+  # config.user_agent   = 'Custom User Agent'          # user agent, default: 'Gitlab Ruby Gem [version]'
+  # config.sudo         = 'user'                       # username for sudo mode, default: nil
+end
diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml
index 61bad2a00..ee361cc2f 100644
--- a/config/locales/commons/zh.yml
+++ b/config/locales/commons/zh.yml
@@ -200,7 +200,7 @@ zh:
   label_subject_empty: 主题不能为空
 
   label_no_data: 没有任何数据可供显示
-  label_repository_no_data: 您还没有创建版本库，每个项目只允许创建一个版本库！
+  label_repository_no_data: 每个项目只能创建一个版本库！
   # 项目、课程、用户公用
   label_settings: 配置
   label_information_plural: 信息  
@@ -354,7 +354,7 @@ zh:
   #  意见反馈
   # 
   label_feedback: 意见反馈
-  label_feedback_tips: "欢迎反馈网站问题，课程中遇到的问题请反馈给相关老师!"
+  label_feedback_tips: "请在此提问平台问题，或直接加入师姐答疑群，谢谢！"
   label_technical_support: "QQ 在线支持："
   label_feedback_success: "您的意见已经反馈到公共贴吧的新手讨论吧，我们会第一时间解决您的问题，谢谢支持！"
   label_feedback_value: "该帖来自用户反馈:)"
diff --git a/config/locales/courses/zh.yml b/config/locales/courses/zh.yml
index 498388cfc..585ef7bec 100644
--- a/config/locales/courses/zh.yml
+++ b/config/locales/courses/zh.yml
@@ -27,7 +27,7 @@ zh:
   # 资源库 (课程、项目按类型分)
   label_course_file: 资源库 
   label_upload_files: 上传资源
-
+  label_apply_join_course: 申请加入课程
   #
   #  课程托管平台主页
   #
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2071529f0..2bed45103 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -481,6 +481,7 @@ en:
   label_attribute_plural: Attributes
   label_change_status: Change status
   label_history: History
+  label_commit_history: Commit History
   label_attachment: Files
   label_attachment_delete: Delete file
   
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index dbce93219..88a710633 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -88,6 +88,8 @@ zh:
   project_module_files: 资源库 
   project_module_repository: 版本库
   project_module_create_repository: 创建版本库
+  project_gitlab_create_repository: 新版本库
+
 
   label_project_more: 更多
   project_module_news: 新闻
@@ -112,6 +114,7 @@ zh:
   label_project_overview: "项目简介"
   label_expend_information: 展开更多信息
   label_project_create: "新建了项目"
+  lable_project_rep_create: 创建
  
   #   
   #  项目托管平台
@@ -322,6 +325,7 @@ zh:
   label_latest_revision_plural: 最近的修订版本
   label_view_revisions: 查看修订
   label_view_all_revisions: 查看所有修订
+  label_view_all_revisions_commits: 查看所有提交记录
   #   
   #  项目托管平台
   #
@@ -374,7 +378,7 @@ zh:
   #     
   label_project_new_description: '项目可以是软件开发项目，也可以是协作研究项目。'
   field_name: 名称
-  field_identifier: 标识
+  field_identifier: 版本库名
   field_enterprise_name: 组织名称
   label_organization_choose: --请选择组织--
   text_length_between: "长度必须在 %{min} 到 %{max} 个字符之间。"
@@ -440,4 +444,8 @@ zh:
   #     
   field_sharing: 共享
   label_title_code_review: 代码评审
-  label_home_non_project: 您还没有创建项目，您可以查看系统的其它项目！
\ No newline at end of file
+  label_home_non_project: 您还没有创建项目，您可以查看系统的其它项目！
+
+  # 版本库迁移
+  label_repository_migrate_dec: 注意：Trustie版本库近期进行了一次大的改造，历史版本需要转换成新的版本，输入新的版本库名，即可完成转换。 转换过程可能需要等待一段时间。
+  label_repository_name_dec: 版本库名仅小写字母（a-z）、数字、破折号（-）和下划线（_）可以使用，长度必须在 1 到 254 个字符之间，一旦保存，标识无法修改。
\ No newline at end of file
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 5efe4a2cc..12c1b9258 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -580,6 +580,7 @@ zh:
 
   label_change_status: 变更状态
   label_history: 历史记录
+  label_commit_history: 历史变更记录
   label_attachment: 文件
 
   label_file_upload: 上传资料
@@ -674,6 +675,7 @@ zh:
   label_branch: 分支
   label_tag: 标签
   label_revision: 修订
+  label_revision_path: 当前路径
   label_revision_plural: 修订
   lable_revision_code_count: 代码量
   label_revision_commit_count: 提交次数
@@ -924,7 +926,7 @@ zh:
   button_change_password: 修改密码
   button_copy: 复制
   button_copy_and_follow: 复制并转到新问题
-  button_annotate: 追溯
+  button_annotate: 代码定位
 
   button_configure: 配置
   button_quote: 引用
@@ -987,7 +989,7 @@ zh:
   text_enumeration_destroy_question: "%{count} 个对象被关联到了这个枚举值。"
   text_enumeration_category_reassign_to: '将它们关联到新的枚举值：'
   text_email_delivery_not_configured: "邮件参数尚未配置，因此邮件通知功能已被禁用。\n请在config/configuration.yml中配置您的SMTP服务器信息并重新启动以使其生效。"
-  text_repository_usernames_mapping: "选择或更新与版本库中的用户名对应的Trustie用户。\n版本库中与Trustie中的同名用户将被自动对应。"
+  text_repository_usernames_mapping: "选择或更新与版本库中的用户名对应的Trustie用户，版本库中与Trustie中的同名用户将被自动对应。"
   text_diff_truncated: '... 差别内容超过了可显示的最大行数并已被截断'
   text_custom_field_possible_values_info: '每项数值一行'
   text_wiki_page_destroy_question: 此页面有 %{descendants} 个子页面和下级页面。您想进行那种操作？
@@ -2022,6 +2024,7 @@ zh:
   label_creat: 创建
   #api end
 
+  label_publish_time: 发布时间
   label_end_time: 截止时间
   label_send_email: 确定发送
   label_input_email: 请输入邮箱地址(必填)
diff --git a/config/routes.rb b/config/routes.rb
index 810c22e7a..6cf872180 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -101,9 +101,12 @@ RedmineApp::Application.routes.draw do
       get 'start_anonymous_comment'
       get 'stop_anonymous_comment'
       get 'alert_anonymous_comment'
+      get 'alert_forbidden_anonymous_comment'
       get 'start_evaluation_set'
+      get 'score_rule_set'
       post 'set_evaluation_attr'
     end
+
     collection do
       post 'next_step'
       post 'programing_test'
@@ -114,6 +117,7 @@ RedmineApp::Application.routes.draw do
     member do
       post 'add_score'
       get 'praise_student_work'
+      get 'forbidden_anonymous_comment'
     end
     collection do
       post 'add_score_reply'
@@ -387,9 +391,19 @@ RedmineApp::Application.routes.draw do
       get 'user_resource_type'
       get 'user_ref_resource_search'
       post 'import_resources_to_homework'
+      get 'dealwith_apply_request'
       get 'store_selected_resource'
       # end
     end
+    #resources :blogs
+    resources :blogs do
+      resources :blog_comments do
+        member do
+          post 'reply'
+          get 'quote'
+        end
+      end
+    end
   end
   match 'users/:id/user_newfeedback', :to => 'users#user_newfeedback',  :via => :get, :as => "feedback"
   match 'users/:id/user_projects', :to => 'users#user_projects',  :via => :get
@@ -533,6 +547,7 @@ RedmineApp::Application.routes.draw do
     resources :repositories, :except => [:index, :show] do
       member do
         get 'newrepo', :via => [:get, :post]
+        put 'to_gitlab'
         # get 'create', :via=>[:get, :post]
       end
     end
@@ -777,6 +792,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 'syllabus'
     end
     collection do
       match 'join_private_courses', :via => [:get, :post]
@@ -855,6 +874,7 @@ RedmineApp::Application.routes.draw do
   match 'projects/:id/feedback', :to => 'projects#feedback',  :via => :get, :as => 'project_feedback'
   match 'project/:id/share', :to => 'projects#share', :as => 'share_show' #share
   post 'words/:id/leave_user_message', :to => 'words#leave_user_message', :as => "leave_user_message"
+  post 'words/:id/leave_homework_message', :to => 'words#leave_homework_message', :as => "leave_homework_message"
 
   post 'join_in/join', :to => 'courses#join', :as => 'join'
   delete 'join_in/join', :to => 'courses#unjoin'
diff --git a/config/settings.yml b/config/settings.yml
index d0af6d7a1..4286e0930 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -259,7 +259,7 @@ tags_min_length:
   default: 1
 tags_max_length:
    format: int
-   default: 14
+   default: 120
 tags_show_search_results:
    format: int
    default: 5
diff --git a/db/migrate/20150712063406_add_gitlab_user_id_to_users.rb b/db/migrate/20150712063406_add_gitlab_user_id_to_users.rb
new file mode 100644
index 000000000..f6e2d60cd
--- /dev/null
+++ b/db/migrate/20150712063406_add_gitlab_user_id_to_users.rb
@@ -0,0 +1,5 @@
+class AddGitlabUserIdToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :gid, :integer
+  end
+end
diff --git a/db/migrate/20151013023237_add_gpid_to_project.rb b/db/migrate/20151013023237_add_gpid_to_project.rb
new file mode 100644
index 000000000..bfa535253
--- /dev/null
+++ b/db/migrate/20151013023237_add_gpid_to_project.rb
@@ -0,0 +1,5 @@
+class AddGpidToProject < ActiveRecord::Migration
+  def change
+    add_column :projects, :gpid, :integer
+  end
+end
diff --git a/db/migrate/20151020013352_update_attachment.rb b/db/migrate/20151020013352_update_attachment.rb
new file mode 100644
index 000000000..3e1161c09
--- /dev/null
+++ b/db/migrate/20151020013352_update_attachment.rb
@@ -0,0 +1,23 @@
+class UpdateAttachment < ActiveRecord::Migration
+  def up
+    count = Attachment.all.count / 30 + 2
+    transaction do
+      for i in 1 ... count do i
+      Attachment.page(i).per(30).each do |attachment|
+        if attachment.container_type == 'Course'
+          course = attachment.course
+          if course
+            if course.is_public == 0
+              attachment.is_public = 0
+              attachment.save
+            end
+          end
+        end
+      end
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20151020014759_delete_null_course_activity.rb b/db/migrate/20151020014759_delete_null_course_activity.rb
new file mode 100644
index 000000000..0d7b11693
--- /dev/null
+++ b/db/migrate/20151020014759_delete_null_course_activity.rb
@@ -0,0 +1,17 @@
+class DeleteNullCourseActivity < ActiveRecord::Migration
+  def up
+    count = CourseActivity.all.count / 30 + 2
+    transaction do
+      for i in 1 ... count do i
+        CourseActivity.page(i).per(30).each do |activity|
+          unless activity.course_act
+            activity.destroy
+          end
+        end
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20151020021234_update_course_activity.rb b/db/migrate/20151020021234_update_course_activity.rb
new file mode 100644
index 000000000..595b0d333
--- /dev/null
+++ b/db/migrate/20151020021234_update_course_activity.rb
@@ -0,0 +1,23 @@
+class UpdateCourseActivity < ActiveRecord::Migration
+  def up
+    count = CourseActivity.all.count / 30 + 2
+    transaction do
+      for i in 1 ... count do i
+      CourseActivity.page(i).per(30).each do |activity|
+        if activity.course_act
+          if activity.course_act_type == 'Poll'
+            if activity.course_act.polls_status == 1
+              activity.destroy
+            end
+          end
+        else
+          activity.destroy
+        end
+      end
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20151022071611_create_blogs.rb b/db/migrate/20151022071611_create_blogs.rb
new file mode 100644
index 000000000..dd782c78f
--- /dev/null
+++ b/db/migrate/20151022071611_create_blogs.rb
@@ -0,0 +1,15 @@
+class CreateBlogs < ActiveRecord::Migration
+  def change
+    create_table :blogs 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.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20151022071804_create_blog_comments.rb b/db/migrate/20151022071804_create_blog_comments.rb
new file mode 100644
index 000000000..254dfd692
--- /dev/null
+++ b/db/migrate/20151022071804_create_blog_comments.rb
@@ -0,0 +1,19 @@
+class CreateBlogComments < ActiveRecord::Migration
+  def change
+    create_table :blog_comments 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.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20151028060607_add_column_outline_to_course.rb b/db/migrate/20151028060607_add_column_outline_to_course.rb
new file mode 100644
index 000000000..a666eba96
--- /dev/null
+++ 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
diff --git a/db/migrate/20151029030006_update_homework_common_publish_time.rb b/db/migrate/20151029030006_update_homework_common_publish_time.rb
new file mode 100644
index 000000000..d24d39282
--- /dev/null
+++ b/db/migrate/20151029030006_update_homework_common_publish_time.rb
@@ -0,0 +1,16 @@
+class UpdateHomeworkCommonPublishTime < ActiveRecord::Migration
+  def up
+    count  = HomeworkCommon.all.count / 30 + 2
+    transaction do
+      for i in 1 ... count do i
+        HomeworkCommon.page(i).per(30).each do |homework|
+          homework.publish_time = homework.created_at.strftime('%d-%b-%Y')
+          homework.save
+        end
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20151102083844_drop_organization.rb b/db/migrate/20151102083844_drop_organization.rb
new file mode 100644
index 000000000..1abb0f6d9
--- /dev/null
+++ b/db/migrate/20151102083844_drop_organization.rb
@@ -0,0 +1,8 @@
+class DropOrganization < ActiveRecord::Migration
+  def up
+    drop_table :organizations
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20151102084419_create_organization.rb b/db/migrate/20151102084419_create_organization.rb
new file mode 100644
index 000000000..af84ebee9
--- /dev/null
+++ b/db/migrate/20151102084419_create_organization.rb
@@ -0,0 +1,18 @@
+class CreateOrganization < ActiveRecord::Migration
+  def up
+    create_table :organizations do |t|
+      t.string :name
+      t.text :description
+      t.integer :creator_id
+      t.integer :home_id
+      t.string :domain
+      t.boolean :is_public
+
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table :organizations
+  end
+end
diff --git a/db/migrate/20151102085318_add_anonymous_comment_to_homework_common.rb b/db/migrate/20151102085318_add_anonymous_comment_to_homework_common.rb
new file mode 100644
index 000000000..ab3cd5505
--- /dev/null
+++ b/db/migrate/20151102085318_add_anonymous_comment_to_homework_common.rb
@@ -0,0 +1,5 @@
+class AddAnonymousCommentToHomeworkCommon < ActiveRecord::Migration
+  def change
+    add_column :homework_commons, :anonymous_comment, :integer, :default => 0
+  end
+end
diff --git a/db/migrate/20151102090519_create_org_members.rb b/db/migrate/20151102090519_create_org_members.rb
new file mode 100644
index 000000000..037d8a3c6
--- /dev/null
+++ b/db/migrate/20151102090519_create_org_members.rb
@@ -0,0 +1,14 @@
+class CreateOrgMembers < ActiveRecord::Migration
+  def up
+    create_table :org_members do |t|
+      t.integer :user_id
+      t.integer :organization_id
+      t.string :role
+
+    end
+  end
+
+  def down
+    drop_table :org_members
+  end
+end
diff --git a/db/migrate/20151109073857_delete_journals_activity.rb b/db/migrate/20151109073857_delete_journals_activity.rb
new file mode 100644
index 000000000..ae7074c9c
--- /dev/null
+++ b/db/migrate/20151109073857_delete_journals_activity.rb
@@ -0,0 +1,40 @@
+class DeleteJournalsActivity < ActiveRecord::Migration
+  def up
+    UserActivity.all.each do |activity|
+      if activity.act_type == 'JournalsForMessage'
+        if activity.act
+          unless activity.act.m_parent_id.nil?
+            parent_act = UserActivity.where("act_id = #{activity.act.m_parent_id} and act_type='JournalsForMessage' and container_type='Principal'").first
+            if parent_act
+              parent_act.created_at = activity.act.parent.children.maximum("created_on")
+              parent_act.save
+              activity.destroy
+            end
+          end
+        else
+          activity.destroy
+        end
+      end
+    end
+
+    PrincipalActivity.all.each do |activity|
+      if activity.principal_act_type == 'JournalsForMessage'
+        if activity.principal_act
+          unless activity.principal_act.m_parent_id.nil?
+            parent_act = PrincipalActivity.where("principal_act_id = #{activity.principal_act.m_parent_id} and principal_act_type='JournalsForMessage'").first
+            if parent_act
+              parent_act.created_at = activity.principal_act.parent.children.maximum("created_on")
+              parent_act.save
+              activity.destroy
+            end
+          end
+        else
+          activity.destroy
+        end
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20151109080256_alter_user_activities_update.rb b/db/migrate/20151109080256_alter_user_activities_update.rb
new file mode 100644
index 000000000..6e77c411f
--- /dev/null
+++ b/db/migrate/20151109080256_alter_user_activities_update.rb
@@ -0,0 +1,16 @@
+class AlterUserActivitiesUpdate < ActiveRecord::Migration
+  def up
+    count = UserActivity.all.count / 30 + 2
+    transaction do
+      for i in 1 ... count do i
+      UserActivity.page(i).per(30).each do |activity|
+        activity.updated_at = activity.created_at
+        activity.save
+      end
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 4a0d2312a..7898b3f4d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20151014023806) do
+ActiveRecord::Schema.define(:version => 20151109080256) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -144,6 +144,36 @@ ActiveRecord::Schema.define(:version => 20151014023806) do
     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
@@ -413,6 +443,7 @@ ActiveRecord::Schema.define(:version => 20151014023806) 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|
@@ -621,12 +652,13 @@ ActiveRecord::Schema.define(:version => 20151014023806) do
     t.text     "description"
     t.date     "publish_time"
     t.date     "end_time"
-    t.integer  "homework_type",    :default => 1
+    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
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
+    t.integer  "teacher_priority",  :default => 1
+    t.integer  "anonymous_comment", :default => 0
   end
 
   create_table "homework_detail_manuals", :force => true do |t|
@@ -1006,11 +1038,21 @@ ActiveRecord::Schema.define(:version => 20151014023806) do
     t.integer  "project_id"
   end
 
+  create_table "org_members", :force => true do |t|
+    t.integer "user_id"
+    t.integer "organization_id"
+    t.string  "role"
+  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
+    t.text     "description"
+    t.integer  "creator_id"
+    t.integer  "home_id"
+    t.string   "domain"
+    t.boolean  "is_public"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
   end
 
   create_table "phone_app_versions", :force => true do |t|
@@ -1155,6 +1197,7 @@ ActiveRecord::Schema.define(:version => 20151014023806) do
     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"
@@ -1571,6 +1614,7 @@ ActiveRecord::Schema.define(:version => 20151014023806) do
     t.string   "identity_url"
     t.string   "mail_notification",               :default => "",    :null => false
     t.string   "salt",              :limit => 64
+    t.integer  "gid"
   end
 
   add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id"
diff --git a/lib/gitlab-cli/Gemfile b/lib/gitlab-cli/Gemfile
new file mode 100644
index 000000000..54fbdf177
--- /dev/null
+++ b/lib/gitlab-cli/Gemfile
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in gitlab.gemspec
+gemspec
diff --git a/lib/gitlab-cli/LICENSE.txt b/lib/gitlab-cli/LICENSE.txt
new file mode 100644
index 000000000..2c289176d
--- /dev/null
+++ b/lib/gitlab-cli/LICENSE.txt
@@ -0,0 +1,24 @@
+Copyright (c) 2012-2014 Nihad Abbasov <mail@narkoz.me>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/lib/gitlab-cli/README.md b/lib/gitlab-cli/README.md
new file mode 100644
index 000000000..1aa73996c
--- /dev/null
+++ b/lib/gitlab-cli/README.md
@@ -0,0 +1,121 @@
+# Gitlab
+
+[![Build Status](https://travis-ci.org/NARKOZ/gitlab.png)](http://travis-ci.org/NARKOZ/gitlab)
+
+[website](http://narkoz.github.io/gitlab) |
+[documentation](http://rubydoc.info/gems/gitlab/frames)
+
+Gitlab is a Ruby wrapper and CLI for the [GitLab API](https://github.com/gitlabhq/gitlabhq/tree/master/doc/api#gitlab-api).
+
+## Installation
+
+Install it from rubygems:
+
+```sh
+gem install gitlab
+```
+
+Or add to a Gemfile:
+
+```ruby
+gem 'gitlab'
+# gem 'gitlab', :git => 'git://github.com/NARKOZ/gitlab.git'
+```
+
+## Usage
+
+Configuration example:
+
+```ruby
+Gitlab.configure do |config|
+  config.endpoint       = 'https://example.net/api/v3' # API endpoint URL, default: ENV['GITLAB_API_ENDPOINT']
+  config.private_token  = 'qEsq1pt6HJPaNciie3MG'       # user's private token, default: ENV['GITLAB_API_PRIVATE_TOKEN']
+  # Optional
+  # config.user_agent   = 'Custom User Agent'          # user agent, default: 'Gitlab Ruby Gem [version]'
+  # config.sudo         = 'user'                       # username for sudo mode, default: nil
+end
+```
+
+(Note: If you are using Gitlab.com's hosted service, your endpoint will be `https://gitlab.com/api/v3`)
+
+Usage examples:
+
+```ruby
+# set an API endpoint
+Gitlab.endpoint = 'http://example.net/api/v3'
+# => "http://example.net/api/v3"
+
+# set a user private token
+Gitlab.private_token = 'qEsq1pt6HJPaNciie3MG'
+# => "qEsq1pt6HJPaNciie3MG"
+
+# list projects
+Gitlab.projects(:per_page => 5)
+# => [#<Gitlab::ObjectifiedHash:0x000000023326e0 @data={"id"=>1, "code"=>"brute", "name"=>"Brute", "description"=>nil, "path"=>"brute", "default_branch"=>nil, "owner"=>#<Gitlab::ObjectifiedHash:0x00000002331600 @data={"id"=>1, "email"=>"john@example.com", "name"=>"John Smith", "blocked"=>false, "created_at"=>"2012-09-17T09:41:56Z"}>, "private"=>true, "issues_enabled"=>true, "merge_requests_enabled"=>true, "wall_enabled"=>true, "wiki_enabled"=>true, "created_at"=>"2012-09-17T09:41:56Z"}>, #<Gitlab::ObjectifiedHash:0x000000023450d8 @data={"id"=>2, "code"=>"mozart", "name"=>"Mozart", "description"=>nil, "path"=>"mozart", "default_branch"=>nil, "owner"=>#<Gitlab::ObjectifiedHash:0x00000002344ca0 @data={"id"=>1, "email"=>"john@example.com", "name"=>"John Smith", "blocked"=>false, "created_at"=>"2012-09-17T09:41:56Z"}>, "private"=>true, "issues_enabled"=>true, "merge_requests_enabled"=>true, "wall_enabled"=>true, "wiki_enabled"=>true, "created_at"=>"2012-09-17T09:41:57Z"}>, #<Gitlab::ObjectifiedHash:0x00000002344958 @data={"id"=>3, "code"=>"gitlab", "name"=>"Gitlab", "description"=>nil, "path"=>"gitlab", "default_branch"=>nil, "owner"=>#<Gitlab::ObjectifiedHash:0x000000023447a0 @data={"id"=>1, "email"=>"john@example.com", "name"=>"John Smith", "blocked"=>false, "created_at"=>"2012-09-17T09:41:56Z"}>, "private"=>true, "issues_enabled"=>true, "merge_requests_enabled"=>true, "wall_enabled"=>true, "wiki_enabled"=>true, "created_at"=>"2012-09-17T09:41:58Z"}>]
+
+# initialize a new client
+g = Gitlab.client(:endpoint => 'https://api.example.com', :private_token => 'qEsq1pt6HJPaNciie3MG')
+# => #<Gitlab::Client:0x00000001e62408 @endpoint="https://api.example.com", @private_token="qEsq1pt6HJPaNciie3MG", @user_agent="Gitlab Ruby Gem 2.0.0">
+
+# get a user
+user = g.user
+# => #<Gitlab::ObjectifiedHash:0x00000002217990 @data={"id"=>1, "email"=>"john@example.com", "name"=>"John Smith", "bio"=>nil, "skype"=>"", "linkedin"=>"", "twitter"=>"john", "dark_scheme"=>false, "theme_id"=>1, "blocked"=>false, "created_at"=>"2012-09-17T09:41:56Z"}>
+
+# get a user's email
+user.email
+# => "john@example.com"
+
+# set a sudo mode to perform API calls as another user
+Gitlab.sudo = 'other_user'
+# => "other_user"
+
+# disable a sudo mode
+Gitlab.sudo = nil
+# => nil
+```
+
+For more information, refer to [documentation](http://rubydoc.info/gems/gitlab/frames).
+
+## CLI
+
+Usage examples:
+
+```sh
+# list users
+gitlab users
+
+# get current user
+gitlab user
+
+# get a user
+gitlab user 2
+
+# filter output
+gitlab user --only=id,username
+
+gitlab user --except=email,bio
+```
+
+## CLI Shell
+
+Usage examples:
+
+```sh
+# start shell session
+gitlab shell
+
+# list available commands
+gitlab> help
+
+# list groups
+gitlab> groups
+
+# protect a branch
+gitlab> protect_branch 1 master
+```
+
+For more information, refer to [website](http://narkoz.github.io/gitlab).
+
+## License
+
+Released under the BSD 2-clause license. See LICENSE.txt for details.
diff --git a/lib/gitlab-cli/Rakefile b/lib/gitlab-cli/Rakefile
new file mode 100644
index 000000000..bf451bdcb
--- /dev/null
+++ b/lib/gitlab-cli/Rakefile
@@ -0,0 +1,9 @@
+require "bundler/gem_tasks"
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern    = FileList['spec/**/*_spec.rb']
+  spec.rspec_opts = ['--color', '--format d']
+end
+
+task :default => :spec
diff --git a/lib/gitlab-cli/bin/gitlab b/lib/gitlab-cli/bin/gitlab
new file mode 100644
index 000000000..af0fd0cc0
--- /dev/null
+++ b/lib/gitlab-cli/bin/gitlab
@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.expand_path('../../lib', __FILE__)
+
+require 'gitlab/cli'
+
+Gitlab::CLI.start(ARGV)
diff --git a/lib/gitlab-cli/gitlab.gemspec b/lib/gitlab-cli/gitlab.gemspec
new file mode 100644
index 000000000..7d5f30862
--- /dev/null
+++ b/lib/gitlab-cli/gitlab.gemspec
@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'gitlab/version'
+
+Gem::Specification.new do |gem|
+  gem.name          = "gitlab"
+  gem.version       = Gitlab::VERSION
+  gem.authors       = ["Nihad Abbasov"]
+  gem.email         = ["mail@narkoz.me"]
+  gem.description   = %q{Ruby client and CLI for GitLab API}
+  gem.summary       = %q{A Ruby wrapper and CLI for the GitLab API}
+  gem.homepage      = "https://github.com/narkoz/gitlab"
+
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
+
+  gem.add_runtime_dependency 'httparty'
+  gem.add_runtime_dependency 'terminal-table'
+
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'webmock'
+end
diff --git a/lib/gitlab-cli/lib/gitlab.rb b/lib/gitlab-cli/lib/gitlab.rb
new file mode 100644
index 000000000..95c382678
--- /dev/null
+++ b/lib/gitlab-cli/lib/gitlab.rb
@@ -0,0 +1,37 @@
+require 'gitlab/version'
+require 'gitlab/objectified_hash'
+require 'gitlab/configuration'
+require 'gitlab/error'
+require 'gitlab/request'
+require 'gitlab/api'
+require 'gitlab/client'
+
+module Gitlab
+  extend Configuration
+
+  # Alias for Gitlab::Client.new
+  #
+  # @return [Gitlab::Client]
+  def self.client(options={})
+    Gitlab::Client.new(options)
+  end
+
+  # Delegate to Gitlab::Client
+  def self.method_missing(method, *args, &block)
+    return super unless client.respond_to?(method)
+    client.send(method, *args, &block)
+  end
+
+  # Delegate to Gitlab::Client
+  def self.respond_to?(method)
+    return client.respond_to?(method) || super
+  end
+
+  # Returns an unsorted array of available client methods.
+  #
+  # @return [Array<Symbol>]
+  def self.actions
+    hidden = /endpoint|private_token|user_agent|sudo|get|post|put|\Adelete\z|validate|set_request_defaults/
+    (Gitlab::Client.instance_methods - Object.methods).reject {|e| e[hidden]}
+  end
+end
diff --git a/lib/gitlab-cli/lib/gitlab/api.rb b/lib/gitlab-cli/lib/gitlab/api.rb
new file mode 100644
index 000000000..62b3f47dc
--- /dev/null
+++ b/lib/gitlab-cli/lib/gitlab/api.rb
@@ -0,0 +1,17 @@
+module Gitlab
+  # @private
+  class API < Request
+    # @private
+    attr_accessor(*Configuration::VALID_OPTIONS_KEYS)
+
+    # Creates a new API.
+    # @raise [Error:MissingCredentials]
+    def initialize(options={})
+      options = Gitlab.options.merge(options)
+      Configuration::VALID_OPTIONS_KEYS.each do |key|
+        send("#{key}=", options[key])
+      end
+      set_request_defaults @endpoint, @private_token, @sudo
+    end
+  end
+end
diff --git a/lib/gitlab-cli/lib/gitlab/cli.rb b/lib/gitlab-cli/lib/gitlab/cli.rb
new file mode 100644
index 000000000..57c2aa5b4
--- /dev/null
+++ b/lib/gitlab-cli/lib/gitlab/cli.rb
@@ -0,0 +1,47 @@
+require 'gitlab'
+require 'terminal-table/import'
+require_relative 'cli_helpers'
+require_relative 'shell'
+
+class Gitlab::CLI
+  extend Helpers
+
+  def self.start(args)
+    command = args.shift.strip rescue 'help'
+    run(command, args)
+  end
+
+  def self.run(cmd, args=[])
+    case cmd
+    when 'help'
+      puts actions_table
+    when 'info'
+      endpoint = Gitlab.endpoint ? Gitlab.endpoint : 'not set'
+      private_token = Gitlab.private_token ? Gitlab.private_token : 'not set'
+      puts "Gitlab endpoint is #{endpoint}"
+      puts "Gitlab private token is #{private_token}"
+      puts "Ruby Version is #{RUBY_VERSION}"
+      puts "Gitlab Ruby Gem #{Gitlab::VERSION}"
+    when '-v', '--version'
+      puts "Gitlab Ruby Gem #{Gitlab::VERSION}"
+    when 'shell'
+      Gitlab::Shell.start
+    else
+      unless valid_command?(cmd)
+        puts "Unknown command. Run `gitlab help` for a list of available commands."
+        exit(1)
+      end
+
+      if args.any? && (args.last.start_with?('--only=') || args.last.start_with?('--except='))
+        command_args = args[0..-2]
+      else
+        command_args = args
+      end
+
+      confirm_command(cmd)
+
+      data = gitlab_helper(cmd, command_args) { exit(1) }
+      output_table(cmd, args, data)
+    end
+  end
+end
diff --git a/lib/gitlab-cli/lib/gitlab/cli_helpers.rb b/lib/gitlab-cli/lib/gitlab/cli_helpers.rb
new file mode 100644
index 000000000..d1c777dc0
--- /dev/null
+++ b/lib/gitlab-cli/lib/gitlab/cli_helpers.rb
@@ -0,0 +1,175 @@
+class Gitlab::CLI
+  # Defines methods related to CLI output and formatting.
+  module Helpers
+    extend self
+
+    # Returns filtered required fields.
+    #
+    # @return [Array]
+    def required_fields(args)
+      if args.any? && args.last.start_with?('--only=')
+        args.last.gsub('--only=', '').split(',')
+      else
+        []
+      end
+    end
+
+    # Returns filtered excluded fields.
+    #
+    # @return [Array]
+    def excluded_fields(args)
+      if args.any? && args.last.start_with?('--except=')
+        args.last.gsub('--except=', '').split(',')
+      else
+        []
+      end
+    end
+
+    # Confirms command is valid.
+    #
+    # @return [Boolean]
+    def valid_command?(cmd)
+      command = cmd.is_a?(Symbol) ? cmd : cmd.to_sym
+      Gitlab.actions.include?(command)
+    end
+
+    # Confirms command with a desctructive action.
+    #
+    # @return [String]
+    def confirm_command(cmd)
+      if cmd.start_with?('remove_') || cmd.start_with?('delete_')
+        puts "Are you sure? (y/n)"
+        if %w(y yes).include?($stdin.gets.to_s.strip.downcase)
+          puts 'Proceeding..'
+        else
+          puts 'Command aborted.'
+          exit(1)
+        end
+      end
+    end
+
+    # Table with available commands.
+    #
+    # @return [String]
+    def actions_table
+      client = Gitlab::Client.new(endpoint: '')
+      actions = Gitlab.actions
+      methods = []
+
+      actions.each do |action|
+        methods << {
+          name: action,
+          owner: client.method(action).owner.to_s.gsub('Gitlab::Client::', '')
+        }
+      end
+
+      owners = methods.map {|m| m[:owner]}.uniq.sort
+      methods_c = methods.group_by {|m| m[:owner]}
+      methods_c = methods_c.map {|_, v| [_, v.sort_by {|hv| hv[:name]}] }
+      methods_c = Hash[methods_c.sort_by(&:first).map {|k, v| [k, v]}]
+      max_column_length = methods_c.values.max_by(&:size).size
+
+      rows = max_column_length.times.map do |i|
+        methods_c.keys.map do |key|
+          methods_c[key][i] ? methods_c[key][i][:name] : ''
+        end
+      end
+
+      table do |t|
+        t.title = "Available commands (#{actions.size} total)"
+        t.headings = owners
+
+        rows.each do |row|
+          t.add_row row
+        end
+      end
+    end
+
+    # Decides which table to use.
+    #
+    # @return [String]
+    def output_table(cmd, args, data)
+      case data
+      when Gitlab::ObjectifiedHash
+        puts single_record_table(data, cmd, args)
+      when Array
+        puts multiple_record_table(data, cmd, args)
+      else
+        puts data.inspect
+      end
+    end
+
+    # Table for a single record.
+    #
+    # @return [String]
+    def single_record_table(data, cmd, args)
+      hash = data.to_h
+      keys = hash.keys.sort {|x, y| x.to_s <=> y.to_s }
+      keys = keys & required_fields(args) if required_fields(args).any?
+      keys = keys - excluded_fields(args)
+
+      table do |t|
+        t.title = "Gitlab.#{cmd} #{args.join(', ')}"
+
+        keys.each_with_index do |key, index|
+          case value = hash[key]
+          when Hash
+            value = 'Hash'
+          when nil
+            value = 'null'
+          end
+
+          t.add_row [key, value]
+          t.add_separator unless keys.size - 1 == index
+        end
+      end
+    end
+
+    # Table for multiple records.
+    #
+    # @return [String]
+    def multiple_record_table(data, cmd, args)
+      return 'No data' if data.empty?
+
+      arr = data.map(&:to_h)
+      keys = arr.first.keys.sort {|x, y| x.to_s <=> y.to_s }
+      keys = keys & required_fields(args) if required_fields(args).any?
+      keys = keys - excluded_fields(args)
+
+      table do |t|
+        t.title = "Gitlab.#{cmd} #{args.join(', ')}"
+        t.headings = keys
+
+        arr.each_with_index do |hash, index|
+          values = []
+
+          keys.each do |key|
+            case value = hash[key]
+            when Hash
+              value = 'Hash'
+            when nil
+              value = 'null'
+            end
+
+            values << value
+          end
+
+          t.add_row values
+          t.add_separator unless arr.size - 1 == index
+        end
+      end
+    end
+
+    # Helper function to call Gitlab commands with args.
+    def gitlab_helper(cmd, args=[])
+      begin
+        data = args.any? ? Gitlab.send(cmd, *args) : Gitlab.send(cmd)
+      rescue => e
+        puts e.message
+        yield if block_given?
+      end
+
+      data
+    end
+  end
+end
diff --git a/lib/gitlab-cli/lib/gitlab/client.rb b/lib/gitlab-cli/lib/gitlab/client.rb
new file mode 100644
index 000000000..5cb01ce2b
--- /dev/null
+++ b/lib/gitlab-cli/lib/gitlab/client.rb
@@ -0,0 +1,18 @@
+module Gitlab
+  # Wrapper for the Gitlab REST API.
+  class Client < API
+    Dir[File.expand_path('../client/*.rb', __FILE__)].each {|f| require f}
+
+    include Branches
+    include Groups
+    include Issues
+    include MergeRequests
+    include Milestones
+    include Notes
+    include Projects
+    include Repositories
+    include Snippets
+    include SystemHooks
+    include Users
+  end
+end
diff --git a/lib/gitlab-cli/lib/gitlab/client/branches.rb b/lib/gitlab-cli/lib/gitlab/client/branches.rb
new file mode 100644
index 000000000..0ba3afb29
--- /dev/null
+++ b/lib/gitlab-cli/lib/gitlab/client/branches.rb
@@ -0,0 +1,79 @@
+class Gitlab::Client
+  # Defines methods related to repositories.
+  module Branches
+    # Gets a list of project repositiory branches.
+    #
+    # @example
+    #   Gitlab.branches(42)
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [Integer] :page The page number.
+    # @option options [Integer] :per_page The number of results per page.
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def branches(project, options={})
+      get("/projects/#{project}/repository/branches", :query => options)
+    end
+    alias_method :repo_branches, :branches
+
+    # Gets information about a repository branch.
+    #
+    # @example
+    #   Gitlab.branch(3, 'api')
+    #   Gitlab.repo_branch(5, 'master')
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [String] branch The name of the branch.
+    # @return [Gitlab::ObjectifiedHash]
+    def branch(project, branch)
+      get("/projects/#{project}/repository/branches/#{branch}")
+    end
+    
+    alias_method :repo_branch, :branch
+
+    # Protects a repository branch.
+    #
+    # @example
+    #   Gitlab.protect_branch(3, 'api')
+    #   Gitlab.repo_protect_branch(5, 'master')
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [String] branch The name of the branch.
+    # @return [Gitlab::ObjectifiedHash]
+    def protect_branch(project, branch)
+      put("/projects/#{project}/repository/branches/#{branch}/protect")
+    end
+    alias_method :repo_protect_branch, :protect_branch
+
+    # Unprotects a repository branch.
+    #
+    # @example
+    #   Gitlab.unprotect_branch(3, 'api')
+    #   Gitlab.repo_unprotect_branch(5, 'master')
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [String] branch The name of the branch.
+    # @return [Gitlab::ObjectifiedHash]
+    def unprotect_branch(project, branch)
+      put("/projects/#{project}/repository/branches/#{branch}/unprotect")
+    end
+    alias_method :repo_unprotect_branch, :unprotect_branch
+
+    # Creates a repository branch.  Requires Gitlab >= 6.8.x
+    #
+    # @example
+    #   Gitlab.create_branch(3, 'api')
+    #   Gitlab.repo_create_branch(5, 'master')
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [String] branch The name of the new branch.
+    # @param  [String] ref Create branch from commit sha or existing branch
+    # @return [Gitlab::ObjectifiedHash]
+    def create_branch(project, branch, ref)
+      post("/projects/#{project}/repository/branches",:body => {:branch_name => branch, :ref => ref})
+    end
+    alias_method :repo_create_branch, :create_branch
+
+  end
+end
+
diff --git a/lib/gitlab-cli/lib/gitlab/client/groups.rb b/lib/gitlab-cli/lib/gitlab/client/groups.rb
new file mode 100644
index 000000000..1ea4bf5bc
--- /dev/null
+++ b/lib/gitlab-cli/lib/gitlab/client/groups.rb
@@ -0,0 +1,88 @@
+class Gitlab::Client
+  # Defines methods related to groups.
+  module Groups
+    # Gets a list of groups.
+    #
+    # @example
+    #   Gitlab.groups
+    #   Gitlab.groups(:per_page => 40)
+    #
+    # @param  [Hash] options A customizable set of options.
+    # @option options [Integer] :page The page number.
+    # @option options [Integer] :per_page The number of results per page.
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def groups(options={})
+      get("/groups", :query => options)
+    end
+
+    # Gets a single group.
+    #
+    # @example
+    #   Gitlab.group(42)
+    #
+    # @param  [Integer] id The ID of a group.
+    # @return [Gitlab::ObjectifiedHash]
+    def group(id)
+      get("/groups/#{id}")
+    end
+
+    # Creates a new group.
+    #
+    # @param  [String] name The name of a group.
+    # @param  [String] path The path of a group.
+    # @return [Gitlab::ObjectifiedHash] Information about created group.
+    def create_group(name, path)
+      body = {:name => name, :path => path}
+      post("/groups", :body => body)
+    end
+
+    # Get a list of group members.
+    #
+    # @example
+    #   Gitlab.group_members(1)
+    #   Gitlab.group_members(1, :per_page => 40)
+    #
+    # @param  [Integer] id The ID of a group.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [Integer] :page The page number.
+    # @option options [Integer] :per_page The number of results per page.
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def group_members(id, options={})
+      get("/groups/#{id}/members", :query => options)
+    end
+
+    # Adds a user to group.
+    #
+    # @example
+    #   Gitlab.add_group_member(1, 2, 40)
+    #
+    # @param  [Integer] team_id The group id to add a member to.
+    # @param  [Integer] user_id The user id of the user to add to the team.
+    # @param  [Integer] access_level Project access level.
+    # @return [Gitlab::ObjectifiedHash] Information about added team member.
+    def add_group_member(team_id, user_id, access_level)
+      post("/groups/#{team_id}/members", :body => {:user_id => user_id, :access_level => access_level})
+    end
+
+    # Removes user from user group.
+    #
+    # @example
+    #   Gitlab.remove_group_member(1, 2)
+    #
+    # @param  [Integer] team_id The group ID.
+    # @param  [Integer] user_id The ID of a user.
+    # @return [Gitlab::ObjectifiedHash] Information about removed team member.
+    def remove_group_member(team_id, user_id)
+      delete("/groups/#{team_id}/members/#{user_id}")
+    end
+
+    # Transfers a project to a group
+    #
+    # @param  [Integer] id The ID of a group.
+    # @param  [Integer] project_id The ID of a project.
+    def transfer_project_to_group(id, project_id)
+      body = {:id => id, :project_id => project_id}
+      post("/groups/#{id}/projects/#{project_id}", :body => body)
+    end
+  end
+end
diff --git a/lib/gitlab-cli/lib/gitlab/client/issues.rb b/lib/gitlab-cli/lib/gitlab/client/issues.rb
new file mode 100644
index 000000000..7248df848
--- /dev/null
+++ b/lib/gitlab-cli/lib/gitlab/client/issues.rb
@@ -0,0 +1,92 @@
+class Gitlab::Client
+  # Defines methods related to issues.
+  module Issues
+    # Gets a list of user's issues.
+    # Will return a list of project's issues if project ID passed.
+    #
+    # @example
+    #   Gitlab.issues
+    #   Gitlab.issues(5)
+    #   Gitlab.issues(:per_page => 40)
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [Integer] :page The page number.
+    # @option options [Integer] :per_page The number of results per page.
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def issues(project=nil, options={})
+      if project.to_i.zero?
+        get("/issues", :query => options)
+      else
+        get("/projects/#{project}/issues", :query => options)
+      end
+    end
+
+    # Gets a single issue.
+    #
+    # @example
+    #   Gitlab.issue(5, 42)
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [Integer] id The ID of an issue.
+    # @return [Gitlab::ObjectifiedHash]
+    def issue(project, id)
+      get("/projects/#{project}/issues/#{id}")
+    end
+
+    # Creates a new issue.
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [String] title The title of an issue.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [String] :description The description of an issue.
+    # @option options [Integer] :assignee_id The ID of a user to assign issue.
+    # @option options [Integer] :milestone_id The ID of a milestone to assign issue.
+    # @option options [String] :labels Comma-separated label names for an issue.
+    # @return [Gitlab::ObjectifiedHash] Information about created issue.
+    def create_issue(project, title, options={})
+      body = {:title => title}.merge(options)
+      post("/projects/#{project}/issues", :body => body)
+    end
+
+    # Updates an issue.
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [Integer] id The ID of an issue.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [String] :title The title of an issue.
+    # @option options [String] :description The description of an issue.
+    # @option options [Integer] :assignee_id The ID of a user to assign issue.
+    # @option options [Integer] :milestone_id The ID of a milestone to assign issue.
+    # @option options [String] :labels Comma-separated label names for an issue.
+    # @option options [String] :state_event The state event of an issue ('close' or 'reopen').
+    # @return [Gitlab::ObjectifiedHash] Information about updated issue.
+    def edit_issue(project, id, options={})
+      put("/projects/#{project}/issues/#{id}", :body => options)
+    end
+
+    # Closes an issue.
+    #
+    # @example
+    #   Gitlab.close_issue(3, 42)
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [Integer] id The ID of an issue.
+    # @return [Gitlab::ObjectifiedHash] Information about closed issue.
+    def close_issue(project, id)
+      put("/projects/#{project}/issues/#{id}", :body => {:state_event => 'close'})
+    end
+
+    # Reopens an issue.
+    #
+    # @example
+    #   Gitlab.reopen_issue(3, 42)
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [Integer] id The ID of an issue.
+    # @return [Gitlab::ObjectifiedHash] Information about reopened issue.
+    def reopen_issue(project, id)
+      put("/projects/#{project}/issues/#{id}", :body => {:state_event => 'reopen'})
+    end
+  end
+end
diff --git a/lib/gitlab-cli/lib/gitlab/client/merge_requests.rb b/lib/gitlab-cli/lib/gitlab/client/merge_requests.rb
new file mode 100644
index 000000000..1ccc25081
--- /dev/null
+++ b/lib/gitlab-cli/lib/gitlab/client/merge_requests.rb
@@ -0,0 +1,107 @@
+class Gitlab::Client
+  # Defines methods related to merge requests.
+  module MergeRequests
+    # Gets a list of project merge requests.
+    #
+    # @example
+    #   Gitlab.merge_requests(5)
+    #   Gitlab.merge_requests(:per_page => 40)
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [Integer] :page The page number.
+    # @option options [Integer] :per_page The number of results per page.
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def merge_requests(project, options={})
+      get("/projects/#{project}/merge_requests", :query => options)
+    end
+
+    # Gets a single merge request.
+    #
+    # @example
+    #   Gitlab.merge_request(5, 36)
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [Integer] id The ID of a merge request.
+    # @return <Gitlab::ObjectifiedHash]
+    def merge_request(project, id)
+      get("/projects/#{project}/merge_request/#{id}")
+    end
+
+    # Creates a merge request.
+    #
+    # @example
+    #   Gitlab.create_merge_request(5, 'New merge request',
+    #     :source_branch => 'source_branch', :target_branch => 'target_branch')
+    #   Gitlab.create_merge_request(5, 'New merge request',
+    #     :source_branch => 'source_branch', :target_branch => 'target_branch', :assignee_id => 42)
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [String] title The title of a merge request.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [String] :source_branch (required) The source branch name.
+    # @option options [String] :target_branch (required) The target branch name.
+    # @option options [Integer] :assignee_id (optional) The ID of a user to assign merge request.
+    # @return [Gitlab::ObjectifiedHash] Information about created merge request.
+    def create_merge_request(project, title, options={})
+      check_attributes!(options, [:source_branch, :target_branch])
+
+      body = {:title => title}.merge(options)
+      post("/projects/#{project}/merge_requests", :body => body)
+    end
+
+    # Updates a merge request.
+    #
+    # @example
+    #   Gitlab.update_merge_request(5, 42, :title => 'New title')
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [Integer] id The ID of a merge request.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [String] :title The title of a merge request.
+    # @option options [String] :source_branch The source branch name.
+    # @option options [String] :target_branch The target branch name.
+    # @option options [Integer] :assignee_id The ID of a user to assign merge request.
+    # @option options [String] :state_event New state (close|reopen|merge).
+    # @return [Gitlab::ObjectifiedHash] Information about updated merge request.
+    def update_merge_request(project, id, options={})
+      put("/projects/#{project}/merge_request/#{id}", :body => options)
+    end
+
+    # Adds a comment to a merge request.
+    #
+    # @example
+    #   Gitlab.create_merge_request_comment(5, 1, "Awesome merge!")
+    #   Gitlab.create_merge_request_comment('gitlab', 1, "Awesome merge!")
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [Integer] id The ID of a merge request.
+    # @param  [String] note The content of a comment.
+    # @return [Gitlab::ObjectifiedHash] Information about created merge request comment.
+    def create_merge_request_comment(project, id, note)
+      post("/projects/#{project}/merge_request/#{id}/comments", :body => {:note => note})
+    end
+
+    # Gets the comments on a merge request.
+    #
+    # @example
+    #   Gitlab.merge_request_comments(5, 1)
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [Integer] id The ID of a merge request.
+    # @return [Gitlab::ObjectifiedHash] The merge request's comments.
+    def merge_request_comments(project, id)
+      get("/projects/#{project}/merge_request/#{id}/comments")
+    end
+
+    private
+
+    def check_attributes!(options, attrs)
+      attrs.each do |attr|
+        unless options.has_key?(attr) || options.has_key?(attr.to_s)
+          raise Gitlab::Error::MissingAttributes.new("Missing '#{attr}' parameter")
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab-cli/lib/gitlab/client/milestones.rb b/lib/gitlab-cli/lib/gitlab/client/milestones.rb
new file mode 100644
index 000000000..4ba4d5e87
--- /dev/null
+++ b/lib/gitlab-cli/lib/gitlab/client/milestones.rb
@@ -0,0 +1,57 @@
+class Gitlab::Client
+  # Defines methods related to milestones.
+  module Milestones
+    # Gets a list of project's milestones.
+    #
+    # @example
+    #   Gitlab.milestones(5)
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [Integer] :page The page number.
+    # @option options [Integer] :per_page The number of results per page.
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def milestones(project, options={})
+      get("/projects/#{project}/milestones", :query => options)
+    end
+
+    # Gets a single milestone.
+    #
+    # @example
+    #   Gitlab.milestone(5, 36)
+    #
+    # @param  [Integer, String] project The ID of a project.
+    # @param  [Integer] id The ID of a milestone.
+    # @return [Gitlab::ObjectifiedHash]
+    def milestone(project, id)
+      get("/projects/#{project}/milestones/#{id}")
+    end
+
+    # Creates a new milestone.
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [String] title The title of a milestone.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [String] :description The description of a milestone.
+    # @option options [String] :due_date The due date of a milestone.
+    # @return [Gitlab::ObjectifiedHash] Information about created milestone.
+    def create_milestone(project, title, options={})
+      body = {:title => title}.merge(options)
+      post("/projects/#{project}/milestones", :body => body)
+    end
+
+    # Updates a milestone.
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [Integer] id The ID of a milestone.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [String] :title The title of a milestone.
+    # @option options [String] :description The description of a milestone.
+    # @option options [String] :due_date The due date of a milestone.
+    # @option options [String] :state_event The state of a milestone ('close' or 'activate').
+    # @return [Gitlab::ObjectifiedHash] Information about updated milestone.
+    def edit_milestone(project, id, options={})
+      put("/projects/#{project}/milestones/#{id}", :body => options)
+    end
+  end
+end
diff --git a/lib/gitlab-cli/lib/gitlab/client/notes.rb b/lib/gitlab-cli/lib/gitlab/client/notes.rb
new file mode 100644
index 000000000..7d782e8e2
--- /dev/null
+++ b/lib/gitlab-cli/lib/gitlab/client/notes.rb
@@ -0,0 +1,106 @@
+class Gitlab::Client
+  # Defines methods related to notes.
+  module Notes
+    # Gets a list of projects notes.
+    #
+    # @example
+    #   Gitlab.notes(5)
+    #
+    # @param [Integer] project The ID of a project.
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def notes(project)
+      get("/projects/#{project}/notes")
+    end
+
+    # Gets a list of notes for a issue.
+    #
+    # @example
+    #   Gitlab.issue_notes(5, 10)
+    #
+    # @param [Integer] project The ID of a project.
+    # @param [Integer] issue The ID of an issue.
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def issue_notes(project, issue)
+      get("/projects/#{project}/issues/#{issue}/notes")
+    end
+
+    # Gets a list of notes for a snippet.
+    #
+    # @example
+    #   Gitlab.snippet_notes(5, 1)
+    #
+    # @param [Integer] project The ID of a project.
+    # @param [Integer] snippet The ID of a snippet.
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def snippet_notes(project, snippet)
+      get("/projects/#{project}/snippets/#{snippet}/notes")
+    end
+
+    # Gets a single wall note.
+    #
+    # @example
+    #   Gitlab.note(5, 15)
+    #
+    # @param [Integer] project The ID of a project.
+    # @param [Integer] id The ID of a note.
+    # @return [Gitlab::ObjectifiedHash]
+    def note(project, id)
+      get("/projects/#{project}/notes/#{id}")
+    end
+
+    # Gets a single issue note.
+    #
+    # @example
+    #   Gitlab.issue_note(5, 10, 1)
+    #
+    # @param [Integer] project The ID of a project.
+    # @param [Integer] issue The ID of an issue.
+    # @param [Integer] id The ID of a note.
+    # @return [Gitlab::ObjectifiedHash]
+    def issue_note(project, issue, id)
+      get("/projects/#{project}/issues/#{issue}/notes/#{id}")
+    end
+
+    # Gets a single snippet note.
+    #
+    # @example
+    #   Gitlab.snippet_note(5, 11, 3)
+    #
+    # @param [Integer] project The ID of a project.
+    # @param [Integer] snippet The ID of a snippet.
+    # @param [Integer] id The ID of an note.
+    # @return [Gitlab::ObjectifiedHash]
+    def snippet_note(project, snippet, id)
+      get("/projects/#{project}/snippets/#{snippet}/notes/#{id}")
+    end
+
+    # Creates a new wall note.
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [String] body The body of a note.
+    # @return [Gitlab::ObjectifiedHash] Information about created note.
+    def create_note(project, body)
+      post("/projects/#{project}/notes", :body => {:body => body})
+    end
+
+    # Creates a new issue note.
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [Integer] issue The ID of an issue.
+    # @param  [String] body The body of a note.
+    # @return [Gitlab::ObjectifiedHash] Information about created note.
+    def create_issue_note(project, issue, body)
+      post("/projects/#{project}/issues/#{issue}/notes", :body => {:body => body})
+    end
+
+    # Creates a new snippet note.
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [Integer] snippet The ID of a snippet.
+    # @param  [String] body The body of a note.
+    # @return [Gitlab::ObjectifiedHash] Information about created note.
+    def create_snippet_note(project, snippet, body)
+      post("/projects/#{project}/snippets/#{snippet}/notes", :body => {:body => body})
+    end
+  end
+end
diff --git a/lib/gitlab-cli/lib/gitlab/client/projects.rb b/lib/gitlab-cli/lib/gitlab/client/projects.rb
new file mode 100644
index 000000000..04ea682aa
--- /dev/null
+++ b/lib/gitlab-cli/lib/gitlab/client/projects.rb
@@ -0,0 +1,300 @@
+class Gitlab::Client
+  # Defines methods related to projects.
+  module Projects
+    # Gets a list of projects owned by the authenticated user.
+    #
+    # @example
+    #   Gitlab.projects
+    #
+    # @param  [Hash] options A customizable set of options.
+    # @option options [Integer] :page The page number.
+    # @option options [Integer] :per_page The number of results per page.
+    # @option options [String] :scope Scope of projects. 'owned' for list of projects owned by the authenticated user, 'all' to get all projects (admin only)
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def projects(options={})
+      if (options[:scope])
+        get("/projects/#{options[:scope]}", :query => options)
+      else
+        get("/projects", :query => options)
+      end
+    end
+
+    # Gets information about a project.
+    #
+    # @example
+    #   Gitlab.project(3)
+    #   Gitlab.project('gitlab')
+    #
+    # @param  [Integer, String] id The ID or name of a project.
+    # @return [Gitlab::ObjectifiedHash]
+    def project(id)
+      get("/projects/#{id}")
+    end
+
+    # Gets a list of project events.
+    #
+    # @example
+    #   Gitlab.project_events(42)
+    #   Gitlab.project_events('gitlab')
+    #
+    # @param  [Integer, String] project The ID or name of a project.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [Integer] :page The page number.
+    # @option options [Integer] :per_page The number of results per page.
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def project_events(project, options={})
+      get("/projects/#{project}/events", :query => options)
+    end
+
+    # Creates a new project.
+    #
+    # @example
+    #   Gitlab.create_project('gitlab')
+    #   Gitlab.create_project('viking', :description => 'Awesome project')
+    #   Gitlab.create_project('Red', :wall_enabled => false)
+    #
+    # @param  [String] name The name of a project.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [String] :description The description of a project.
+    # @option options [String] :default_branch The default branch of a project.
+    # @option options [String] :group_id The group in which to create a project.
+    # @option options [String] :namespace_id The namespace in which to create a project.
+    # @option options [Boolean] :wiki_enabled The wiki integration for a project (0 = false, 1 = true).
+    # @option options [Boolean] :wall_enabled The wall functionality for a project (0 = false, 1 = true).
+    # @option options [Boolean] :issues_enabled The issues integration for a project (0 = false, 1 = true).
+    # @option options [Boolean] :snippets_enabled The snippets integration for a project (0 = false, 1 = true).
+    # @option options [Boolean] :merge_requests_enabled The merge requests functionality for a project (0 = false, 1 = true).
+    # @option options [Boolean] :public The setting for making a project public (0 = false, 1 = true).
+    # @option options [Integer] :user_id The user/owner id of a project.
+    # @return [Gitlab::ObjectifiedHash] Information about created project.
+    def create_project(name, options={})
+      url = options[:user_id] ? "/projects/user/#{options[:user_id]}" : "/projects"
+      post(url, :body => {:name => name}.merge(options))
+    end
+
+    # Deletes a project.
+    #
+    # @example
+    #   Gitlab.delete_project(4)
+    #
+    # @param  [Integer, String] id The ID or name of a project.
+    # @return [Gitlab::ObjectifiedHash] Information about deleted project.
+    def delete_project(id)
+      delete("/projects/#{id}")
+    end
+
+    # Gets a list of project team members.
+    #
+    # @example
+    #   Gitlab.team_members(42)
+    #   Gitlab.team_members('gitlab')
+    #
+    # @param  [Integer, String] project The ID or name of a project.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [String] :query The search query.
+    # @option options [Integer] :page The page number.
+    # @option options [Integer] :per_page The number of results per page.
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def team_members(project, options={})
+      get("/projects/#{project}/members", :query => options)
+    end
+
+    # Gets a project team member.
+    #
+    # @example
+    #   Gitlab.team_member('gitlab', 2)
+    #
+    # @param  [Integer, String] project The ID or name of a project.
+    # @param  [Integer] id The ID of a project team member.
+    # @return [Gitlab::ObjectifiedHash]
+    def team_member(project, id)
+      get("/projects/#{project}/members/#{id}")
+    end
+
+    # Adds a user to project team.
+    #
+    # @example
+    #   Gitlab.add_team_member('gitlab', 2, 40)
+    #
+    # @param  [Integer, String] project The ID or name of a project.
+    # @param  [Integer] id The ID of a user.
+    # @param  [Integer] access_level The access level to project.
+    # @param  [Hash] options A customizable set of options.
+    # @return [Gitlab::ObjectifiedHash] Information about added team member.
+    def add_team_member(project, id, access_level)
+      post("/projects/#{project}/members", :body => {:user_id => id, :access_level => access_level})
+    end
+
+    # Updates a team member's project access level.
+    #
+    # @example
+    #   Gitlab.edit_team_member('gitlab', 3, 20)
+    #
+    # @param  [Integer, String] project The ID or name of a project.
+    # @param  [Integer] id The ID of a user.
+    # @param  [Integer] access_level The access level to project.
+    # @param  [Hash] options A customizable set of options.
+    # @return [Array<Gitlab::ObjectifiedHash>] Information about updated team member.
+    def edit_team_member(project, id, access_level)
+      put("/projects/#{project}/members/#{id}", :body => {:access_level => access_level})
+    end
+
+    # Removes a user from project team.
+    #
+    # @example
+    #   Gitlab.remove_team_member('gitlab', 2)
+    #
+    # @param  [Integer, String] project The ID or name of a project.
+    # @param  [Integer] id The ID of a user.
+    # @param  [Hash] options A customizable set of options.
+    # @return [Gitlab::ObjectifiedHash] Information about removed team member.
+    def remove_team_member(project, id)
+      delete("/projects/#{project}/members/#{id}")
+    end
+
+    # Gets a list of project hooks.
+    #
+    # @example
+    #   Gitlab.project_hooks(42)
+    #   Gitlab.project_hooks('gitlab')
+    #
+    # @param  [Integer, String] project The ID or name of a project.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [Integer] :page The page number.
+    # @option options [Integer] :per_page The number of results per page.
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def project_hooks(project, options={})
+      get("/projects/#{project}/hooks", :query => options)
+    end
+
+    # Gets a project hook.
+    #
+    # @example
+    #   Gitlab.project_hook(42, 5)
+    #   Gitlab.project_hook('gitlab', 5)
+    #
+    # @param  [Integer, String] project The ID or name of a project.
+    # @param  [Integer] id The ID of a hook.
+    # @return [Gitlab::ObjectifiedHash]
+    def project_hook(project, id)
+      get("/projects/#{project}/hooks/#{id}")
+    end
+
+    # Adds a new hook to the project.
+    #
+    # @example
+    #   Gitlab.add_project_hook(42, 'https://api.example.net/v1/webhooks/ci')
+    #
+    # @param  [Integer, String] project The ID or name of a project.
+    # @param  [String] url The hook URL.
+    # @param  [Hash] options Events list (`{push_events: true, merge_requests_events: false}`).
+    # @return [Gitlab::ObjectifiedHash] Information about added hook.
+    def add_project_hook(project, url, options = {})
+      available_events = [:push_events, :merge_requests_events, :issues_events]
+      passed_events = available_events.select { |event| options[event] }
+      events = Hash[passed_events.map { |event| [event, options[event]] }]
+
+      post("/projects/#{project}/hooks", :body => {:url => url}.merge(events))
+    end
+
+    # Updates a project hook URL.
+    #
+    # @example
+    #   Gitlab.edit_project_hook(42, 1, 'https://api.example.net/v1/webhooks/ci')
+    #
+    # @param  [Integer, String] project The ID or name of a project.
+    # @param  [Integer] id The ID of the hook.
+    # @param  [String] url The hook URL.
+    # @return [Gitlab::ObjectifiedHash] Information about updated hook.
+    def edit_project_hook(project, id, url)
+      put("/projects/#{project}/hooks/#{id}", :body => {:url => url})
+    end
+
+    # Deletes a hook from project.
+    #
+    # @example
+    #   Gitlab.delete_project_hook('gitlab', 4)
+    #
+    # @param  [Integer, String] project The ID or name of a project.
+    # @param  [String] id The ID of the hook.
+    # @return [Gitlab::ObjectifiedHash] Information about deleted hook.
+    def delete_project_hook(project, id)
+      delete("/projects/#{project}/hooks/#{id}")
+    end
+
+    # Mark this project as forked from the other
+    #
+    # @example
+    #   Gitlab.make_forked(42, 24)
+    #
+    # @param  [Integer, String] project The ID or name of a project.
+    # @param  [Integer] id The ID of the project it is forked from.
+    # @return [Gitlab::ObjectifiedHash] Information about the forked project.
+    def make_forked_from(project, id)
+      post("/projects/#{project}/fork/#{id}")
+    end
+
+    # Remove a forked_from relationship for a project.
+    #
+    # @example
+    #  Gitlab.remove_forked(42)
+    #
+    # @param  [Integer, String] project The ID or name of a project.
+    # @param  [Integer] project The ID of the project it is forked from
+    # @return [Gitlab::ObjectifiedHash] Information about the forked project.
+    def remove_forked(project)
+      delete("/projects/#{project}/fork")
+    end
+
+    # Gets a project deploy keys.
+    #
+    # @example
+    #   Gitlab.deploy_keys(42)
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [Integer] :page The page number.
+    # @option options [Integer] :per_page The number of results per page.
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def deploy_keys(project, options={})
+      get("/projects/#{project}/keys", :query => options)
+    end
+
+    # Gets a single project deploy key.
+    #
+    # @example
+    #   Gitlab.deploy_key(42, 1)
+    #
+    # @param  [Integer, String] project The ID of a project.
+    # @param  [Integer] id The ID of a deploy key.
+    # @return [Gitlab::ObjectifiedHash]
+    def deploy_key(project, id)
+      get("/projects/#{project}/keys/#{id}")
+    end
+
+    # Creates a new deploy key.
+    #
+    # @example
+    #   Gitlab.create_deploy_key(42, 'My Key', 'Key contents')
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [String] title The title of a deploy key.
+    # @param  [String] key The content of a deploy key.
+    # @return [Gitlab::ObjectifiedHash] Information about created deploy key.
+    def create_deploy_key(project, title, key)
+      post("/projects/#{project}/keys", body: {title: title, key: key})
+    end
+
+    # Deletes a deploy key from project.
+    #
+    # @example
+    #   Gitlab.delete_deploy_key(42, 1)
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [Integer] id The ID of a deploy key.
+    # @return [Gitlab::ObjectifiedHash] Information about deleted deploy key.
+    def delete_deploy_key(project, id)
+      delete("/projects/#{project}/keys/#{id}")
+    end
+  end
+end
diff --git a/lib/gitlab-cli/lib/gitlab/client/repositories.rb b/lib/gitlab-cli/lib/gitlab/client/repositories.rb
new file mode 100644
index 000000000..f489e5009
--- /dev/null
+++ b/lib/gitlab-cli/lib/gitlab/client/repositories.rb
@@ -0,0 +1,89 @@
+class Gitlab::Client
+  # Defines methods related to repositories.
+  module Repositories
+
+    def trees(project, options={})
+      get "/projects/#{project}/repository/tree", query: options
+    end
+    alias_method :repo_trees, :trees
+
+    def files(project, file_path, ref)
+      get "/projects/#{project}/repository/files", query: {file_path: file_path, ref: ref}
+    end
+    alias_method :repo_files, :files
+
+    # Gets a list of project repository tags.
+    #
+    # @example
+    #   Gitlab.tags(42)
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [Integer] :page The page number.
+    # @option options [Integer] :per_page The number of results per page.
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def tags(project, options={})
+      get("/projects/#{project}/repository/tags", :query => options)
+    end
+    alias_method :repo_tags, :tags
+
+    # Creates a new project repository tag.
+    #
+    # @example
+    #   Gitlab.create_tag(42,'new_tag','master')
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [String]  tag_name The name of the new tag.
+    # @param  [String]  ref The ref (commit sha, branch name, or another tag) the tag will point to.
+    # @return [Gitlab::ObjectifiedHash]
+    def create_tag(project, tag_name, ref)
+      post("/projects/#{project}/repository/tags", body: {tag_name: tag_name, ref: ref})
+    end
+    alias_method :repo_create_tag, :create_tag
+
+    # Gets a list of project commits.
+    #
+    # @example
+    #   Gitlab.commits('viking')
+    #   Gitlab.repo_commits('gitlab', :ref_name => 'api')
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [String] :ref_name The branch or tag name of a project repository.
+    # @option options [Integer] :page The page number.
+    # @option options [Integer] :per_page The number of results per page.
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def commits(project, options={})
+      get("/projects/#{project}/repository/commits", :query => options)
+    end
+    alias_method :repo_commits, :commits
+
+    # Gets a specific commit identified by the commit hash or name of a branch or tag.
+    #
+    # @example
+    #   Gitlab.commit(42, '6104942438c14ec7bd21c6cd5bd995272b3faff6')
+    #   Gitlab.repo_commit(3, 'ed899a2f4b50b4370feeea94676502b42383c746')
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [String] sha The commit hash or name of a repository branch or tag
+    # @return [Gitlab::ObjectifiedHash]
+    def commit(project, sha)
+      get("/projects/#{project}/repository/commits/#{sha}")
+    end
+    alias_method :repo_commit, :commit
+
+    # Get the diff of a commit in a project.
+    #
+    # @example
+    #   Gitlab.commit_diff(42, '6104942438c14ec7bd21c6cd5bd995272b3faff6')
+    #   Gitlab.repo_commit_diff(3, 'ed899a2f4b50b4370feeea94676502b42383c746')
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [String] sha The name of a repository branch or tag or if not given the default branch.
+    # @return [Gitlab::ObjectifiedHash]
+    def commit_diff(project, sha)
+      get("/projects/#{project}/repository/commits/#{sha}/diff") 
+    end
+    alias_method :repo_commit_diff, :commit_diff
+  end
+end
diff --git a/lib/gitlab-cli/lib/gitlab/client/snippets.rb b/lib/gitlab-cli/lib/gitlab/client/snippets.rb
new file mode 100644
index 000000000..594d37402
--- /dev/null
+++ b/lib/gitlab-cli/lib/gitlab/client/snippets.rb
@@ -0,0 +1,86 @@
+class Gitlab::Client
+  # Defines methods related to snippets.
+  module Snippets
+    # Gets a list of project's snippets.
+    #
+    # @example
+    #   Gitlab.snippets(42)
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [Integer] :page The page number.
+    # @option options [Integer] :per_page The number of results per page.
+    # @return [Gitlab::ObjectifiedHash]
+    def snippets(project, options={})
+      get("/projects/#{project}/snippets", :query => options)
+    end
+
+    # Gets information about a snippet.
+    #
+    # @example
+    #   Gitlab.snippet(2, 14)
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [Integer] id The ID of a snippet.
+    # @return [Gitlab::ObjectifiedHash]
+    def snippet(project, id)
+      get("/projects/#{project}/snippets/#{id}")
+    end
+
+    # Creates a new snippet.
+    #
+    # @example
+    #   Gitlab.create_snippet(42, {:title => 'REST', :file_name => 'api.rb', :code => 'some code'})
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [String] :title (required) The title of a snippet.
+    # @option options [String] :file_name (required) The name of a snippet file.
+    # @option options [String] :code (required) The content of a snippet.
+    # @option options [String] :lifetime (optional) The expiration date of a snippet.
+    # @return [Gitlab::ObjectifiedHash] Information about created snippet.
+    def create_snippet(project, options={})
+      check_attributes!(options, [:title, :file_name, :code])
+      post("/projects/#{project}/snippets", :body => options)
+    end
+
+    # Updates a snippet.
+    #
+    # @example
+    #   Gitlab.edit_snippet(42, 34, :file_name => 'README.txt')
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [Integer] id The ID of a snippet.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [String] :title The title of a snippet.
+    # @option options [String] :file_name The name of a snippet file.
+    # @option options [String] :code The content of a snippet.
+    # @option options [String] :lifetime The expiration date of a snippet.
+    # @return [Gitlab::ObjectifiedHash] Information about updated snippet.
+    def edit_snippet(project, id, options={})
+      put("/projects/#{project}/snippets/#{id}", :body => options)
+    end
+
+    # Deletes a snippet.
+    #
+    # @example
+    #   Gitlab.delete_snippet(2, 14)
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [Integer] id The ID of a snippet.
+    # @return [Gitlab::ObjectifiedHash] Information about deleted snippet.
+    def delete_snippet(project, id)
+      delete("/projects/#{project}/snippets/#{id}")
+    end
+
+    private
+
+    def check_attributes!(options, attrs)
+      attrs.each do |attr|
+        unless options.has_key?(attr) || options.has_key?(attr.to_s)
+          raise Gitlab::Error::MissingAttributes.new("Missing '#{attr}' parameter")
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab-cli/lib/gitlab/client/system_hooks.rb b/lib/gitlab-cli/lib/gitlab/client/system_hooks.rb
new file mode 100644
index 000000000..59db4f924
--- /dev/null
+++ b/lib/gitlab-cli/lib/gitlab/client/system_hooks.rb
@@ -0,0 +1,58 @@
+class Gitlab::Client
+  # Defines methods related to system hooks.
+  module SystemHooks
+    # Gets a list of system hooks.
+    #
+    # @example
+    #   Gitlab.hooks
+    #   Gitlab.system_hooks
+    #
+    # @param  [Hash] options A customizable set of options.
+    # @option options [Integer] :page The page number.
+    # @option options [Integer] :per_page The number of results per page.
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def hooks(options={})
+      get("/hooks", query: options)
+    end
+    alias_method :system_hooks, :hooks
+
+    # Adds a new system hook.
+    #
+    # @example
+    #   Gitlab.add_hook('http://example.com/hook')
+    #   Gitlab.add_system_hook('https://api.example.net/v1/hook')
+    #
+    # @param  [String] url The hook URL.
+    # @return [Gitlab::ObjectifiedHash]
+    def add_hook(url)
+      post("/hooks", :body => {:url => url})
+    end
+    alias_method :add_system_hook, :add_hook
+
+    # Tests a system hook.
+    #
+    # @example
+    #   Gitlab.hook(3)
+    #   Gitlab.system_hook(12)
+    #
+    # @param  [Integer] id The ID of a system hook.
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def hook(id)
+      get("/hooks/#{id}")
+    end
+    alias_method :system_hook, :hook
+
+    # Deletes a new system hook.
+    #
+    # @example
+    #   Gitlab.delete_hook(3)
+    #   Gitlab.delete_system_hook(12)
+    #
+    # @param  [Integer] id The ID of a system hook.
+    # @return [Gitlab::ObjectifiedHash]
+    def delete_hook(id)
+      delete("/hooks/#{id}")
+    end
+    alias_method :delete_system_hook, :delete_hook
+  end
+end
diff --git a/lib/gitlab-cli/lib/gitlab/client/users.rb b/lib/gitlab-cli/lib/gitlab/client/users.rb
new file mode 100644
index 000000000..37bfc0d74
--- /dev/null
+++ b/lib/gitlab-cli/lib/gitlab/client/users.rb
@@ -0,0 +1,128 @@
+class Gitlab::Client
+  # Defines methods related to users.
+  module Users
+    # Gets a list of users.
+    #
+    # @example
+    #   Gitlab.users
+    #
+    # @param  [Hash] options A customizable set of options.
+    # @option options [Integer] :page The page number.
+    # @option options [Integer] :per_page The number of results per page.
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def users(options={})
+      get("/users", :query => options)
+    end
+
+    # Gets information about a user.
+    # Will return information about an authorized user if no ID passed.
+    #
+    # @example
+    #   Gitlab.user
+    #   Gitlab.user(2)
+    #
+    # @param  [Integer] id The ID of a user.
+    # @return [Gitlab::ObjectifiedHash]
+    def user(id=nil)
+      id.to_i.zero? ? get("/user") : get("/users/#{id}")
+    end
+
+    # Creates a new user.
+    # Requires authentication from an admin account.
+    #
+    # @param  [String] email The email of a user.
+    # @param  [String] password The password of a user.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [String] :name The name of a user. Defaults to email.
+    # @option options [String] :skype The skype of a user.
+    # @option options [String] :linkedin The linkedin of a user.
+    # @option options [String] :twitter The twitter of a user.
+    # @option options [Integer] :projects_limit The limit of projects for a user.
+    # @return [Gitlab::ObjectifiedHash] Information about created user.
+    def create_user(email, password, options={})
+      body = {:email => email, :password => password, :name => email}.merge(options)
+      post("/users", :body => body)
+    end
+
+    # Updates a user.
+    #
+    # @param  [Integer] id The ID of a user.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [String] email The email of a user.
+    # @option options [String] password The password of a user.
+    # @option options [String] :name The name of a user. Defaults to email.
+    # @option options [String] :skype The skype of a user.
+    # @option options [String] :linkedin The linkedin of a user.
+    # @option options [String] :twitter The twitter of a user.
+    # @option options [Integer] :projects_limit The limit of projects for a user.
+    # @return [Gitlab::ObjectifiedHash] Information about created user.
+    def edit_user(user_id, options={})
+      put("/users/#{user_id}", :body => options)
+    end
+
+
+    def delete_user(user_id)
+        delete("/users/#{user_id}")
+    end
+
+    # Creates a new user session.
+    #
+    # @example
+    #   Gitlab.session('jack@example.com', 'secret12345')
+    #
+    # @param  [String] email The email of a user.
+    # @param  [String] password The password of a user.
+    # @return [Gitlab::ObjectifiedHash]
+    # @note This method doesn't require private_token to be set.
+    def session(email, password)
+      post("/session", :body => {:email => email, :password => password})
+    end
+
+    # Gets a list of user's SSH keys.
+    #
+    # @example
+    #   Gitlab.ssh_keys
+    #
+    # @param  [Hash] options A customizable set of options.
+    # @option options [Integer] :page The page number.
+    # @option options [Integer] :per_page The number of results per page.
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def ssh_keys(options={})
+      get("/user/keys", :query => options)
+    end
+
+    # Gets information about SSH key.
+    #
+    # @example
+    #   Gitlab.ssh_key(1)
+    #
+    # @param  [Integer] id The ID of a user's SSH key.
+    # @return [Gitlab::ObjectifiedHash]
+    def ssh_key(id)
+      get("/user/keys/#{id}")
+    end
+
+    # Creates a new SSH key.
+    #
+    # @example
+    #   Gitlab.create_ssh_key('key title', 'key body')
+    #
+    # @param  [String] title The title of an SSH key.
+    # @param  [String] key The SSH key body.
+    # @return [Gitlab::ObjectifiedHash] Information about created SSH key.
+    def create_ssh_key(title, key)
+      post("/user/keys", :body => {:title => title, :key => key})
+    end
+
+    # Deletes an SSH key.
+    #
+    # @example
+    #   Gitlab.delete_ssh_key(1)
+    #
+    # @param  [Integer] id The ID of a user's SSH key.
+    # @return [Gitlab::ObjectifiedHash] Information about deleted SSH key.
+    def delete_ssh_key(id)
+      delete("/user/keys/#{id}")
+    end
+  end
+end
diff --git a/lib/gitlab-cli/lib/gitlab/configuration.rb b/lib/gitlab-cli/lib/gitlab/configuration.rb
new file mode 100644
index 000000000..b36ed5a7d
--- /dev/null
+++ b/lib/gitlab-cli/lib/gitlab/configuration.rb
@@ -0,0 +1,39 @@
+module Gitlab
+  # Defines constants and methods related to configuration.
+  module Configuration
+    # An array of valid keys in the options hash when configuring a Gitlab::API.
+    VALID_OPTIONS_KEYS = [:endpoint, :private_token, :user_agent, :sudo, :httparty].freeze
+
+    # The user agent that will be sent to the API endpoint if none is set.
+    DEFAULT_USER_AGENT = "Gitlab Ruby Gem #{Gitlab::VERSION}".freeze
+
+    # @private
+    attr_accessor(*VALID_OPTIONS_KEYS)
+
+    # Sets all configuration options to their default values
+    # when this module is extended.
+    def self.extended(base)
+      base.reset
+    end
+
+    # Convenience method to allow configuration options to be set in a block.
+    def configure
+      yield self
+    end
+
+    # Creates a hash of options and their values.
+    def options
+      VALID_OPTIONS_KEYS.inject({}) do |option, key|
+        option.merge!(key => send(key))
+      end
+    end
+
+    # Resets all configuration options to the defaults.
+    def reset
+      self.endpoint       = ENV['GITLAB_API_ENDPOINT']
+      self.private_token  = ENV['GITLAB_API_PRIVATE_TOKEN']
+      self.sudo           = nil
+      self.user_agent     = DEFAULT_USER_AGENT
+    end
+  end
+end
diff --git a/lib/gitlab-cli/lib/gitlab/error.rb b/lib/gitlab-cli/lib/gitlab/error.rb
new file mode 100644
index 000000000..96a8a39d6
--- /dev/null
+++ b/lib/gitlab-cli/lib/gitlab/error.rb
@@ -0,0 +1,42 @@
+module Gitlab
+  module Error
+    # Custom error class for rescuing from all Gitlab errors.
+    class Error < StandardError; end
+
+    # Raise when attributes are missing.
+    class MissingAttributes < Error; end
+
+    # Raised when API endpoint credentials not configured.
+    class MissingCredentials < Error; end
+
+    # Raised when impossible to parse response body.
+    class Parsing < Error; end
+
+    # Raised when API endpoint returns the HTTP status code 400.
+    class BadRequest < Error; end
+
+    # Raised when API endpoint returns the HTTP status code 401.
+    class Unauthorized < Error; end
+
+    # Raised when API endpoint returns the HTTP status code 403.
+    class Forbidden < Error; end
+
+    # Raised when API endpoint returns the HTTP status code 404.
+    class NotFound < Error; end
+
+    # Raised when API endpoint returns the HTTP status code 405.
+    class MethodNotAllowed < Error; end
+
+    # Raised when API endpoint returns the HTTP status code 409.
+    class Conflict < Error; end
+
+    # Raised when API endpoint returns the HTTP status code 500.
+    class InternalServerError < Error; end
+
+    # Raised when API endpoint returns the HTTP status code 502.
+    class BadGateway < Error; end
+
+    # Raised when API endpoint returns the HTTP status code 503.
+    class ServiceUnavailable < Error; end
+  end
+end
diff --git a/lib/gitlab-cli/lib/gitlab/help.rb b/lib/gitlab-cli/lib/gitlab/help.rb
new file mode 100644
index 000000000..6ead8af94
--- /dev/null
+++ b/lib/gitlab-cli/lib/gitlab/help.rb
@@ -0,0 +1,44 @@
+require 'gitlab'
+require 'gitlab/cli_helpers'
+
+module Gitlab::Help
+  extend Gitlab::CLI::Helpers
+
+  def self.get_help(methods,cmd=nil)
+    help = ''
+
+    if cmd.nil? || cmd == 'help'
+      help = actions_table
+    else
+      ri_cmd = `which ri`.chomp
+
+      if $? == 0
+        namespace = methods.select {|m| m[:name] === cmd }.map {|m| m[:owner]+'.'+m[:name] }.shift
+
+        if namespace
+          begin
+            ri_output = `#{ri_cmd} -T #{namespace} 2>&1`.chomp
+
+            if $? == 0
+              ri_output.gsub!(/#{cmd}\((.*?)\)/, cmd+' \1')
+              ri_output.gsub!(/Gitlab\./, 'gitlab> ')
+              ri_output.gsub!(/Gitlab\..+$/, '')
+              ri_output.gsub!(/\,\s?/, ' ')
+              help = ri_output
+            else
+              help = "Ri docs not found for #{namespace}, please install the docs to use 'help'"
+            end
+          rescue => e
+            puts e.message
+          end
+        else
+          help = "Unknown command: #{cmd}"
+        end
+      else
+        help = "'ri' tool not found in your PATH, please install it to use the help."
+      end
+    end
+
+    puts help
+  end
+end
diff --git a/lib/gitlab-cli/lib/gitlab/objectified_hash.rb b/lib/gitlab-cli/lib/gitlab/objectified_hash.rb
new file mode 100644
index 000000000..87ca2fc77
--- /dev/null
+++ b/lib/gitlab-cli/lib/gitlab/objectified_hash.rb
@@ -0,0 +1,24 @@
+module Gitlab
+  # Converts hashes to the objects.
+  class ObjectifiedHash
+    # Creates a new ObjectifiedHash object.
+    def initialize(hash)
+      @hash = hash
+      @data = hash.inject({}) do |data, (key,value)|
+        value = ObjectifiedHash.new(value) if value.is_a? Hash
+        data[key.to_s] = value
+        data
+      end
+    end
+
+    def to_hash
+      @hash
+    end
+    alias_method :to_h, :to_hash
+
+    # Delegate to ObjectifiedHash.
+    def method_missing(key)
+      @data.key?(key.to_s) ? @data[key.to_s] : nil
+    end
+  end
+end
diff --git a/lib/gitlab-cli/lib/gitlab/request.rb b/lib/gitlab-cli/lib/gitlab/request.rb
new file mode 100644
index 000000000..64a8f6b4c
--- /dev/null
+++ b/lib/gitlab-cli/lib/gitlab/request.rb
@@ -0,0 +1,113 @@
+require 'httparty'
+require 'json'
+
+module Gitlab
+  # @private
+  class Request
+    include HTTParty
+    format :json
+    headers 'Accept' => 'application/json'
+    parser Proc.new { |body, _| parse(body) }
+
+    attr_accessor :private_token
+
+    # Converts the response body to an ObjectifiedHash.
+    def self.parse(body)
+      body = decode(body)
+
+      if body.is_a? Hash
+        ObjectifiedHash.new body
+      elsif body.is_a? Array
+        body.collect! { |e| ObjectifiedHash.new(e) }
+      else
+        raise Error::Parsing.new "Couldn't parse a response body"
+      end
+    end
+
+    # Decodes a JSON response into Ruby object.
+    def self.decode(response)
+      begin
+        JSON.load response
+      rescue JSON::ParserError
+        raise Error::Parsing.new "The response is not a valid JSON"
+      end
+    end
+
+    def get(path, options={})
+      set_httparty_config(options)
+      set_private_token_header(options)
+      validate self.class.get(path, options)
+    end
+
+    def post(path, options={})
+      set_httparty_config(options)
+      set_private_token_header(options, path)
+      validate self.class.post(path, options)
+    end
+
+    def put(path, options={})
+      set_httparty_config(options)
+      set_private_token_header(options)
+      validate self.class.put(path, options)
+    end
+
+    def delete(path, options={})
+      set_httparty_config(options)
+      set_private_token_header(options)
+      validate self.class.delete(path, options)
+    end
+
+    # Checks the response code for common errors.
+    # Returns parsed response for successful requests.
+    def validate(response)
+      case response.code
+        when 400; raise Error::BadRequest.new error_message(response)
+        when 401; raise Error::Unauthorized.new error_message(response)
+        when 403; raise Error::Forbidden.new error_message(response)
+        when 404; raise Error::NotFound.new error_message(response)
+        when 405; raise Error::MethodNotAllowed.new error_message(response)
+        when 409; raise Error::Conflict.new error_message(response)
+        when 500; raise Error::InternalServerError.new error_message(response)
+        when 502; raise Error::BadGateway.new error_message(response)
+        when 503; raise Error::ServiceUnavailable.new error_message(response)
+      end
+
+      response.parsed_response
+    end
+
+    # Sets a base_uri and default_params for requests.
+    # @raise [Error::MissingCredentials] if endpoint not set.
+    def set_request_defaults(endpoint, private_token, sudo=nil)
+      raise Error::MissingCredentials.new("Please set an endpoint to API") unless endpoint
+      @private_token = private_token
+
+      self.class.base_uri endpoint
+      self.class.default_params :sudo => sudo
+      self.class.default_params.delete(:sudo) if sudo.nil?
+    end
+
+    private
+
+    # Sets a PRIVATE-TOKEN header for requests.
+    # @raise [Error::MissingCredentials] if private_token not set.
+    def set_private_token_header(options, path=nil)
+      unless path == '/session'
+        raise Error::MissingCredentials.new("Please set a private_token for user") unless @private_token
+        options[:headers] = {'PRIVATE-TOKEN' => @private_token}
+      end
+    end
+
+    # Set HTTParty configuration
+    # @see https://github.com/jnunemaker/httparty
+    def set_httparty_config(options)
+      if self.httparty
+        options.merge!(self.httparty)
+      end
+    end
+
+    def error_message(response)
+      "Server responded with code #{response.code}, message: #{response.parsed_response.message}. " \
+      "Request URI: #{response.request.base_uri}#{response.request.path}"
+    end
+  end
+end
diff --git a/lib/gitlab-cli/lib/gitlab/shell.rb b/lib/gitlab-cli/lib/gitlab/shell.rb
new file mode 100644
index 000000000..9253b61e3
--- /dev/null
+++ b/lib/gitlab-cli/lib/gitlab/shell.rb
@@ -0,0 +1,51 @@
+require 'gitlab'
+require 'gitlab/help'
+require 'gitlab/cli_helpers'
+require 'readline'
+
+class Gitlab::Shell
+  extend Gitlab::CLI::Helpers
+
+  def self.start
+    actions = Gitlab.actions
+
+    comp = proc { |s| actions.map(&:to_s).grep(/^#{Regexp.escape(s)}/) }
+
+    Readline.completion_proc = comp
+    Readline.completion_append_character = ' '
+
+    client = Gitlab::Client.new(endpoint: '')
+
+    while buf = Readline.readline('gitlab> ', true)
+      next if buf.nil? || buf.empty?
+      break if buf == 'exit'
+
+      buf = buf.scan(/["][^"]+["]|\S+/).map { |word| word.gsub(/^['"]|['"]$/,'') }
+      cmd = buf.shift
+      args = buf.count > 0 ? buf : []
+
+      if cmd == 'help'
+        methods = []
+
+        actions.each do |action|
+          methods << {
+            name: action.to_s,
+            owner: client.method(action).owner.to_s
+          }
+        end
+
+        args[0].nil? ? Gitlab::Help.get_help(methods) : Gitlab::Help.get_help(methods, args[0])
+        next
+      end
+
+      data = if actions.include?(cmd.to_sym)
+        confirm_command(cmd)
+        gitlab_helper(cmd, args)
+      else
+        "'#{cmd}' is not a valid command.  See the 'help' for a list of valid commands."
+      end
+
+      output_table(cmd, args, data)
+    end
+  end
+end
diff --git a/lib/gitlab-cli/lib/gitlab/version.rb b/lib/gitlab-cli/lib/gitlab/version.rb
new file mode 100644
index 000000000..42ba291e0
--- /dev/null
+++ b/lib/gitlab-cli/lib/gitlab/version.rb
@@ -0,0 +1,3 @@
+module Gitlab
+  VERSION = "3.2.0"
+end
diff --git a/lib/gitlab-cli/spec/fixtures/branch.json b/lib/gitlab-cli/spec/fixtures/branch.json
new file mode 100644
index 000000000..34a02081f
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/branch.json
@@ -0,0 +1 @@
+{"name":"api","commit":{"id":"f7dd067490fe57505f7226c3b54d3127d2f7fd46","parents":[{"id":"949b1df930bedace1dbd755aaa4a82e8c451a616"}],"tree":"f8c4b21c036339f92fcc5482aa28a41250553b27","message":"API: expose issues project id","author":{"name":"Nihad Abbasov","email":"narkoz.2008@gmail.com"},"committer":{"name":"Nihad Abbasov","email":"narkoz.2008@gmail.com"},"authored_date":"2012-07-25T04:22:21-07:00","committed_date":"2012-07-25T04:22:21-07:00"},"protected": true}
diff --git a/lib/gitlab-cli/spec/fixtures/branches.json b/lib/gitlab-cli/spec/fixtures/branches.json
new file mode 100644
index 000000000..05a39447d
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/branches.json
@@ -0,0 +1 @@
+[{"name":"api","commit":{"id":"f7dd067490fe57505f7226c3b54d3127d2f7fd46","parents":[{"id":"949b1df930bedace1dbd755aaa4a82e8c451a616"}],"tree":"f8c4b21c036339f92fcc5482aa28a41250553b27","message":"API: expose issues project id","author":{"name":"Nihad Abbasov","email":"narkoz.2008@gmail.com"},"committer":{"name":"Nihad Abbasov","email":"narkoz.2008@gmail.com"},"authored_date":"2012-07-25T04:22:21-07:00","committed_date":"2012-07-25T04:22:21-07:00"}},{"name":"dashboard-feed","commit":{"id":"f8f6ff065eccc6ede4d35ed87a09bb962b84ca25","parents":[{"id":"2cf8010792c3075824ee27d0f037aeb178cbbf7e"}],"tree":"e17f2157143d550891d4669c10b7446e4739bc6d","message":"add projects atom feed","author":{"name":"Nihad Abbasov","email":"narkoz.2008@gmail.com"},"committer":{"name":"Nihad Abbasov","email":"narkoz.2008@gmail.com"},"authored_date":"2012-05-31T23:42:02-07:00","committed_date":"2012-05-31T23:42:02-07:00"}},{"name":"master","commit":{"id":"2cf8010792c3075824ee27d0f037aeb178cbbf7e","parents":[{"id":"af226ae9c9af406c8a0e0bbdf364563495c2f432"},{"id":"e851cb07762aa464aae10e8b4b28de87c1a6f925"}],"tree":"6c6845838039f01723d91f395a1d2fa1dcc82522","message":"Merge pull request #868 from SaitoWu/bugfix/encoding\n\nBugfix/encoding","author":{"name":"Dmitriy Zaporozhets","email":"dmitriy.zaporozhets@gmail.com"},"committer":{"name":"Dmitriy Zaporozhets","email":"dmitriy.zaporozhets@gmail.com"},"authored_date":"2012-05-30T00:24:43-07:00","committed_date":"2012-05-30T00:24:43-07:00"}},{"name":"preview_notes","commit":{"id":"3749e0d99ac6bfbc65889b1b7a5310e14e7fe89a","parents":[{"id":"2483181f2c3d4ea7d2c68147b19bc07fc3937b0c"}],"tree":"f8c56161b0d6561568f088df9961362eb1ece88b","message":"pass project_id to notes preview path","author":{"name":"Nihad Abbasov","email":"narkoz.2008@gmail.com"},"committer":{"name":"Nihad Abbasov","email":"narkoz.2008@gmail.com"},"authored_date":"2012-08-09T23:46:27-07:00","committed_date":"2012-08-09T23:46:27-07:00"}},{"name":"refactoring","commit":{"id":"7c7761099cae83f59fe5780340e100be890847b2","parents":[{"id":"058d80b3363dd4fc4417ca4f60f76119188a2470"}],"tree":"d7d4a94c700dc0e84ee943019213d2358a49c413","message":"fix deprecation warnings","author":{"name":"Nihad Abbasov","email":"narkoz.2008@gmail.com"},"committer":{"name":"Nihad Abbasov","email":"narkoz.2008@gmail.com"},"authored_date":"2012-05-29T07:16:28-07:00","committed_date":"2012-05-29T07:16:28-07:00"}}]
diff --git a/lib/gitlab-cli/spec/fixtures/comment_merge_request.json b/lib/gitlab-cli/spec/fixtures/comment_merge_request.json
new file mode 100644
index 000000000..742f33377
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/comment_merge_request.json
@@ -0,0 +1 @@
+{"note":"Cool Merge Request!","author":{"id":1,"username":"jsmith","email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-07-11T01:32:18Z"}}
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/fixtures/create_branch.json b/lib/gitlab-cli/spec/fixtures/create_branch.json
new file mode 100644
index 000000000..0b011abdb
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/create_branch.json
@@ -0,0 +1 @@
+{"name":"api","commit":{ "id":"f7dd067490fe57505f7226c3b54d3127d2f7fd46","message":"API: expose issues project id","parent_ids":["949b1df930bedace1dbd755aaa4a82e8c451a616"],"authored_date":"2012-07-25T04:22:21-07:00","author_name":"Nihad Abbasov","author_email":"narkoz.2008@gmail.com","committed_date":"2012-07-25T04:22:21-07:00","committer_name":"Nihad Abbasov","committer_email":"narkoz.2008@gmail.com"},"protected": false}
diff --git a/lib/gitlab-cli/spec/fixtures/create_merge_request.json b/lib/gitlab-cli/spec/fixtures/create_merge_request.json
new file mode 100644
index 000000000..c27435168
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/create_merge_request.json
@@ -0,0 +1 @@
+{"id":2,"target_branch":"master","source_branch":"api","project_id":3,"title":"New feature","closed":false,"merged":false,"author":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-10-19T05:56:05Z"},"assignee":{"id":2,"email":"jack@example.com","name":"Jack Smith","blocked":false,"created_at":"2012-10-19T05:56:14Z"}}
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/fixtures/error_already_exists.json b/lib/gitlab-cli/spec/fixtures/error_already_exists.json
new file mode 100644
index 000000000..d1070f560
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/error_already_exists.json
@@ -0,0 +1 @@
+{"message": "409 Already exists"}
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/fixtures/group.json b/lib/gitlab-cli/spec/fixtures/group.json
new file mode 100644
index 000000000..bce3581d8
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/group.json
@@ -0,0 +1,60 @@
+{"id": 10, "name": "GitLab-Group", "path": "gitlab-group", "owner_id": 6, "projects": [
+    {
+        "id": 9,
+        "name": "mojito",
+        "description": null,
+        "default_branch": "master",
+        "owner": {
+            "id": 6,
+            "username": "jose",
+            "email": "jose@abc.com",
+            "name": "Jose Jose",
+            "blocked": false,
+            "created_at": "2013-02-06T06:54:06Z"
+        },
+        "path": "mojito",
+        "path_with_namespace": "gitlab-group/mojito",
+        "issues_enabled": true,
+        "merge_requests_enabled": true,
+        "wall_enabled": true,
+        "wiki_enabled": true,
+        "created_at": "2013-02-06T16:59:15Z",
+        "namespace": {
+            "created_at": "2013-02-06T16:58:22Z",
+            "id": 10,
+            "name": "GitLab-Group",
+            "owner_id": 6,
+            "path": "gitlab-group",
+            "updated_at": "2013-02-06T16:58:22Z"
+        }
+    },
+    {
+        "id": 10,
+        "name": "gitlabhq",
+        "description": null,
+        "default_branch": null,
+        "owner": {
+            "id": 6,
+            "username": "randx",
+            "email": "randx@github.com",
+            "name": "Dmitry Z",
+            "blocked": false,
+            "created_at": "2013-02-06T06:54:06Z"
+        },
+        "path": "gitlabhq",
+        "path_with_namespace": "gitlab-group/gitlabhq",
+        "issues_enabled": true,
+        "merge_requests_enabled": true,
+        "wall_enabled": true,
+        "wiki_enabled": true,
+        "created_at": "2013-02-06T17:02:31Z",
+        "namespace": {
+            "created_at": "2013-02-06T16:58:22Z",
+            "id": 10,
+            "name": "GitLab-Group",
+            "owner_id": 6,
+            "path": "gitlab-group",
+            "updated_at": "2013-02-06T16:58:22Z"
+        }
+    }
+]}
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/fixtures/group_create.json b/lib/gitlab-cli/spec/fixtures/group_create.json
new file mode 100644
index 000000000..67445f68b
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/group_create.json
@@ -0,0 +1 @@
+{"id":3,"name":"Gitlab-Group","path":"gitlab-group","owner_id":1}
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/fixtures/group_member.json b/lib/gitlab-cli/spec/fixtures/group_member.json
new file mode 100644
index 000000000..feef54322
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/group_member.json
@@ -0,0 +1 @@
+{"id":2,"username":"jsmith","email":"jsmith@local.host","name":"John Smith","state":"active","created_at":"2013-09-04T18:15:30Z","access_level":10}
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/fixtures/group_member_delete.json b/lib/gitlab-cli/spec/fixtures/group_member_delete.json
new file mode 100644
index 000000000..ff052edf6
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/group_member_delete.json
@@ -0,0 +1 @@
+{"created_at":"2013-09-04T18:18:15Z","group_access":10,"group_id":3,"id":2,"notification_level":3,"updated_at":"2013-09-04T18:18:15Z","user_id":2}
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/fixtures/group_members.json b/lib/gitlab-cli/spec/fixtures/group_members.json
new file mode 100644
index 000000000..02ddc1089
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/group_members.json
@@ -0,0 +1 @@
+[{"id":1,"username":"eraymond","email":"eraymond@local.host","name":"Edward Raymond","state":"active","created_at":"2013-08-30T16:16:22Z","access_level":50},{"id":1,"username":"jsmith","email":"jsmith@local.host","name":"John Smith","state":"active","created_at":"2013-08-30T16:16:22Z","access_level":50}]
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/fixtures/groups.json b/lib/gitlab-cli/spec/fixtures/groups.json
new file mode 100644
index 000000000..7d8b426a4
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/groups.json
@@ -0,0 +1,2 @@
+[{"id": 3,"name": "ThreeGroup","path": "threegroup","owner_id": 1},{"id": 5,"name": "Five-Group","path": "five-group","owner_id": 2},{"id": 8,"name": "Eight Group","path": "eight-group","owner_id": 6}
+]
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/fixtures/issue.json b/lib/gitlab-cli/spec/fixtures/issue.json
new file mode 100644
index 000000000..9f70318a7
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/issue.json
@@ -0,0 +1 @@
+{"id":33,"project_id":3,"title":"Beatae possimus nostrum nihil reiciendis laboriosam nihil delectus alias accusantium dolor unde.","description":null,"labels":[],"milestone":null,"assignee":{"id":2,"email":"jack@example.com","name":"Jack Smith","blocked":false,"created_at":"2012-09-17T09:42:03Z"},"author":{"id":2,"email":"jack@example.com","name":"Jack Smith","blocked":false,"created_at":"2012-09-17T09:42:03Z"},"closed":false,"updated_at":"2012-09-17T09:42:20Z","created_at":"2012-09-17T09:42:20Z"}
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/fixtures/issues.json b/lib/gitlab-cli/spec/fixtures/issues.json
new file mode 100644
index 000000000..62e4cadd2
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/issues.json
@@ -0,0 +1 @@
+[{"id":1,"project_id":1,"title":"Culpa eius recusandae suscipit autem distinctio dolorum.","description":null,"labels":[],"milestone":null,"assignee":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z"},"author":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z"},"closed":false,"updated_at":"2012-09-17T09:42:20Z","created_at":"2012-09-17T09:42:20Z"},{"id":6,"project_id":2,"title":"Ut in dolorum omnis sed sit aliquam.","description":null,"labels":[],"milestone":null,"assignee":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z"},"author":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z"},"closed":false,"updated_at":"2012-09-17T09:42:20Z","created_at":"2012-09-17T09:42:20Z"},{"id":12,"project_id":3,"title":"Veniam et tempore quidem eum reprehenderit cupiditate non aut velit eaque.","description":null,"labels":[],"milestone":null,"assignee":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z"},"author":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z"},"closed":false,"updated_at":"2012-09-17T09:42:20Z","created_at":"2012-09-17T09:42:20Z"},{"id":21,"project_id":1,"title":"Vitae ea aliquam et quo eligendi sapiente voluptatum labore hic nihil culpa.","description":null,"labels":[],"milestone":null,"assignee":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z"},"author":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z"},"closed":false,"updated_at":"2012-09-17T09:42:20Z","created_at":"2012-09-17T09:42:20Z"},{"id":26,"project_id":2,"title":"Quo enim est nihil atque placeat voluptas neque eos voluptas.","description":null,"labels":[],"milestone":null,"assignee":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z"},"author":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z"},"closed":false,"updated_at":"2012-09-17T09:42:20Z","created_at":"2012-09-17T09:42:20Z"},{"id":32,"project_id":3,"title":"Deserunt tenetur impedit est beatae voluptas voluptas quaerat quisquam.","description":null,"labels":[],"milestone":null,"assignee":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z"},"author":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z"},"closed":false,"updated_at":"2012-09-17T09:42:20Z","created_at":"2012-09-17T09:42:20Z"}]
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/fixtures/key.json b/lib/gitlab-cli/spec/fixtures/key.json
new file mode 100644
index 000000000..6595c8ceb
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/key.json
@@ -0,0 +1 @@
+{"id":1,"title":"narkoz@helium","key":"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCkUsh42Nh1yefGd1jbSELn5XsY8p5Oxmau0/1HqHnjuYOaj5X+kHccFDwtmtg9Ox8ua/+WptNsiE8IUwsD3zKgEjajgwq3gMeeFdxfXwM+tEvHOOMV9meRrgRWGYCToPbT6sR7/YMAYa7cPqWSpx/oZhYfz4XtoMv3ZZT1fZMmx3MY3HwXwW8j+obJyN2K4LN0TFi9RPgWWYn0DCyb9OccmABimt3i74WoJ/OT8r6/7swce8+OSe0Q2wBhyTtvxg2vtUcoek8Af+EZaUMBwSEzEsocOCzwQvjF5XUk5o7dJ8nP8W3RE60JWX57t16eQm7lBmumLYfszpn2isd6W7a1 narkoz@helium"}
diff --git a/lib/gitlab-cli/spec/fixtures/keys.json b/lib/gitlab-cli/spec/fixtures/keys.json
new file mode 100644
index 000000000..d81fca6ad
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/keys.json
@@ -0,0 +1 @@
+[{"id":1,"title":"narkoz@helium","key":"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCkUsh42Nh1yefGd1jbSELn5XsY8p5Oxmau0/1HqHnjuYOaj5X+kHccFDwtmtg9Ox8ua/+WptNsiE8IUwsD3zKgEjajgwq3gMeeFdxfXwM+tEvHOOMV9meRrgRWGYCToPbT6sR7/YMAYa7cPqWSpx/oZhYfz4XtoMv3ZZT1fZMmx3MY3HwXwW8j+obJyN2K4LN0TFi9RPgWWYn0DCyb9OccmABimt3i74WoJ/OT8r6/7swce8+OSe0Q2wBhyTtvxg2vtUcoek8Af+EZaUMBwSEzEsocOCzwQvjF5XUk5o7dJ8nP8W3RE60JWX57t16eQm7lBmumLYfszpn2isd6W7a1 narkoz@helium"}]
diff --git a/lib/gitlab-cli/spec/fixtures/merge_request.json b/lib/gitlab-cli/spec/fixtures/merge_request.json
new file mode 100644
index 000000000..5278f4664
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/merge_request.json
@@ -0,0 +1 @@
+{"id":1,"target_branch":"master","source_branch":"api","project_id":3,"title":"New feature","closed":false,"merged":false,"author":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-10-19T05:56:05Z"},"assignee":{"id":2,"email":"jack@example.com","name":"Jack Smith","blocked":false,"created_at":"2012-10-19T05:56:14Z"}}
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/fixtures/merge_request_comments.json b/lib/gitlab-cli/spec/fixtures/merge_request_comments.json
new file mode 100644
index 000000000..3b9733ef3
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/merge_request_comments.json
@@ -0,0 +1 @@
+[{"note":"this is the 1st comment on the 2merge merge request","author":{"id":11,"username":"admin","email":"admin@example.com","name":"A User","state":"active","created_at":"2014-03-06T08:17:35.000Z"}},{"note":"another discussion point on the 2merge request","author":{"id":12,"username":"admin","email":"admin@example.com","name":"A User","state":"active","created_at":"2014-03-06T08:17:35.000Z"}}]
diff --git a/lib/gitlab-cli/spec/fixtures/merge_requests.json b/lib/gitlab-cli/spec/fixtures/merge_requests.json
new file mode 100644
index 000000000..ea32ac4e6
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/merge_requests.json
@@ -0,0 +1 @@
+[{"id":1,"target_branch":"master","source_branch":"api","project_id":3,"title":"New feature","closed":false,"merged":false,"author":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-10-19T05:56:05Z"},"assignee":{"id":2,"email":"jack@example.com","name":"Jack Smith","blocked":false,"created_at":"2012-10-19T05:56:14Z"}}]
diff --git a/lib/gitlab-cli/spec/fixtures/milestone.json b/lib/gitlab-cli/spec/fixtures/milestone.json
new file mode 100644
index 000000000..94ea3d360
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/milestone.json
@@ -0,0 +1 @@
+{"id":1,"project_id":3,"title":"3.0","description":"","due_date":"2012-10-22","closed":false,"updated_at":"2012-09-17T10:15:31Z","created_at":"2012-09-17T10:15:31Z"}
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/fixtures/milestones.json b/lib/gitlab-cli/spec/fixtures/milestones.json
new file mode 100644
index 000000000..f9e309af6
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/milestones.json
@@ -0,0 +1 @@
+[{"id":1,"project_id":3,"title":"3.0","description":"","due_date":"2012-10-22","closed":false,"updated_at":"2012-09-17T10:15:31Z","created_at":"2012-09-17T10:15:31Z"}]
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/fixtures/note.json b/lib/gitlab-cli/spec/fixtures/note.json
new file mode 100644
index 000000000..3f575aed3
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/note.json
@@ -0,0 +1 @@
+{"id":1201,"body":"The solution is rather tricky","author":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z"},"created_at":"2012-11-27T19:16:44Z"}
diff --git a/lib/gitlab-cli/spec/fixtures/notes.json b/lib/gitlab-cli/spec/fixtures/notes.json
new file mode 100644
index 000000000..15c0d8ca2
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/notes.json
@@ -0,0 +1 @@
+[{"id":1201,"body":"The solution is rather tricky","author":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z"},"created_at":"2012-11-27T19:16:44Z"},{"id":1207,"body":"I know, right?","author":{"id":1,"email":"jack@example.com","name":"Jack Smith","blocked":false,"created_at":"2012-09-17T09:42:03Z"},"created_at":"2012-11-27T19:58:21Z"}]
diff --git a/lib/gitlab-cli/spec/fixtures/project.json b/lib/gitlab-cli/spec/fixtures/project.json
new file mode 100644
index 000000000..1f4f96028
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/project.json
@@ -0,0 +1 @@
+{"id":3,"code":"gitlab","name":"Gitlab","description":null,"path":"gitlab","default_branch":null,"owner":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z"},"public":false,"issues_enabled":true,"merge_requests_enabled":true,"wall_enabled":true,"wiki_enabled":true,"created_at":"2012-09-17T09:41:58Z"}
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/fixtures/project_commit.json b/lib/gitlab-cli/spec/fixtures/project_commit.json
new file mode 100644
index 000000000..ace52b700
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/project_commit.json
@@ -0,0 +1,13 @@
+{
+    "id": "6104942438c14ec7bd21c6cd5bd995272b3faff6",
+    "short_id": "6104942438c",
+    "title": "Sanitize for network graph",
+    "author_name": "randx",
+    "author_email": "dmitriy.zaporozhets@gmail.com",
+    "created_at": "2012-09-20T09:06:12+03:00",
+    "committed_date": "2012-09-20T09:06:12+03:00",
+    "authored_date": "2012-09-20T09:06:12+03:00",
+    "parent_ids": [
+        "ae1d9fb46aa2b07ee9836d49862ec4e2c46fbbba"
+    ]
+}
diff --git a/lib/gitlab-cli/spec/fixtures/project_commit_diff.json b/lib/gitlab-cli/spec/fixtures/project_commit_diff.json
new file mode 100644
index 000000000..ad3dfde86
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/project_commit_diff.json
@@ -0,0 +1,10 @@
+{
+    "diff": "--- a/doc/update/5.4-to-6.0.md\n+++ b/doc/update/5.4-to-6.0.md\n@@ -71,6 +71,8 @@\n sudo -u git -H bundle exec rake migrate_keys RAILS_ENV=production\n sudo -u git -H bundle exec rake migrate_inline_notes RAILS_ENV=production\n \n+sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production\n+\n ```\n \n ### 6. Update config files",
+    "new_path": "doc/update/5.4-to-6.0.md",
+    "old_path": "doc/update/5.4-to-6.0.md",
+    "a_mode": null,
+    "b_mode": "100644",
+    "new_file": false,
+    "renamed_file": false,
+    "deleted_file": false
+}
diff --git a/lib/gitlab-cli/spec/fixtures/project_commits.json b/lib/gitlab-cli/spec/fixtures/project_commits.json
new file mode 100644
index 000000000..58cb5020d
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/project_commits.json
@@ -0,0 +1 @@
+[{"id":"f7dd067490fe57505f7226c3b54d3127d2f7fd46","short_id":"f7dd067490f","title":"API: expose issues project id","author_name":"Nihad Abbasov","author_email":"narkoz.2008@gmail.com","created_at":"2012-07-25T04:22:21-07:00"},{"id":"949b1df930bedace1dbd755aaa4a82e8c451a616","short_id":"949b1df930b","title":"API: update docs","author_name":"Nihad Abbasov","author_email":"narkoz.2008@gmail.com","created_at":"2012-07-25T02:35:41-07:00"},{"id":"1b95c8bff351f6718ec31ac1de1e48c57bc95d44","short_id":"1b95c8bff35","title":"API: ability to get project by id","author_name":"Nihad Abbasov","author_email":"narkoz.2008@gmail.com","created_at":"2012-07-25T02:18:30-07:00"},{"id":"92d98f5a0c28bffd7b070cda190b07ab72667d58","short_id":"92d98f5a0c2","title":"Merge pull request #1118 from patthoyts/pt/ldap-missing-password","author_name":"Dmitriy Zaporozhets","author_email":"dmitriy.zaporozhets@gmail.com","created_at":"2012-07-25T01:51:06-07:00"},{"id":"60d3e94874964a626f105d3598e1c122addcf43e","short_id":"60d3e948749","title":"Merge pull request #1122 from patthoyts/pt/missing-log","author_name":"Dmitriy Zaporozhets","author_email":"dmitriy.zaporozhets@gmail.com","created_at":"2012-07-25T01:50:34-07:00"},{"id":"b683a71aa1230f17f9df47661c77dfeae27027de","short_id":"b683a71aa12","title":"Merge pull request #1135 from NARKOZ/api","author_name":"Dmitriy Zaporozhets","author_email":"dmitriy.zaporozhets@gmail.com","created_at":"2012-07-25T01:48:00-07:00"},{"id":"fbb41100db35cf2def2c8b4d896b7015d56bd15b","short_id":"fbb41100db3","title":"update help section with issues API docs","author_name":"Nihad Abbasov","author_email":"narkoz.2008@gmail.com","created_at":"2012-07-24T05:52:43-07:00"},{"id":"eca823c1c7cef45cc18c6ab36d2327650c85bfc3","short_id":"eca823c1c7c","title":"Merge branch 'master' into api","author_name":"Nihad Abbasov","author_email":"narkoz.2008@gmail.com","created_at":"2012-07-24T05:46:36-07:00"},{"id":"024e0348904179a8dea81c01e27a5f014cf57499","short_id":"024e0348904","title":"update API docs","author_name":"Nihad Abbasov","author_email":"narkoz.2008@gmail.com","created_at":"2012-07-24T05:25:01-07:00"},{"id":"7b33d8cbcab3b0ee5789ec607455ab62130db69f","short_id":"7b33d8cbcab","title":"add issues API","author_name":"Nihad Abbasov","author_email":"narkoz.2008@gmail.com","created_at":"2012-07-24T05:19:51-07:00"},{"id":"6035ad7e1fe519d0c6a42731790183889e3ba31d","short_id":"6035ad7e1fe","title":"Create the githost.log file if necessary.","author_name":"Pat Thoyts","author_email":"patthoyts@users.sourceforge.net","created_at":"2012-07-21T07:32:04-07:00"},{"id":"a2d244ec062f3348f6cd1c5218c6097402c5f562","short_id":"a2d244ec062","title":"Handle LDAP missing credentials error with a flash message.","author_name":"Pat Thoyts","author_email":"patthoyts@users.sourceforge.net","created_at":"2012-07-21T01:04:05-07:00"},{"id":"8b7e404b5b6944e9c92cc270b2e5d0005781d49d","short_id":"8b7e404b5b6","title":"Up to 2.7.0","author_name":"randx","author_email":"dmitriy.zaporozhets@gmail.com","created_at":"2012-07-21T00:53:55-07:00"},{"id":"11721b0dbe82c35789be3e4fa8e14663934b2ff5","short_id":"11721b0dbe8","title":"Help section for system hooks completed","author_name":"randx","author_email":"dmitriy.zaporozhets@gmail.com","created_at":"2012-07-21T00:47:57-07:00"},{"id":"9c8a1e651716212cf50a623d98e03b8dbdb2c64a","short_id":"9c8a1e65171","title":"Fix system hook example","author_name":"randx","author_email":"dmitriy.zaporozhets@gmail.com","created_at":"2012-07-21T00:32:42-07:00"},{"id":"4261acda90ff4c61326d80cba026ae76e8551f8f","short_id":"4261acda90f","title":"move SSH keys tab closer to begining","author_name":"randx","author_email":"dmitriy.zaporozhets@gmail.com","created_at":"2012-07-21T00:27:09-07:00"},{"id":"a69fc5dd23bd502fd36892a80eec21a4c53891f8","short_id":"a69fc5dd23b","title":"Endless event loading for dsahboard","author_name":"randx","author_email":"dmitriy.zaporozhets@gmail.com","created_at":"2012-07-21T00:23:05-07:00"},{"id":"860fa1163a5fbdfec2bb01ff2d584351554dee29","short_id":"860fa1163a5","title":"Merge pull request #1117 from patthoyts/pt/user-form","author_name":"Dmitriy Zaporozhets","author_email":"dmitriy.zaporozhets@gmail.com","created_at":"2012-07-20T14:23:49-07:00"},{"id":"787e5e94acf5e20280416c9fda105ef5b77576b3","short_id":"787e5e94acf","title":"Fix english on the edit user form.","author_name":"Pat Thoyts","author_email":"patthoyts@users.sourceforge.net","created_at":"2012-07-20T14:18:42-07:00"},{"id":"9267cb04b0b3fdf127899c4b7e636dc27fac06d3","short_id":"9267cb04b0b","title":"Merge branch 'refactoring_controllers' of dev.gitlabhq.com:gitlabhq","author_name":"Dmitriy Zaporozhets","author_email":"dmitriy.zaporozhets@gmail.com","created_at":"2012-07-20T07:24:56-07:00"}]
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/fixtures/project_delete_key.json b/lib/gitlab-cli/spec/fixtures/project_delete_key.json
new file mode 100644
index 000000000..ed4141599
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/project_delete_key.json
@@ -0,0 +1,8 @@
+{
+  "created_at": "2013-10-05T15:05:26Z",
+  "fingerprint": "5c:b5:e6:b0:f5:31:65:3f:a6:b5:59:86:32:cc:15:e1",
+  "id": 2,
+  "key": "ssh-rsa ...",
+  "updated_at": "2013-10-05T15:05:26Z",
+  "user_id": null
+}
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/fixtures/project_events.json b/lib/gitlab-cli/spec/fixtures/project_events.json
new file mode 100644
index 000000000..4d5afc04e
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/project_events.json
@@ -0,0 +1 @@
+[{"title":null,"project_id":2,"action_name":"opened","target_id":null,"target_type":null,"author_id":1,"data":{"before":"ac0c1aa3898d6dea54d7868ea6f9c45fd5e30c59","after":"66350dbb62a221bc619b665aef3e1e7d3b306747","ref":"refs/heads/master","user_id":1,"user_name":"Administrator","project_id":2,"repository":{"name":"gitlab-ci","url":"git@demo.gitlab.com:gitlab/gitlab-ci.git","description":"Continuous integration server for gitlabhq | Coordinator","homepage":"http://demo.gitlab.com/gitlab/gitlab-ci"},"commits":[{"id":"8cf469b039931bab37bbf025e6b69287ea3cfb0e","message":"Modify screenshot\n\nSigned-off-by: Dmitriy Zaporozhets \u003Cdummy@gmail.com\u003E","timestamp":"2014-05-20T10:34:27+00:00","url":"http://demo.gitlab.com/gitlab/gitlab-ci/commit/8cf469b039931bab37bbf025e6b69287ea3cfb0e","author":{"name":"Dummy","email":"dummy@gmail.com"}},{"id":"66350dbb62a221bc619b665aef3e1e7d3b306747","message":"Edit some code\n\nSigned-off-by: Dmitriy Zaporozhets \u003Cdummy@gmail.com\u003E","timestamp":"2014-05-20T10:35:15+00:00","url":"http://demo.gitlab.com/gitlab/gitlab-ci/commit/66350dbb62a221bc619b665aef3e1e7d3b306747","author":{"name":"Dummy","email":"dummy@gmail.com"}}],"total_commits_count":2},"target_title":null,"created_at":"2014-05-20T10:35:26.240Z"},{"title":null,"project_id":2,"action_name":"opened","target_id":2,"target_type":"MergeRequest","author_id":1,"data":null,"target_title":"    Morbi et cursus leo. Sed eget vestibulum sapien","created_at":"2014-05-20T10:24:11.917Z"}]
diff --git a/lib/gitlab-cli/spec/fixtures/project_for_user.json b/lib/gitlab-cli/spec/fixtures/project_for_user.json
new file mode 100644
index 000000000..e2835d865
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/project_for_user.json
@@ -0,0 +1 @@
+{"id":1,"code":"brute","name":"Brute","description":null,"path":"brute","default_branch":null,"owner":{"id":1,"email":"john@example.com","name":"John Owner","blocked":false,"created_at":"2012-09-17T09:41:56Z"},"private":true,"issues_enabled":true,"merge_requests_enabled":true,"wall_enabled":true,"wiki_enabled":true,"created_at":"2012-09-17T09:41:56Z"}
diff --git a/lib/gitlab-cli/spec/fixtures/project_fork_link.json b/lib/gitlab-cli/spec/fixtures/project_fork_link.json
new file mode 100644
index 000000000..f1490dfa7
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/project_fork_link.json
@@ -0,0 +1 @@
+{"created_at":"2013-07-03T13:51:48Z","forked_from_project_id":24,"forked_to_project_id":42,"id":1,"updated_at":"2013-07-03T13:51:48Z"}
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/fixtures/project_hook.json b/lib/gitlab-cli/spec/fixtures/project_hook.json
new file mode 100644
index 000000000..180dd4555
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/project_hook.json
@@ -0,0 +1 @@
+{"id":1,"url":"https://api.example.net/v1/webhooks/ci"}
diff --git a/lib/gitlab-cli/spec/fixtures/project_hooks.json b/lib/gitlab-cli/spec/fixtures/project_hooks.json
new file mode 100644
index 000000000..e70d4122c
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/project_hooks.json
@@ -0,0 +1 @@
+[{"id":1,"url":"https://api.example.net/v1/webhooks/ci"}]
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/fixtures/project_issues.json b/lib/gitlab-cli/spec/fixtures/project_issues.json
new file mode 100644
index 000000000..87fb2fb18
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/project_issues.json
@@ -0,0 +1 @@
+[{"id":36,"project_id":3,"title":"Eos ut modi et laudantium quasi porro voluptas sed.","description":null,"labels":[],"milestone":null,"assignee":{"id":5,"email":"aliza_stark@schmeler.info","name":"Michale Von","blocked":false,"created_at":"2012-09-17T09:42:03Z"},"author":{"id":5,"email":"aliza_stark@schmeler.info","name":"Michale Von","blocked":false,"created_at":"2012-09-17T09:42:03Z"},"closed":false,"updated_at":"2012-09-17T09:42:20Z","created_at":"2012-09-17T09:42:20Z"},{"id":35,"project_id":3,"title":"Ducimus illo in iure voluptatem dolores labore.","description":null,"labels":[],"milestone":null,"assignee":{"id":4,"email":"nicole@mertz.com","name":"Felipe Davis","blocked":false,"created_at":"2012-09-17T09:42:03Z"},"author":{"id":4,"email":"nicole@mertz.com","name":"Felipe Davis","blocked":false,"created_at":"2012-09-17T09:42:03Z"},"closed":false,"updated_at":"2012-09-17T09:42:20Z","created_at":"2012-09-17T09:42:20Z"},{"id":34,"project_id":3,"title":"Rem tempora voluptatum atque eum sit nihil neque.","description":null,"labels":[],"milestone":null,"assignee":{"id":3,"email":"wilma@mayerblanda.ca","name":"Beatrice Jewess","blocked":false,"created_at":"2012-09-17T09:42:03Z"},"author":{"id":3,"email":"wilma@mayerblanda.ca","name":"Beatrice Jewess","blocked":false,"created_at":"2012-09-17T09:42:03Z"},"closed":false,"updated_at":"2012-09-17T09:42:20Z","created_at":"2012-09-17T09:42:20Z"},{"id":33,"project_id":3,"title":"Beatae possimus nostrum nihil reiciendis laboriosam nihil delectus alias accusantium dolor unde.","description":null,"labels":[],"milestone":null,"assignee":{"id":2,"email":"jack@example.com","name":"Jack Smith","blocked":false,"created_at":"2012-09-17T09:42:03Z"},"author":{"id":2,"email":"jack@example.com","name":"Jack Smith","blocked":false,"created_at":"2012-09-17T09:42:03Z"},"closed":false,"updated_at":"2012-09-17T09:42:20Z","created_at":"2012-09-17T09:42:20Z"},{"id":32,"project_id":3,"title":"Deserunt tenetur impedit est beatae voluptas voluptas quaerat quisquam.","description":null,"labels":[],"milestone":null,"assignee":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z"},"author":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z"},"closed":false,"updated_at":"2012-09-17T09:42:20Z","created_at":"2012-09-17T09:42:20Z"},{"id":16,"project_id":3,"title":"Numquam earum aut laudantium reprehenderit voluptatem aut.","description":null,"labels":[],"milestone":null,"assignee":{"id":5,"email":"aliza_stark@schmeler.info","name":"Michale Von","blocked":false,"created_at":"2012-09-17T09:42:03Z"},"author":{"id":5,"email":"aliza_stark@schmeler.info","name":"Michale Von","blocked":false,"created_at":"2012-09-17T09:42:03Z"},"closed":false,"updated_at":"2012-09-17T09:42:20Z","created_at":"2012-09-17T09:42:20Z"},{"id":15,"project_id":3,"title":"Qui veritatis voluptas fuga voluptate voluptas cupiditate.","description":null,"labels":[],"milestone":null,"assignee":{"id":4,"email":"nicole@mertz.com","name":"Felipe Davis","blocked":false,"created_at":"2012-09-17T09:42:03Z"},"author":{"id":4,"email":"nicole@mertz.com","name":"Felipe Davis","blocked":false,"created_at":"2012-09-17T09:42:03Z"},"closed":false,"updated_at":"2012-09-17T09:42:20Z","created_at":"2012-09-17T09:42:20Z"},{"id":14,"project_id":3,"title":"In assumenda et ipsa qui debitis voluptatem incidunt.","description":null,"labels":[],"milestone":null,"assignee":{"id":3,"email":"wilma@mayerblanda.ca","name":"Beatrice Jewess","blocked":false,"created_at":"2012-09-17T09:42:03Z"},"author":{"id":3,"email":"wilma@mayerblanda.ca","name":"Beatrice Jewess","blocked":false,"created_at":"2012-09-17T09:42:03Z"},"closed":false,"updated_at":"2012-09-17T09:42:20Z","created_at":"2012-09-17T09:42:20Z"},{"id":13,"project_id":3,"title":"Illo eveniet consequatur enim iste provident facilis rerum voluptatem et architecto aut.","description":null,"labels":[],"milestone":null,"assignee":{"id":2,"email":"jack@example.com","name":"Jack Smith","blocked":false,"created_at":"2012-09-17T09:42:03Z"},"author":{"id":2,"email":"jack@example.com","name":"Jack Smith","blocked":false,"created_at":"2012-09-17T09:42:03Z"},"closed":false,"updated_at":"2012-09-17T09:42:20Z","created_at":"2012-09-17T09:42:20Z"},{"id":12,"project_id":3,"title":"Veniam et tempore quidem eum reprehenderit cupiditate non aut velit eaque.","description":null,"labels":[],"milestone":null,"assignee":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z"},"author":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z"},"closed":false,"updated_at":"2012-09-17T09:42:20Z","created_at":"2012-09-17T09:42:20Z"}]
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/fixtures/project_key.json b/lib/gitlab-cli/spec/fixtures/project_key.json
new file mode 100644
index 000000000..d917f9466
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/project_key.json
@@ -0,0 +1,6 @@
+{
+  "id": 2,
+  "title": "Key Title",
+  "key": "ssh-rsa ...",
+  "created_at": "2013-09-22T18:34:32Z"
+}
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/fixtures/project_keys.json b/lib/gitlab-cli/spec/fixtures/project_keys.json
new file mode 100644
index 000000000..dd22f9668
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/project_keys.json
@@ -0,0 +1,6 @@
+[{
+  "id": 2,
+  "title": "Key Title",
+  "key": "ssh-rsa ...",
+  "created_at": "2013-09-22T18:34:32Z"
+}]
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/fixtures/project_tags.json b/lib/gitlab-cli/spec/fixtures/project_tags.json
new file mode 100644
index 000000000..1e2fb96cb
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/project_tags.json
@@ -0,0 +1 @@
+[{"name":"v2.8.2","commit":{"id":"a502f67c0b358cc6b391df0c5dca48375c21fcad","parents":[{"id":"4381084af341684240b1a671d368511afcf5774a"}],"tree":"1612068bdd20de5d14b3096cfa4c621e2051ed4c","message":"Up to 2.8.2","author":{"name":"randx","email":"dmitriy.zaporozhets@gmail.com"},"committer":{"name":"randx","email":"dmitriy.zaporozhets@gmail.com"},"authored_date":"2012-08-24T02:03:48-07:00","committed_date":"2012-08-24T02:03:48-07:00"}},{"name":"v2.8.1","commit":{"id":"ed2b53cd1c34c421b23208eeb502a141a6829f9d","parents":[{"id":"7ab587a47791e371f5c109c14097a5d1d7776ea5"}],"tree":"b7393b0b33b777583b285e85b423c4e5ab7f859f","message":"Up to 2.8.1","author":{"name":"Dmitriy Zaporozhets","email":"dmitriy.zaporozhets@gmail.com"},"committer":{"name":"Dmitriy Zaporozhets","email":"dmitriy.zaporozhets@gmail.com"},"authored_date":"2012-08-22T23:17:18-07:00","committed_date":"2012-08-22T23:17:18-07:00"}},{"name":"v2.8.0pre","commit":{"id":"b2c6ba97a25d299e83c51493d7bc770c13b8ed1a","parents":[{"id":"05da3801f53f06fdc529b4f3820af1380039f245"},{"id":"66399d558da45fb9cd3ea972a47a4f7bb12bfc8d"}],"tree":"36ad53f35bce1fe3f2a4a5f840e7b1bdbfed9c82","message":"Merge pull request #1230 from tsigo/hooray_apostrophes\n\nCorrect usage of \"Can't\"","author":{"name":"Dmitriy Zaporozhets","email":"dmitriy.zaporozhets@gmail.com"},"committer":{"name":"Dmitriy Zaporozhets","email":"dmitriy.zaporozhets@gmail.com"},"authored_date":"2012-08-16T14:11:08-07:00","committed_date":"2012-08-16T14:11:08-07:00"}},{"name":"v2.8.0","commit":{"id":"5c7ed6fa26b47ac71ff6ba04720d85df6d74b200","parents":[{"id":"d1daeba1736ba145fe525ce08a91f29495a3abf1"}],"tree":"4fc230ff2dbc0e75f27321eac2976aba5a6d323d","message":"Up to 2.8","author":{"name":"Dmitriy Zaporozhets","email":"dmitriy.zaporozhets@gmail.com"},"committer":{"name":"Dmitriy Zaporozhets","email":"dmitriy.zaporozhets@gmail.com"},"authored_date":"2012-08-21T15:15:26-07:00","committed_date":"2012-08-21T15:15:26-07:00"}},{"name":"v2.7.0pre","commit":{"id":"72a571724d84d112f98a5543c971e9b3b9da1383","parents":[{"id":"3ac840ff06e0ee5b349c52b5a8c02e803a17eec3"},{"id":"990b9217d9a55e26a53d4143d4a3c89123384327"}],"tree":"64b104df5d956e21e0749dc8e70849d1989de36f","message":"Merge pull request #1096 from moregeek/show-flash-note-when-destroying-a-project\n\nshow flash notice after deletion of a project","author":{"name":"Valeriy Sizov","email":"vsv2711@gmail.com"},"committer":{"name":"Valeriy Sizov","email":"vsv2711@gmail.com"},"authored_date":"2012-07-18T05:35:42-07:00","committed_date":"2012-07-18T05:35:42-07:00"}},{"name":"v2.7.0","commit":{"id":"8b7e404b5b6944e9c92cc270b2e5d0005781d49d","parents":[{"id":"11721b0dbe82c35789be3e4fa8e14663934b2ff5"}],"tree":"89fe8c5ff58daaedea07a910cffb14b04ebcc828","message":"Up to 2.7.0","author":{"name":"randx","email":"dmitriy.zaporozhets@gmail.com"},"committer":{"name":"randx","email":"dmitriy.zaporozhets@gmail.com"},"authored_date":"2012-07-21T00:53:55-07:00","committed_date":"2012-07-21T00:53:55-07:00"}},{"name":"v2.6.3","commit":{"id":"666cdb22792dd955a286b9993d6235b4cdd68b4b","parents":[{"id":"d92446df1fdba87101c92c90b1c34eb2f1eebef4"}],"tree":"888173aa4c12a4920d318c35b950095d3505673d","message":"up to 2.6.3","author":{"name":"randx","email":"dmitriy.zaporozhets@gmail.com"},"committer":{"name":"randx","email":"dmitriy.zaporozhets@gmail.com"},"authored_date":"2012-06-26T09:20:47-07:00","committed_date":"2012-06-26T09:21:28-07:00"}},{"name":"v2.6.2","commit":{"id":"39fecb554f172a0c8ea00316e612e1d37efc7200","parents":[{"id":"68389588d664100590b1a6ca7eedd50860b7e9bc"}],"tree":"53accb25e0b9d038d550cf387753bde15fe4ad19","message":"Up to 2.6.2","author":{"name":"randx","email":"dmitriy.zaporozhets@gmail.com"},"committer":{"name":"randx","email":"dmitriy.zaporozhets@gmail.com"},"authored_date":"2012-06-22T13:50:58-07:00","committed_date":"2012-06-22T13:50:58-07:00"}},{"name":"v2.6.1","commit":{"id":"d92a22c9e627268eca697bbd9b660d8c335df953","parents":[{"id":"193804516b8b0783c850981456e947f888ff51bb"}],"tree":"4ac1b5225f597ab55372cb5e950b121d6f55e386","message":"Up to 2.6.1","author":{"name":"randx","email":"dmitriy.zaporozhets@gmail.com"},"committer":{"name":"randx","email":"dmitriy.zaporozhets@gmail.com"},"authored_date":"2012-06-22T12:49:03-07:00","committed_date":"2012-06-22T12:49:03-07:00"}},{"name":"v2.6.0","commit":{"id":"b32465712becfbcf83d63b1e6eff7d1483fdabea","parents":[{"id":"1903f6ade027df0f10ef96b9439495eeda07482c"}],"tree":"ffbc05fd0f1771c1602c956df9556260048c7167","message":"Up to 2.6","author":{"name":"randx","email":"dmitriy.zaporozhets@gmail.com"},"committer":{"name":"randx","email":"dmitriy.zaporozhets@gmail.com"},"authored_date":"2012-06-21T10:25:23-07:00","committed_date":"2012-06-21T10:25:23-07:00"}},{"name":"v2.5.0","commit":{"id":"cc8369144db2147d2956e8dd7d314e9a7dfd4fbb","parents":[{"id":"1b2068eaa91e5002d01a220c65da21dad8ccb071"}],"tree":"666a442e00689911169e8cc336c5ce60d014854c","message":"Prevent app crash in case if encoding failed","author":{"name":"Dmitriy Zaporozhets","email":"dmitriy.zaporozhets@gmail.com"},"committer":{"name":"Dmitriy Zaporozhets","email":"dmitriy.zaporozhets@gmail.com"},"authored_date":"2012-05-22T04:57:04-07:00","committed_date":"2012-05-22T04:57:04-07:00"}},{"name":"v2.4.2","commit":{"id":"f18339c26d673c5f8b4c19776036fd42a0de30aa","parents":[{"id":"c937d06c3c98e9ffce8ec1132203eaff6bf7b231"},{"id":"35e602f19c83585d64aa2043ed26eeb8cd7b40e2"}],"tree":"5101f0cd8e395fee1996764298a202437757e85b","message":"Merge branch 'master' of github.com:gitlabhq/gitlabhq","author":{"name":"Zevs","email":"vsv2711@gmail.com"},"committer":{"name":"Zevs","email":"vsv2711@gmail.com"},"authored_date":"2012-04-29T14:24:59-07:00","committed_date":"2012-04-29T14:24:59-07:00"}},{"name":"v2.4.1","commit":{"id":"d97a9aa4a44ff9f452144fad348fd9d7e3b48260","parents":[{"id":"21f3da23589d50038728393f0badc6255b5762ca"}],"tree":"905c33874b064778199f806749d5688e33d64be3","message":"fixed email markdown","author":{"name":"gitlabhq","email":"m@gitlabhq.com"},"committer":{"name":"gitlabhq","email":"m@gitlabhq.com"},"authored_date":"2012-04-23T05:32:56-07:00","committed_date":"2012-04-23T05:32:56-07:00"}},{"name":"v2.4.0pre","commit":{"id":"1845429268364e75bffdeb1075de8f1606e157ec","parents":[{"id":"45b18365d5f409f196a02a4e6e2b77b8ebef909b"}],"tree":"423c70246fa7ffd8804b26628fea34bdb2b22846","message":"Use try for commit prev_commit_id detection","author":{"name":"Dmitriy Zaporozhets","email":"dmitriy.zaporozhets@gmail.com"},"committer":{"name":"Dmitriy Zaporozhets","email":"dmitriy.zaporozhets@gmail.com"},"authored_date":"2012-04-19T13:35:35-07:00","committed_date":"2012-04-19T13:35:35-07:00"}},{"name":"v2.4.0","commit":{"id":"204c66461ed519eb0078be7e8ac8a6cb56834753","parents":[{"id":"511d07c47c9bf3a18bfa276d452c899369432a22"}],"tree":"9416c777cccf87d348f5705078e82f3f97485e19","message":"corrected exception for automerge","author":{"name":"Dmitriy Zaporozhets","email":"dmitriy.zaporozhets@gmail.com"},"committer":{"name":"Dmitriy Zaporozhets","email":"dmitriy.zaporozhets@gmail.com"},"authored_date":"2012-04-22T06:49:45-07:00","committed_date":"2012-04-22T06:49:45-07:00"}},{"name":"v2.3.1","commit":{"id":"fa8219e0a753e642a6f1dbdfc010d01ae8a949ee","parents":[{"id":"81da8e46f24913ccf42d3e2644962cbcbc0f9c2e"}],"tree":"5debfcd6d17f9d582aace6ac9b80db27d5c1fe36","message":"better MR list, dashboard  pollished","author":{"name":"Dmitriy Zaporozhets","email":"dmitriy.zaporozhets@gmail.com"},"committer":{"name":"Dmitriy Zaporozhets","email":"dmitriy.zaporozhets@gmail.com"},"authored_date":"2012-03-22T13:57:04-07:00","committed_date":"2012-03-22T13:57:04-07:00"}},{"name":"v2.3.0pre","commit":{"id":"cadf12c60cc27c5b0b8273c1de4b190a0e88bd7d","parents":[{"id":"724ea16c348bc61cf7cb3dbe362c6f30cff1b2c7"}],"tree":"6f4c22761fd2dee405d3fbf38f9dd835bb3c8694","message":"Merged activities & projects pages","author":{"name":"Dmitriy Zaporozhets","email":"dmitriy.zaporozhets@gmail.com"},"committer":{"name":"Dmitriy Zaporozhets","email":"dmitriy.zaporozhets@gmail.com"},"authored_date":"2012-03-19T15:05:35-07:00","committed_date":"2012-03-19T15:05:35-07:00"}},{"name":"v2.3.0","commit":{"id":"b57faf9282d7df6cdd62953d474652a0ae2e6896","parents":[{"id":"cadf12c60cc27c5b0b8273c1de4b190a0e88bd7d"}],"tree":"f0d5b826df373191b4681452fc2ae4c5970cef4a","message":"Push events polished","author":{"name":"Dmitriy Zaporozhets","email":"dmitriy.zaporozhets@gmail.com"},"committer":{"name":"Dmitriy Zaporozhets","email":"dmitriy.zaporozhets@gmail.com"},"authored_date":"2012-03-20T14:59:35-07:00","committed_date":"2012-03-20T14:59:35-07:00"}},{"name":"v2.2.0pre","commit":{"id":"6a445b42003007cbb6c06f477c4d7a0b175688c1","parents":[{"id":"22f4c1908d0fc2dbce02e74ed03bf65f028d78d6"}],"tree":"9c60577833f6ca717acdebfa66140124c88e8471","message":"fixed forgot password form","author":{"name":"Dmitriy Zaporozhets","email":"dmitriy.zaporozhets@gmail.com"},"committer":{"name":"Dmitriy Zaporozhets","email":"dmitriy.zaporozhets@gmail.com"},"authored_date":"2012-02-20T10:37:37-08:00","committed_date":"2012-02-20T10:37:37-08:00"}},{"name":"v2.2.0","commit":{"id":"9e6d0710e927aa8ea834b8a9ae9f277be617ac7d","parents":[{"id":"8c40aab120dbc5507ab9cc8d7ad8e2519d6e9f25"},{"id":"6ea87c47f0f8a24ae031c3fff17bc913889ecd00"}],"tree":"86c831ab21236f21ffa5b97c752369612ce41b39","message":"Merge pull request #443 from CedricGatay/fix/incorrectLineNumberingInDiff\n\nIncorrect line numbering in diff","author":{"name":"Dmitriy Zaporozhets","email":"dmitriy.zaporozhets@gmail.com"},"committer":{"name":"Dmitriy Zaporozhets","email":"dmitriy.zaporozhets@gmail.com"},"authored_date":"2012-02-22T07:14:54-08:00","committed_date":"2012-02-22T07:14:54-08:00"}},{"name":"v2.1.0","commit":{"id":"98d6492582d232ed86525aa31ccbf280f4cbdaef","parents":[{"id":"611c5a87ab0c083a43785323b09cc47f554c3ba4"}],"tree":"1689b3cad580a18fd9b429ee0b33dac21c9f5a48","message":"removed broken migration","author":{"name":"Dmitriy Zaporozhets","email":"dmitriy.zaporozhets@gmail.com"},"committer":{"name":"Dmitriy Zaporozhets","email":"dmitriy.zaporozhets@gmail.com"},"authored_date":"2012-01-22T10:52:06-08:00","committed_date":"2012-01-22T10:52:06-08:00"}},{"name":"v2.0.0","commit":{"id":"9a2a8612769d472503b367fa35e99f6fb2876704","parents":[{"id":"2f7b67161952fc9ab322eba6878511b5f2dd5cf1"}],"tree":"26cdb4e66b5e664fe4bcd57d011c54c9c9c26ded","message":"Design tab for profile. Colorscheme as db value","author":{"name":"Dmitriy Zaporozhets","email":"dmitriy.zaporozhets@gmail.com"},"committer":{"name":"Dmitriy Zaporozhets","email":"dmitriy.zaporozhets@gmail.com"},"authored_date":"2011-12-20T12:47:09-08:00","committed_date":"2011-12-20T12:47:09-08:00"}},{"name":"v1.2.2","commit":{"id":"139a332293b9d8c4e5436619036e093483d8347f","parents":[{"id":"ade12da9488bea19d12505c371ead35686a1436e"}],"tree":"365d57f4df5c5dcac69b666cf6d2bfd8ef058008","message":"updated readme","author":{"name":"Dmitriy Zaporozhets","email":"dzaporozhets@sphereconsultinginc.com"},"committer":{"name":"Dmitriy Zaporozhets","email":"dzaporozhets@sphereconsultinginc.com"},"authored_date":"2011-11-25T14:30:51-08:00","committed_date":"2011-11-25T14:30:51-08:00"}},{"name":"v1.2.1","commit":{"id":"7ebba27db21719c0035bab65fea92a4780051c73","parents":[{"id":"b56024100d40457a998f83adae3cdc830c997cda"},{"id":"a4fbe13fce87cb6ff2a27a2574ae25bf1dad145c"}],"tree":"b121a7576af1503a96954ce9a94598a68579e053","message":"Merge branch 'master' of dev.gitlabhq.com:gitlabhq","author":{"name":"Dmitriy Zaporozhets","email":"dzaporozhets@sphereconsultinginc.com"},"committer":{"name":"Dmitriy Zaporozhets","email":"dzaporozhets@sphereconsultinginc.com"},"authored_date":"2011-11-22T13:15:09-08:00","committed_date":"2011-11-22T13:15:09-08:00"}},{"name":"v1.2.0pre","commit":{"id":"86829cae50857b5edf74b935380c6f68a19c2282","parents":[{"id":"a6b99319381c2d62ec4b92d64805e8de8965859e"}],"tree":"6aab9d13000584fa96fb3cb34d94f3b122bd1143","message":"fixed min height for menu","author":{"name":"gitlabhq","email":"m@gitlabhq.com"},"committer":{"name":"gitlabhq","email":"m@gitlabhq.com"},"authored_date":"2011-11-22T06:03:27-08:00","committed_date":"2011-11-22T06:03:27-08:00"}},{"name":"v1.2.0","commit":{"id":"b56024100d40457a998f83adae3cdc830c997cda","parents":[{"id":"4451b8df8ad6d4b6d79fbce77687c6c2fd37d0a9"}],"tree":"f402cbb6d54526a32b30968c98410bae97b27c8d","message":"lil style fixes","author":{"name":"Dmitriy Zaporozhets","email":"dzaporozhets@sphereconsultinginc.com"},"committer":{"name":"Dmitriy Zaporozhets","email":"dzaporozhets@sphereconsultinginc.com"},"authored_date":"2011-11-22T09:57:25-08:00","committed_date":"2011-11-22T09:57:25-08:00"}},{"name":"v1.1.0pre","commit":{"id":"6b030fd41d697e327d2935b406cba70b6a460504","parents":[{"id":"3a2b273316fb29d63b489906f85d9b5329377258"}],"tree":"63b1fdb2a0f135f7074f6a94da14543b8450dd71","message":"1.1pre1","author":{"name":"Dmitriy Zaporozhets","email":"dzaporozhets@sphereconsultinginc.com"},"committer":{"name":"Dmitriy Zaporozhets","email":"dzaporozhets@sphereconsultinginc.com"},"authored_date":"2011-10-21T10:04:41-07:00","committed_date":"2011-10-21T10:04:41-07:00"}},{"name":"v1.1.0","commit":{"id":"ba8048d71019b5aaa1f92ee5c3415bfddaa9babb","parents":[{"id":"6b030fd41d697e327d2935b406cba70b6a460504"}],"tree":"4db2b5f4f9b374dd1be3579459bc5947c225c9ba","message":"v1.1.0","author":{"name":"Dmitriy Zaporozhets","email":"dzaporozhets@sphereconsultinginc.com"},"committer":{"name":"Dmitriy Zaporozhets","email":"dzaporozhets@sphereconsultinginc.com"},"authored_date":"2011-10-22T06:07:26-07:00","committed_date":"2011-10-22T06:07:26-07:00"}},{"name":"v1.0.2","commit":{"id":"3a2b273316fb29d63b489906f85d9b5329377258","parents":[{"id":"757ea634665e475bf69c1ec962040a0511ee8aeb"},{"id":"c374eb80ff9fb71d37faffc15714bf98b632d3e5"}],"tree":"e0d8170e61a9468a7bb5d4e63305171ec1efa6bf","message":"Merge pull request #40 from vslinko/patch-1\n\nIncrease max key length. Some keys has comment after key string.","author":{"name":"Dmitriy Zaporozhets","email":"dmitriy.zaporozhets@gmail.com"},"committer":{"name":"Dmitriy Zaporozhets","email":"dmitriy.zaporozhets@gmail.com"},"authored_date":"2011-10-18T23:30:06-07:00","committed_date":"2011-10-18T23:30:06-07:00"}},{"name":"v1.0.1","commit":{"id":"7b5799a97998b68416f1b6233ce427135c99165a","parents":[{"id":"0541b3f3c5dcd291d144c83d9731c75ee811b4e0"},{"id":"7b67480c76db8b9a9ccdc80015cc500dc6d26892"}],"tree":"e052185e9dd72a1b1a04d59a5f9efbf3c0369601","message":"Merge branch '1x' of github.com:gitlabhq/gitlabhq into 1x","author":{"name":"Dmitriy Zaporozhets","email":"dzaporozhets@sphereconsultinginc.com"},"committer":{"name":"Dmitriy Zaporozhets","email":"dzaporozhets@sphereconsultinginc.com"},"authored_date":"2011-10-14T15:16:44-07:00","committed_date":"2011-10-14T15:16:44-07:00"}}]
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/fixtures/projects.json b/lib/gitlab-cli/spec/fixtures/projects.json
new file mode 100644
index 000000000..deab4c5f3
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/projects.json
@@ -0,0 +1 @@
+[{"id":1,"code":"brute","name":"Brute","description":null,"path":"brute","default_branch":null,"owner":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z"},"private":true,"issues_enabled":true,"merge_requests_enabled":true,"wall_enabled":true,"wiki_enabled":true,"created_at":"2012-09-17T09:41:56Z"},{"id":2,"code":"mozart","name":"Mozart","description":null,"path":"mozart","default_branch":null,"owner":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z"},"private":true,"issues_enabled":true,"merge_requests_enabled":true,"wall_enabled":true,"wiki_enabled":true,"created_at":"2012-09-17T09:41:57Z"},{"id":3,"code":"gitlab","name":"Gitlab","description":null,"path":"gitlab","default_branch":null,"owner":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z"},"private":true,"issues_enabled":true,"merge_requests_enabled":true,"wall_enabled":true,"wiki_enabled":true,"created_at":"2012-09-17T09:41:58Z"}]
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/fixtures/protect_branch.json b/lib/gitlab-cli/spec/fixtures/protect_branch.json
new file mode 100644
index 000000000..752bc2389
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/protect_branch.json
@@ -0,0 +1 @@
+{"name":"api","commit":{"id":"f7dd067490fe57505f7226c3b54d3127d2f7fd46","parents":[{"id":"949b1df930bedace1dbd755aaa4a82e8c451a616"}],"tree":"f8c4b21c036339f92fcc5482aa28a41250553b27","message":"API: expose issues project id","author":{"name":"Nihad Abbasov","email":"narkoz.2008@gmail.com"},"committer":{"name":"Nihad Abbasov","email":"narkoz.2008@gmail.com"},"authored_date":"2012-07-25T04:22:21-07:00","committed_date":"2012-07-25T04:22:21-07:00"},"protected":true}
diff --git a/lib/gitlab-cli/spec/fixtures/session.json b/lib/gitlab-cli/spec/fixtures/session.json
new file mode 100644
index 000000000..e4f5ba35f
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/session.json
@@ -0,0 +1 @@
+{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z","private_token":"qEsq1pt6HJPaNciie3MG"}
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/fixtures/snippet.json b/lib/gitlab-cli/spec/fixtures/snippet.json
new file mode 100644
index 000000000..34e9d994d
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/snippet.json
@@ -0,0 +1 @@
+{"id":1,"title":"Rails Console ActionMailer","file_name":"mailer_test.rb","author":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z"},"expires_at":"2012-09-24T00:00:00Z","updated_at":"2012-09-17T09:51:42Z","created_at":"2012-09-17T09:51:42Z"}
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/fixtures/snippets.json b/lib/gitlab-cli/spec/fixtures/snippets.json
new file mode 100644
index 000000000..26457995c
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/snippets.json
@@ -0,0 +1 @@
+[{"id":1,"title":"Rails Console ActionMailer","file_name":"mailer_test.rb","author":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z"},"expires_at":"2012-09-24T00:00:00Z","updated_at":"2012-09-17T09:51:42Z","created_at":"2012-09-17T09:51:42Z"}]
diff --git a/lib/gitlab-cli/spec/fixtures/system_hook.json b/lib/gitlab-cli/spec/fixtures/system_hook.json
new file mode 100644
index 000000000..0028b7a52
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/system_hook.json
@@ -0,0 +1 @@
+{"id": 3, "url": "http://example.com/hook", "created_at": "2013-10-02T10:15:31Z"}
diff --git a/lib/gitlab-cli/spec/fixtures/system_hook_test.json b/lib/gitlab-cli/spec/fixtures/system_hook_test.json
new file mode 100644
index 000000000..cc79044ff
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/system_hook_test.json
@@ -0,0 +1 @@
+{ "event_name": "project_create", "name": "Ruby", "path": "ruby", "project_id": 1, "owner_name": "Someone", "owner_email": "example@gitlabhq.com" }
diff --git a/lib/gitlab-cli/spec/fixtures/system_hooks.json b/lib/gitlab-cli/spec/fixtures/system_hooks.json
new file mode 100644
index 000000000..2b58791c3
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/system_hooks.json
@@ -0,0 +1 @@
+[{"id": 3, "url": "http://example.com/hook", "created_at": "2013-10-02T10:15:31Z"}]
diff --git a/lib/gitlab-cli/spec/fixtures/tag.json b/lib/gitlab-cli/spec/fixtures/tag.json
new file mode 100644
index 000000000..a56a09262
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/tag.json
@@ -0,0 +1 @@
+{"name": "v1.0.0","commit": {"id": "2695effb5807a22ff3d138d593fd856244e155e7","parents": [],"message": "Initial commit","authored_date": "2012-05-28T04:42:42-07:00","author_name": "John Smith","author email": "john@example.com","committer_name": "Jack Smith","committed_date": "2012-05-28T04:42:42-07:00","committer_email": "jack@example.com"},"protected": false}
diff --git a/lib/gitlab-cli/spec/fixtures/team_member.json b/lib/gitlab-cli/spec/fixtures/team_member.json
new file mode 100644
index 000000000..fd3ac3852
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/team_member.json
@@ -0,0 +1 @@
+{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z","access_level":40}
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/fixtures/team_members.json b/lib/gitlab-cli/spec/fixtures/team_members.json
new file mode 100644
index 000000000..a2fe19e3b
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/team_members.json
@@ -0,0 +1 @@
+[{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z","access_level":40},{"id":2,"email":"jack@example.com","name":"Jack Smith","blocked":false,"created_at":"2012-09-17T09:42:03Z","access_level":20},{"id":3,"email":"wilma@mayerblanda.ca","name":"Beatrice Jewess","blocked":false,"created_at":"2012-09-17T09:42:03Z","access_level":40},{"id":5,"email":"aliza_stark@schmeler.info","name":"Michale Von","blocked":false,"created_at":"2012-09-17T09:42:03Z","access_level":40},{"id":6,"email":"faye.watsica@rohanwalter.com","name":"Ambrose Hansen","blocked":false,"created_at":"2012-09-17T09:42:03Z","access_level":40},{"id":7,"email":"maida@walshtorp.name","name":"Alana Hahn","blocked":false,"created_at":"2012-09-17T09:42:03Z","access_level":20}]
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/fixtures/unprotect_branch.json b/lib/gitlab-cli/spec/fixtures/unprotect_branch.json
new file mode 100644
index 000000000..854c8274a
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/unprotect_branch.json
@@ -0,0 +1 @@
+{"name":"api","commit":{"id":"f7dd067490fe57505f7226c3b54d3127d2f7fd46","parents":[{"id":"949b1df930bedace1dbd755aaa4a82e8c451a616"}],"tree":"f8c4b21c036339f92fcc5482aa28a41250553b27","message":"API: expose issues project id","author":{"name":"Nihad Abbasov","email":"narkoz.2008@gmail.com"},"committer":{"name":"Nihad Abbasov","email":"narkoz.2008@gmail.com"},"authored_date":"2012-07-25T04:22:21-07:00","committed_date":"2012-07-25T04:22:21-07:00"},"protected":false}
diff --git a/lib/gitlab-cli/spec/fixtures/update_merge_request.json b/lib/gitlab-cli/spec/fixtures/update_merge_request.json
new file mode 100644
index 000000000..735819ff3
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/update_merge_request.json
@@ -0,0 +1 @@
+{"id":1,"target_branch":"master","source_branch":"api","project_id":3,"title":"A different new feature","closed":false,"merged":false,"author":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-10-19T05:56:05Z"},"assignee":{"id":2,"email":"jack@example.com","name":"Jack Smith","blocked":false,"created_at":"2012-10-19T05:56:14Z"}}
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/fixtures/user.json b/lib/gitlab-cli/spec/fixtures/user.json
new file mode 100644
index 000000000..4e0daca50
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/user.json
@@ -0,0 +1 @@
+{"id":1,"email":"john@example.com","name":"John Smith","bio":null,"skype":"","linkedin":"","twitter":"john","dark_scheme":false,"theme_id":1,"blocked":false,"created_at":"2012-09-17T09:41:56Z"}
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/fixtures/users.json b/lib/gitlab-cli/spec/fixtures/users.json
new file mode 100644
index 000000000..14c6388bf
--- /dev/null
+++ b/lib/gitlab-cli/spec/fixtures/users.json
@@ -0,0 +1 @@
+[{"id":1,"email":"john@example.com","name":"John Smith","bio":null,"skype":"","linkedin":"","twitter":"john","dark_scheme":false,"theme_id":1,"blocked":false,"created_at":"2012-09-17T09:41:56Z"},{"id":2,"email":"jack@example.com","name":"Jack Smith","bio":null,"skype":"","linkedin":"","twitter":"","dark_scheme":false,"theme_id":1,"blocked":false,"created_at":"2012-09-17T09:42:03Z"},{"id":3,"email":"wilma@mayerblanda.ca","name":"Beatrice Jewess","bio":null,"skype":"","linkedin":"","twitter":"","dark_scheme":false,"theme_id":1,"blocked":false,"created_at":"2012-09-17T09:42:03Z"},{"id":4,"email":"nicole@mertz.com","name":"Felipe Davis","bio":null,"skype":"","linkedin":"","twitter":"","dark_scheme":false,"theme_id":1,"blocked":false,"created_at":"2012-09-17T09:42:03Z"},{"id":5,"email":"aliza_stark@schmeler.info","name":"Michale Von","bio":null,"skype":"","linkedin":"","twitter":"","dark_scheme":false,"theme_id":1,"blocked":false,"created_at":"2012-09-17T09:42:03Z"},{"id":6,"email":"faye.watsica@rohanwalter.com","name":"Ambrose Hansen","bio":null,"skype":"","linkedin":"","twitter":"","dark_scheme":false,"theme_id":1,"blocked":false,"created_at":"2012-09-17T09:42:03Z"},{"id":7,"email":"maida@walshtorp.name","name":"Alana Hahn","bio":null,"skype":"","linkedin":"","twitter":"","dark_scheme":false,"theme_id":1,"blocked":false,"created_at":"2012-09-17T09:42:03Z"}]
\ No newline at end of file
diff --git a/lib/gitlab-cli/spec/gitlab/cli_spec.rb b/lib/gitlab-cli/spec/gitlab/cli_spec.rb
new file mode 100644
index 000000000..8b002ec64
--- /dev/null
+++ b/lib/gitlab-cli/spec/gitlab/cli_spec.rb
@@ -0,0 +1,80 @@
+require 'spec_helper'
+
+describe Gitlab::CLI do
+  describe ".run" do
+    context "when command is version" do
+      it "should show gem version" do
+        output = capture_output { Gitlab::CLI.run('-v') }
+        expect(output).to eq("Gitlab Ruby Gem #{Gitlab::VERSION}\n")
+      end
+    end
+
+    context "when command is info" do
+      it "should show environment info" do
+        output = capture_output { Gitlab::CLI.run('info') }
+        expect(output).to include("Gitlab endpoint is")
+        expect(output).to include("Gitlab private token is")
+        expect(output).to include("Ruby Version is")
+        expect(output).to include("Gitlab Ruby Gem")
+      end
+    end
+
+    context "when command is help" do
+      it "should show available actions" do
+        output = capture_output { Gitlab::CLI.run('help') }
+        expect(output).to include('Available commands')
+        expect(output).to include('MergeRequests')
+        expect(output).to include('team_members')
+      end
+    end
+
+    context "when command is user" do
+      before do
+        stub_get("/user", "user")
+        @output = capture_output { Gitlab::CLI.run('user') }
+      end
+
+      it "should show executed command" do
+        expect(@output).to include('Gitlab.user')
+      end
+
+      it "should show user data" do
+        expect(@output).to include('name')
+        expect(@output).to include('John Smith')
+      end
+    end
+  end
+
+  describe ".start" do
+    context "when command with excluded fields" do
+      before do
+        stub_get("/user", "user")
+        args = ['user', '--except=id,email,name']
+        @output = capture_output { Gitlab::CLI.start(args) }
+      end
+
+      it "should show user data with excluded fields" do
+        expect(@output).to_not include('John Smith')
+        expect(@output).to include('bio')
+        expect(@output).to include('created_at')
+      end
+    end
+
+    context "when command with required fields" do
+      before do
+        stub_get("/user", "user")
+        args = ['user', '--only=id,email,name']
+        @output = capture_output { Gitlab::CLI.start(args) }
+      end
+
+      it "should show user data with required fields" do
+        expect(@output).to include('id')
+        expect(@output).to include('name')
+        expect(@output).to include('email')
+        expect(@output).to include('John Smith')
+        expect(@output).to_not include('bio')
+        expect(@output).to_not include('created_at')
+      end
+    end
+  end
+end
diff --git a/lib/gitlab-cli/spec/gitlab/client/branches_spec.rb b/lib/gitlab-cli/spec/gitlab/client/branches_spec.rb
new file mode 100644
index 000000000..80c18ccb5
--- /dev/null
+++ b/lib/gitlab-cli/spec/gitlab/client/branches_spec.rb
@@ -0,0 +1,103 @@
+require 'spec_helper'
+
+describe Gitlab::Client do
+  it { should respond_to :repo_branches }
+  it { should respond_to :repo_branch }
+  it { should respond_to :repo_protect_branch }
+  it { should respond_to :repo_unprotect_branch }
+
+  describe ".branches" do
+    before do
+      stub_get("/projects/3/repository/branches", "branches")
+      @branches = Gitlab.branches(3)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/repository/branches")).to have_been_made
+    end
+
+    it "should return an array of repository branches" do
+      expect(@branches).to be_an Array
+      expect(@branches.first.name).to eq("api")
+    end
+  end
+
+  describe ".branch" do
+    before do
+      stub_get("/projects/3/repository/branches/api", "branch")
+      @branch = Gitlab.branch(3, "api")
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/repository/branches/api")).to have_been_made
+    end
+
+    it "should return information about a repository branch" do
+      expect(@branch.name).to eq("api")
+    end
+  end
+
+  describe ".protect_branch" do
+    before do
+      stub_put("/projects/3/repository/branches/api/protect", "protect_branch")
+      @branch = Gitlab.protect_branch(3, "api")
+    end
+
+    it "should get the correct resource" do
+      expect(a_put("/projects/3/repository/branches/api/protect")).to have_been_made
+    end
+
+    it "should return information about a protected repository branch" do
+      expect(@branch.name).to eq("api")
+      expect(@branch.protected).to eq(true)
+    end
+  end
+
+  describe ".unprotect_branch" do
+    before do
+      stub_put("/projects/3/repository/branches/api/unprotect", "unprotect_branch")
+      @branch = Gitlab.unprotect_branch(3, "api")
+    end
+
+    it "should get the correct resource" do
+      expect(a_put("/projects/3/repository/branches/api/unprotect")).to have_been_made
+    end
+
+    it "should return information about an unprotected repository branch" do
+      expect(@branch.name).to eq("api")
+      expect(@branch.protected).to eq(false)
+    end
+  end
+
+  describe ".create_branch" do
+    context "with branch name" do
+      before do
+        stub_post("/projects/3/repository/branches", "create_branch")
+        @branch = Gitlab.create_branch(3, "api","master")
+      end
+
+      it "should get the correct resource" do
+        expect(a_post("/projects/3/repository/branches")).to have_been_made
+      end
+
+      it "should return information about a new repository branch" do
+        expect(@branch.name).to eq("api")
+      end
+    end
+    context "with commit hash" do
+      before do
+        stub_post("/projects/3/repository/branches", "create_branch")
+        @branch = Gitlab.create_branch(3, "api","949b1df930bedace1dbd755aaa4a82e8c451a616")
+      end
+
+      it "should get the correct resource" do
+        expect(a_post("/projects/3/repository/branches")).to have_been_made
+      end
+
+      it "should return information about a new repository branch" do
+        expect(@branch.name).to eq("api")
+      end
+    end
+  end
+
+end
diff --git a/lib/gitlab-cli/spec/gitlab/client/groups_spec.rb b/lib/gitlab-cli/spec/gitlab/client/groups_spec.rb
new file mode 100644
index 000000000..ad17aedaa
--- /dev/null
+++ b/lib/gitlab-cli/spec/gitlab/client/groups_spec.rb
@@ -0,0 +1,111 @@
+require 'spec_helper'
+
+describe Gitlab::Client do
+  describe ".groups" do
+    before do
+      stub_get("/groups", "groups")
+      stub_get("/groups/3", "group")
+      @group = Gitlab.group(3)
+      @groups = Gitlab.groups
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/groups")).to have_been_made
+      expect(a_get("/groups/3")).to have_been_made
+    end
+
+    it "should return an array of Groups" do
+      expect(@groups).to be_an Array
+      expect(@groups.first.path).to eq("threegroup")
+    end
+  end
+
+  describe ".create_group" do
+    before do
+      stub_post("/groups", "group_create")
+      @group = Gitlab.create_group('GitLab-Group', 'gitlab-path')
+    end
+
+    it "should get the correct resource" do
+      expect(a_post("/groups").
+          with(:body => {:path => 'gitlab-path', :name => 'GitLab-Group'})).to have_been_made
+    end
+
+    it "should return information about a created group" do
+      expect(@group.name).to eq("Gitlab-Group")
+      expect(@group.path).to eq("gitlab-group")
+    end
+  end
+
+  describe ".transfer_project_to_group" do
+    before do
+      stub_post("/projects", "project")
+      @project = Gitlab.create_project('Gitlab')
+      stub_post("/groups", "group_create")
+      @group = Gitlab.create_group('GitLab-Group', 'gitlab-path')
+
+      stub_post("/groups/#{@group.id}/projects/#{@project.id}", "group_create")
+      @group_transfer = Gitlab.transfer_project_to_group(@group.id,@project.id)
+    end
+
+    it "should post to the correct resource" do
+      expect(a_post("/groups/#{@group.id}/projects/#{@project.id}").with(:body => {:id => @group.id.to_s, :project_id => @project.id.to_s})).to have_been_made
+    end
+
+    it "should return information about the group" do
+      expect(@group_transfer.name).to eq(@group.name)
+      expect(@group_transfer.path).to eq(@group.path)
+      expect(@group_transfer.id).to eq(@group.id)
+    end
+  end
+
+  describe ".group_members" do
+    before do
+      stub_get("/groups/3/members", "group_members")
+      @members = Gitlab.group_members(3)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/groups/3/members")).to have_been_made
+    end
+
+    it "should return information about a group members" do
+      expect(@members).to be_an Array
+      expect(@members.size).to eq(2)
+      expect(@members[1].name).to eq("John Smith")
+    end
+  end
+
+  describe ".add_group_member" do
+    before do
+      stub_post("/groups/3/members", "group_member")
+      @member = Gitlab.add_group_member(3, 1, 40)
+    end
+
+    it "should get the correct resource" do
+      expect(a_post("/groups/3/members").
+        with(:body => {:user_id => '1', :access_level => '40'})).to have_been_made
+    end
+
+    it "should return information about an added member" do
+      expect(@member.name).to eq("John Smith")
+    end
+  end
+
+  describe ".remove_group_member" do
+    before do
+      stub_delete("/groups/3/members/1", "group_member_delete")
+      @group = Gitlab.remove_group_member(3, 1)
+    end
+
+    it "should get the correct resource" do
+      expect(a_delete("/groups/3/members/1")).to have_been_made
+    end
+
+    it "should return information about the group the member was removed from" do
+      expect(@group.group_id).to eq(3)
+    end
+  end
+
+
+end
diff --git a/lib/gitlab-cli/spec/gitlab/client/issues_spec.rb b/lib/gitlab-cli/spec/gitlab/client/issues_spec.rb
new file mode 100644
index 000000000..e5a506b94
--- /dev/null
+++ b/lib/gitlab-cli/spec/gitlab/client/issues_spec.rb
@@ -0,0 +1,122 @@
+require 'spec_helper'
+
+describe Gitlab::Client do
+  describe ".issues" do
+    context "with project ID passed" do
+      before do
+        stub_get("/projects/3/issues", "project_issues")
+        @issues = Gitlab.issues(3)
+      end
+
+      it "should get the correct resource" do
+        expect(a_get("/projects/3/issues")).to have_been_made
+      end
+
+      it "should return an array of project's issues" do
+        expect(@issues).to be_an Array
+        expect(@issues.first.project_id).to eq(3)
+      end
+    end
+
+    context "without project ID passed" do
+      before do
+        stub_get("/issues", "issues")
+        @issues = Gitlab.issues
+      end
+
+      it "should get the correct resource" do
+        expect(a_get("/issues")).to have_been_made
+      end
+
+      it "should return an array of user's issues" do
+        expect(@issues).to be_an Array
+        expect(@issues.first.closed).to be_falsey
+        expect(@issues.first.author.name).to eq("John Smith")
+      end
+    end
+  end
+
+  describe ".issue" do
+    before do
+      stub_get("/projects/3/issues/33", "issue")
+      @issue = Gitlab.issue(3, 33)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/issues/33")).to have_been_made
+    end
+
+    it "should return information about an issue" do
+      expect(@issue.project_id).to eq(3)
+      expect(@issue.assignee.name).to eq("Jack Smith")
+    end
+  end
+
+  describe ".create_issue" do
+    before do
+      stub_post("/projects/3/issues", "issue")
+      @issue = Gitlab.create_issue(3, 'title')
+    end
+
+    it "should get the correct resource" do
+      expect(a_post("/projects/3/issues").
+        with(:body => {:title => 'title'})).to have_been_made
+    end
+
+    it "should return information about a created issue" do
+      expect(@issue.project_id).to eq(3)
+      expect(@issue.assignee.name).to eq("Jack Smith")
+    end
+  end
+
+  describe ".edit_issue" do
+    before do
+      stub_put("/projects/3/issues/33", "issue")
+      @issue = Gitlab.edit_issue(3, 33, :title => 'title')
+    end
+
+    it "should get the correct resource" do
+      expect(a_put("/projects/3/issues/33").
+        with(:body => {:title => 'title'})).to have_been_made
+    end
+
+    it "should return information about an edited issue" do
+      expect(@issue.project_id).to eq(3)
+      expect(@issue.assignee.name).to eq("Jack Smith")
+    end
+  end
+
+  describe ".close_issue" do
+    before do
+      stub_put("/projects/3/issues/33", "issue")
+      @issue = Gitlab.close_issue(3, 33)
+    end
+
+    it "should get the correct resource" do
+      expect(a_put("/projects/3/issues/33").
+        with(:body => {:state_event => 'close'})).to have_been_made
+    end
+
+    it "should return information about an closed issue" do
+      expect(@issue.project_id).to eq(3)
+      expect(@issue.assignee.name).to eq("Jack Smith")
+    end
+  end
+
+  describe ".reopen_issue" do
+    before do
+      stub_put("/projects/3/issues/33", "issue")
+      @issue = Gitlab.reopen_issue(3, 33)
+    end
+
+    it "should get the correct resource" do
+      expect(a_put("/projects/3/issues/33").
+        with(:body => {:state_event => 'reopen'})).to have_been_made
+    end
+
+    it "should return information about an reopened issue" do
+      expect(@issue.project_id).to eq(3)
+      expect(@issue.assignee.name).to eq("Jack Smith")
+    end
+  end
+end
diff --git a/lib/gitlab-cli/spec/gitlab/client/merge_requests_spec.rb b/lib/gitlab-cli/spec/gitlab/client/merge_requests_spec.rb
new file mode 100644
index 000000000..a336da9f5
--- /dev/null
+++ b/lib/gitlab-cli/spec/gitlab/client/merge_requests_spec.rb
@@ -0,0 +1,124 @@
+require 'spec_helper'
+
+describe Gitlab::Client do
+  describe ".merge_requests" do
+    before do
+      stub_get("/projects/3/merge_requests", "merge_requests")
+      @merge_requests = Gitlab.merge_requests(3)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/merge_requests")).to have_been_made
+    end
+
+    it "should return an array of project's merge requests" do
+      expect(@merge_requests).to be_an Array
+      expect(@merge_requests.first.project_id).to eq(3)
+    end
+  end
+
+  describe ".merge_request" do
+    before do
+      stub_get("/projects/3/merge_request/1", "merge_request")
+      @merge_request = Gitlab.merge_request(3, 1)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/merge_request/1")).to have_been_made
+    end
+
+    it "should return information about a merge request" do
+      expect(@merge_request.project_id).to eq(3)
+      expect(@merge_request.assignee.name).to eq("Jack Smith")
+    end
+  end
+
+  describe ".create_merge_request" do
+    before do
+      stub_post("/projects/3/merge_requests", "create_merge_request")
+    end
+
+    it "should fail if it doesn't have a source_branch" do
+      expect {
+        Gitlab.create_merge_request(3, 'New merge request', :target_branch => 'master')
+      }.to raise_error Gitlab::Error::MissingAttributes
+    end
+
+    it "should fail if it doesn't have a target_branch" do
+      expect {
+        Gitlab.create_merge_request(3, 'New merge request', :source_branch => 'dev')
+      }.to raise_error Gitlab::Error::MissingAttributes
+    end
+
+    it "should return information about a merge request" do
+      @merge_request = Gitlab.create_merge_request(3, 'New feature',
+        :source_branch => 'api',
+        :target_branch => 'master'
+      )
+      expect(@merge_request.project_id).to eq(3)
+      expect(@merge_request.assignee.name).to eq("Jack Smith")
+      expect(@merge_request.title).to eq('New feature')
+    end
+  end
+
+  describe ".update_merge_request" do
+    before do
+      stub_put("/projects/3/merge_request/2", "update_merge_request")
+      @merge_request = Gitlab.update_merge_request(3, 2,
+        :assignee_id   => '1',
+        :target_branch => 'master',
+        :title         => 'A different new feature'
+      )
+    end
+
+    it "should return information about a merge request" do
+      expect(@merge_request.project_id).to eq(3)
+      expect(@merge_request.assignee.name).to eq("Jack Smith")
+      expect(@merge_request.title).to eq('A different new feature')
+    end
+  end
+
+  describe ".merge_request_comments" do
+    before do
+      stub_get("/projects/3/merge_request/2/comments", "merge_request_comments")
+      @merge_request = Gitlab.merge_request_comments(3, 2)
+    end
+
+    it "should return merge request's comments" do
+      expect(@merge_request).to be_an Array
+      expect(@merge_request.length).to eq(2)
+      expect(@merge_request[0].note).to eq("this is the 1st comment on the 2merge merge request")
+      expect(@merge_request[0].author.id).to eq(11)
+      expect(@merge_request[1].note).to eq("another discussion point on the 2merge request")
+      expect(@merge_request[1].author.id).to eq(12)
+    end
+  end
+
+  describe ".merge_request_comments" do
+    before do
+      stub_get("/projects/3/merge_request/2/comments", "merge_request_comments")
+      @merge_request = Gitlab.merge_request_comments(3, 2)
+    end
+
+    it "should return merge request's comments" do
+      expect(@merge_request).to be_an Array
+      expect(@merge_request.length).to eq(2)
+      expect(@merge_request[0].note).to eq("this is the 1st comment on the 2merge merge request")
+      expect(@merge_request[0].author.id).to eq(11)
+      expect(@merge_request[1].note).to eq("another discussion point on the 2merge request")
+      expect(@merge_request[1].author.id).to eq(12)
+    end
+  end
+
+  describe ".create_merge_request_comment" do
+    before do
+      stub_post("/projects/3/merge_request/2/comments", "comment_merge_request")
+    end
+
+    it "should return information about a merge request" do
+      @merge_request = Gitlab.create_merge_request_comment(3, 2, 'Cool Merge Request!')
+      expect(@merge_request.note).to eq('Cool Merge Request!')
+      @merge_request.author.id == 1
+    end
+  end
+end
diff --git a/lib/gitlab-cli/spec/gitlab/client/milestones_spec.rb b/lib/gitlab-cli/spec/gitlab/client/milestones_spec.rb
new file mode 100644
index 000000000..aa1e66b14
--- /dev/null
+++ b/lib/gitlab-cli/spec/gitlab/client/milestones_spec.rb
@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+describe Gitlab::Client do
+  describe ".milestones" do
+    before do
+      stub_get("/projects/3/milestones", "milestones")
+      @milestones = Gitlab.milestones(3)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/milestones")).to have_been_made
+    end
+
+    it "should return an array of project's milestones" do
+      expect(@milestones).to be_an Array
+      expect(@milestones.first.project_id).to eq(3)
+    end
+  end
+
+  describe ".milestone" do
+    before do
+      stub_get("/projects/3/milestones/1", "milestone")
+      @milestone = Gitlab.milestone(3, 1)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/milestones/1")).to have_been_made
+    end
+
+    it "should return information about a milestone" do
+      expect(@milestone.project_id).to eq(3)
+    end
+  end
+
+  describe ".create_milestone" do
+    before do
+      stub_post("/projects/3/milestones", "milestone")
+      @milestone = Gitlab.create_milestone(3, 'title')
+    end
+
+    it "should get the correct resource" do
+      expect(a_post("/projects/3/milestones").
+        with(:body => {:title => 'title'})).to have_been_made
+    end
+
+    it "should return information about a created milestone" do
+      expect(@milestone.project_id).to eq(3)
+    end
+  end
+
+  describe ".edit_milestone" do
+    before do
+      stub_put("/projects/3/milestones/33", "milestone")
+      @milestone = Gitlab.edit_milestone(3, 33, :title => 'title')
+    end
+
+    it "should get the correct resource" do
+      expect(a_put("/projects/3/milestones/33").
+        with(:body => {:title => 'title'})).to have_been_made
+    end
+
+    it "should return information about an edited milestone" do
+      expect(@milestone.project_id).to eq(3)
+    end
+  end
+end
diff --git a/lib/gitlab-cli/spec/gitlab/client/notes_spec.rb b/lib/gitlab-cli/spec/gitlab/client/notes_spec.rb
new file mode 100644
index 000000000..d80cad476
--- /dev/null
+++ b/lib/gitlab-cli/spec/gitlab/client/notes_spec.rb
@@ -0,0 +1,156 @@
+require 'spec_helper'
+
+describe Gitlab::Client do
+  describe "notes" do
+    context "when wall notes" do
+      before do
+        stub_get("/projects/3/notes", "notes")
+        @notes = Gitlab.notes(3)
+      end
+
+      it "should get the correct resource" do
+        expect(a_get("/projects/3/notes")).to have_been_made
+      end
+
+      it "should return an array of notes" do
+        expect(@notes).to be_an Array
+        expect(@notes.first.author.name).to eq("John Smith")
+      end
+    end
+
+    context "when issue notes" do
+      before do
+        stub_get("/projects/3/issues/7/notes", "notes")
+        @notes = Gitlab.issue_notes(3, 7)
+      end
+
+      it "should get the correct resource" do
+        expect(a_get("/projects/3/issues/7/notes")).to have_been_made
+      end
+
+      it "should return an array of notes" do
+        expect(@notes).to be_an Array
+        expect(@notes.first.author.name).to eq("John Smith")
+      end
+    end
+
+    context "when snippet notes" do
+      before do
+        stub_get("/projects/3/snippets/7/notes", "notes")
+        @notes = Gitlab.snippet_notes(3, 7)
+      end
+
+      it "should get the correct resource" do
+        expect(a_get("/projects/3/snippets/7/notes")).to have_been_made
+      end
+
+      it "should return an array of notes" do
+        expect(@notes).to be_an Array
+        expect(@notes.first.author.name).to eq("John Smith")
+      end
+    end
+  end
+
+  describe "note" do
+    context "when wall note" do
+      before do
+        stub_get("/projects/3/notes/1201", "note")
+        @note = Gitlab.note(3, 1201)
+      end
+
+      it "should get the correct resource" do
+        expect(a_get("/projects/3/notes/1201")).to have_been_made
+      end
+
+      it "should return information about a note" do
+        expect(@note.body).to eq("The solution is rather tricky")
+        expect(@note.author.name).to eq("John Smith")
+      end
+    end
+
+    context "when issue note" do
+      before do
+        stub_get("/projects/3/issues/7/notes/1201", "note")
+        @note = Gitlab.issue_note(3, 7, 1201)
+      end
+
+      it "should get the correct resource" do
+        expect(a_get("/projects/3/issues/7/notes/1201")).to have_been_made
+      end
+
+      it "should return information about a note" do
+        expect(@note.body).to eq("The solution is rather tricky")
+        expect(@note.author.name).to eq("John Smith")
+      end
+    end
+
+    context "when snippet note" do
+      before do
+        stub_get("/projects/3/snippets/7/notes/1201", "note")
+        @note = Gitlab.snippet_note(3, 7, 1201)
+      end
+
+      it "should get the correct resource" do
+        expect(a_get("/projects/3/snippets/7/notes/1201")).to have_been_made
+      end
+
+      it "should return information about a note" do
+        expect(@note.body).to eq("The solution is rather tricky")
+        expect(@note.author.name).to eq("John Smith")
+      end
+    end
+  end
+
+  describe "create note" do
+    context "when wall note" do
+      before do
+        stub_post("/projects/3/notes", "note")
+        @note = Gitlab.create_note(3, "The solution is rather tricky")
+      end
+
+      it "should get the correct resource" do
+        expect(a_post("/projects/3/notes").
+          with(:body => {:body => 'The solution is rather tricky'})).to have_been_made
+      end
+
+      it "should return information about a created note" do
+        expect(@note.body).to eq("The solution is rather tricky")
+        expect(@note.author.name).to eq("John Smith")
+      end
+    end
+
+    context "when issue note" do
+      before do
+        stub_post("/projects/3/issues/7/notes", "note")
+        @note = Gitlab.create_issue_note(3, 7, "The solution is rather tricky")
+      end
+
+      it "should get the correct resource" do
+        expect(a_post("/projects/3/issues/7/notes").
+          with(:body => {:body => 'The solution is rather tricky'})).to have_been_made
+      end
+
+      it "should return information about a created note" do
+        expect(@note.body).to eq("The solution is rather tricky")
+        expect(@note.author.name).to eq("John Smith")
+      end
+    end
+
+    context "when snippet note" do
+      before do
+        stub_post("/projects/3/snippets/7/notes", "note")
+        @note = Gitlab.create_snippet_note(3, 7, "The solution is rather tricky")
+      end
+
+      it "should get the correct resource" do
+        expect(a_post("/projects/3/snippets/7/notes").
+          with(:body => {:body => 'The solution is rather tricky'})).to have_been_made
+      end
+
+      it "should return information about a created note" do
+        expect(@note.body).to eq("The solution is rather tricky")
+        expect(@note.author.name).to eq("John Smith")
+      end
+    end
+  end
+end
diff --git a/lib/gitlab-cli/spec/gitlab/client/projects_spec.rb b/lib/gitlab-cli/spec/gitlab/client/projects_spec.rb
new file mode 100644
index 000000000..5096f8f66
--- /dev/null
+++ b/lib/gitlab-cli/spec/gitlab/client/projects_spec.rb
@@ -0,0 +1,357 @@
+require 'spec_helper'
+
+describe Gitlab::Client do
+  describe ".projects" do
+    before do
+      stub_get("/projects", "projects")
+      @projects = Gitlab.projects
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects")).to have_been_made
+    end
+
+    it "should return an array of projects" do
+      expect(@projects).to be_an Array
+      expect(@projects.first.name).to eq("Brute")
+      expect(@projects.first.owner.name).to eq("John Smith")
+    end
+  end
+
+  describe ".project" do
+    before do
+      stub_get("/projects/3", "project")
+      @project = Gitlab.project(3)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3")).to have_been_made
+    end
+
+    it "should return information about a project" do
+      expect(@project.name).to eq("Gitlab")
+      expect(@project.owner.name).to eq("John Smith")
+    end
+  end
+
+  describe ".project_events" do
+    before do
+      stub_get("/projects/2/events", "project_events")
+      @events = Gitlab.project_events(2)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/2/events")).to have_been_made
+    end
+
+    it "should return an array of events" do
+      expect(@events).to be_an Array
+      expect(@events.size).to eq(2)
+    end
+
+    it "should return the action name of the event" do
+      expect(@events.first.action_name).to eq("opened")
+    end
+  end
+
+  describe ".create_project" do
+    before do
+      stub_post("/projects", "project")
+      @project = Gitlab.create_project('Gitlab')
+    end
+
+    it "should get the correct resource" do
+      expect(a_post("/projects")).to have_been_made
+    end
+
+    it "should return information about a created project" do
+      expect(@project.name).to eq("Gitlab")
+      expect(@project.owner.name).to eq("John Smith")
+    end
+  end
+
+  describe ".create_project for user" do
+    before do
+      stub_post("/users", "user")
+      @owner = Gitlab.create_user("john@example.com", "pass", {name: 'John Owner'})
+      stub_post("/projects/user/#{@owner.id}", "project_for_user")
+      @project = Gitlab.create_project('Brute', {:user_id => @owner.id})
+    end
+
+    it "should return information about a created project" do
+      expect(@project.name).to eq("Brute")
+      expect(@project.owner.name).to eq("John Owner")
+    end
+  end
+
+  describe ".delete_project" do
+    before do
+      stub_delete("/projects/Gitlab", "project")
+      @project = Gitlab.delete_project('Gitlab')
+    end
+
+    it "should get the correct resource" do
+      expect(a_delete("/projects/Gitlab")).to have_been_made
+    end
+
+    it "should return information about a deleted project" do
+      expect(@project.name).to eq("Gitlab")
+      expect(@project.owner.name).to eq("John Smith")
+    end
+  end
+
+  describe ".team_members" do
+    before do
+      stub_get("/projects/3/members", "team_members")
+      @team_members = Gitlab.team_members(3)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/members")).to have_been_made
+    end
+
+    it "should return an array of team members" do
+      expect(@team_members).to be_an Array
+      expect(@team_members.first.name).to eq("John Smith")
+    end
+  end
+
+  describe ".team_member" do
+    before do
+      stub_get("/projects/3/members/1", "team_member")
+      @team_member = Gitlab.team_member(3, 1)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/members/1")).to have_been_made
+    end
+
+    it "should return information about a team member" do
+      expect(@team_member.name).to eq("John Smith")
+    end
+  end
+
+  describe ".add_team_member" do
+    before do
+      stub_post("/projects/3/members", "team_member")
+      @team_member = Gitlab.add_team_member(3, 1, 40)
+    end
+
+    it "should get the correct resource" do
+      expect(a_post("/projects/3/members").
+          with(:body => {:user_id => '1', :access_level => '40'})).to have_been_made
+    end
+
+    it "should return information about an added team member" do
+      expect(@team_member.name).to eq("John Smith")
+    end
+  end
+
+  describe ".edit_team_member" do
+    before do
+      stub_put("/projects/3/members/1", "team_member")
+      @team_member = Gitlab.edit_team_member(3, 1, 40)
+    end
+
+    it "should get the correct resource" do
+      expect(a_put("/projects/3/members/1").
+          with(:body => {:access_level => '40'})).to have_been_made
+    end
+
+    it "should return information about an edited team member" do
+      expect(@team_member.name).to eq("John Smith")
+    end
+  end
+
+  describe ".remove_team_member" do
+    before do
+      stub_delete("/projects/3/members/1", "team_member")
+      @team_member = Gitlab.remove_team_member(3, 1)
+    end
+
+    it "should get the correct resource" do
+      expect(a_delete("/projects/3/members/1")).to have_been_made
+    end
+
+    it "should return information about a removed team member" do
+      expect(@team_member.name).to eq("John Smith")
+    end
+  end
+
+  describe ".project_hooks" do
+    before do
+      stub_get("/projects/1/hooks", "project_hooks")
+      @hooks = Gitlab.project_hooks(1)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/1/hooks")).to have_been_made
+    end
+
+    it "should return an array of hooks" do
+      expect(@hooks).to be_an Array
+      expect(@hooks.first.url).to eq("https://api.example.net/v1/webhooks/ci")
+    end
+  end
+
+  describe ".project_hook" do
+    before do
+      stub_get("/projects/1/hooks/1", "project_hook")
+      @hook = Gitlab.project_hook(1, 1)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/1/hooks/1")).to have_been_made
+    end
+
+    it "should return information about a hook" do
+      expect(@hook.url).to eq("https://api.example.net/v1/webhooks/ci")
+    end
+  end
+
+  describe ".add_project_hook" do
+    context "without specified events" do
+      before do
+        stub_post("/projects/1/hooks", "project_hook")
+        @hook = Gitlab.add_project_hook(1, "https://api.example.net/v1/webhooks/ci")
+      end
+
+      it "should get the correct resource" do
+        body = {:url => "https://api.example.net/v1/webhooks/ci"}
+        expect(a_post("/projects/1/hooks").with(:body => body)).to have_been_made
+      end
+
+      it "should return information about an added hook" do
+        expect(@hook.url).to eq("https://api.example.net/v1/webhooks/ci")
+      end
+    end
+
+    context "with specified events" do
+      before do
+        stub_post("/projects/1/hooks", "project_hook")
+        @hook = Gitlab.add_project_hook(1, "https://api.example.net/v1/webhooks/ci", push_events: true, merge_requests_events: true)
+      end
+
+      it "should get the correct resource" do
+        body = {:url => "https://api.example.net/v1/webhooks/ci", push_events: "true", merge_requests_events: "true"}
+        expect(a_post("/projects/1/hooks").with(:body => body)).to have_been_made
+      end
+
+      it "should return information about an added hook" do
+        expect(@hook.url).to eq("https://api.example.net/v1/webhooks/ci")
+      end
+    end
+  end
+
+  describe ".edit_project_hook" do
+    before do
+      stub_put("/projects/1/hooks/1", "project_hook")
+      @hook = Gitlab.edit_project_hook(1, 1, "https://api.example.net/v1/webhooks/ci")
+    end
+
+    it "should get the correct resource" do
+      body = {:url => "https://api.example.net/v1/webhooks/ci"}
+      expect(a_put("/projects/1/hooks/1").with(:body => body)).to have_been_made
+    end
+
+    it "should return information about an edited hook" do
+      expect(@hook.url).to eq("https://api.example.net/v1/webhooks/ci")
+    end
+  end
+
+  describe ".delete_project_hook" do
+    before do
+      stub_delete("/projects/1/hooks/1", "project_hook")
+      @hook = Gitlab.delete_project_hook(1, 1)
+    end
+
+    it "should get the correct resource" do
+      expect(a_delete("/projects/1/hooks/1")).to have_been_made
+    end
+
+    it "should return information about a deleted hook" do
+      expect(@hook.url).to eq("https://api.example.net/v1/webhooks/ci")
+    end
+  end
+
+  describe ".make_forked_from" do
+    before do
+      stub_post("/projects/42/fork/24", "project_fork_link")
+      @forked_project_link = Gitlab.make_forked_from(42, 24)
+    end
+
+    it "should get the correct resource" do
+      expect(a_post("/projects/42/fork/24")).to have_been_made
+    end
+
+    it "should return information about a forked project" do
+      expect(@forked_project_link.forked_from_project_id).to eq(24)
+      expect(@forked_project_link.forked_to_project_id).to eq(42)
+    end
+  end
+
+  describe ".remove_forked" do
+    before do
+      stub_delete("/projects/42/fork", "project_fork_link")
+      @forked_project_link = Gitlab.remove_forked(42)
+    end
+
+    it "should be sent to correct resource" do
+      expect(a_delete("/projects/42/fork")).to have_been_made
+    end
+
+    it "should return information about an unforked project" do
+      expect(@forked_project_link.forked_to_project_id).to eq(42)
+    end
+  end
+
+  describe ".deploy_keys" do
+    before do
+      stub_get("/projects/42/keys", "project_keys")
+      @deploy_keys = Gitlab.deploy_keys(42)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/42/keys")).to have_been_made
+    end
+
+    it "should return project deploy keys" do
+      expect(@deploy_keys).to be_an Array
+      expect(@deploy_keys.first.id).to eq 2
+      expect(@deploy_keys.first.title).to eq "Key Title"
+      expect(@deploy_keys.first.key).to match(/ssh-rsa/)
+    end
+  end
+
+  describe ".deploy_key" do
+    before do
+      stub_get("/projects/42/keys/2", "project_key")
+      @deploy_key = Gitlab.deploy_key(42, 2)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/42/keys/2")).to have_been_made
+    end
+
+    it "should return project deploy key" do
+      expect(@deploy_key.id).to eq 2
+      expect(@deploy_key.title).to eq "Key Title"
+      expect(@deploy_key.key).to match(/ssh-rsa/)
+    end
+  end
+
+  describe ".delete_deploy_key" do
+    before do
+      stub_delete("/projects/42/keys/2", "project_delete_key")
+      @deploy_key = Gitlab.delete_deploy_key(42, 2)
+    end
+
+    it "should get the correct resource" do
+      expect(a_delete("/projects/42/keys/2")).to have_been_made
+    end
+
+    it "should return information about a deleted key" do
+      expect(@deploy_key.id).to eq(2)
+    end
+  end
+end
diff --git a/lib/gitlab-cli/spec/gitlab/client/repositories_spec.rb b/lib/gitlab-cli/spec/gitlab/client/repositories_spec.rb
new file mode 100644
index 000000000..f58e315d0
--- /dev/null
+++ b/lib/gitlab-cli/spec/gitlab/client/repositories_spec.rb
@@ -0,0 +1,92 @@
+require 'spec_helper'
+
+describe Gitlab::Client do
+  it { should respond_to :repo_tags }
+  it { should respond_to :repo_create_tag }
+  it { should respond_to :repo_branches }
+  it { should respond_to :repo_branch }
+  it { should respond_to :repo_commits }
+  it { should respond_to :repo_commit }
+  it { should respond_to :repo_commit_diff }
+
+  describe ".tags" do
+    before do
+      stub_get("/projects/3/repository/tags", "project_tags")
+      @tags = Gitlab.tags(3)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/repository/tags")).to have_been_made
+    end
+
+    it "should return an array of repository tags" do
+      expect(@tags).to be_an Array
+      expect(@tags.first.name).to eq("v2.8.2")
+    end
+  end
+
+  describe ".create_tag" do
+    before do
+      stub_post("/projects/3/repository/tags", "tag")
+      @tag = Gitlab.create_tag(3, 'v1.0.0', '2695effb5807a22ff3d138d593fd856244e155e7')
+    end
+
+    it "should get the correct resource" do
+      expect(a_post("/projects/3/repository/tags")).to have_been_made
+    end
+
+    it "should return information about a new repository tag" do
+      expect(@tag.name).to eq("v1.0.0")
+    end
+  end
+
+  describe ".commits" do
+    before do
+      stub_get("/projects/3/repository/commits", "project_commits").
+        with(:query => {:ref_name => "api"})
+      @commits = Gitlab.commits(3, :ref_name => "api")
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/repository/commits").
+        with(:query => {:ref_name => "api"})).to have_been_made
+    end
+
+    it "should return an array of repository commits" do
+      expect(@commits).to be_an Array
+      expect(@commits.first.id).to eq("f7dd067490fe57505f7226c3b54d3127d2f7fd46")
+    end
+  end
+
+  describe ".commit" do
+    before do
+      stub_get("/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6", "project_commit")
+      @commit = Gitlab.commit(3, '6104942438c14ec7bd21c6cd5bd995272b3faff6')
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6"))
+        .to have_been_made
+    end
+
+    it "should return a repository commit" do
+      expect(@commit.id).to eq("6104942438c14ec7bd21c6cd5bd995272b3faff6")
+    end
+  end
+
+  describe ".commit_diff" do
+    before do
+      stub_get("/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6/diff", "project_commit_diff")
+      @diff = Gitlab.commit_diff(3, '6104942438c14ec7bd21c6cd5bd995272b3faff6')
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6/diff"))
+        .to have_been_made
+    end
+
+    it "should return a diff of a commit" do
+      expect(@diff.new_path).to eq("doc/update/5.4-to-6.0.md")
+    end
+  end
+end
diff --git a/lib/gitlab-cli/spec/gitlab/client/snippets_spec.rb b/lib/gitlab-cli/spec/gitlab/client/snippets_spec.rb
new file mode 100644
index 000000000..b6ceecc0d
--- /dev/null
+++ b/lib/gitlab-cli/spec/gitlab/client/snippets_spec.rb
@@ -0,0 +1,85 @@
+require 'spec_helper'
+
+describe Gitlab::Client do
+  describe ".snippets" do
+    before do
+      stub_get("/projects/3/snippets", "snippets")
+      @snippets = Gitlab.snippets(3)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/snippets")).to have_been_made
+    end
+
+    it "should return an array of project's snippets" do
+      expect(@snippets).to be_an Array
+      expect(@snippets.first.file_name).to eq("mailer_test.rb")
+    end
+  end
+
+  describe ".snippet" do
+    before do
+      stub_get("/projects/3/snippets/1", "snippet")
+      @snippet = Gitlab.snippet(3, 1)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/snippets/1")).to have_been_made
+    end
+
+    it "should return information about a snippet" do
+      expect(@snippet.file_name).to eq("mailer_test.rb")
+      expect(@snippet.author.name).to eq("John Smith")
+    end
+  end
+
+  describe ".create_snippet" do
+    before do
+      stub_post("/projects/3/snippets", "snippet")
+      @snippet = Gitlab.create_snippet(3, {:title => 'API', :file_name => 'api.rb', :code => 'code'})
+    end
+
+    it "should get the correct resource" do
+      body = {:title => 'API', :file_name => 'api.rb', :code => 'code'}
+      expect(a_post("/projects/3/snippets").with(:body => body)).to have_been_made
+    end
+
+    it "should return information about a new snippet" do
+      expect(@snippet.file_name).to eq("mailer_test.rb")
+      expect(@snippet.author.name).to eq("John Smith")
+    end
+  end
+
+  describe ".edit_snippet" do
+    before do
+      stub_put("/projects/3/snippets/1", "snippet")
+      @snippet = Gitlab.edit_snippet(3, 1, :file_name => 'mailer_test.rb')
+    end
+
+    it "should get the correct resource" do
+      expect(a_put("/projects/3/snippets/1").
+        with(:body => {:file_name => 'mailer_test.rb'})).to have_been_made
+    end
+
+    it "should return information about an edited snippet" do
+      expect(@snippet.file_name).to eq("mailer_test.rb")
+      expect(@snippet.author.name).to eq("John Smith")
+    end
+  end
+
+  describe ".delete_snippet" do
+    before do
+      stub_delete("/projects/3/snippets/1", "snippet")
+      @snippet = Gitlab.delete_snippet(3, 1)
+    end
+
+    it "should get the correct resource" do
+      expect(a_delete("/projects/3/snippets/1")).to have_been_made
+    end
+
+    it "should return information about a deleted snippet" do
+      expect(@snippet.file_name).to eq("mailer_test.rb")
+      expect(@snippet.author.name).to eq("John Smith")
+    end
+  end
+end
diff --git a/lib/gitlab-cli/spec/gitlab/client/system_hooks_spec.rb b/lib/gitlab-cli/spec/gitlab/client/system_hooks_spec.rb
new file mode 100644
index 000000000..7410c3655
--- /dev/null
+++ b/lib/gitlab-cli/spec/gitlab/client/system_hooks_spec.rb
@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+describe Gitlab::Client do
+  it { should respond_to :system_hooks }
+  it { should respond_to :add_system_hook }
+  it { should respond_to :system_hook }
+  it { should respond_to :delete_system_hook }
+
+  describe ".hooks" do
+    before do
+      stub_get("/hooks", "system_hooks")
+      @hooks = Gitlab.hooks
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/hooks")).to have_been_made
+    end
+
+    it "should return an array of system hooks" do
+      expect(@hooks).to be_an Array
+      expect(@hooks.first.url).to eq("http://example.com/hook")
+    end
+  end
+
+  describe ".add_hook" do
+    before do
+      stub_post("/hooks", "system_hook")
+      @hook = Gitlab.add_hook("http://example.com/hook")
+    end
+
+    it "should get the correct resource" do
+      expect(a_post("/hooks")).to have_been_made
+    end
+
+    it "should return information about a added system hook" do
+      expect(@hook.url).to eq("http://example.com/hook")
+    end
+  end
+
+  describe ".hook" do
+    before do
+      stub_get("/hooks/3", "system_hook_test")
+      @hook = Gitlab.hook(3)
+    end
+    it "should get the correct resource" do
+      expect(a_get("/hooks/3")).to have_been_made
+    end
+
+    it "should return information about a added system hook" do
+      expect(@hook.event_name).to eq("project_create")
+      expect(@hook.project_id).to eq(1)
+    end
+  end
+
+  describe ".delete_hook" do
+    before do
+      stub_delete("/hooks/3", "system_hook")
+      @hook = Gitlab.delete_hook(3)
+    end
+
+    it "should get the correct resource" do
+      expect(a_delete("/hooks/3")).to have_been_made
+    end
+
+    it "should return information about a deleted system hook" do
+      expect(@hook.url).to eq("http://example.com/hook")
+    end
+  end
+end
diff --git a/lib/gitlab-cli/spec/gitlab/client/users_spec.rb b/lib/gitlab-cli/spec/gitlab/client/users_spec.rb
new file mode 100644
index 000000000..ead205b47
--- /dev/null
+++ b/lib/gitlab-cli/spec/gitlab/client/users_spec.rb
@@ -0,0 +1,192 @@
+require 'spec_helper'
+
+describe Gitlab::Client do
+  describe ".users" do
+    before do
+      stub_get("/users", "users")
+      @users = Gitlab.users
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/users")).to have_been_made
+    end
+
+    it "should return an array of users" do
+      expect(@users).to be_an Array
+      expect(@users.first.email).to eq("john@example.com")
+    end
+  end
+
+  describe ".user" do
+    context "with user ID passed" do
+      before do
+        stub_get("/users/1", "user")
+        @user = Gitlab.user(1)
+      end
+
+      it "should get the correct resource" do
+        expect(a_get("/users/1")).to have_been_made
+      end
+
+      it "should return information about a user" do
+        expect(@user.email).to eq("john@example.com")
+      end
+    end
+
+    context "without user ID passed" do
+      before do
+        stub_get("/user", "user")
+        @user = Gitlab.user
+      end
+
+      it "should get the correct resource" do
+        expect(a_get("/user")).to have_been_made
+      end
+
+      it "should return information about an authorized user" do
+        expect(@user.email).to eq("john@example.com")
+      end
+    end
+  end
+
+  describe ".create_user" do
+    context "when successful request" do
+      before do
+        stub_post("/users", "user")
+        @user = Gitlab.create_user("email", "pass")
+      end
+
+      it "should get the correct resource" do
+        body = {:email => "email", :password => "pass", :name => "email"}
+        expect(a_post("/users").with(:body => body)).to have_been_made
+      end
+
+      it "should return information about a created user" do
+        expect(@user.email).to eq("john@example.com")
+      end
+    end
+
+    context "when bad request" do
+      it "should throw an exception" do
+        stub_post("/users", "error_already_exists", 409)
+        expect {
+          Gitlab.create_user("email", "pass")
+        }.to raise_error(Gitlab::Error::Conflict, "Server responded with code 409, message: 409 Already exists. Request URI: #{Gitlab.endpoint}/users")
+      end
+    end
+  end
+
+  describe ".edit_user" do
+    before do
+      @options = { :name => "Roberto" }
+      stub_put("/users/1", "user").with(:body => @options)
+      @user = Gitlab.edit_user(1, @options)
+    end
+
+    it "should get the correct resource" do
+      expect(a_put("/users/1").with(:body => @options)).to have_been_made
+    end
+  end
+
+  describe ".session" do
+    after do
+      Gitlab.endpoint = 'https://api.example.com'
+      Gitlab.private_token = 'secret'
+    end
+
+    before do
+      stub_request(:post, "#{Gitlab.endpoint}/session").
+        to_return(:body => load_fixture('session'), :status => 200)
+      @session = Gitlab.session("email", "pass")
+    end
+
+    context "when endpoint is not set" do
+      it "should raise Error::MissingCredentials" do
+        Gitlab.endpoint = nil
+        expect {
+          Gitlab.session("email", "pass")
+        }.to raise_error(Gitlab::Error::MissingCredentials, 'Please set an endpoint to API')
+      end
+    end
+
+    context "when private_token is not set" do
+      it "should not raise Error::MissingCredentials" do
+        Gitlab.private_token = nil
+        expect { Gitlab.session("email", "pass") }.to_not raise_error
+      end
+    end
+
+    context "when endpoint is set" do
+      it "should get the correct resource" do
+        expect(a_request(:post, "#{Gitlab.endpoint}/session")).to have_been_made
+      end
+
+      it "should return information about a created session" do
+        expect(@session.email).to eq("john@example.com")
+        expect(@session.private_token).to eq("qEsq1pt6HJPaNciie3MG")
+      end
+    end
+  end
+
+  describe ".ssh_keys" do
+    before do
+      stub_get("/user/keys", "keys")
+      @keys = Gitlab.ssh_keys
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/user/keys")).to have_been_made
+    end
+
+    it "should return an array of SSH keys" do
+      expect(@keys).to be_an Array
+      expect(@keys.first.title).to eq("narkoz@helium")
+    end
+  end
+
+  describe ".ssh_key" do
+    before do
+      stub_get("/user/keys/1", "key")
+      @key = Gitlab.ssh_key(1)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/user/keys/1")).to have_been_made
+    end
+
+    it "should return information about an SSH key" do
+      expect(@key.title).to eq("narkoz@helium")
+    end
+  end
+
+  describe ".create_ssh_key" do
+    before do
+      stub_post("/user/keys", "key")
+      @key = Gitlab.create_ssh_key("title", "body")
+    end
+
+    it "should get the correct resource" do
+      body = {:title => "title", :key => "body"}
+      expect(a_post("/user/keys").with(:body => body)).to have_been_made
+    end
+
+    it "should return information about a created SSH key" do
+      expect(@key.title).to eq("narkoz@helium")
+    end
+  end
+
+  describe ".delete_ssh_key" do
+    before do
+      stub_delete("/user/keys/1", "key")
+      @key = Gitlab.delete_ssh_key(1)
+    end
+
+    it "should get the correct resource" do
+      expect(a_delete("/user/keys/1")).to have_been_made
+    end
+
+    it "should return information about a deleted SSH key" do
+      expect(@key.title).to eq("narkoz@helium")
+    end
+  end
+end
diff --git a/lib/gitlab-cli/spec/gitlab/objectified_hash_spec.rb b/lib/gitlab-cli/spec/gitlab/objectified_hash_spec.rb
new file mode 100644
index 000000000..db45711df
--- /dev/null
+++ b/lib/gitlab-cli/spec/gitlab/objectified_hash_spec.rb
@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Gitlab::ObjectifiedHash do
+  before do
+    @hash = {a: 1, b: 2}
+    @oh = Gitlab::ObjectifiedHash.new @hash
+  end
+
+  it "should objectify hash" do
+    expect(@oh.a).to eq(@hash[:a])
+    expect(@oh.b).to eq(@hash[:b])
+  end
+
+  describe "#to_hash" do
+    it "should return an original hash" do
+      expect(@oh.to_hash).to eq(@hash)
+    end
+
+    it "should have an alias #to_h" do
+      expect(@oh.respond_to?(:to_h)).to be_truthy
+    end
+  end
+end
diff --git a/lib/gitlab-cli/spec/gitlab/request_spec.rb b/lib/gitlab-cli/spec/gitlab/request_spec.rb
new file mode 100644
index 000000000..869c2e964
--- /dev/null
+++ b/lib/gitlab-cli/spec/gitlab/request_spec.rb
@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe Gitlab::Request do
+  it { should respond_to :get }
+  it { should respond_to :post }
+  it { should respond_to :put }
+  it { should respond_to :delete }
+
+  describe ".default_options" do
+    it "should have default values" do
+      default_options = Gitlab::Request.default_options
+      expect(default_options).to be_a Hash
+      expect(default_options[:parser]).to be_a Proc
+      expect(default_options[:format]).to eq(:json)
+      expect(default_options[:headers]).to eq({'Accept' => 'application/json'})
+      expect(default_options[:default_params]).to be_nil
+    end
+  end
+
+  describe ".parse" do
+    it "should return ObjectifiedHash" do
+      body = JSON.unparse({a: 1, b: 2})
+      expect(Gitlab::Request.parse(body)).to be_an Gitlab::ObjectifiedHash
+    end
+  end
+
+  describe "#set_request_defaults" do
+    context "when endpoint is not set" do
+      it "should raise Error::MissingCredentials" do
+        expect {
+          Gitlab::Request.new.set_request_defaults(nil, 1234000)
+        }.to raise_error(Gitlab::Error::MissingCredentials, 'Please set an endpoint to API')
+      end
+    end
+
+    context "when endpoint is set" do
+      it "should set base_uri" do
+        Gitlab::Request.new.set_request_defaults('http://rabbit-hole.example.org', 1234000)
+        expect(Gitlab::Request.base_uri).to eq("http://rabbit-hole.example.org")
+      end
+
+      it "should set default_params" do
+        Gitlab::Request.new.set_request_defaults('http://rabbit-hole.example.org', 1234000, 'sudoer')
+        expect(Gitlab::Request.default_params).to eq({:sudo => 'sudoer'})
+      end
+    end
+  end
+end
diff --git a/lib/gitlab-cli/spec/gitlab_spec.rb b/lib/gitlab-cli/spec/gitlab_spec.rb
new file mode 100644
index 000000000..f037e70aa
--- /dev/null
+++ b/lib/gitlab-cli/spec/gitlab_spec.rb
@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+describe Gitlab do
+  after { Gitlab.reset }
+
+  describe ".client" do
+    it "should be a Gitlab::Client" do
+      expect(Gitlab.client).to be_a Gitlab::Client
+    end
+  end
+
+  describe ".actions" do
+    it "should return an array of client methods" do
+      actions = Gitlab.actions
+      expect(actions).to be_an Array
+      expect(actions.first).to be_a Symbol
+      expect(actions.sort.first).to match(/add_/)
+    end
+  end
+
+  describe ".endpoint=" do
+    it "should set endpoint" do
+      Gitlab.endpoint = 'https://api.example.com'
+      expect(Gitlab.endpoint).to eq('https://api.example.com')
+    end
+  end
+
+  describe ".private_token=" do
+    it "should set private_token" do
+      Gitlab.private_token = 'secret'
+      expect(Gitlab.private_token).to eq('secret')
+    end
+  end
+
+  describe ".sudo=" do
+    it "should set sudo" do
+      Gitlab.sudo = 'user'
+      expect(Gitlab.sudo).to eq('user')
+    end
+  end
+
+  describe ".user_agent" do
+    it "should return default user_agent" do
+      expect(Gitlab.user_agent).to eq(Gitlab::Configuration::DEFAULT_USER_AGENT)
+    end
+  end
+
+  describe ".user_agent=" do
+    it "should set user_agent" do
+      Gitlab.user_agent = 'Custom User Agent'
+      expect(Gitlab.user_agent).to eq('Custom User Agent')
+    end
+  end
+
+  describe ".configure" do
+    Gitlab::Configuration::VALID_OPTIONS_KEYS.each do |key|
+      it "should set #{key}" do
+        Gitlab.configure do |config|
+          config.send("#{key}=", key)
+          expect(Gitlab.send(key)).to eq(key)
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab-cli/spec/spec_helper.rb b/lib/gitlab-cli/spec/spec_helper.rb
new file mode 100644
index 000000000..28df28be2
--- /dev/null
+++ b/lib/gitlab-cli/spec/spec_helper.rb
@@ -0,0 +1,74 @@
+require 'rspec'
+require 'webmock/rspec'
+
+require File.expand_path('../../lib/gitlab', __FILE__)
+require File.expand_path('../../lib/gitlab/cli', __FILE__)
+
+def capture_output
+  out = StringIO.new
+  $stdout = out
+  $stderr = out
+  yield
+  $stdout = STDOUT
+  $stderr = STDERR
+  out.string
+end
+
+def load_fixture(name)
+  File.new(File.dirname(__FILE__) + "/fixtures/#{name}.json")
+end
+
+RSpec.configure do |config|
+  config.before(:all) do
+    Gitlab.endpoint = 'https://api.example.com'
+    Gitlab.private_token = 'secret'
+  end
+end
+
+# GET
+def stub_get(path, fixture)
+  stub_request(:get, "#{Gitlab.endpoint}#{path}").
+    with(:headers => {'PRIVATE-TOKEN' => Gitlab.private_token}).
+    to_return(:body => load_fixture(fixture))
+end
+
+def a_get(path)
+  a_request(:get, "#{Gitlab.endpoint}#{path}").
+    with(:headers => {'PRIVATE-TOKEN' => Gitlab.private_token})
+end
+
+# POST
+def stub_post(path, fixture, status_code=200)
+  stub_request(:post, "#{Gitlab.endpoint}#{path}").
+    with(:headers => {'PRIVATE-TOKEN' => Gitlab.private_token}).
+    to_return(:body => load_fixture(fixture), :status => status_code)
+end
+
+def a_post(path)
+  a_request(:post, "#{Gitlab.endpoint}#{path}").
+    with(:headers => {'PRIVATE-TOKEN' => Gitlab.private_token})
+end
+
+# PUT
+def stub_put(path, fixture)
+  stub_request(:put, "#{Gitlab.endpoint}#{path}").
+    with(:headers => {'PRIVATE-TOKEN' => Gitlab.private_token}).
+    to_return(:body => load_fixture(fixture))
+end
+
+def a_put(path)
+  a_request(:put, "#{Gitlab.endpoint}#{path}").
+    with(:headers => {'PRIVATE-TOKEN' => Gitlab.private_token})
+end
+
+# DELETE
+def stub_delete(path, fixture)
+  stub_request(:delete, "#{Gitlab.endpoint}#{path}").
+    with(:headers => {'PRIVATE-TOKEN' => Gitlab.private_token}).
+    to_return(:body => load_fixture(fixture))
+end
+
+def a_delete(path)
+  a_request(:delete, "#{Gitlab.endpoint}#{path}").
+    with(:headers => {'PRIVATE-TOKEN' => Gitlab.private_token})
+end
diff --git a/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb b/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
index 9378013f9..682714b9b 100644
--- a/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
+++ b/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
@@ -93,13 +93,13 @@ module Redmine
           end
         end
 
-        def save_attachmentsex(attachments, author=User.current,attachment_type, public_status)
+        def save_attachmentsex(attachments, author=User.current,attachment_type)
           @curattachment_type = attachment_type
-          result = save_attachments(attachments,author, public_status)
+          result = save_attachments(attachments,author)
           result
         end
 
-        def save_attachments(attachments, author=User.current,public_status)
+        def save_attachments(attachments, author=User.current)
           # 清除临时文件
           if attachments
             tempAttach = attachments[:dummy]
@@ -140,16 +140,12 @@ module Redmine
                   end
                 end
               end
-              if public_status
-                if a && !attachment['is_public_checkbox']
-                  a.is_public = false
-                elsif a && attachment['is_public_checkbox']
-                  a.is_public = true
-                end
-              else
-                a.is_public = false
-              end
 
+              if a && !attachment['is_public_checkbox']
+                a.is_public = false
+              elsif a && attachment['is_public_checkbox']
+                a.is_public = true
+              end
               set_attachment_public(a) if a
               next unless a
               a.description = attachment['description'].to_s.strip
diff --git a/lib/redmine/scm/adapters/gitlab_adapter.rb b/lib/redmine/scm/adapters/gitlab_adapter.rb
new file mode 100644
index 000000000..32429fe35
--- /dev/null
+++ b/lib/redmine/scm/adapters/gitlab_adapter.rb
@@ -0,0 +1,289 @@
+#coding=utf-8
+#
+require 'redmine/scm/adapters/abstract_adapter'
+require 'base64'
+
+module Redmine
+  module Scm
+    module Adapters
+
+      class GitlabAdapter < AbstractAdapter
+
+        class GitBranch < Branch 
+          attr_accessor :is_default
+        end
+
+        def initialize(url, root_url=nil, login=nil, password=nil, path_encoding=nil)
+          super
+          @g = Gitlab.client
+          @project = Repository.find_by_url(url).project.gpid
+          @path_encoding = path_encoding.blank? ? 'UTF-8' : path_encoding
+        end
+
+        def path_encoding
+          @path_encoding
+        end
+
+        def info
+          begin
+            Info.new(:root_url => url, :lastrev => lastrev('',nil))
+          rescue
+            nil
+          end
+        end
+
+        def branches
+          return @branches if @branches
+          @branches = []
+          branches = @g.branches(@project)
+          branches.each do |line|
+              name = line.name
+              scmid = line.commit.id
+              bran = GitBranch.new(name)
+              bran.revision =  scmid
+              bran.scmid    =  name
+              bran.is_default = true  #TODO
+              @branches << bran
+          end
+          @branches.sort!
+        rescue ScmCommandAborted
+          nil
+        end
+
+        def tags
+          return @tags if @tags
+          tags = @g.tags(@project)
+          @tags = []
+          tags.each do |tag|
+            @tags << tag.name
+          end
+        rescue ScmCommandAborted
+          nil
+        end
+
+        def default_branch
+          bras = self.branches
+          return nil if bras.nil?
+          default_bras = bras.select{|x| x.is_default == true}
+          return default_bras.first.to_s if ! default_bras.empty?
+          master_bras = bras.select{|x| x.to_s == 'master'}
+          master_bras.empty? ? bras.first.to_s : 'master' 
+        end
+
+        def entry(path=nil, identifier=nil)
+          parts = path.to_s.split(%r{[\/\\]}).select {|n| !n.blank?}
+          search_path = parts[0..-2].join('/')
+          search_name = parts[-1]
+          if search_path.blank? && search_name.blank?
+            # Root entry
+            Entry.new(:path => '', :kind => 'dir')
+          else
+            # Search for the entry in the parent directory
+            es = entries(search_path, identifier,
+                         options = {:report_last_commit => false})
+            es ? es.detect {|e| e.name == search_name} : nil
+          end
+        end
+
+        def entries(path=nil, identifier=nil, options={})
+          entries  = Entries.new
+          trees = @g.trees(@project, path: path, ref_name: identifier)
+          trees.each do |tree|
+            entries << Entry.new({
+              :name => tree.name,
+              :path => File.join(path,tree.name),
+              :kind => tree.type == 'tree' ? 'dir' : 'file',
+              :size => nil,
+              :lastrev =>  nil
+            }) 
+          end
+          entries.sort_by_name
+        rescue ScmCommandAborted
+          nil
+        rescue Exception
+          nil
+        end
+
+        def lastrev(path, rev)
+          return nil if path.nil?
+          cmd_args = %w|log --no-color --encoding=UTF-8 --date=iso --pretty=fuller --no-merges -n 1|
+          cmd_args << rev if rev
+          cmd_args << "--" << path unless path.empty?
+          lines = []
+          git_cmd(cmd_args) { |io| lines = io.readlines }
+          begin
+            id = lines[0].split[1]
+            author = lines[1].match('Author:\s+(.*)$')[1]
+            time = Time.parse(lines[4].match('CommitDate:\s+(.*)$')[1])
+
+            Revision.new({
+              :identifier => id,
+              :scmid      => id,
+              :author     => author,
+              :time       => time,
+              :message    => nil,
+              :paths      => nil
+            })
+          rescue NoMethodError => e
+            logger.error("The revision '#{path}' has a wrong format")
+            return nil
+          end
+        rescue ScmCommandAborted
+          nil
+        end
+
+        def revisions(path, identifier_from, identifier_to, options={})
+          revs = Revisions.new
+          cmd_args = %w|log --no-color --encoding=UTF-8 --raw --date=iso --pretty=fuller --parents --stdin|
+          cmd_args << "--reverse" if options[:reverse]
+          cmd_args << "-n" << "#{options[:limit].to_i}" if options[:limit]
+          cmd_args << "--" << scm_iconv(@path_encoding, 'UTF-8', path) if path && !path.empty?
+          revisions = []
+          if identifier_from || identifier_to
+            revisions << ""
+            revisions[0] << "#{identifier_from}.." if identifier_from
+            revisions[0] << "#{identifier_to}" if identifier_to
+          else
+            unless options[:includes].blank?
+              revisions += options[:includes]
+            end
+            unless options[:excludes].blank?
+              revisions += options[:excludes].map{|r| "^#{r}"}
+            end
+          end
+
+
+          commits = @g.commits(@project, {ref_name: identifier_to})
+          commits.each do |commit|
+            revision = Revision.new({
+              :identifier => commit.id,
+              :scmid      => commit.id,
+              :author     => commit.author_name,
+              :time       => Time.parse(commit.created_at),
+              :message    => commit.message,
+              :paths      => nil,
+              :parents    => nil
+            })
+            revs << revision
+          end
+
+          revs
+        rescue ScmCommandAborted => e
+          err_msg = "git log error: #{e.message}"
+          logger.error(err_msg)
+          if block_given?
+            raise CommandFailed, err_msg
+          else
+            revs
+          end
+        end
+
+        def diff(path, identifier_from, identifier_to=nil)
+          path ||= ''
+          cmd_args = []
+          if identifier_to
+            cmd_args << "diff" << "--no-color" <<  identifier_to << identifier_from
+          else
+            cmd_args << "show" << "--no-color" << identifier_from
+          end
+          cmd_args << "--" <<  scm_iconv(@path_encoding, 'UTF-8', path) unless path.empty?
+          diff = []
+          git_cmd(cmd_args) do |io|
+            io.each_line do |line|
+              diff << line
+            end
+          end
+          diff
+        rescue ScmCommandAborted
+          nil
+        end
+
+        def annotate(path, identifier=nil)
+          identifier = 'HEAD' if identifier.blank?
+          cmd_args = %w|blame|
+          cmd_args << "-p" << identifier << "--" <<  scm_iconv(@path_encoding, 'UTF-8', path)
+          blame = Annotate.new
+          content = nil
+          git_cmd(cmd_args) { |io| io.binmode; content = io.read }
+          # git annotates binary files
+          return nil if content.is_binary_data?
+          identifier = ''
+          # git shows commit author on the first occurrence only
+          authors_by_commit = {}
+          content.split("\n").each do |line|
+            if line =~ /^([0-9a-f]{39,40})\s.*/
+              identifier = $1
+            elsif line =~ /^author (.+)/
+              authors_by_commit[identifier] = $1.strip
+            elsif line =~ /^\t(.*)/
+              blame.add_line($1, Revision.new(
+                :identifier => identifier,
+                :revision   => identifier,
+                :scmid      => identifier,
+                :author     => authors_by_commit[identifier]
+              ))
+              identifier = ''
+              author = ''
+            end
+          end
+          blame
+        rescue ScmCommandAborted
+          nil
+        end
+
+        def cat(path, identifier=nil)
+          if identifier.nil?
+            identifier = 'HEAD'
+          end
+          file = @g.files(@project, path, identifier)
+          cat = Base64.decode64 file.content
+        rescue ScmCommandAborted
+          nil
+        end
+
+        def parse_commit(commits)
+          sum = {file: 0, insertion: 0, deletion: 0}
+          commits.split("\n").each do |commit|
+            if /(\d+)\s+?file/ =~ commit
+              sum[:file] += $1 .to_i
+            end
+            if /(\d+)\s+?insertion/ =~ commit
+              sum[:insertion] += $1.to_i 
+            end
+            if /(\d+)\s+?deletion/ =~ commit
+              sum[:deletion] += $1.to_i
+            end
+          end
+          sum[:insertion] + sum[:deletion]
+        end
+
+        def commits(authors, start_date, end_date, branch='master')
+          rs = []
+          authors.each do |author|
+            cmd_args = %W|log #{branch} --pretty=tformat: --shortstat --author=#{author} --since=#{start_date} --until=#{end_date}|
+            commits = ''
+            git_cmd(cmd_args) do |io|
+              commits = io.read
+            end
+            logger.info "git log output for #{author} #{commits}"
+            rs << {author: author, num: parse_commit(commits)}
+          end
+          rs
+        end
+
+        class Revision < Redmine::Scm::Adapters::Revision
+          # Returns the readable identifier
+          def format_identifier
+            identifier[0,8]
+          end
+        end
+
+        def git_cmd(args, options = {}, &block)
+          logger.info "git cmd: #{args.join(' ')}"
+        end
+        private :git_cmd
+      end
+
+    end
+  end
+end
diff --git a/lib/tasks/gitlab.rake b/lib/tasks/gitlab.rake
new file mode 100644
index 000000000..729c9245f
--- /dev/null
+++ b/lib/tasks/gitlab.rake
@@ -0,0 +1,44 @@
+require 'trustie/gitlab/sync'
+
+namespace :gitlab do
+  namespace :sync do
+    desc "sync users to gitlab"
+    task :users => :environment do
+      # User.where(username: 'root').find_each do |user|
+      s = Trustie::Gitlab::Sync.new
+      User.find_each do |user|
+        s.sync_user(user)
+      end
+    end
+
+    desc "update user password"
+    task :password => :environment do
+      s = Trustie::Gitlab::Sync.new
+      s.change_password(1,'5188b7a65acf294ee7deceb397b6f9c62214ea50','dcb8d9fffabec60c2d0d1030b679fbbb')
+    end
+
+    desc "sync projects to gitlab"
+    task :projects => :environment do
+      s = Trustie::Gitlab::Sync.new
+      Project.where(id: ENV["PROJECT_ID"]).find_each do |project|
+        s.sync_project(project, path: ENV["REP_NAME"], import_url: project.repository.url)
+      end
+    end
+
+    desc "remove all projects" 
+    task :remove_all_projects => :environment do
+      g = Gitlab.client
+      100.times do
+      g.projects(scope: 'all').each do |p|
+        puts p.id
+        begin
+        g.delete_project(p.id)
+        rescue => e
+          puts e 
+        end
+      end
+      end
+    end
+
+  end
+end
diff --git a/lib/tasks/homework_evaluation.rake b/lib/tasks/homework_evaluation.rake
index 6cf4dd6da..bf5f32dfe 100644
--- a/lib/tasks/homework_evaluation.rake
+++ b/lib/tasks/homework_evaluation.rake
@@ -11,7 +11,7 @@ namespace :homework_evaluation do
     homework_detail_manuals = HomeworkDetailManual.where("evaluation_start = '#{Date.today}'")
     homework_detail_manuals.each do |homework_detail_manual|
       homework_common = homework_detail_manual.homework_common
-      if homework_detail_manual.comment_status == 1  #新建状态才可开启匿评
+      if homework_common.anonymous_comment == 0 && homework_detail_manual.comment_status == 1  #新建状态才可开启匿评
         student_works = homework_common.student_works
         if student_works && student_works.size >= 2
           student_works.each_with_index do |work, index|
@@ -55,7 +55,7 @@ namespace :homework_evaluation do
     homework_detail_manuals = HomeworkDetailManual.where("evaluation_end = '#{Date.today}'")
     homework_detail_manuals.each do |homework_detail_manual|
       homework_common = homework_detail_manual.homework_common
-      if homework_detail_manual.comment_status == 2 #开启匿评状态才可关闭匿评
+      if homework_common.anonymous_comment == 0 && homework_detail_manual.comment_status == 2 #开启匿评状态才可关闭匿评
         #计算缺评扣分
         work_ids = "(" + homework_common.student_works.map(&:id).join(",") + ")"
         homework_common.student_works.each do |student_work|
diff --git a/lib/tasks/homework_publishtime.rake b/lib/tasks/homework_publishtime.rake
new file mode 100644
index 000000000..4d79086d4
--- /dev/null
+++ b/lib/tasks/homework_publishtime.rake
@@ -0,0 +1,23 @@
+#coding=utf-8
+
+namespace :homework_publishtime do
+  desc "start publish homework"
+  task :publish => :environment do
+    homework_commons = HomeworkCommon.where("publish_time = '#{Date.today}'")
+    homework_commons.each do |homework|
+      homework_detail_manual = homework.homework_detail_manual
+      if homework_detail_manual.comment_status == 0
+        homework_detail_manual.update_column('comment_status', 1)
+        course = homework.course
+        course.members.each do |m|
+          homework.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => nil)
+        end
+        if homework.course_acts.size == 0
+          homework.course_acts << CourseActivity.new(:user_id => homework.user_id,:course_id => homework.course_id)
+        end
+        # 邮件通知
+        Mailer.run.homework_added(homework)
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/tasks/sync_gitlab_user.rake b/lib/tasks/sync_gitlab_user.rake
new file mode 100644
index 000000000..c932ca36c
--- /dev/null
+++ b/lib/tasks/sync_gitlab_user.rake
@@ -0,0 +1,39 @@
+#coding=utf-8
+
+namespace :gitlab do
+  desc "sync gitlab's users which lost in last sync"
+  task :add_gid => :environment do
+    users = User.find_by_sql("select * from users where gid is null")
+    s = Trustie::Gitlab::Sync.new
+    g = Gitlab.client
+    users.each do |user|
+      us = g.get("/users?search=#{user.mail}")
+      puts user.mail
+      if us.blank?
+        puts "55555555555555555"
+        s.sync_user(user)
+      else
+        # 解决查询的时候出现多值的情况，比如:123@163.com和g123@163.com
+        puts "66666666666666666666"
+        puts user.id
+        if Array === us
+          us.each do |u|
+            if u.email == user.mail
+              user.gid = u.id
+              user.save
+            end
+          end
+        end
+      end
+    end
+  end
+
+  task :sync_members => :environment do
+    projects = Project.all
+    s = Trustie::Gitlab::Sync.new
+    projects.each do |project|
+      puts project.id
+      s.only_members(project.first)
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/tasks/sync_sigle_rep.rake b/lib/tasks/sync_sigle_rep.rake
new file mode 100644
index 000000000..591dcce84
--- /dev/null
+++ b/lib/tasks/sync_sigle_rep.rake
@@ -0,0 +1,30 @@
+#coding=utf-8
+
+namespace :sync_rep do
+  desc "sync some projects which just have sigle repository"
+  task :sigle => :environment do
+    projects = Project.where("user_id !=?",12)
+    projects.each do |project|
+      # 针对类型为Git并且只有一个版本库的项目
+      if project.repositories && project.repositories.count == 1 && project.repositories.first.type == "Repository::Git"
+        rep = project.repositories.first
+        count = Repository.find_by_sql("SELECT * FROM `repositories` where identifier = '#{rep.identifier}'").count
+        puts count
+        unless count > 1
+          rep.identifier
+          puts "################################"
+          puts project.id
+          puts rep.id
+          s = Trustie::Gitlab::Sync.new
+          s.sync_project(project, path: rep.identifier, import_url: rep.url)
+          rep.type = 'Repository::Gitlab'
+          rep.save
+          puts "*************************************"
+          puts project.id
+          puts rep.id
+          puts rep.identifier
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/trustie.rb b/lib/trustie.rb
index 3636efd95..2010e2d43 100644
--- a/lib/trustie.rb
+++ b/lib/trustie.rb
@@ -1,3 +1,4 @@
 require 'trustie/utils'
 require 'trustie/utils/image'
+require 'trustie/gitlab/api'
 require 'trustie/grack/grack'
diff --git a/lib/trustie/gitlab/api.rb b/lib/trustie/gitlab/api.rb
new file mode 100644
index 000000000..6c1993721
--- /dev/null
+++ b/lib/trustie/gitlab/api.rb
@@ -0,0 +1,35 @@
+#coding=utf-8
+#
+#
+module Trustie
+  module Gitlab
+    class Api
+      # attr_accessor :g
+
+      def initialize(client=nil)
+        @g = client || ::Gitlab.client 
+      end
+
+      def trees(project_id)
+        @g.trees(project_id)
+      end 
+
+      def entries(project)
+        entries  = []
+        api = Trustie::Gitlab::Api.new
+        trees = api.trees(11)
+        trees.each do |tree|
+          entries << Redmine::Scm::Adapters::Entry.new({
+            :name => tree.name,
+            :path => tree.id,
+            :kind => tree.type == 'tree' ? 'dir' : 'file',
+            :size => nil,
+            :lastrev =>  nil
+          }) 
+        end
+        entries
+      end
+      
+    end
+  end
+end
diff --git a/lib/trustie/gitlab/helper.rb b/lib/trustie/gitlab/helper.rb
new file mode 100644
index 000000000..61c1fbd17
--- /dev/null
+++ b/lib/trustie/gitlab/helper.rb
@@ -0,0 +1,49 @@
+#coding=utf-8
+
+module Trustie
+  module Gitlab
+    module Helper
+      def change_password(uid, en_pwd, salt)
+        return unless uid
+        options = {:encrypted_password=>en_pwd, :password_salt=>salt}
+        self.g.put("/users/ext/#{uid}", :body => options)
+        # g.edit_user(uid, :encrypted_password=>en_pwd, :password_salt=>salt)
+      end
+
+      def find_user(user)
+        us = self.g.get("/users?search=#{user.mail}")
+        if Array === us
+          us.each do |u|
+            return u if u.email == user.mail
+          end
+        end
+        return nil
+      end
+
+      def add_user(user)
+        u = nil
+        begin
+          u = find_user(user)
+          unless u
+            u = self.g.create_user(user.mail,
+                                   user.hashed_password,
+                                   name: user.show_name,
+                                   username: user.login,
+                                   confirm: "true")
+            user.gid = u.id
+          end
+          change_password(u.id, user.hashed_password, user.salt)
+        rescue => e
+          puts e
+        end
+        return u
+      end
+
+      def del_user(user)
+        return unless user.gid
+        self.g.delete_user(user.gid)
+      end
+
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/trustie/gitlab/manage_member.rb b/lib/trustie/gitlab/manage_member.rb
new file mode 100644
index 000000000..b8c2149f4
--- /dev/null
+++ b/lib/trustie/gitlab/manage_member.rb
@@ -0,0 +1,60 @@
+#coding=utf-8
+#
+# 
+module Trustie
+  module Gitlab
+
+    module ManageMember
+      def self.included(base)
+        base.class_eval {
+          before_create :add_gitlab_member
+          before_destroy :delete_gitlab_member
+          after_save :change_gitlab_member
+        }
+      end
+
+      def change_gitlab_member
+        if isGitlabProject?
+          @g ||= ::Gitlab.client
+          @g.edit_team_member(project.gpid, self.member.user.gid, self.role.to_gitlab_role )
+        end
+      end
+
+      def add_gitlab_member
+        if isGitlabProject?
+          @g ||= ::Gitlab.client
+          @g.add_team_member(project.gpid, self.member.user.gid, self.role.to_gitlab_role )
+        end
+      end
+
+      def delete_gitlab_member
+        if isGitlabProject?
+          if member.roles.count <=1
+              @g ||= ::Gitlab.client
+              @g.remove_team_member(project.gpid, self.member.user.gid)
+          end
+        end
+      end
+
+      private
+      def project
+        self.member.project
+      end
+
+      def repository
+        unless project.nil?
+          project.repository
+        end
+      end
+
+      def isGitlabProject?
+        unless repository.nil?
+          repository && repository.gitlab?
+        end
+      end
+
+    end
+
+  end
+end
+
diff --git a/lib/trustie/gitlab/manage_user.rb b/lib/trustie/gitlab/manage_user.rb
new file mode 100644
index 000000000..a87984490
--- /dev/null
+++ b/lib/trustie/gitlab/manage_user.rb
@@ -0,0 +1,36 @@
+#coding=utf-8
+#
+# 
+require_relative 'helper'
+module Trustie
+  module Gitlab
+    module ManageUser
+        include Helper
+
+        def self.included(base)
+            base.class_eval {
+                #before_create :add_gitlab_user
+                #before_destroy :delete_gitlab_user
+                before_save :change_gitlab_user
+            }
+        end
+
+        def add_gitlab_user
+            add_user(self)
+        end
+
+        def delete_gitlab_user
+            del_user(self)
+        end
+
+        def change_gitlab_user
+            change_password(self.gid, self.hashed_password, self.salt)
+        end
+
+        def g
+            @g ||= ::Gitlab.client
+        end
+
+    end
+  end
+end
diff --git a/lib/trustie/gitlab/sync.rb b/lib/trustie/gitlab/sync.rb
new file mode 100644
index 000000000..a303b22fb
--- /dev/null
+++ b/lib/trustie/gitlab/sync.rb
@@ -0,0 +1,128 @@
+#coding=utf-8
+
+require_relative 'helper'
+
+module Trustie
+  module Gitlab
+    module UserLevel
+        GUEST     = 10
+        REPORTER  = 20
+        DEVELOPER = 30
+        MASTER    = 40
+        OWNER     = 50
+    end
+
+    class Sync
+        attr :g
+        include Helper
+        
+        def initialize
+            @g = ::Gitlab.client
+        end
+
+        def sync_user(user)
+            u = add_user(user)
+            if (!("day,none,all".include? user.mail_notification) or user.mail_notification.blank?)
+              user.mail_notification = "day"
+            end
+            user.save!
+            u
+        end
+
+
+        def create_project(project, repository)
+            gid = project.owner.gid
+            unless gid
+              gid = sync_user(project.owner).id
+            end
+            raise "unknow gid" unless gid
+
+            gproject = g.create_project(repository.identifier, 
+                      path: repository.identifier,
+                      description: project.description, 
+                      wiki_enabled: false,
+                      wall_enabled: false,
+                      issues_enabled: false,
+                      snippets_enabled: false,
+                      public: false,
+                      user_id: gid
+                      )
+            project.gpid = gproject.id
+            project.save!
+        end
+
+        def sync_project(project, opt={})
+            gid = project.owner.gid
+            unless gid
+              gid = sync_user(project.owner).id
+            end
+
+            raise "unknow gid" unless gid
+            path = opt[:path]
+            raise "unknow path" unless path
+            import_url = opt[:import_url]
+            raise "unknow import_url" unless import_url
+
+            if opt[:password]
+                import_url.sub('@', ":#{opt[:password]}@")
+            end
+
+            # import url http://xianbo_trustie2:1234@repository.trustie.net/xianbo/trustie2.git
+            # can use password
+            puts "@@@@@@@@@@@@@@@@@@@@@@@"
+            puts path
+            puts project.description
+            puts gid
+            puts import_url
+            gproject = self.g.create_project(path, 
+                            path: path,
+                            description: project.description, 
+                            wiki_enabled: false,
+                            wall_enabled: false,
+                            issues_enabled: false,
+                            snippets_enabled: false,
+                            merge_requests_enabled: true,
+                            public: false,
+                            user_id: gid,
+                            import_url: import_url
+                            )
+            puts "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
+            project.gpid = gproject.id
+            project.save!
+            puts "Successfully created #{project.name}"
+            # add team members
+            #
+            
+            project.members.each do |m|
+              begin
+                gid = m.user.gid
+                unless gid
+                    gid = sync_user(m.user).id
+                end
+                self.g.add_team_member(gproject.id, gid, UserLevel::DEVELOPER)
+              rescue => e
+                puts e
+              end
+            end
+        end
+
+        def only_members(project)
+          project.members.each do |m|
+            begin
+              gid = m.user.gid
+              unless gid
+                gid = sync_user(m.user).id
+              end
+              self.g.add_team_member(project.gpid, gid, UserLevel::DEVELOPER)
+            rescue => e
+              puts e
+            end
+          end
+        end
+
+        def remove_project
+        end
+    end
+
+  end
+end
\ No newline at end of file
diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index 5f1063f0b..a6506bbf3 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -263,7 +263,7 @@ K.options = {
 	cssData : '',
 	minWidth : 650,
 	minHeight : 100,
-	minChangeSize : 50,
+	minChangeSize : 1,
 	zIndex : 811213,
 	items : ['code','emoticons','fontname',
         'forecolor', 'hilitecolor', 'bold', '|', 'justifyleft', 'justifycenter', 'insertorderedlist','insertunorderedlist', '|',
@@ -277,7 +277,7 @@ K.options = {
 		['#337FE5', '#003399', '#4C33E5', '#9933E5', '#CC33E5', '#EE33EE'],
 		['#FFFFFF', '#CCCCCC', '#999999', '#666666', '#333333', '#000000']
 	],
-	fontSizeTable : ['9px', '10px', '12px', '14px', '16px', '18px', '24px', '32px'],
+	fontSizeTable : ['选中的字体大小:','9px', '10px', '12px', '14px', '16px', '18px', '24px', '32px'],
 	htmlTags : {
 		font : ['id', 'class', 'color', 'size', 'face', '.background-color'],
 		span : [
@@ -5737,20 +5737,45 @@ _plugin('core', function(K) {
 		});
 	});
 	self.clickToolbar('fontsize', function() {
+       // knode = self.getSelectedAnchor();
+
+        //console.log(self.cmd.range.startContainer.parentElement.style.fontSize)
 		var curVal = self.cmd.val('fontsize'),
 			menu = self.createMenu({
 				name : 'fontsize',
 				width : 150
 			});
 		_each(self.fontSizeTable, function(i, val) {
-			menu.addItem({
-				title : '<span style="font-size:' + val + ';" unselectable="on">' + val + '</span>',
-				height : _removeUnit(val) + 12,
-				checked : curVal === val,
-				click : function() {
-					self.exec('fontsize', val).hideMenu();
-				}
-			});
+            if (i==0){
+                fontsize = "14px"
+                if(self.cmd.range.startContainer.parentElement.style.fontSize) {
+                    fontsize = self.cmd.range.startContainer.parentElement.style.fontSize
+                    menu.addItem({
+                        title: '<span style="font-size:14px ;" unselectable="on">首个选中字体:' + fontsize + '</span>',
+                        height: 14,
+                        click: function () {
+                        }
+                    });
+                }else {
+                    menu.addItem({
+                        title: '<span style="font-size:14px ;" unselectable="on">当前为默认字体:' + fontsize + '</span>',
+                        height: 14,
+                        click: function () {
+                        }
+                    });
+                }
+            }else {
+                menu.addItem({
+                    title: '<span style="font-size:' + val + ';" unselectable="on">' + val + '</span>',
+                    height: _removeUnit(val) + 12,
+                    checked: curVal === val,
+                    click: function () {
+                        self.exec('fontsize', val).hideMenu();
+
+                    }
+                });
+            }
+
 		});
 	});
 	_each('forecolor,hilitecolor'.split(','), function(i, name) {
diff --git a/public/images/course/arrow_up.jpg b/public/images/course/arrow_up.jpg
index bbf348fe1..7bcfa859c 100644
Binary files a/public/images/course/arrow_up.jpg and b/public/images/course/arrow_up.jpg differ
diff --git a/public/images/course/arrow_up2.jpg b/public/images/course/arrow_up2.jpg
new file mode 100644
index 000000000..bbf348fe1
Binary files /dev/null and b/public/images/course/arrow_up2.jpg differ
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/news_dot.png b/public/images/news_dot.png
new file mode 100644
index 000000000..7dea0bbe4
Binary files /dev/null and b/public/images/news_dot.png differ
diff --git a/public/images/news_dot2.png b/public/images/news_dot2.png
new file mode 100644
index 000000000..3b9f9e88d
Binary files /dev/null and b/public/images/news_dot2.png differ
diff --git a/public/images/sidebar_bg.png b/public/images/sidebar_bg.png
index 9ceea0f91..e4d12da4d 100644
Binary files a/public/images/sidebar_bg.png and b/public/images/sidebar_bg.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/images/vlicon/branch_icon.png b/public/images/vlicon/branch_icon.png
new file mode 100644
index 000000000..c80e17134
Binary files /dev/null and b/public/images/vlicon/branch_icon.png differ
diff --git a/public/images/vlicon/clone_url.png b/public/images/vlicon/clone_url.png
new file mode 100644
index 000000000..a1c71862a
Binary files /dev/null and b/public/images/vlicon/clone_url.png differ
diff --git a/public/images/vlicon/commit_icon.png b/public/images/vlicon/commit_icon.png
new file mode 100644
index 000000000..148dbcd4b
Binary files /dev/null and b/public/images/vlicon/commit_icon.png differ
diff --git a/public/images/vlicon/download_icon.png b/public/images/vlicon/download_icon.png
new file mode 100644
index 000000000..b442730fe
Binary files /dev/null and b/public/images/vlicon/download_icon.png differ
diff --git a/public/images/vlicon/fork_icon.png b/public/images/vlicon/fork_icon.png
new file mode 100644
index 000000000..45a6b0e82
Binary files /dev/null and b/public/images/vlicon/fork_icon.png differ
diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js
index 9c32e41dc..813c10dee 100644
--- a/public/javascripts/attachments.js
+++ b/public/javascripts/attachments.js
@@ -37,27 +37,27 @@ function addFile_board(inputEl, file, eagerUpload, id) {
         fileSpan.append(
             $('<input>', {
                 'type': 'text',
-                'class': 'filename readonly',
+                'class': 'upload_filename readonly',
                 'name': 'attachments[' + attachmentId + '][filename]',
                 'readonly': 'readonly'
             }).val(file.name),
-            $('<input>', {
-                'type': 'text',
-                'class': 'description',
-                'name': 'attachments[' + attachmentId + '][description]',
-                'maxlength': 254,
-                'placeholder': $(inputEl).data('descriptionPlaceholder')
-            }).toggle(!eagerUpload),
-            $('<span >' + $(inputEl).data('fieldIsPublic') + ':</span>').attr({
-                'class': 'ispublic-label'
-            }),
-            $('<input>', {
-                'type': 'checkbox',
-                'class': 'is_public_checkbox',
-                'value': 1,
-                'name': 'attachments[' + attachmentId + '][is_public_checkbox]',
-                checked: 'checked'
-            }).toggle(!eagerUpload),
+//            $('<input>', {
+//                'type': 'text',
+//                'class': 'description',
+//                'name': 'attachments[' + attachmentId + '][description]',
+//                'maxlength': 254,
+//                'placeholder': $(inputEl).data('descriptionPlaceholder')
+//            }).toggle(!eagerUpload),
+//            $('<span >' + $(inputEl).data('fieldIsPublic') + ':</span>').attr({
+//                'class': 'ispublic-label'
+//            }),
+//            $('<input>', {
+//                'type': 'checkbox',
+//                'class': 'is_public_checkbox',
+//                'value': 1,
+//                'name': 'attachments[' + attachmentId + '][is_public_checkbox]',
+//                checked: 'checked'
+//            }).toggle(!eagerUpload),
             $('<a>&nbsp</a>').attr({
                 'href': "#",
                 'class': 'remove-upload',
@@ -103,27 +103,27 @@ function addFile(inputEl, file, eagerUpload) {
         fileSpan.append(
             $('<input>', {
                 'type': 'text',
-                'class': 'filename readonly',
+                'class': 'upload_filename readonly',
                 'name': 'attachments[' + attachmentId + '][filename]',
                 'readonly': 'readonly'
             }).val(file.name),
-            $('<input>', {
-                'type': 'text',
-                'class': 'description',
-                'name': 'attachments[' + attachmentId + '][description]',
-                'maxlength': 254,
-                'placeholder': $(inputEl).data('descriptionPlaceholder')
-            }).toggle(!eagerUpload),
-            $('<span >' + $(inputEl).data('fieldIsPublic') + ':</span>').attr({
-                'class': 'ispublic-label'
-            }),
-            $('<input>', {
-                'type': 'checkbox',
-                'class': 'is_public_checkbox',
-                'value': 1,
-                'name': 'attachments[' + attachmentId + '][is_public_checkbox]',
-                checked: 'checked'
-            }).toggle(!eagerUpload),
+//            $('<input>', {
+//                'type': 'text',
+//                'class': 'description',
+//                'name': 'attachments[' + attachmentId + '][description]',
+//                'maxlength': 254,
+//                'placeholder': $(inputEl).data('descriptionPlaceholder')
+//            }).toggle(!eagerUpload),
+//            $('<span >' + $(inputEl).data('fieldIsPublic') + ':</span>').attr({
+//                'class': 'ispublic-label'
+//            }),
+//            $('<input>', {
+//                'type': 'checkbox',
+//                'class': 'is_public_checkbox',
+//                'value': 1,
+//                'name': 'attachments[' + attachmentId + '][is_public_checkbox]',
+//                checked: 'checked'
+//            }).toggle(!eagerUpload),
             $('<a>&nbsp</a>').attr({
                 'href': "#",
                 'class': 'remove-upload'
@@ -173,9 +173,9 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) {
         ajaxUpload.uploading++;
 
         uploadBlob(file, $(inputEl).data('upload-path'), attachmentId, {
-                loadstartEventHandler: onLoadstart.bind(progressSpan),
-                progressEventHandler: onProgress.bind(progressSpan)
-            })
+            loadstartEventHandler: onLoadstart.bind(progressSpan),
+            progressEventHandler: onProgress.bind(progressSpan)
+        })
             .done(function(result) {
                 progressSpan.progressbar('value', 100).remove();
                 fileSpan.find('input.description, a').css('display', 'inline-block');
@@ -198,7 +198,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) {
 
         //gcm files count and add delete_all link
 
-        //modify by yutao 2015-5-14  ��1��ҳ����ڶ���ϴ��ؼ�ʱ�˿�������bug  �ʸ�֮  start
+        //modify by yutao 2015-5-14  ��1��ҳ����ڶ���ϴ��ؼ�ʱ�˿�������bug  �ʸ�֮  start
         var containerid = $(inputEl).data('containerid');
         if (containerid == undefined) {
             var count = $('#attachments_fields>span').length;
@@ -233,7 +233,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) {
                     }));
                 }
             }
-            //modify by yutao 2015-5-14  ��1��ҳ����ڶ���ϴ��ؼ�ʱ�˿�������bug  �ʸ�֮  end
+            //modify by yutao 2015-5-14  ��1��ҳ����ڶ���ϴ��ؼ�ʱ�˿�������bug  �ʸ�֮  end
         }
 
         //gcm
@@ -260,24 +260,24 @@ function removeFile() {
 }
 
 //gcm delete all file
-//modify by yutao 2015-5-14  ��1��ҳ����ڶ���ϴ��ؼ�ʱ�˿�������bug  �ʸ�֮  start
+//modify by yutao 2015-5-14  ��1��ҳ����ڶ���ϴ��ؼ�ʱ�˿�������bug  �ʸ�֮  start
 function removeAll(containerid) {
-        if (confirm(deleteallfiles)) {
-            if (containerid == undefined) {
-                $(".remove-upload").removeAttr("data-confirm");
-                $(".remove-upload").click();
-            } else {
-                var arr = $(".remove-upload").filter(function() {
-                    return $(this).data('containerid') == containerid;
-                });
-                arr.removeAttr("data-confirm");
-                arr.click();
-            }
+    if (confirm(deleteallfiles)) {
+        if (containerid == undefined) {
+            $(".remove-upload").removeAttr("data-confirm");
+            $(".remove-upload").click();
+        } else {
+            var arr = $(".remove-upload").filter(function() {
+                return $(this).data('containerid') == containerid;
+            });
+            arr.removeAttr("data-confirm");
+            arr.click();
         }
-        //	return false;
     }
-    //modify by yutao 2015-5-14  ��1��ҳ����ڶ���ϴ��ؼ�ʱ�˿�������bug  �ʸ�֮  end
-    //gcm
+    //	return false;
+}
+//modify by yutao 2015-5-14  ��1��ҳ����ڶ���ϴ��ؼ�ʱ�˿�������bug  �ʸ�֮  end
+//gcm
 
 function uploadBlob(blob, uploadUrl, attachmentId, options) {
 
@@ -467,3 +467,139 @@ $(function() {
         }
     });
 });
+
+//课程课件
+function addInputFilesCourseSource(inputEl) {
+    checkBox = arguments[1] == 'public' ? false : true;
+    // var clearedFileInput = $(inputEl).clone().val('');
+    if (inputEl.files) {
+        // upload files using ajax
+        uploadAndAttachFilesCourseSource(inputEl.files, inputEl,checkBox);
+        //   $(inputEl).remove();
+    } else {
+        // browser not supporting the file API, upload on form submission
+        var attachmentId;
+        var aFilename = inputEl.value.split(/\/|\\/);
+        var count = $('#attachments_fields>span').length;
+        attachmentId = addFile(inputEl, {
+            name: aFilename[aFilename.length - 1]
+        }, false);
+        if (attachmentId) {
+            $(inputEl).attr({
+                name: 'attachments[' + attachmentId + '][file]'
+            }).hide();
+            if (count <= 0) count = 1;
+            $('#upload_file_count').html("<span id=\"count\">" + count + "</span>" + $(inputEl).data('fileCount'));
+        }
+    }
+
+    //clearedFileInput.insertAfter('#attachments_fields');
+}
+
+function uploadAndAttachFilesCourseSource(files, inputEl,checkBox) {
+
+    var maxFileSize = $(inputEl).data('max-file-size');
+    var maxFileSizeExceeded = $(inputEl).data('max-file-size-message');
+
+    var sizeExceeded = false;
+    $.each(files, function() {
+        if (this.size && maxFileSize != null && this.size > parseInt(maxFileSize)) {
+            sizeExceeded = true;
+        }
+    });
+    if (sizeExceeded) {
+        window.alert(maxFileSizeExceeded);
+    } else {
+        $.each(files, function() {
+            addFileCourseSource(inputEl, this, true,checkBox);
+        });
+    }
+}
+
+function addFileCourseSource(inputEl, file, eagerUpload,checkBox) {
+
+    var attachments_frame = '#attachments_fields';
+    if ($(attachments_frame).children().length < 30) {
+        deleteallfiles = $(inputEl).data('deleteAllFiles');
+        var attachmentId = addFile.nextAttachmentId++;
+
+        var fileSpan = $('<span>', {
+            'id': 'attachments_' + attachmentId,
+            'class': 'attachment'
+        });
+        //alert(checkBox);
+        if(checkBox){
+            fileSpan.append(
+                $('<input>', {
+                    'type': 'text',
+                    'class': 'upload_filename readonly',
+                    'name': 'attachments[' + attachmentId + '][filename]',
+                    'readonly': 'readonly'
+                }).val(file.name),
+//                $('<input>', {
+//                    'type': 'text',
+//                    'class': 'description',
+//                    'name': 'attachments[' + attachmentId + '][description]',
+//                    'maxlength': 254,
+//                    'placeholder': $(inputEl).data('descriptionPlaceholder')
+//                }).toggle(!eagerUpload),
+                $('<div>', {
+                    'class': 'div_attachments',
+                    'name': 'div_' + 'attachments_' + attachmentId
+                })
+            ).appendTo('#attachments_fields');
+        }else {
+            fileSpan.append(
+                $('<input>', {
+                    'type': 'text',
+                    'class': 'upload_filename readonly',
+                    'name': 'attachments[' + attachmentId + '][filename]',
+                    'readonly': 'readonly'
+                }).val(file.name),
+//                $('<input>', {
+//                    'type': 'text',
+//                    'class': 'description',
+//                    'name': 'attachments[' + attachmentId + '][description]',
+//                    'maxlength': 254,
+//                    'placeholder': $(inputEl).data('descriptionPlaceholder')
+//                }).toggle(!eagerUpload),
+//                $('<span >' + $(inputEl).data('fieldIsPublic') + ':</span>').attr({
+//                    'class': 'ispublic-label'
+//                }),
+//                $('<input>', {
+//                    'type': 'checkbox',
+//                    'class': 'is_public_checkbox',
+//                    'value': 1,
+//                    'name': 'attachments[' + attachmentId + '][is_public_checkbox]',
+//                    checked: 'checked'
+//                }).toggle(!eagerUpload),
+                $('<a>&nbsp</a>').attr({
+                    'href': "#",
+                    'class': 'remove-upload'
+                }).click(function () {
+                    if (confirm($(inputEl).data('areYouSure'))) {
+                        removeFile();
+                        if (!eagerUpload) {
+                            (function (e) {
+                                reload(e);
+                            })(fileSpan);
+                        }
+                    }
+
+                }).toggle(!eagerUpload),
+                $('<div>', {
+                    'class': 'div_attachments',
+                    'name': 'div_' + 'attachments_' + attachmentId
+                })
+            ).appendTo('#attachments_fields');
+        }
+
+        if (eagerUpload) {
+            ajaxUpload(file, attachmentId, fileSpan, inputEl);
+
+        }
+        return attachmentId;
+    }
+    return null;
+}
+addFileCourseSource.nextAttachmentId = 1;
\ No newline at end of file
diff --git a/public/javascripts/blog.js b/public/javascripts/blog.js
new file mode 100644
index 000000000..feaab0100
--- /dev/null
+++ b/public/javascripts/blog.js
@@ -0,0 +1,82 @@
+function regexTopicSubject() {
+    var name = $("#message_subject").val();
+    if(name.length ==0)
+    {
+        $("#subjectmsg").text("标题不能为空");
+        $("#subjectmsg").css('color','#ff0000');
+        $("#message_subject").focus();
+        return false;
+    }
+    else if(name.length <= 255)
+    {
+        $("#subjectmsg").text("填写正确");
+        $("#subjectmsg").css('color','#008000');
+        return true;
+    }
+    else
+    {
+        $("#subjectmsg").text("标题超过255个字符");
+        $("#subjectmsg").css('color','#ff0000');
+        $("#message_subject").focus();
+        return false;
+    }
+}
+
+function submit_article()
+{
+    if(regexTopicSubject() && regexTopicDescription())
+    {
+        message_content_editor.sync();
+        $("#message-form").submit();
+    }
+}
+
+function regexTopicDescription()
+{
+    var name = message_content_editor.html();
+    if(name.length ==0)
+    {
+        $("#message_content_span").text("描述不能为空");
+        $("#message_content_span").css('color','#ff0000');
+        return false;
+    }
+    else if(name.length >=20000){
+        $("#message_content_span").text("描述最多20000个汉字(或40000个英文字符)");
+        $("#message_content_span").css('color','#ff0000');
+        return false;
+    }
+    else
+    {
+        $("#message_content_span").text("填写正确");
+        $("#message_content_span").css('color','#008000');
+        return true;
+    }
+}
+
+function MessageReplayVevify() {
+    var content = message_content_editor.html();//$.trim($("#message_content").val());
+    if (content.length == 0) {
+        $("#message_content_span").text("回复不能为空");
+        $("#message_content_span").css('color', '#ff0000');
+        return  false;
+    }
+    else {
+        $("#message_content_span").text("填写正确");
+        $("#message_content_span").css('color', '#008000');
+        return true;
+    }
+}
+function submit_message_replay()
+{
+    if(MessageReplayVevify())
+    {
+        message_content_editor.sync();//提交内容之前要sync，不然服务器端取不到值
+        $("#message_form").submit();
+    }
+}
+
+function canel_message_replay()
+{
+    $("#reply").hide(200);
+    $("#message_quote").html("");
+}
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 3baa11970..84e087c49 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -176,7 +176,7 @@ function regexTopicSubject() {
 function regexTopicDescription()
 {
     var name = message_content_editor.html();
-    if(name.length ==0)
+    if(message_content_editor.isEmpty())
     {
         $("#message_content_span").text("描述不能为空");
         $("#message_content_span").css('color','#ff0000');
@@ -282,7 +282,7 @@ function regexTitle()
 function regexDescription()
 {
     var name = news_description_editor.html();
-    if(name.length ==0)
+    if(news_description_editor.isEmpty())
     {
         $("#description_notice_span").text("描述不能为空");
         $("#description_notice_span").css('color','#ff0000');
@@ -327,7 +327,7 @@ function submitComment()
 
 function newsReplyVerify() {
     var content = comment_editor.html();
-    if(content.length == 0) {
+    if(comment_editor.isEmpty()) {
         $("#add_reply_news").text("评论不能为空");
         $("#add_reply_news").css('color', '#ff0000');
         return false;
@@ -356,7 +356,7 @@ function course_board_canel_message_replay()
 
 function MessageReplayVevify() {
     var content = message_content_editor.html();//$.trim($("#message_content").val());
-    if (content.length == 0) {
+    if (message_content_editor.isEmpty()) {
         $("#message_content_span").text("回复不能为空");
         $("#message_content_span").css('color', '#ff0000');
         return  false;
@@ -629,6 +629,9 @@ function submit_homework(id){
     else if(!regex_homework_end_time()){
         $("#homework_end_time").focus();
     }
+    else if(!regex_homework_end_publish_time()){
+        $("#homework_end_time").focus();
+    }
     else if(!regex_course_id()){
         $("#course_id").focus();
     }
@@ -654,6 +657,28 @@ function regex_homework_name()
         return true;
     }
 }
+//验证发布时间不能大于截止时间
+function regex_homework_end_publish_time()
+{
+    var myDate = new Date();
+    if($.trim($("#homework_publish_time").val()) == "")
+    {
+        $("#homework_publish_time").val(formate_date(myDate));
+    }
+    var publish_time = Date.parse($("#homework_publish_time").val());
+    var end_time = Date.parse($("#homework_end_time").val());
+    if(end_time < publish_time)
+    {
+        $("#homework_end_time_span").text("截止日期不能小于发布日期");
+        return false;
+    }
+    else
+    {
+        $("#homework_end_time_span").text("");
+        return true;
+    }
+}
+
 //验证截止时间
 function regex_homework_end_time()
 {
@@ -670,6 +695,21 @@ function regex_homework_end_time()
     }
 }
 
+function formate_date(date){
+    var str = "";
+    var year = date.getFullYear();
+    var month = date.getMonth() + 1;
+    var day = date.getDate();
+    if(month < 10) {
+        month = '0' + month;
+    }
+    if(day < 10) {
+        day = '0' + day;
+    }
+    str = year + '-' + month + '-' + day;
+    return str;
+}
+
 //验证发送到课程
 function regex_course_id(){
     var course_id = $("#course_id").val();
@@ -914,13 +954,19 @@ function regexStudentWorkDescription()
 function new_student_work()
 {
     if(regexStudentWorkName()&&regexStudentWorkDescription())
-    {$("#new_student_work").submit();}
+    {
+        $("#new_student_work").submit();
+        $("#ajax-indicator").hide();
+    }
 }
 
 function edit_student_work(id)
 {
     if(regexStudentWorkName()&&regexStudentWorkDescription())
-    {$("#edit_student_work_" + id).submit();}
+    {
+        $("#edit_student_work_" + id).submit();
+        $("#ajax-indicator").hide();
+    }
 }
 
 //
@@ -1222,4 +1268,16 @@ var autoTextarea2 = function (elem,elem2, extra, maxHeight) {
     addEvent(elem2, 'input', change);
     addEvent(elem2, 'focus', change);
     change();
-};
\ No newline at end of file
+};
+
+//课程大纲选择请求,第二个参数是可选的，判断当前页面是大纲显示页面还是 课程首页
+function course_outline(id){
+    $.get(
+        ' /courses/'+id+'/course_outline'+"?is_in_show_outline_page="+(arguments[1] ? arguments[1] : 'N')
+    )
+}
+//$(function(){
+//    $('#course_outline_search').on('input',function(){
+//        alert('<%= @course.id%>')
+//    })
+//})
diff --git a/public/javascripts/feedback.js b/public/javascripts/feedback.js
index fb3b35ca7..97209131e 100644
--- a/public/javascripts/feedback.js
+++ b/public/javascripts/feedback.js
@@ -1,5 +1,10 @@
 (function($){
     $.fn.fix = function(options){
+        var u = navigator.userAgent;
+        if((u.indexOf('Android') > -1 || u.indexOf('Linux') > -1 ||u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1)){
+            $("#scrollsidebar").css("display","none");
+            return;
+        }
         var defaults = {
             float : 'right',
             minStatue : true,
@@ -19,12 +24,12 @@
             if(options.minStatue == "true"){
                 show_btn.css("float", options.float);
                 sideContent.css('width', 0);
-                show_btn.css('width', 25);
+                show_btn.css('width', 28);
             }
             //close
             closeBtn.bind("click",function(){
                 sideContent.animate({width: '0px'},"fast");
-                show_btn.stop(true, true).delay(300).animate({ width: '25px'},"fast");
+                show_btn.stop(true, true).delay(300).animate({ width: '28px'},"fast");
                 cookiesave('minStatue','true','','','');
             });
             //show
@@ -73,6 +78,11 @@ function cookieget(n)
 
 
 $(function(){
+    var u = navigator.userAgent;
+    if((u.indexOf('Android') > -1 || u.indexOf('Linux') > -1 ||u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1)){
+        $("#scrollsidebar").css("display","none");
+        return;
+    }
     $(".closeSidebar").click(function(){
         $(".show_btn").css("display","none");
         $("#scrollsidebar").css("display","none");
@@ -109,4 +119,30 @@ $(function(){
             $("#textCount").text(50-$("#subject").val().length)
         }
     });
-});
\ No newline at end of file
+});
+
+//var browser={
+//    versions:function(){
+//        var u = navigator.userAgent, app = navigator.appVersion;
+//        return {//移动终端浏览器版本信息
+//            trident: u.indexOf('Trident') > -1, //IE内核
+//            presto: u.indexOf('Presto') > -1, //opera内核
+//            webKit: u.indexOf('AppleWebKit') > -1, //苹果、谷歌内核
+//            gecko: u.indexOf('Gecko') > -1 && u.indexOf('KHTML') == -1, //火狐内核
+//            mobile: !!u.match(/AppleWebKit.*Mobile.*/)||!!u.match(/AppleWebKit/), //是否为移动终端
+//            ios: !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/), //ios终端
+//            android: u.indexOf('Android') > -1 || u.indexOf('Linux') > -1, //android终端或者uc浏览器
+//            iPhone: u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1, //是否为iPhone或者QQHD浏览器
+//            iPad: u.indexOf('iPad') > -1, //是否iPad
+//            webApp: u.indexOf('Safari') == -1 //是否web应该程序，没有头部与底部
+//        };
+//    }(),
+//    language:(navigator.browserLanguage || navigator.language).toLowerCase()
+//}
+//document.writeln("语言版本: "+browser.language);
+//document.writeln(" 是否为移动终端: "+browser.versions.mobile);
+//document.writeln(" ios终端: "+browser.versions.ios);
+//document.writeln(" android终端: "+browser.versions.android);
+//document.writeln(" 是否为iPhone: "+browser.versions.iPhone);
+//document.writeln(" 是否iPad: "+browser.versions.iPad);
+//document.writeln(navigator.userAgent);
\ No newline at end of file
diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index be3119257..a0647b592 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -63,6 +63,9 @@ function submit_homework(id){
     else if(!regex_homework_end_time()){
         $("#homework_end_time").focus();
     }
+    else if(!regex_homework_end_publish_time()){
+        $("#homework_end_time").focus();
+    }
     else if(!regex_course_id()){
         $("#course_id").focus();
     }
@@ -88,6 +91,28 @@ function regex_homework_name()
         return true;
     }
 }
+//验证发布时间不能大于截止时间
+function regex_homework_end_publish_time()
+{
+    var myDate = new Date();
+    if($.trim($("#homework_publish_time").val()) == "")
+    {
+        $("#homework_publish_time").val(formate_date(myDate));
+    }
+    var end_time = Date.parse($("#homework_end_time").val());
+    var publish_time = Date.parse($("#homework_publish_time").val());
+    if(end_time < publish_time)
+    {
+        $("#homework_end_time_span").text("截止日期不能小于发布日期");
+        return false;
+    }
+    else
+    {
+        $("#homework_end_time_span").text("");
+        return true;
+    }
+}
+
 //验证截止时间
 function regex_homework_end_time()
 {
@@ -104,6 +129,21 @@ function regex_homework_end_time()
     }
 }
 
+function formate_date(date){
+    var str = "";
+    var year = date.getFullYear();
+    var month = date.getMonth() + 1;
+    var day = date.getDate();
+    if(month < 10) {
+        month = '0' + month;
+    }
+    if(day < 10) {
+        day = '0' + day;
+    }
+    str = year + '-' + month + '-' + day;
+    return str;
+}
+
 //验证发送到课程
 function regex_course_id(){
     var course_id = $("#course_id").val();
@@ -210,13 +250,19 @@ function regex_evaluation_num(){
 function new_student_work()
 {
     if(regexStudentWorkName()&&regexStudentWorkDescription())
-    {$("#new_student_work").submit();}
+    {
+        $("#new_student_work").submit();
+        $("#ajax-indicator").hide();
+    }
 }
 
 function edit_student_work(id)
 {
     if(regexStudentWorkName()&&regexStudentWorkDescription())
-    {$("#edit_student_work_" + id).submit();}
+    {
+        $("#edit_student_work_" + id).submit();
+        $("#ajax-indicator").hide();
+    }
 }
 
 //验证作品名称
diff --git a/public/javascripts/project.js b/public/javascripts/project.js
index c74ff18bf..a31ae2356 100644
--- a/public/javascripts/project.js
+++ b/public/javascripts/project.js
@@ -511,3 +511,19 @@ function submitProjectFeedback() {
     $("#project_feedback_form").submit();
 }
 
+// 点击按钮复制功能
+function jsCopy(){
+    var e=document.getElementById("copy_rep_content");
+    e.select();
+    document.execCommand("Copy");
+}
+function jsCopy2(id){
+    //alert("copy_rep_content2_" + id);
+    var e=document.getElementById("copy_rep_content2_" + id);
+    e.select();
+    document.execCommand("Copy");
+}
+
+function zip(){
+    alert("该功能正在紧张的开发中，我们会争取在最短时间内上线，如若对您工作造成不便敬请谅解！")
+}
\ No newline at end of file
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 6c6227ed4..5646737f5 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -12,11 +12,20 @@ li{list-style-type:none;}
 /*Tim 151019*/
 .schoolName {border:1px solid #dddddd; outline: none; width: 180px; height: 22px;}
 .provinceSelect {border: 1px solid #dddddd; outline: none; color: #888888;}
-.submit_btn {background-color: #269ac9; color: #ffffff; padding: 2px 5px; border: none; border-radius: 3px; cursor: pointer;}
-.submit_btn:hover {background-color:#297fb8;}
+.submit_btn_s {background-color: #269ac9; color: #ffffff; padding: 2px 5px; border: none; border-radius: 3px; cursor: pointer;}
+.submit_btn_s:hover {background-color:#297fb8;}
 .cancel_btn {background-color: #c1c1c1; color: #ffffff; padding: 2px 5px; border: none; border-radius: 3px; cursor: pointer;}
 .cancel_btn:hover {background-color:#656565; }
 /*huang*/
+.repository-update-dec{
+    padding: 10px;
+}
+.repository-update-dec .c_grey {
+    color: #999999;
+}
+.repository-update-dec .c_orange {
+    color: #ff7143;
+}
 
 .hwork_input_news{ border:1px solid #64bdd9; height:22px; width:594px; background:#fff; margin-bottom:10px; padding:5px;}
 .ml55{ margin-left:55px;}
@@ -1862,7 +1871,7 @@ span.required {color: #bb0000;}
 #attachments_fields .ajax-waiting input.filename {background:url(../images/hourglass.png) no-repeat 0px 50%;}
 #attachments_fields .ajax-loading input.filename {background:url(../images/loading.gif) no-repeat 0px 50%;}
 #attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
-a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%; width:1px; display:inline-block; padding-left:16px;}
+a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%; width:1px; display:inline-block; padding-left:16px;margin-left: 5px;}
 a.remove-upload:hover {text-decoration:none !important;}
 
 /*gcm upload file count and deleteall*/
@@ -2736,15 +2745,31 @@ h2 img { vertical-align:middle; }
 
 /*added by william*/ 
 #tag {
-		background: url(../images/issue_tag.png) no-repeat right -19px;
-		border-radius: 3px;
-		color: #3a587d !important;
-		padding: 1px 4px 2px 4px;
-		margin: 3px;
-		display: inline-block;
-		font-size: 13px;   /*modified by linchun*/
-		text-decoration: none;
-		cursor: pointer;
+		/*background: url(../images/issue_tag.png) no-repeat right -19px;*/
+		/*border-radius: 3px;*/
+		/*color: #3a587d !important;*/
+		/*padding: 1px 4px 2px 4px;*/
+		/*margin: 3px;*/
+		/*display: inline-block;*/
+		/*font-size: 13px;   *//*modified by linchun*/
+		/*text-decoration: none;*/
+		/*cursor: pointer;*/
+    border-radius: 3px;
+    color: #3a587d !important;
+    padding: 1px 4px 2px 4px;
+    margin: 3px;
+    display: inline-block;
+    font-size: 13px;
+    text-decoration: none;
+    cursor: pointer;
+    width: auto;
+    padding: 0 5px;
+    padding-top: 2px;
+    border: 1px solid #f8df8c;
+    background: #fffce6;
+    margin-right: 5px;
+    word-wrap: break-word;
+    word-break: break-all;
 }
 
 /*tanxianbo*/
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 2fb7ec9c9..48c6a2d88 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -33,7 +33,7 @@ a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;}
 .ctt2{clear:both; }
 .hworkListBanner {width:720px; height:40px; background:#eaeaea; margin-bottom:10px;}
 .hworkListContainer {float:left; clear:both; width:720px;}
-.showHwork{ border:2px solid #269ac9; width:696px; padding:10px; color:#666666; padding-bottom:0px; }
+.showHwork{ border:1px solid #eaeaea; width:696px; padding:10px; color:#666666; padding-bottom:0px; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); }
 .showHworkP{ width:630px; float:left;}
 .showHwork ul li {margin-bottom: 5px;}
 .hworkPingText{ float:left; border:1px solid #e4e4e4; padding:5px; width:618px; height:35px;}
@@ -41,12 +41,15 @@ a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;}
 .pingBoxTit{ float:left; width:625px; margin-left:10px;}
 .pingText{border:1px solid #CCCCCC; margin:5px; padding:5px; width:610px; height:20px; }
 .pingBackTit{ float:left; width:573px; margin-left:10px; }
-.hworkUl{ height:30px; border-bottom:1px solid #eaeaea; line-height:30px; vertical-align:middle;}
+.hworkUl{ height:30px; border-bottom:1px solid #eaeaea; line-height:30px; vertical-align:middle; background-color: #f6f6f6;}
 .hworkH30 {height:30px !important; line-height:30px !important;}
-.hworkListRow {height:65px; border-bottom:1px solid #eaeaea; line-height:65px; vertical-align:middle;}
+.hworkListRow {height:65px; border-bottom:1px dashed #eaeaea; line-height:65px; vertical-align:middle; position: relative;}
 .hworkListRow:hover {background-color:#f6f6f7;}
 .hworkUl li{ float:left;}
 .hworkListRow li{ float:left;}
+.hworkTip{position:absolute; padding:3px 5px; border:1px solid #eaeaea; display:block; right:-108px; top:20px; background-color:#ffffff; line-height:20px; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5);}
+.hworkTip em {display:block; border-width:8px; position:absolute; bottom:4px; left:-16px; border-style:dashed solid dashed dashed; border-color:transparent #eaeaea transparent transparent; font-size:0; line-height:0;}
+.hworkTip span {display:block; border-width:8px; position:absolute; bottom:4px; left:-15px; border-style:dashed solid dashed dashed; border-color:transparent #FFF transparent transparent; font-size:0; line-height:0;}
 .hworkList340 {width:335px; text-align:left; height:50px; line-height:50px;padding-left:5px;}
 .hworkList80 {width:80px; text-align:center;}
 .hworkList50 {width:50px; text-align:center;}
@@ -71,9 +74,9 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re
 .classSplit {border:1px solid #e7e7e7; height:27px; line-height:27px; display:inline-block; margin-left:10px; padding-left:5px; cursor:pointer; outline:none; width:95px; max-width:95px;}
 .classList {width:45px; border:1px solid #e7e7e7; float:left; position:absolute; background-color:#ffffff; left:-1px;}
 .hworkPortrait {float:left; width:40px;}
-.HomeworkNameTitle{width: 285px;text-align: center;margin-left: 50px;}
+.HomeworkNameTitle{width: 285px;text-align: left;margin-left: 50px;}
 .HomeworkStuTitle{width: 80px;text-align: center;}
-.StudentName{display: table-cell;width: 115px;vertical-align: middle;text-align: center;height: 40px;}
+.StudentName{display: table-cell;width: 115px;vertical-align: middle;text-align: left;height: 40px;}
 .width385{width: 385px;}
 .width505{width: 505px;}
 .width165{width: 165px;}
@@ -81,9 +84,19 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re
 .width525{width: 525px;}
 .width285{width: 285px;}
 .mr95{margin-right: 95px;}
+.mr140 {margin-right: 140px;}
 .ml100{margin-left: 100px;}
 .mt16{margin-top: 16px;}
 .pr10{padding-right: 10px;}
+
+/*作业信息*/
+.mt-2 {margin-top:-2px;}
+.homeworkInfo {background:#F6F6F6; padding:10px; margin-bottom:10px;}
+.homeworkDetail {line-height:18px; font-size:12px; color:#484848; overflow:hidden;}
+.max_h54 {max-height:54px; }
+.homeworkState {padding:3px 5px; background-color:#28be6c; border-radius:3px; float:left; margin-left:15px; color:#ffffff;}
+.homeworkClose {padding:3px 5px; background-color:#b2b2b2; border-radius:3px; float:left; margin-left:15px; color:#ffffff;}
+
 /*课程右侧动态 new_user.css*/
 .resources {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;float: right}
 .homepageRight {width:750px; float:left; margin-top:10px; margin-bottom:10px;}
@@ -111,7 +124,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostSubmitContainer {height:25px; margin-top: 8px; margin-bottom: 5px;}
 .homepagePostSubmit {font-size:14px; color:#888888; border:1px solid #dddddd; background-color:#eaeaea; float:left; margin-right:20px; padding:0px 10px;}
 .homepagePostSubmit:hover {background-color:#d8d8d8;}
-.homepagePostIntro {font-size:14px; color:#484848;}
+.homepagePostIntro {font-size:14px; color:#484848;overflow:hidden;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReply {width:710px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;}
@@ -139,7 +152,7 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostSetting ul li:hover ul {display:block;}
 .homepagePostSettingIcon {background:url(../images/homepage_icon.png) -93px -5px no-repeat; width:20px; height:20px;}
 .homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;}
-.homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}
+.homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;cursor: pointer}
 a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;}
 a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyPortrait {float:left; width:33px;}
@@ -147,11 +160,12 @@ a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyDes {float:left; width:632px; margin-left:15px;}
 .homepagePostReplyPublisher {font-size:12px; color:#888888; margin-bottom:5px;}
 .homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;}
+.table_maxWidth table {max-width: 642px;}
 .homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
 .homepagePostAssignTo {float:left; font-size:14px; color:#269ac9;}
-.homepagePostFileAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/homepage_icon.png) -85px -150px no-repeat; padding-left:35px; font-size:14px; margin-right:25px;}
+.homepagePostFileAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/public_icon.png) -27px -577px no-repeat; padding-left:25px; font-size:14px;}
 .homepagePostImageAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/homepage_icon.png) -86px -195px no-repeat; padding-left:35px; font-size:14px; margin-right:25px;}
-.postAttSize {color:#888888; font-size:12px;}
+.postAttSize {color:#888888; font-size:12px; margin-left: 5px;}
 a.postGrey {color:#484848;}
 a.postGrey:hover {color:#000000;}
 a.gz_btn{display:block; background:url(../images/pic_uersall.png) -318px -25px no-repeat; width:53px; height:18px; border:1px solid #cdcdcd; color:#333333; padding:0px 0 0 18px;margin-top: 2px;margin-right: 15px;}
@@ -168,8 +182,10 @@ a.f_grey:hover {color:#000000;}
 /*.upbtn{ margin:42px 0 0 10px; border:none; color:#999; width:150px;}*/
 .red_btn_cir{ background:#e74c3c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
 .green_btn_cir{ background:#28be6c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
+.green_homework_btn_cir{ background:#28be6c; padding:1px 3px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
 .grey_btn_cir{ background:#b2b2b2; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
-.blue_btn_cir{ background:#3498db; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
+.grey_homework_btn_cir{ background:#b2b2b2; padding:1px 3px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
+.blue_btn_cir{ background:#3498db; padding:1px 3px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
 .orange_btn_cir{ background:#e67e22; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
 .sticky_btn_cir{ background:#269ac9; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
 .locked_btn_cir{background: url("../images/locked.png") 0 0 no-repeat; cursor: default;}
@@ -194,6 +210,9 @@ a.menuGrey:hover {color:#fe7d68;}
 #navSearchAlert {display:none;}
 .homepagePostReplyjournal{margin-left: 15px; float: left;}
 
+.lh18 {line-height: 18px;}
+.maxh360 {max-height: 360px;}
+
 /*邮件邀请*/
 .box_main{ width:345px; margin:0 auto;}
 .box_h3{ color:#15bccf; text-align:center; font-size:16px;}
@@ -292,6 +311,7 @@ a.re_open{display:block; width:46px;  border:1px solid #64bdd9; color:#64bdd9;
 a:hover.re_open{ background:#64bdd9; color:#fff; text-decoration:none;}
 a.re_de{ color:#6883b6; margin-left:15px;}
 .re_con_box{ border-bottom:1px dashed #dadada; padding-bottom:10px; margin-bottom:10px;}
+span.re_open{display:block; width:46px;  border:1px solid #64bdd9; color:#64bdd9;  margin-left:10px;padding:1px 5px;text-align: center}
 
 
 /* 作业列表 */
@@ -463,7 +483,7 @@ a.xls{ margin-left:5px; color:#136b3b;}
 /* 开启匿评弹框 */
 .anonymos{width:480px;height:180px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-215px 0 0 -300px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
 .anonymos_work {position:fixed !important;left:60%;top:60%;margin:-215px 0 0 -300px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
-.ni_con { width:425px; margin:25px 30px;}
+.ni_con { width:425px; margin:25px 30px;font-family:"微软雅黑","宋体";}
 .ni_con h2{ display:block; height:40px; width:425px;   text-align:center; color:#3a3a3a;}
 .ni_con p{ color:#808181; }
 .ni_con a:hover{ text-decoration:none;}
@@ -474,6 +494,14 @@ a:hover.tijiao{ background:#0f99a9;}
 .ni_con_work { width:300px; margin:25px 20px;}
 .ni_con_work p{ color:#808181; }
 a.xls{ margin-left:5px; color:#136b3b;}
+.grey_c{ color:#808181;}
+
+.disable_btn { height:46px; display:block; width:90px; color:#fff; background:#d0d2d0; text-align:center; padding-top:4px; margin-right:15px;}
+a.term_btn{ height:38px; display:block; width:90px; color:#fff; background:#269ac9; text-align:center; padding-top:12px; margin-right:15px;}
+a:hover.term_btn{ background:#297fb8;}
+p.c_black{ color:#000000;}
+a.exit { height:24px; display:block; width:80px; color:#000000; background:#c3c3c3; text-align:center; padding-top:4px;}
+.lh22{ line-height: 22px;}
 /* 学生列表*/
 .st_list{ width:670px;}
 .st_search{ }
@@ -537,8 +565,8 @@ blockquote {background: #e8e8e8;padding: 10px;margin-bottom: 5px;word-break: bre
 
 #attachments_fields input.description {margin-left: 4px;width: 100px;}
 #attachments_fields span.ispublic-label {display: inline-block;width: 30px;margin-left: 10px;}
-a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;}
-#attachments_fields input.filename {border: 0;height: 1.8em;width: 150px;color: #555;background-color: inherit;background: url(../images/attachment.png) no-repeat 1px 50%;padding-left: 18px;padding-top: 2px; white-space: nowrap; text-overflow:ellipsis;}
+a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;margin-left: 5px;}
+#attachments_fields input.filename {border: 0;height: 1.8em;color: #555;background-color: inherit;background: url(../images/attachment.png) no-repeat 1px ;padding-left: 18px;padding-top: 2px; white-space: nowrap; }
 span.add_attachment {font-size: 80%;line-height: 2.5em;}
 #attachments_fields span {display: block;white-space: nowrap;}
 .file_selector{position: relative;opacity: 0;filter: alpha(opacity:0);}
@@ -555,8 +583,8 @@ span.add_attachment {font-size: 80%;line-height: 2.5em;}
 a.remove-upload:hover {text-decoration:none !important;}
 
 .attachments_fields span.ispublic-label {display: inline-block;width: 30px;margin-left: 10px;}
-a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;}
-.attachments_fields input.filename {border: 0;height: 1.8em;width: 150px;color: #555;background-color: inherit;background: url(../images/attachment.png) no-repeat 1px 50%;padding-left: 18px;padding-top: 2px;}
+a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;margin-left: 5px;}
+.attachments_fields input.filename {border: 0;height: 1.8em;color: #555;background-color: inherit;background: url(../images/attachment.png) no-repeat 1px ;padding-left: 18px;padding-top: 2px;}
 span.add_attachment {font-size: 80%;line-height: 2.5em;}
 .attachments_fields span {display: block;white-space: nowrap;}
 .file_selector{position: relative;opacity: 0;filter: alpha(opacity:0);}
@@ -821,7 +849,7 @@ a:hover.icon_remove{background:url(images/icons.png) -20px -338px no-repeat;}
 a.hwork_center{ display:block; width:60px; text-align:center; margin-right:5px;}
 .show_hwork{ border:2px solid #64bdd9; width:646px; padding:10px; color:#666666; padding-bottom:0px; }
 .show_hwork ul li{ margin-bottom:5px;}
-.show_hwork_arrow{ position:relative; top:2px; left:165px;background:url(../images/course/arrow_up.jpg) 0 0 no-repeat; width:20px; height:11px;}
+.show_hwork_arrow{ position:relative; top:1px; left:165px;background:url(../images/course/arrow_up.jpg) 0 0 no-repeat; width:20px; height:11px;}
 .tit_fb{ font-weight:bold; width:66px; text-align:right; display:block; float:left;}
 .ml160{ margin-left:160px;}
 .show_hwork_p{ width:630px; float:left;}
@@ -875,6 +903,9 @@ a.work_list_tit{width:580px;  display:block; overflow:hidden; font-size:14px;  f
 .c_w{ color:#fff;}
 
 .filename { background: url(../images/pic_file.png) 0 -25px no-repeat;color: #3ca5c6;max-width: 150px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;}
+ .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;}
+ .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;}
+.upload_filename{ background: url(../images/pic_file.png) 0 -20px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;}
 .evaluation{position: relative;}
 .evaluation_submit{position: absolute;right: 0px;bottom: 0px;}
 .student_work_search{background-color: #64bdd9;color: white !important;padding: 2px 7px;margin-left: 10px;cursor: pointer; }
@@ -951,6 +982,9 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r
 .ProResultCon{ padding:10px; color:#888888; line-height:24px; border-bottom:1px solid #dddddd; }
 .W50{ width:50px;}
 .W200{ width:200px;}
+.m_w460{max-width: 460px;}
+.m_w505{max-width: 505px;}
+.m_w500{max-width: 500px;}
 .m_w530{max-width: 530px;}
 .ProResultTable{ color:#888888;}
 .T_C{ text-align:center;}
@@ -958,7 +992,7 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r
 .SearchIcon:hover{background:url(../images/homepage_icon2.png) 676px -419px no-repeat; }
 a.link_file{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; }
 a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
-a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;}
+a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;margin-left: 5px;}
 a.FilesName{ max-width:540px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block;}
 a.FilesName02{ max-width:665px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block;}
 .ProResultUl span { display:block; float:left;}
@@ -1031,6 +1065,8 @@ a.pro_mes_w{ height:20px; display:block; color:#999999;}
 .rside_work_con{ width:650px;}
 a.c_grey{ color:#999999;}
 a:hover.c_grey{ color:#333;}
+a.link_file_a{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; }
+a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
 .link_file_a{ display:block; max-width:450px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .last_time{width:auto; text-align:right; margin-right:70px;}
 .link_file_box{ width:360px;}
@@ -1072,3 +1108,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: 20px; overflow-y:auto; margin-bottom:5px;width: 246px}
+.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;}
diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css
index 6114c1b4d..b740436f9 100644
--- a/public/stylesheets/css.css
+++ b/public/stylesheets/css.css
@@ -152,11 +152,12 @@ a:hover.tijiao{ background:#0f99a9 !important;}
 /* 匿名评分弹框 */
 .alert_praise{width:480px;height:200px;position:fixed;z-index:100;left:50%;top:50%;margin:-215px 0 0 -300px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
 .alert .close02{width:26px;height:26px;overflow:hidden;position:absolute;top:-10px;right:-490px;background:url(images/close.png) no-repeat;cursor:pointer;}
-.ni_con { width:425px; margin:25px 30px;}
+.ni_con { width:425px; margin:25px 30px;font-family:"微软雅黑","宋体";}
 .ni_con h2{ display:block; height:40px; width:188px;  margin:0 auto;}
 .ni_con p{ color:#808181;}
 .ni_con a:hover{ text-decoration:none;}
 
+.grey_c{ color:#808181;}
 /*弹框*/
 .black_overlay{display:none;position:absolute;top:0%;left:0%;width:100%;height:100%;background-color:black;z-index:1001;-moz-opacity:0.3;opacity:.30;filter:alpha(opacity=30);}
 .upload_box{display:none;position:absolute;top:25%;left:35%;width:30%;height: auto;padding:5px;border:3px solid #15bccf; background:#fff;z-index:1002;overflow:auto;}
diff --git a/public/stylesheets/images/post_image_list.png b/public/stylesheets/images/post_image_list.png
index 07636288d..001fd5df0 100644
Binary files a/public/stylesheets/images/post_image_list.png and b/public/stylesheets/images/post_image_list.png differ
diff --git a/public/stylesheets/leftside.css b/public/stylesheets/leftside.css
index 990c02d54..26976343e 100644
--- a/public/stylesheets/leftside.css
+++ b/public/stylesheets/leftside.css
@@ -56,7 +56,7 @@ a:hover.subnav_green{ background:#14ad5a;}
 a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;}
 .submit{height:21px;border:0; cursor:pointer; background:url(../images/btn.png) no-repeat  0 0;width:42px; margin-top:2px; margin-left:3px; }
 .isTxt{background:#fbfbfb url(../images/inputBg.png) repeat-x left top;height:22px;line-height:22px;border:1px solid #c1c1c1;padding:0 5px;color:#666666;}
-.re_tag{ width: auto; padding:0 5px; padding-top:2px; height:20px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px;  }
+.re_tag{ width: auto; padding:0 5px; padding-top:2px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px; word-wrap: break-word;word-break: break-all  }
 .re_tag a{ color:#0d90c3;}
 .tag_h{ }
 .tag_h span,.tag_h a{ margin-bottom:5px;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 872d8df6d..f21a4b1fd 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -105,6 +105,7 @@ a.linkGrey6:hover {color:#ffffff !important;}
 .mt12 { margin-top:12px;}
 .mt15 {margin-top:15px;}
 .mt19 {margin-top:19px !important;}
+.mb0 {margin-bottom: 0px !important;}
 .mb4{ margin-bottom:4px;}
 .mb5{ margin-bottom:5px;}
 .mb8 {margin-bottom:8px !important;}
@@ -212,6 +213,8 @@ a.bBlue {background-color:#3498db;}
 a.bBlue:hover {background-color:#297fb8;}
 a.submit_btn {border:1px solid #3498db; padding:3px 10px; border-radius:3px; color:#3498db;}
 a.submit_btn:hover {background-color:#3498db; color:#ffffff;}
+a.submit_btn2 {background-color: #269ac9; padding: 3px 5px; color: #ffffff;}
+a.submit_btn2:hover {background-color:  #297fb8;}
 
 /****翻页***/
 .wlist{float:right;}
@@ -293,7 +296,9 @@ a:hover.bgreen_n_btn{background:#08a384;}
 .upbtn{ margin:42px 0 0 10px; border:none; color:#999; width:150px;}
 .red_btn_cir{ background:#e74c3c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
 .green_btn_cir{ background:#28be6c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
+.green_homework_btn_cir{ background:#28be6c; padding:1px 3px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
 .grey_btn_cir{ background:#b2b2b2; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
+.grey_homework_btn_cir{ background:#b2b2b2; padding:1px 3px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
 .blue_btn_cir{ background:#3498db; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
 .orange_btn_cir{ background:#e67e22; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
 .sticky_btn_cir{ background:#269ac9; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
@@ -396,7 +401,8 @@ a.resourcesBlack {font-size:12px; color:#4c4c4c;white-space: nowrap;text-align:
 a.resourcesBlack:hover {font-size:12px; color:#000000;}
 .resourcesListCheckbox {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle;}
 .resourcesCheckbox {padding:0px; margin:0px; margin-top:14px; width:12px; height:12px;}
-.resourcesList {width:710px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px; margin-left:auto; margin-right:auto;}
+.resourcesList {width:710px; height:39px; background-color:#ffffff;  color:#9a9a9a; font-size:12px; margin-left:auto; margin-right:auto;} /*border-bottom:1px dashed #eaeaea;*/
+.resourcesListDashLine {width:710px;border-bottom:1px dashed #eaeaea !important; margin-left:auto; margin-right:auto; padding-bottom: 2px} /*border-bottom:1px dashed #eaeaea;*/
 .resourcesListOption {width:710px; height:40px; line-height:40px; vertical-align:middle; margin-left:auto; margin-right:auto; background-color:#f6f6f6;}
 .resourcesCheckAll {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle; float:left;}
 .resourcesSelectSend {float:right;}
@@ -482,8 +488,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}
@@ -501,7 +507,7 @@ input.sendSourceText:hover {background-color:#297fb8;}
 .popbox{/* width:300px; *//* height:100px; */position:fixed !important;/* z-index:100; */left:50%;top:50%;margin:-100px 0 0 -150px;  /* background:#fff; */ -moz-border-radius:5px;  /* -webkit-border-radius:5px; */  /* border-radius:5px; */ /* box-shadow:0px 0px 8px #194a81; */  /* overflow:auto; */}
 /*上传资源弹窗*/
 .resourceUploadPopup {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;}
-.uploadText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; width:140px; display:inline-block;}
+.uploadText {font-size:16px; color:#269ac9; line-height:16px; padding-top:15px; width:140px; display:inline-block;}
 .uploadBoxContainer {height:33px; line-height:33px; margin-top:10px; position:relative;}
 .uploadBox {width:100px; height:33px; line-height:33px; text-align:center; vertical-align:middle; background-color:#269ac9; border-radius:3px; float:left; margin-right:12px;}
 .uploadBox:hover {background-color:#297fb8;}
@@ -646,7 +652,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostSubmitContainer {height:25px; margin-top: 8px; margin-bottom: 5px;}
 .homepagePostSubmit {font-size:14px; color:#888888; border:1px solid #dddddd; background-color:#eaeaea; float:left; margin-right:20px; padding:0px 10px;}
 .homepagePostSubmit:hover {background-color:#d8d8d8;}
-.homepagePostIntro {font-size:14px; color:#484848;}
+.homepagePostIntro {font-size:14px; color:#484848;overflow:hidden;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReply {width:720px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;}
@@ -682,16 +688,24 @@ a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyDes {float:left; width:642px; margin-left:15px;}
 .homepagePostReplyPublisher {font-size:12px; color:#888888; margin-bottom:5px;}
 .homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;}
+.table_maxWidth table {max-width: 642px;}
 .homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
 .homepagePostAssignTo {float:left; font-size:14px; color:#269ac9;}
-.homepagePostFileAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/homepage_icon.png) -85px -150px no-repeat; padding-left:35px; font-size:14px; margin-right:25px;}
+.homepagePostFileAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/public_icon.png) -27px -577px no-repeat; padding-left:25px; font-size:14px;}
 .homepagePostImageAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/homepage_icon.png) -86px -195px no-repeat; padding-left:35px; font-size:14px; margin-right:25px;}
-.postAttSize {color:#888888; font-size:12px;}
+.postAttSize {color:#888888; font-size:12px; margin-left: 5px;}
 a.postGrey {color:#484848;}
 a.postGrey:hover {color:#000000;}
 a.gz_btn{display:block; background:url(../images/pic_uersall.png) -318px -25px no-repeat; width:53px; height:18px; border:1px solid #cdcdcd; color:#333333; padding:0px 0 0 18px;margin-top: 2px;margin-right: 15px;}
 a:hover.gz_btn{ color:#ff5722;}
 .homepagePostReplyjournal{margin-left: 15px; float: left;}
+.lh18 {line-height: 18px;}
+.maxh360 {max-height: 360px;}
+
+.courseMenu {width:30px; display:block; float:right;height: 50px;}
+.courseMenuIcon {display:inline-block; background:url(../images/homepage_icon2.png) -190px -365px no-repeat; width:15px; height:15px; margin-top: 16px; margin-right: 15px; position: relative;line-height:0;}
+.topnav_course_menu{display: none; border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 20px;}
+.topnav_course_menu a{color:#269ac9;}
 
 /*课程主页css*/
 .homepageCoursesType {width:75px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-65px; font-size:12px; color:#4b4b4b; line-height:2; z-index:9999; display:none;}
@@ -717,6 +731,8 @@ a.loginChooseTab {color:#484848; height:30px; display:block;}
 .loginUpButton {width:315px; height:40px; background-color:#269ac9; margin-left:46px; font-size:14px; text-align:center; line-height:40px; vertical-align:middle; margin-top:30px;}
 .loginInButton:hover {background-color: #297fb8}
 .loginUpButton:hover {background-color: #297fb8}
+.loginUpDisableButton {width:315px; height:40px; background-color:#C1C1C1; margin-left:46px; font-size:14px; text-align:center; line-height:40px; vertical-align:middle; margin-top:30px;}
+.loginUpDisableButton:hover {background-color: #C1C1C1}
 .loginChooseBorder {width:295px; height:30px; border-bottom:1px solid #e3e3e3;}
 .loginSign {width:405px; background-color:#ffffff;}
 .loginSignBox {width:308px; height:38px; margin-left:46px; border:1px solid #98a1a6; outline:none;}
@@ -1062,6 +1078,8 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r
 .ProResultCon{ padding:10px; color:#888888; line-height:24px; border-bottom:1px solid #dddddd; }
 .W50{ width:50px;}
 .W200{ width:200px;}
+.m_w460{max-width: 460px;}
+.m_w505{max-width: 505px;}
 .m_w530{max-width: 530px;}
 .ProResultTable{ color:#888888;}
 .T_C{ text-align:center;}
@@ -1069,7 +1087,7 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r
 .SearchIcon:hover{background:url(../images/homepage_icon2.png) 676px -419px no-repeat; }
 a.link_file{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; }
 a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
-a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;}
+a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;margin-left: 5px;}
 a.FilesName{ max-width:540px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block;}
 a.FilesName02{ max-width:665px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block;}
 .ProResultUl span { display:block; float:left;}
@@ -1135,6 +1153,9 @@ img.ui-datepicker-trigger {
     text-overflow: ellipsis;
     margin-bottom: 3px;
 }
+ .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;}
+ .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;}
+.upload_filename{ background: url(../images/pic_file.png) 0 -25px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;}
 .message_title{border: 1px solid #9C9C9C;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff; max-width:400px;word-wrap:break-word; word-break:break-all;}
 .message_title_red{border: 1px solid #484848;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff;background-image: -moz-linear-gradient(top, #fff, #E0E0E0);}
 
@@ -1266,7 +1287,7 @@ a:hover.tijiao{ background:#0f99a9;}
 #cboxPrevious{position:absolute; bottom:0px; left:0; color:#444;}
 #cboxNext{position:absolute; bottom:0px; left:63px; color:#444;}
 #cboxClose{position:absolute; bottom:0; right:0; display:block; color:#444;}
-.system_message_style {line-height: 19.1px; max-width: 681px;overflow:hidden; work-wrap: break-word; word-break: break-all;}
+.system_message_style {line-height: 19.1px; max-width: 681px; work-wrap: break-word; word-break: break-all; text-overflow:clip; z-index:9999}
 .system_message_style img {max-width: 100%;}
 /*20150906关联项目LB*/
 a.RalationIcon{  background: url(../images/homepage_icon.png) -183px -396px  no-repeat; height:20px; display:block; padding-left:20px; color:#888888;}
@@ -1279,20 +1300,25 @@ a:hover.SetUpIcon{background: url(../images/homepage_icon.png) 0px -486px no-rep
 /* 开启匿评弹框 */
 .anonymos{width:480px;height:180px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-215px 0 0 -300px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
 .anonymos_work {position:fixed !important;left:60%;top:60%;margin:-215px 0 0 -300px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
-.ni_con { width:425px; margin:25px 30px;}
+.ni_con { width:425px; margin:15px;font-family:"微软雅黑","宋体";}
 .ni_con h2{ display:block; height:40px; width:425px;   text-align:center; color:#3a3a3a;}
 .ni_con p{ color:#808181; }
 .ni_con a:hover{ text-decoration:none;}
 .ni_btn{ width:190px; margin:15px auto;  line-height:1.9;}
-a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#15bccf; text-align:center; padding-top:4px; float:left; margin-right:15px;}
-a:hover.tijiao{ background:#0f99a9;}
+a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#269ac9; text-align:center; padding-top:4px; float:left; margin-right:15px;}
+a:hover.tijiao{ background:#297fb8;}
 .c_pink{ color:#e65d5e;}
 .ni_con_work { width:300px; margin:25px 20px;}
 .ni_con_work p{ color:#808181; }
-
+.grey_c{ color:#808181;}
 a.link_file_a{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; }
 a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
 .link_file_a{ display:block; max-width:450px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 
 .list_style ol li{list-style-type: decimal;margin-left: 20px;}
 .list_style ul li{list-style-type: disc;margin-left: 20px;}
+.ul_grey li {color:#909090; list-style-position:inside; padding-left:1px;list-style-image:url('../images/news_dot2.png')}
+.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/nyan.css b/public/stylesheets/nyan.css
index b476210b1..dc380f6ef 100644
--- a/public/stylesheets/nyan.css
+++ b/public/stylesheets/nyan.css
@@ -724,9 +724,16 @@ div.actions input[type="text"] {
     word-wrap: break-word;
 }
 
-.memo-content li {
+.memo-content ol li {
     list-style-type: decimal;
 }
+.memo-content ul li {
+    list-style-type: disc;
+}
+
+.memo-content ul li {
+    list-style-type: disc;
+}
 
 .memo-timestamp {
     position: absolute;
diff --git a/public/stylesheets/pleft.css b/public/stylesheets/pleft.css
index 1f48c9166..1ce12bdda 100644
--- a/public/stylesheets/pleft.css
+++ b/public/stylesheets/pleft.css
@@ -59,7 +59,7 @@ a:hover.subnav_green{ background:#14ad5a;}
 a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;}
 .submit{height:21px;border:0; cursor:pointer; background:url(../images/btn.png) no-repeat  0 0;width:42px; margin-top:2px; margin-left:3px; }
 .isTxt{background:#fbfbfb url(../images/inputBg.png) repeat-x left top;height:22px;line-height:22px;border:1px solid #c1c1c1;padding:0 5px;color:#666666;}
-.re_tag{ width: auto; padding:0 5px; padding-top:2px; height:20px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px;  }
+.re_tag{ width: auto; padding:0 5px; padding-top:2px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px; word-wrap: break-word;word-break: break-all }
 .re_tag a{ color:#0d90c3;}
 .tag_h{ }
 .tag_h span,.tag_h a{ margin-bottom:5px;}
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 27bb66bbb..e7a24b151 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -13,6 +13,7 @@ a:hover.lg-foot{ color:#787b7e;}
 /*右侧内容--动态*/
 .project_r_h{ width:670px; height:40px; background:#eaeaea; margin-bottom:10px;}
 .project_h2{ background:#64bdd9; color:#fff; height:33px; width:90px; text-align:center; font-weight:normal; padding-top:7px; font-size:16px;}
+.project_h2_repository{ background:#64bdd9; color:#fff; height:33px; width:auto; text-align:center; font-weight:normal; padding-top:7px; font-size:16px;}
 .project_h22{ background:#64bdd9; color:#fff; height:33px; width:124px; text-align:center; font-weight:normal; padding-top:7px; font-size:16px;}
 .project_r_box{ border:1px solid #e2e1e1; width:670px; margin-top:10px;}
 .project_h3 { color:#646464; font-size:14px; padding:0 10px; border-bottom:1px solid #e2e1e1;}
@@ -359,7 +360,7 @@ blockquote {background: #eeeeee;padding: 10px;margin-bottom: 10px;}
 a.remove-upload:hover {text-decoration:none !important;}
 
 #attachments_fields span.ispublic-label {display: inline-block;width: 30px;margin-left: 10px;}
-a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;}
+a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;margin-left: 5px;}
 #attachments_fields input.filename {border: 0;height: 1.8em;width: 150px;color: #555;background-color: inherit;background: url(../images/attachment.png) no-repeat 1px 50%;padding-left: 18px;padding-top: 2px;  white-space: nowrap; text-overflow:ellipsis;}
 span.add_attachment {font-size: 80%;line-height: 2.5em;}
 #attachments_fields span {display: block;white-space: nowrap;}
@@ -368,7 +369,9 @@ span.add_attachment {font-size: 80%;line-height: 2.5em;}
 #attachments_fields .ajax-loading input.filename {background:url(../images/loading.gif) no-repeat 0px 50%;}
 .reply_btn{ cursor:pointer; -moz-border-radius:3px;  -webkit-border-radius:3px; border:1px solid #ccc; color:#999;  border-radius:3px; padding:2px 10px; margin-bottom:10px;display: block;margin-left: 470px;}
 .reply_btn:hover{ background:#999; color:#fff; }
-
+ .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;}
+ .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;}
+.upload_filename{ background: url(../images/pic_file.png) 0 -22px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;}
 .attachments_fields input.description {margin-left:4px; width:100px; }
 .attachments_fields span .boldSpan{display:block; white-space:nowrap; font-family:'微软雅黑';}
 .attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
@@ -377,7 +380,7 @@ a.remove-upload:hover {text-decoration:none !important;}
 
 
 .attachments_fields span.ispublic-label {display: inline-block;width: 30px;margin-left: 10px;}
-a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;}
+a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;margin-left: 5px;}
 .attachments_fields input.filename {border: 0;height: 1.8em;width: 150px;color: #555;background-color: inherit;background: url(../images/attachment.png) no-repeat 1px 50%;padding-left: 18px;padding-top: 2px;}
 span.add_attachment {font-size: 80%;line-height: 2.5em;}
 .attachments_fields span {display: block;white-space: nowrap;}
@@ -552,6 +555,7 @@ a:hover.member_btn{ background:#329cbd;}
 .pro_table tr td{ height:30px;}
 .pro_table_tit{  text-align:center; font-weight:bold;}
 .pro_table_on{  background:#f0fbff; }
+.pro_table_on_forge{  background: #EAEAEA; }
 .pro_st_edit_issues{ display:none; margin-top:20px;}
 .pro_st_edit_issues ul li{ margin-bottom:10px;}
 .pro_st_edit_ban{ display:none; margin-top:20px;}
@@ -814,8 +818,8 @@ div.changeset { border-bottom: 1px solid #ddd; }
 
 
 /*****项目版本库文件 Tables *****/
-.autoscroll {overflow-x: auto; padding:1px; margin-bottom: 1.2em;}
-tr.entry { border: 1px solid #f8f8f8; }
+.autoscroll {overflow-x: auto;  margin-bottom: 0.2em;}
+tr.entry { border: 1px solid #DDD; }
 tr.entry td { white-space: nowrap; }
 tr.entry td.filename { width: 30%; }
 tr.entry td.filename_no_report { width: 70%; }
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 45580e95e..49b2906aa 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; }
+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;}
@@ -71,6 +71,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .ml45{ margin-left:45px;}
 .ml55{ margin-left:55px;}
 .ml30{ margin-left:30px;}
+.ml38{ margin-left:38px;}
 .ml60{ margin-left:60px;}
 .ml80{ margin-left:80px;}
 .ml90{ margin-left:90px;}
@@ -104,17 +105,22 @@ h4{ font-size:14px; color:#3b3b3b;}
 .mt8{ margin-top:8px;}
 .mt10{ margin-top:10px !important;}
 .mt30{ margin-top: 30px;}
+.mt40{ margin-top: 40px;}
 .mt12 { margin-top:12px !important;}
 .mt15 {margin-top:15px;}
 .mt19 {margin-top:19px !important;}
 .ml70{margin-left: 70px;}
+.mb0 {margin-bottom: 0px !important;}
 .mb4{ margin-bottom:4px;}
 .mb5{ margin-bottom:5px;}
 .mb8 {margin-bottom:8px;}
 .mb10{ margin-bottom:10px !important;}
 .mb20{ margin-bottom:20px;}
 .pl15{ padding-left:15px;}
+.pl5{ padding-left:5px;}
 .pt5{ padding-top:5px;}
+.pt10{ padding-top:10px;}
+.pb5{ padding-bottom: 5px;}
 .w20{ width:20px;}
 .w40{width: 40px;}
 .w45{ width: 45px;}
@@ -129,6 +135,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .w265{ width: 265px;}
 .w270{ width: 270px;}
 .w350 {width:350px;}
+.w362 {width:362px;}
 .w430{ width:470px;}
 .w520{ width:520px;}
 .w543{ width:543px;}
@@ -536,7 +543,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostSubmitContainer {height:25px; margin-top: 8px; margin-bottom: 5px;}
 .homepagePostSubmit {font-size:14px; color:#888888; border:1px solid #dddddd; background-color:#eaeaea; float:left; margin-right:20px; padding:0px 10px;}
 .homepagePostSubmit:hover {background-color:#d8d8d8;}
-.homepagePostIntro {font-size:14px; color:#484848;}
+.homepagePostIntro {font-size:14px; color:#484848;overflow:hidden;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;}
@@ -568,11 +575,12 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostReplyDes {float:left; width:620px; margin-left:15px;}
 .homepagePostReplyPublisher {font-size:12px; color:#484848; margin-bottom:5px;}
 .homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;}
+.table_maxWidth table {max-width: 642px;}
 .homepagePostProjectState {width:42px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
 .homepagePostAssignTo {float:left; font-size:14px; color:#15bccf; height:30px; line-height:30px; vertical-align:middle;}
-.homepagePostFileAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/homepage_icon.png) -85px -150px no-repeat; padding-left:35px; font-size:14px; margin-right:25px;}
+.homepagePostFileAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/homepage_icon.png) -85px -150px no-repeat; padding-left:35px; font-size:14px;}
 .homepagePostImageAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/homepage_icon.png) -86px -195px no-repeat; padding-left:35px; font-size:14px; margin-right:25px;}
-.postAttSize {color:#888888; font-size:12px;}
+.postAttSize {color:#888888; font-size:12px; margin-left: 5px;}
 a.postGrey {color:#484848;}
 a.postGrey:hover {color:#000000;}
 .homepagePostReplyjournal{margin-left: 15px; float: left;}
@@ -902,3 +910,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;}
+
diff --git a/public/stylesheets/repository.css b/public/stylesheets/repository.css
new file mode 100644
index 000000000..27941cb9e
--- /dev/null
+++ b/public/stylesheets/repository.css
@@ -0,0 +1,289 @@
+.git_usr_title{
+    margin: 0px;
+    overflow: hidden;
+    font-size: 18px;
+    font-weight: bold;
+    text-overflow: ellipsis;
+    vertical-align: top;
+    white-space: nowrap;
+    padding: 0px 10px;
+}
+.overall-summary{
+    position: relative;
+    margin-bottom: 10px;
+    border: 1px solid #DDD;
+    border-radius: 3px;
+}
+.overall-summary .overall-summary-bottomless{
+    margin-bottom: 0px;
+    border-bottom: 0px none;
+    border-radius: 3px 3px 0px 0px;
+}
+.stats-switcher-viewport{
+    height: 38px;
+    overflow: hidden;
+}
+.stats-switcher-viewport .stats-switcher-wrapper{
+    position: relative;
+    top: 0px;
+    transition: top 0.25s ease-in-out 0s;
+}
+.numbers-summary{
+    display: table;
+    width: 100%;
+    table-layout: fixed;
+    margin-top: 9px;
+}
+.numbers-summary li{
+    display: table-cell;
+    padding: 0px;
+    margin: 0px;
+    text-align: center;
+    white-space: nowrap;
+}
+.numbers-summary .octicon {
+    color: #999;
+}
+.text-emphasized {
+    font-weight: bold;
+    color: #333;
+}
+.octicon .octicon-history {
+    font: 16px/1 octicons;
+    display: inline-block;
+    text-decoration: none;
+    text-rendering: auto;
+    -moz-user-select: none;
+}
+.select2-container {
+    margin: 0px;
+    position: relative;
+    display: inline-block;
+    vertical-align: middle;
+}
+
+.select2-container .select2-choice {
+    display: block;
+    height: 26px;
+    padding: 0px 0px 0px 8px;
+    overflow: hidden;
+    position: relative;
+    border: 1px solid #AAA;
+    white-space: nowrap;
+    line-height: 26px;
+    color: #444;
+    text-decoration: none;
+    border-radius: 4px;
+    background-clip: padding-box;
+    -moz-user-select: none;
+    background-color: #FFF;
+    background-image: linear-gradient(to top, #EEE 0%, #FFF 50%);
+}
+.repository-title-dec{
+    color: #fff !important;
+}
+.repository-url{
+    color: #2D2D2D;
+    margin: auto 0px;
+    text-align: center;
+    font-size: 14px;
+    margin-bottom: 10px;
+    margin-top: 10px;
+}
+.center{
+    text-align: center;
+}
+.light-well {
+    background: #F9F9F9 none repeat scroll 0% 0%;
+    padding: 15px;
+}
+.page-title {
+    margin-top: 0px;
+    line-height: 1.5;
+    font-weight: bold;
+    margin-bottom: 5px;
+    font-size: 18px;
+}
+/************* CodeRay styles *************/
+.syntaxhl div {display: inline;}
+.syntaxhl .line-numbers {padding: 2px 4px 2px 4px; background-color: #eee; margin:0px 5px 0px 0px;}
+.syntaxhl .code pre { overflow: auto }
+.syntaxhl .debug { color: white !important; background: blue !important; }
+
+.syntaxhl .annotation { color:#007 }
+.syntaxhl .attribute-name { color:#b48 }
+.syntaxhl .attribute-value { color:#700 }
+.syntaxhl .binary { color:#509 }
+.syntaxhl .char .content { color:#D20 }
+.syntaxhl .char .delimiter { color:#710 }
+.syntaxhl .char { color:#D20 }
+.syntaxhl .class { color:#258; font-weight:bold }
+.syntaxhl .class-variable { color:#369 }
+.syntaxhl .color { color:#0A0 }
+.syntaxhl .comment { color:#385 }
+.syntaxhl .comment .char { color:#385 }
+.syntaxhl .comment .delimiter { color:#385 }
+.syntaxhl .complex { color:#A08 }
+.syntaxhl .constant { color:#258; font-weight:bold }
+.syntaxhl .decorator { color:#B0B }
+.syntaxhl .definition { color:#099; font-weight:bold }
+.syntaxhl .delimiter { color:black }
+.syntaxhl .directive { color:#088; font-weight:bold }
+.syntaxhl .doc { color:#970 }
+.syntaxhl .doc-string { color:#D42; font-weight:bold }
+.syntaxhl .doctype { color:#34b }
+.syntaxhl .entity { color:#800; font-weight:bold }
+.syntaxhl .error { color:#F00; background-color:#FAA }
+.syntaxhl .escape  { color:#666 }
+.syntaxhl .exception { color:#C00; font-weight:bold }
+.syntaxhl .float { color:#06D }
+.syntaxhl .function { color:#06B; font-weight:bold }
+.syntaxhl .global-variable { color:#d70 }
+.syntaxhl .hex { color:#02b }
+.syntaxhl .imaginary { color:#f00 }
+.syntaxhl .include { color:#B44; font-weight:bold }
+.syntaxhl .inline { background-color: hsla(0,0%,0%,0.07); color: black }
+.syntaxhl .inline-delimiter { font-weight: bold; color: #666 }
+.syntaxhl .instance-variable { color:#33B }
+.syntaxhl .integer  { color:#06D }
+.syntaxhl .key .char { color: #60f }
+.syntaxhl .key .delimiter { color: #404 }
+.syntaxhl .key { color: #606 }
+.syntaxhl .keyword { color:#939; font-weight:bold }
+.syntaxhl .label { color:#970; font-weight:bold }
+.syntaxhl .local-variable { color:#963 }
+.syntaxhl .namespace { color:#707; font-weight:bold }
+.syntaxhl .octal { color:#40E }
+.syntaxhl .operator { }
+.syntaxhl .predefined { color:#369; font-weight:bold }
+.syntaxhl .predefined-constant { color:#069 }
+.syntaxhl .predefined-type { color:#0a5; font-weight:bold }
+.syntaxhl .preprocessor { color:#579 }
+.syntaxhl .pseudo-class { color:#00C; font-weight:bold }
+.syntaxhl .regexp .content { color:#808 }
+.syntaxhl .regexp .delimiter { color:#404 }
+.syntaxhl .regexp .modifier { color:#C2C }
+.syntaxhl .regexp { background-color:hsla(300,100%,50%,0.06); }
+.syntaxhl .reserved { color:#080; font-weight:bold }
+.syntaxhl .shell .content { color:#2B2 }
+.syntaxhl .shell .delimiter { color:#161 }
+.syntaxhl .shell { background-color:hsla(120,100%,50%,0.06); }
+.syntaxhl .string .char { color: #46a }
+.syntaxhl .string .content { color: #46a }
+.syntaxhl .string .delimiter { color: #46a }
+.syntaxhl .string .modifier { color: #46a }
+.syntaxhl .symbol .content { color:#d33 }
+.syntaxhl .symbol .delimiter { color:#d33 }
+.syntaxhl .symbol { color:#d33 }
+.syntaxhl .tag { color:#070 }
+.syntaxhl .type { color:#339; font-weight:bold }
+.syntaxhl .value { color: #088; }
+.syntaxhl .variable  { color:#037 }
+
+.syntaxhl .insert { background: hsla(120,100%,50%,0.12) }
+.syntaxhl .delete { background: hsla(0,100%,50%,0.12) }
+.syntaxhl .change { color: #bbf; background: #007; }
+.syntaxhl .head { color: #f8f; background: #505 }
+.syntaxhl .head .filename { color: white; }
+
+.syntaxhl .delete .eyecatcher { background-color: hsla(0,100%,50%,0.2); border: 1px solid hsla(0,100%,45%,0.5); margin: -1px; border-bottom: none; border-top-left-radius: 5px; border-top-right-radius: 5px; }
+.syntaxhl .insert .eyecatcher { background-color: hsla(120,100%,50%,0.2); border: 1px solid hsla(120,100%,25%,0.5); margin: -1px; border-top: none; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; }
+
+.syntaxhl .insert .insert { color: #0c0; background:transparent; font-weight:bold }
+.syntaxhl .delete .delete { color: #c00; background:transparent; font-weight:bold }
+.syntaxhl .change .change { color: #88f }
+.syntaxhl .head .head { color: #f4f }
+
+/***** Media print specific styles *****/
+@media print {
+    #top-menu, #header, #main-menu, #sidebar, #footer, .contextual, .other-formats { display:none; }
+    #main { background: #fff; }
+    #content { width: 99%; margin: 0; padding: 0; border: 0; background: #fff; overflow: visible !important;}
+    #wiki_add_attachment { display:none; }
+    .hide-when-print { display: none; }
+    .autoscroll {overflow-x: visible;}
+    table.list {margin-top:0.5em;}
+    table.list th, table.list td {border: 1px solid #aaa;}
+}
+
+.cloneUrl {width:235px; height:21px; border:1px solid #dddddd; outline:none; overflow:hidden; line-height:21px; resize:none;white-space:nowrap;}
+.cloneUrl2 {width:328px; height:21px; border:1px solid #dddddd; outline:none; overflow:hidden; line-height:21px; resize:none;white-space:nowrap;}
+.clone_btn {width:30px; height:21px; border-top:1px solid #dddddd; border-bottom:1px solid #dddddd; border-right:1px solid #dddddd; outline:none; float:left; background-image:linear-gradient(#FCFCFC, #EEE); text-align:center;}
+.vl_btn {height:21px; padding:0px 5px; vertical-align:middle; border:1px solid #dddddd; float:left; line-height:21px; background-image:linear-gradient(#FCFCFC, #EEE);}
+.vl_btn_2 {height:21px; padding:0px 5px; vertical-align:middle; border-top:1px solid #dddddd; border-bottom:1px solid #dddddd; border-right:1px solid #dddddd; float:left; line-height:21px;}
+.recordBanner {width:670px; height:30px; background-color:#f1f1f1; color:#666666; line-height:30px; vertical-align:middle;}
+.vl_copy {background:url(../images/vlicon/clone_url.png) 0px 0px no-repeat; padding-left:22px;}
+.vl_copy2 {background:url(../images/vlicon/clone_url.png) 0px 0px no-repeat; padding-left:22px;}
+.vl_zip {background:url(../images/vlicon/download_icon.png) 0px 0px no-repeat; padding-left:22px;}
+.vl_fork {background:url(../images/vlicon/fork_icon.png) 0px -2px no-repeat; padding-left:22px;}
+.vl_commit {background:url(../images/vlicon/commit_icon.png) 0px -2px no-repeat; padding-left:22px;weight:20px;height: 24px;}
+.vl_branch {background:url(../images/vlicon/branch_icon.png) 0px -2px no-repeat; padding-left:22px}
+.mt1 {margin-top:1px;}
+.mt2 {margin-top:2px;}
+.commit_content_dec{width: 300px;overflow: hidden; white-space: nowrap;text-overflow: ellipsis;}
+
+/*提交信息列表*/
+.col-md-10 {
+    width: 100%;
+}
+ul.bordered-list {
+    margin: 5px 0px;
+    padding: 0px;
+}
+ul.bordered-list li {
+    padding: 5px 0px;
+    border-bottom: 1px solid #EEE;
+    overflow: hidden;
+    display: block;
+    margin: 0px;
+}
+.commits-row ul li.commit {
+    padding: 8px 0px;
+}
+li.commit .commit-row-title {
+    font-size: 15px;
+    line-height: 20px;
+    margin-bottom: 2px;
+}
+li.commit .commit-row-title .str-truncated {
+    max-width: 70%;
+}
+.str-truncated {
+    display: inline-block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    vertical-align: top;
+    white-space: nowrap;
+    max-width: 82%;
+}
+li.commit .commit-row-title .commit-row-message {
+    color: #444;
+}
+.pull-right {
+    float: right;
+    color: #777;
+}
+li.commit .commit-row-title .commit_short_id {
+    min-width: 65px;
+    font-family: "Menlo","Liberation Mono","Consolas","DejaVu Sans Mono","Ubuntu Mono","Courier New","andale mono","lucida console",monospace;
+}
+li.commit .commit-row-info {
+    color: #777;
+    line-height: 24px;
+    font-size: 13px;
+}
+li.commit .commit-row-info a {
+    color: #777;
+}
+li.commit .commit-row-info .committed_ago {
+    display: inline-block;
+}
+.rep_history_title{
+    font-weight: bold;
+    font-size: 13px;
+    color: #7F7F7F;
+    padding-bottom: 10px;
+}
+.rep_history_grey{
+    color: #7F7F7F;
+}
\ No newline at end of file
diff --git a/public/stylesheets/user_leftside.css b/public/stylesheets/user_leftside.css
index e33e2c7d6..c8dfbe316 100644
--- a/public/stylesheets/user_leftside.css
+++ b/public/stylesheets/user_leftside.css
@@ -56,7 +56,7 @@ a:hover.subnav_green{ background:#14ad5a;}
 a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;}
 .submit{height:21px;border:0; cursor:pointer; background:url(images/btn.png) no-repeat  0 0;width:42px; margin-top:2px; margin-left:3px; }
 .isTxt{background:#fbfbfb url(images/inputBg.png) repeat-x left top;height:22px;line-height:22px;border:1px solid #c1c1c1;padding:0 5px;color:#666666;}
-.re_tag{ width: auto; padding:0 5px; padding-top:2px; height:20px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px;  }
+.re_tag{ width: auto; padding:0 5px; padding-top:2px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px; word-wrap: break-word;word-break: break-all }
 .re_tag a{ color:#0d90c3;}
 .tag_h{ }
 .tag_h span,.tag_h a{ margin-bottom:5px;}
diff --git a/spec/controllers/blog_comments_controller_spec.rb b/spec/controllers/blog_comments_controller_spec.rb
new file mode 100644
index 000000000..585af2555
--- /dev/null
+++ b/spec/controllers/blog_comments_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe BlogCommentsController, :type => :controller do
+
+end
diff --git a/spec/controllers/blogs_controller_spec.rb b/spec/controllers/blogs_controller_spec.rb
new file mode 100644
index 000000000..5b618caa8
--- /dev/null
+++ b/spec/controllers/blogs_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe BlogsController, :type => :controller do
+
+end
diff --git a/spec/factories/blog_comments.rb b/spec/factories/blog_comments.rb
new file mode 100644
index 000000000..e168f824a
--- /dev/null
+++ b/spec/factories/blog_comments.rb
@@ -0,0 +1,6 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :blog_comment do
+  end
+end
diff --git a/spec/factories/blogs.rb b/spec/factories/blogs.rb
new file mode 100644
index 000000000..a1a640f89
--- /dev/null
+++ b/spec/factories/blogs.rb
@@ -0,0 +1,6 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :blog do
+  end
+end
diff --git a/spec/requests/gitlab_request_spec.rb b/spec/requests/gitlab_request_spec.rb
new file mode 100644
index 000000000..05a94568b
--- /dev/null
+++ b/spec/requests/gitlab_request_spec.rb
@@ -0,0 +1,13 @@
+require 'rails_helper'
+
+RSpec.describe "Gitlab request", :type => :request do
+
+  describe "get repository files" do
+    it "参数正确，可以获取正确列表 " do
+       api = Trustie::Gitlab::Api.new
+       trees = api.trees(11)
+       expect(trees).to be_instance_of(Array)
+    end
+  end
+end
+