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

Conflicts:
	app/controllers/admin_controller.rb

Gemfile

@@ -6,6 +6,7 @@ unless RUBY_PLATFORM =~ /w32/
   gem 'iconv'
 end
 
+gem 'grack', path:'./lib/grack'
 gem 'rest-client'
 gem "mysql2", "= 0.3.18"
 gem 'redis-rails'

app/controllers/account_controller.rb

@@ -28,6 +28,7 @@ class AccountController < ApplicationController
       if User.current.logged?
         redirect_to home_url
       end
+    # render :layout =>   'login'
     else
       authenticate_user
     end

app/controllers/admin_controller.rb

@@ -397,19 +397,10 @@ class AdminController < ApplicationController
 
   #留言列表
   def leave_messages
-    @jour = JournalsForMessage.where("jour_type = 'Principal' or jour_type = 'Course'").reorder('created_on desc')
+    @jour = JournalsForMessage.find_by_sql("SELECT * FROM journals_for_messages AS j1
-    case params[:format]
+    WHERE j1.jour_type IN ('Course','Principal') AND (j1.m_parent_id IS NULL OR (j1.m_parent_id IN (SELECT id FROM journals_for_messages WHERE jour_type IN ('Course','Principal')))) order by created_on desc")
-      when 'xml', 'json'
+    @jour = paginateHelper @jour,30
-        @offset, @limit = api_offset_and_limit({:limit => 30})
+    @page = (params['page'] || 1).to_i - 1
-      else
-        @limit = 30#per_page_option
-    end
-
-    @jour_count = @jour.count
-    @jour_pages = Paginator.new @jour_count, @limit, params['page']
-    @offset ||= @jour_pages.offset
-    @jour = @jour.limit(@limit).offset(@offset).all
-
     respond_to do |format|
       format.html
     end
@@ -418,7 +409,8 @@ class AdminController < ApplicationController
   #帖子
   def messages_list
     @memo = Memo.reorder("created_at desc")
-
+    @memo = paginateHelper @memo,30
+    @page = (params['page'] || 1).to_i - 1
     respond_to do |format|
       format.html
     end
@@ -426,29 +418,55 @@ class AdminController < ApplicationController
 
   #课程讨论区的帖子
   def course_messages
-    #@boards=Board.where('course_id is NULL')
-    #@course_ms = Message.reorder('created_on desc')
     @course_ms=Message.joins("join boards on messages.board_id=boards.id where boards.course_id is not NULL").reorder('created_on desc')
+    @course_ms = paginateHelper @course_ms,30
+    @page = (params['page'] || 1).to_i - 1
+    respond_to do |format|
+      format.html
+    end
   end
 
   #项目讨论区的帖子
   def project_messages
     @project_ms=Message.joins("join boards on messages.board_id=boards.id where boards.project_id != -1").reorder('created_on desc')
+    @project_ms = paginateHelper @project_ms,30
+    @page = (params['page'] || 1).to_i - 1
+    respond_to do |format|
+      format.html
+    end
   end
 
   #通知
   def notices
     @news = News.where('course_id is not NULL').order('created_on desc')
+    @news = paginateHelper @news,30
+    @page = (params['page'] || 1).to_i - 1
+    respond_to do |format|
+      format.html
+    end
   end
 
   #最近登录用户列表
   def latest_login_users
-    @user = User.order('last_login_on desc')
+    scope = User.order('last_login_on desc')
+    scope = scope.where("last_login_on>= '#{params[:startdate]} 00:00:00'") if params[:startdate].present?
+    scope =scope.where("last_login_on <= '#{params[:enddate]} 23:59:59'") if params[:enddate].present?
+    @user = scope
+    @user = paginateHelper @user,30
+    @page = (params['page'] || 1).to_i - 1
+    respond_to do |format|
+      format.html
+    end
   end
 
   #作业
   def homework
     @homework = HomeworkCommon.order('end_time desc')
+    @homework = paginateHelper @homework,30
+    @page = (params['page'] || 1).to_i - 1
+    respond_to do |format|
+      format.html
+    end
   end
 
 end

app/controllers/repositories_controller.rb

@@ -127,19 +127,18 @@ update
       end
     else  # 原逻辑
       ##xianbo
+      params[:repository_scm] = "Git"
       @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]
+      @repository_tag=params[:repository][:upassword] || params[:repository][:password] || '1234'
       @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 = Repository.factory(params[:repository_scm]||"Git")
       @repository.safe_attributes = params[:repository]
       if attrs[:attrs_extra].keys.any?
         @repository.merge_extra_info(attrs[:attrs_extra])
@@ -278,7 +277,8 @@ update
       @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+
+      # @repos_url = "http://"+@repository.login.to_s+"_"+@repository.identifier.to_s+"@"+ip.to_s+
+      @repos_url = "http://#{Setting.host_name}/#{@repository.login.to_s}/#{@repository.identifier.to_s}.git"
       @repository.url.slice(project_path_cut, @repository.url.length).to_s
       if @course_tag == 1
         render :action => 'show', :layout => 'base_courses'

app/controllers/users_controller.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 # Redmine - project management software
 # Copyright (C) 2006-2013  Jean-Philippe Lang
 #
@@ -14,6 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
 class UsersController < ApplicationController
 
   layout :setting_layout
@@ -41,14 +43,16 @@ class UsersController < ApplicationController
     :user_watchlist, :user_fanslist,:update, :user_courses, :user_homeworks, :watch_projects, :show_score, :topic_score_index, :project_score_index,
     :activity_score_index, :influence_score_index, :score_index,:show_new_score, :topic_new_score_index, :project_new_score_index,
     :activity_new_score_index, :influence_new_score_index, :score_new_index,:update_score,:user_activities,:user_projects_index,
-    :user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages]
+    :user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,
+    :user_resource,:user_resource_create,:user_resource_delete,:rename_resource,:search_user_course,:add_exist_file_to_course,
+    :search_user_project,:resource_preview,:resource_search,:add_exist_file_to_project,:user_messages]
   #edit has been deleted by huang, 2013-9-23
   before_filter :find_user, :only => [:user_fanslist, :user_watchlist, :show, :edit, :update, :destroy, :edit_membership, :user_courses,
                                   :user_homeworks, :destroy_membership, :user_activities, :user_projects, :user_newfeedback, :user_comments,
                                   :watch_contests, :info, :watch_projects, :show_score, :topic_score_index, :project_score_index,
                                   :activity_score_index, :influence_score_index, :score_index,:show_new_score, :topic_new_score_index, :project_new_score_index,
-                                  :activity_new_score_index, :influence_new_score_index, :score_new_index,:user_projects_index,
+                                  :activity_new_score_index, :influence_new_score_index, :score_new_index,:user_projects_index,:user_resource,
-                                  :user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages]
+                                  :user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages,:edit_brief_introduction]
   before_filter :auth_user_extension, only: :show
   #before_filter :rest_user_score, only: :show
   #before_filter :select_entry, only: :user_projects
@@ -97,37 +101,83 @@ class UsersController < ApplicationController
   end
 
   # 用户消息
+  # 说明： homework 发布作业；message：讨论区； news：新闻； poll：问卷；works_reviewers：作品评阅；works_reply:作品回复
+  # issue：问题；journal：缺陷状态更新； forum：公共贴吧: user_feedback: 用户留言; new_reply:新闻回复（comment）
   def user_messages
     unless User.current.logged?
       render_403
       return
     end
     # 当前用户查看消息，则设置消息为已读
-    querys = @user.course_messages
+    course_querys = @user.course_messages
+    forge_querys = @user.forge_messages
+    user_querys = @user.user_feedback_messages
+    forum_querys = @user.memo_messages
     if User.current.id == @user.id
-      querys.update_all(:viewed => true)
+      course_querys.update_all(:viewed => true)
+      forge_querys.update_all(:viewed => true)
+      user_querys.update_all(:viewed => true)
+      forum_querys.update_all(:viewed => true)
     end
-    if @user.course_messages
+    @new_message_count = @user.forge_messages.count + @user.memo_messages.count + @user.course_messages.count + @user.user_feedback_messages.count
-     if params[:type].nil?
-       @user_course_messages = @user.course_messages.reverse
-       @user_project_messges = @user.forge_messages.reverse
-     else
     case params[:type]
+      when nil
+        @user_course_messages = CourseMessage.where("user_id =?",@user).order("created_at desc")
+        @user_forge_messages = ForgeMessage.where("user_id =?",@user).order("created_at desc")
+        @user_memo_messages = MemoMessage.where("user_id =?",@user).order("created_at desc")
+        @user_feedback_messages = UserFeedbackMessage.where("user_id =?",@user).order("created_at desc")
+        @user_course_messages_count = @user_course_messages.count
+        @user_forge_messages_count = @user_forge_messages.count
+        @user_memo_messages_count = @user_memo_messages.count
+        @user_feedback_messages_count = @user_feedback_messages.count
       when 'homework'
-          @user_course_messages = @user.course_messages.reverse.select{|x| x.course_message_type == "HomeworkCommon"}
+        @user_course_messages = CourseMessage.where("course_message_type =? and user_id =?", "HomeworkCommon", @user).order("created_at desc")
-          #@user_course_messages = ForgeMessage.find_by_sql("select * from course_messages where user_id='#{@user.id}' and course_message_type = 'HomeworkCommon' order by created_at desc;")
+        @user_course_messages_count = @user_course_messages.count
-        when 'message'
+      when 'course_message'
-          @user_course_messages = @user.course_messages.reverse.select{|x| x.course_message_type == "Message"}
+        @user_course_messages = CourseMessage.where("course_message_type =? and user_id =?", "Message", @user).order("created_at desc")
-        when 'news'
+        @user_course_messages_count = @user_course_messages.count
-          @user_course_messages = @user.course_messages.reverse.select{|x| x.course_message_type == "News"}
+      when 'forge_message'
+        @user_forge_messages = ForgeMessage.where("forge_message_type =? and user_id =?", "Message", @user).order("created_at desc")
+        @user_forge_messages_count = @user_forge_messages.count
+      when 'course_news'
+        @user_course_messages = CourseMessage.where("course_message_type =? and user_id =?", "News", @user).order("created_at desc")
+        @user_course_messages_count = @user_course_messages.count
+      when 'forge_news'
+        @user_forge_messages = ForgeMessage.where("forge_message_type =? and user_id =?", "News", @user).order("created_at desc")
+        @user_forge_messages_count = @user_forge_messages.count
+      when 'course_news_reply'
+        @user_course_messages = CourseMessage.where("course_message_type =? and user_id =?", "Comment", @user).order("created_at desc")
+        @user_course_messages_count = @user_course_messages.count
+      when 'forge_news_reply'
+        @user_forge_messages = ForgeMessage.where("course_message_type =? and user_id =?", "Comment", @user).order("created_at desc")
+        @user_forge_messagess_count = @user_forge_messages.count
       when 'poll'
-          @user_course_messages = @user.course_messages.reverse.select{|x| x.course_message_type == "Poll"}
+        @user_course_messages = CourseMessage.where("course_message_type =? and user_id =?", "Poll", @user).order("created_at desc")
-      end
+        @user_course_messages_count = @user_course_messages.count
+      when 'works_reviewers'
+        @user_course_messages = CourseMessage.where("course_message_type =? and user_id =?", "StudentWorksScore", @user).order("created_at desc")
+        @user_course_messages_count = @user_course_messages.count
+      when 'works_reply'
+        @user_course_messages = CourseMessage.where("course_message_type =? and user_id =?", "JournalsForMessage", @user).order("created_at desc")
+        @user_course_messages_count = @user_course_messages.count
+      when 'issue'
+        @user_forge_messages = ForgeMessage.where("forge_message_type =? and user_id =?", "Issue", @user).order("created_at desc")
+        @user_forge_messages_count = @user_forge_messages.count
+      when 'issue_update' # 缺陷状态更新、留言
+        @user_forge_messages = ForgeMessage.where("forge_message_type =? and user_id =?", "Journal", @user).order("created_at desc")
+        @user_forge_messages_count = @user_forge_messages.count
+      when 'forum'
+        @user_memo_messages = MemoMessage.where("memo_type =? and user_id =?", "Memo", @user).order("created_at desc")
+        @user_memo_messages_count = @user_memo_messages.count
+      when 'user_feedback'
+        @user_feedback_messages = UserFeedbackMessage.where("journals_for_message_type =? and user_id =?", "Principal", @user).order("created_at desc")
+        @user_feedback_messages_count = @user_feedback_messages.count
+      else
+        render_404
+        return
     end
     respond_to do |format|
-          format.html{render :layout=>'base_users_new'}
+      format.html{render :layout=>'new_base_user'}
-          format.api
-        end
     end
   end
 
@@ -423,40 +473,16 @@ class UsersController < ApplicationController
     end
   end
 
+  #显示更多用户课程
   def user_courses4show
-    query = Course.joins("join members m on #{Course.table_name}.id=m.course_id")
+    @page = params[:page].to_i + 1
-    query = query.where("m.user_id = ?",@user.id).order("#{Course.table_name}.id desc")
+    @courses = @user.courses.visible.select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5).offset(@page * 5)
-    if User.current == @user  #看自己
-    else
-      if @user.user_extensions!=nil && @user.user_extensions.identity == 0 #看老师
-        query = query.joins("join member_roles r on m.id = r.member_id")
-        query = query.where("r.role_id in(3,7,9)")
-      end
-      query = query.where(Course.table_name+".is_public = 1")
-    end
-
-    if params[:lastid]!=nil && !params[:lastid].empty?
-      query = query.where(" #{Course.table_name}.id < ?",params[:lastid],)
   end
-    @list = query.limit(8)
 
-    render :layout=>nil
+  #显示更多用户项目
-  end
   def user_projects4show
-    query = Project.joins("join members m on #{Project.table_name}.id=m.project_id")
+    @page = params[:page].to_i + 1
-    query = query.where("m.user_id = ? and #{Project.table_name}.project_type=?",@user.id,Project::ProjectType_project)
+    @projects = @user.projects.visible.select("projects.*,(SELECT MAX(created_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5).offset(@page * 5)
-    if User.current == @user  #看自己
-    else
-      query = query.where(Project.table_name+".is_public = 1")
-      # TODO or exists (select 1 from project c2,members m2 where c2.id=m2.course_id and c2.id=#{Project.table_name}.id and m2.user_id= User.current.id)
-    end
-
-    if params[:lastid]!=nil && !params[:lastid].empty?
-      query = query.where("( (#{Project.table_name}.updated_on=? and #{Project.table_name}.id < ?) or #{Project.table_name}.updated_on<?)",params[:lasttime],params[:lastid],params[:lasttime])
-    end
-    @list = query.order("#{Project.table_name}.updated_on desc,#{Project.table_name}.id desc").limit(8).all
-
-    render :layout=>nil
   end
 
   def user_course_activities
@@ -850,6 +876,274 @@ class UsersController < ApplicationController
     end
   end
 
+  # 上传用户资源
+  def user_resource_create
+    @user = User.find(params[:id])
+    #@user.save_attachments(params[:attachments],User.current)
+    # Container_type为Principal
+      Attachment.attach_filesex(@user, params[:attachments], params[:attachment_type])
+    if(params[:type].nil? || params[:type] == "1") #全部
+      if User.current.id.to_i == params[:id].to_i
+        user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
+        @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+                                            "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+      else
+        user_course_ids = User.find(params[:id]).courses.visible.map { |c| c.id}  #Ta的资源库的话，应该是他上传的公开资源 加上 他加入的所有我可见课程里的公开资源
+        @attachments = Attachment.where("(author_id = #{params[:id]} and is_public = 1 " +
+                                            "and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) " +
+                                            "or (container_type = 'Course' and is_public = 1 and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+      end
+    elsif params[:type] == "2" #课程资源
+      if User.current.id.to_i == params[:id].to_i
+        user_course_ids = User.current.courses.map { |c| c.id}
+        @attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course') or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) ").order("created_on desc")
+      else
+        user_course_ids = User.find(params[:id]).courses.visible.map { |c| c.id}  #如果课程私有资源，那么要看这个资源的课程是不是在 这个user的所有我可见的课程中
+        @attachments = Attachment.where("(author_id = #{params[:id]} and is_public = 1 and container_type = 'Course')"+
+                                            "or (container_type = 'Course' and is_public = 1 and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+      end
+    elsif params[:type] == "3" #项目资源
+      if User.current.id.to_i == params[:id].to_i
+        @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project'").order("created_on desc")
+      else
+        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type = 'Project' ").order("created_on desc")
+      end
+    elsif params[:type] == "4" #附件
+      if User.current.id.to_i == params[:id].to_i
+        @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon')").order("created_on desc")
+      else
+        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon')").order("created_on desc")
+      end
+    end
+    @type = params[:type] || 1
+    @limit = 15
+    @is_remote = true
+    @atta_count = @attachments.count
+    @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+    @offset ||= @atta_pages.offset
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @attachments = paginateHelper @attachments,15
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  # 删除用户资源，分为批量删除 和 单个删除，只能删除自己上传的资源
+  def user_resource_delete
+    if params[:resource_id].present?
+     Attachment.where("author_id = #{User.current.id}").delete(params[:resource_id])
+    elsif params[:checkbox1].present?
+       params[:checkbox1].each do |id|
+         Attachment.where("author_id = #{User.current.id}").delete(id)
+      end
+    end
+
+    if(params[:type].nil? || params[:type] == "1") #全部
+      if User.current.id.to_i == params[:id].to_i
+        user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
+        @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+                                            "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+      else
+        user_course_ids = User.find(params[:id]).courses.visible.map { |c| c.id}  #Ta的资源库的话，应该是他上传的公开资源 加上 他加入的所有我可见课程里的公开资源
+        @attachments = Attachment.where("(author_id = #{params[:id]} and is_public = 1 " +
+                                            "and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) " +
+                                            "or (container_type = 'Course' and is_public = 1 and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+      end
+    elsif params[:type] == "2" #课程资源
+      if User.current.id.to_i == params[:id].to_i
+        user_course_ids = User.current.courses.map { |c| c.id}
+        @attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course') or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) ").order("created_on desc")
+      else
+        user_course_ids = User.find(params[:id]).courses.visible.map { |c| c.id}  #如果课程私有资源，那么要看这个资源的课程是不是在 这个user的所有我可见的课程中
+        @attachments = Attachment.where("(author_id = #{params[:id]} and is_public = 1 and container_type = 'Course')"+
+                                            "or (container_type = 'Course' and is_public = 1 and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+      end
+    elsif params[:type] == "3" #项目资源
+      if User.current.id.to_i == params[:id].to_i
+        @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project'").order("created_on desc")
+      else
+        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type = 'Project' ").order("created_on desc")
+      end
+    elsif params[:type] == "4" #附件
+      if User.current.id.to_i == params[:id].to_i
+        @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon')").order("created_on desc")
+      else
+        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon')").order("created_on desc")
+      end
+    end
+    @type = params[:type]
+    @limit = 15
+    @is_remote = true
+    @atta_count = @attachments.count
+    @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+    @offset ||= @atta_pages.offset
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @attachments = paginateHelper @attachments,15
+     respond_to do |format|
+       format.js
+     end
+  end
+
+  #根据id或者名称搜索教师或者助教为当前用户的课程
+  def search_user_course
+    @user = User.current
+    if !params[:search].nil?
+        @course = @user.courses.where(" #{Course.table_name}.id = #{params[:search].to_i } or #{Course.table_name}.name like '%#{params[:search.to_s]}%'")
+              .select { |course|  @user.allowed_to?(:as_teacher,course)}
+    else
+      @course = @user.courses
+      .select { |course|  @user.allowed_to?(:as_teacher,course)}
+    end
+    #这里仅仅是传递需要发送的资源id
+    @send_id = params[:send_id]
+    @send_ids = params[:checkbox1] || params[:send_ids]
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  # 根据id或者名称搜索当前用户所在的项目
+  def search_user_project
+    @user = User.current
+    if !params[:search].nil?
+      @projects = @user.projects.where(" #{Project.table_name}.id = #{params[:search].to_i } or #{Project.table_name}.name like '%#{params[:search.to_s]}%'")
+    else
+      @projects = @user.projects
+    end
+    #这里仅仅是传递需要发送的资源id
+    @send_id = params[:send_id]
+    @send_ids = params[:checkbox1] || params[:send_ids] #搜索的时候  和 直接 用表格提交的时候的send_ids
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  # 将资源发送到对应的课程,分为发送单个，或者批量发送
+  def add_exist_file_to_course
+   if  params[:send_id].present?
+      send_id  = params[:send_id]
+      ori = Attachment.find_by_id(send_id)
+      course_ids = params[:course_ids]
+        unless course_ids.nil?
+          course_ids.each do |id|
+            next if ori.blank?
+            attach_copied_obj = ori.copy
+            attach_copied_obj.tag_list.add(ori.tag_list) # tag关联
+            attach_copied_obj.container = Course.find(id)
+            attach_copied_obj.created_on = Time.now
+            attach_copied_obj.author_id = User.current.id
+            if attach_copied_obj.attachtype == nil
+              attach_copied_obj.attachtype = 4
+            end
+            attach_copied_obj.save
+            @save_message = attach_copied_obj.errors.full_messages
+        end
+        end
+    elsif params[:send_ids].present?
+      send_ids = params[:send_ids].split(" ")
+      send_ids.each do |send_id|
+        ori = Attachment.find_by_id(send_id)
+        course_ids = params[:course_ids]
+        unless course_ids.nil?
+          course_ids.each do |id|
+            next if ori.blank?
+            attach_copied_obj = ori.copy
+            attach_copied_obj.tag_list.add(ori.tag_list) # tag关联
+            attach_copied_obj.container = Course.find(id)
+            attach_copied_obj.created_on = Time.now
+            attach_copied_obj.author_id = User.current.id
+            if attach_copied_obj.attachtype == nil
+              attach_copied_obj.attachtype = 4
+            end
+            attach_copied_obj.save
+            @save_message = attach_copied_obj.errors.full_messages
+          end
+        end
+      end
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  # 添加资源到对应的项目
+  def add_exist_file_to_project
+    if  params[:send_id].present?
+      send_id  = params[:send_id]
+      project_ids = params[:projects_ids]
+      ori = Attachment.find_by_id(send_id)
+      unless project_ids.nil?
+        project_ids.each do |project_id|
+          next if ori.blank?
+          attach_copied_obj = ori.copy
+          attach_copied_obj.tag_list.add(ori.tag_list) # tag关联
+          attach_copied_obj.container = Project.find(project_id)
+          attach_copied_obj.created_on = Time.now
+          attach_copied_obj.author_id = User.current.id
+          if attach_copied_obj.attachtype == nil
+            attach_copied_obj.attachtype = 1
+          end
+          attach_copied_obj.save
+        end
+      end
+    elsif params[:send_ids].present?
+      send_ids = params[:send_ids].split(" ")
+      send_ids.each do |send_id|
+        project_ids = params[:projects_ids]
+        ori = Attachment.find_by_id(send_id)
+        unless project_ids.nil?
+          project_ids.each do |project_id|
+            next if ori.blank?
+            attach_copied_obj = ori.copy
+            attach_copied_obj.tag_list.add(ori.tag_list) # tag关联
+            attach_copied_obj.container = Project.find(project_id)
+            attach_copied_obj.created_on = Time.now
+            attach_copied_obj.author_id = User.current.id
+            if attach_copied_obj.attachtype == nil
+              attach_copied_obj.attachtype = 1
+            end
+            attach_copied_obj.save
+          end
+        end
+      end
+    else
+    end
+
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  # 资源预览
+  def resource_preview
+      preview_id = params[:resource_id]
+      @file = Attachment.find(preview_id)
+      @preview_able = false;
+      if %w(pdf pptx doc docx xls xlsx).any?{|x| @file.filename.downcase.end_with?(x)}
+         @preview_able = true;
+      end
+      respond_to do |format|
+        format.js
+      end
+  end
+
+  # 重命名资源
+  def rename_resource
+    @attachment = Attachment.find(params[:res_id]) if params[:res_id].present?
+    if  @attachment != nil
+      @attachment.filename =  params[:res_name]
+      @flag = @attachment.save
+    end
+    # respond_to do |format|
+    #   format.js
+    # end
+    if @flag
+      render :text=> download_named_attachment_path(@attachment.id, @attachment.filename)
+    else
+      render :text=>'fail'
+    end
+  end
+
   def destroy
     @user.destroy
     respond_to do |format|
@@ -1051,6 +1345,123 @@ class UsersController < ApplicationController
     @user = User.find(params[:id])
   end
 
+  #修改个人简介
+  def edit_brief_introduction
+    if @user && @user.extensions
+      @user.extensions.update_column("brief_introduction",params[:brief_introduction])
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  # 资源库 分为全部  课程资源 项目资源 附件
+  def user_resource
+    #确定container_type
+    # @user = User.find(params[:id])
+    # 别人的资源库是没有权限去看的
+    if User.current.id.to_i != params[:id].to_i
+      render_403
+      return
+    end
+    if(params[:type].nil? || params[:type] == "1") #全部
+      if User.current.id.to_i == params[:id].to_i
+        user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
+        @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+                                            "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+      else
+        user_course_ids = User.find(params[:id]).courses.visible.map { |c| c.id}  #Ta的资源库的话，应该是他上传的公开资源 加上 他加入的所有我可见课程里的公开资源
+        @attachments = Attachment.where("(author_id = #{params[:id]} and is_public = 1 " +
+                                            "and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) " +
+                                            "or (container_type = 'Course' and is_public = 1 and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+      end
+    elsif params[:type] == "2" #课程资源
+      if User.current.id.to_i == params[:id].to_i
+        user_course_ids = User.current.courses.map { |c| c.id}
+        @attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course') or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) ").order("created_on desc")
+      else
+        user_course_ids = User.find(params[:id]).courses.visible.map { |c| c.id}  #如果课程私有资源，那么要看这个资源的课程是不是在 这个user的所有我可见的课程中
+        @attachments = Attachment.where("(author_id = #{params[:id]} and is_public = 1 and container_type = 'Course')"+
+                                            "or (container_type = 'Course' and is_public = 1 and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+      end
+    elsif params[:type] == "3" #项目资源
+      if User.current.id.to_i == params[:id].to_i
+        @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project'").order("created_on desc")
+      else
+        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type = 'Project' ").order("created_on desc")
+      end
+    elsif params[:type] == "4" #附件
+      if User.current.id.to_i == params[:id].to_i
+        @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon')").order("created_on desc")
+      else
+        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon')").order("created_on desc")
+      end
+    end
+    @type = params[:type]
+    @limit = 15
+    @is_remote = true
+    @atta_count = @attachments.count
+    @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+    @offset ||= @atta_pages.offset
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @attachments = paginateHelper @attachments,15
+    respond_to do |format|
+      format.js
+      format.html {render :layout => 'new_base_user'}
+    end
+  end
+
+  # 根据资源关键字进行搜索
+  def resource_search
+    search = params[:search].to_s.strip.downcase
+    if(params[:type].nil? || params[:type] == "1") #全部
+      if User.current.id.to_i == params[:id].to_i
+        user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源 取交集并查询
+        @attachments = Attachment.where("((author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+                                            " or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))) and (filename like '%#{search}%') ").order("created_on desc")
+      else
+        user_course_ids = User.find(params[:id]).courses.visible.map { |c| c.id}  #如果课程私有资源，那么要看这个资源的课程是不是在 这个user的所有我可见的课程中
+        @attachments = Attachment.where("((author_id = #{params[:id]} and is_public = 1 and container_type in" +
+         " ('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon'))"+
+         " or (container_type = 'Course' and is_public = 1 and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) )" +
+         " and (filename like '%#{search}%') ").order("created_on desc")
+      end
+    elsif params[:type] == "2" #课程资源
+      if User.current.id.to_i == params[:id].to_i
+        user_course_ids = User.current.courses.map { |c| c.id}
+        @attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course') or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) and (filename like '%#{search}%') ").order("created_on desc")
+      else
+        user_course_ids = User.find(params[:id]).courses.visible.map { |c| c.id}  #如果课程私有资源，那么要看这个资源的课程是不是在 这个user的所有我可见的课程中
+        @attachments = Attachment.where("((author_id = #{params[:id]} and is_public = 1 and container_type = 'Course') "+
+                                              "or (container_type = 'Course' and is_public = 1 and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) )"+
+                                            " and (filename like '%#{search}%') ").order("created_on desc")
+      end
+    elsif params[:type] == "3" #项目资源
+      if User.current.id.to_i == params[:id].to_i
+        @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project'  and (filename like '%#{search}%')").order("created_on desc")
+      else
+        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type = 'Project'  and (filename like '%#{search}%') ").order("created_on desc")
+      end
+    elsif params[:type] == "4" #附件
+      if User.current.id.to_i == params[:id].to_i
+        @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Project','Issue','Document','Message','News','StudentWorkScore','HomewCommon')  and (filename like '%#{search}%')").order("created_on desc")
+      else
+        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon')  and (filename like '%#{search}%')").order("created_on desc")
+      end
+    end
+    @type = params[:type]
+    @limit = 15
+    @is_remote = true
+    @atta_count = @attachments.count
+    @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+    @offset ||= @atta_pages.offset
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @attachments = paginateHelper @attachments,15
+    respond_to do |format|
+      format.js
+    end
+  end
+
   private
 
   def find_user
@@ -1064,7 +1475,7 @@ class UsersController < ApplicationController
     render_404
   end
 
-  def setting_layout(default_base='base_users')
+  def setting_layout(default_base='base_users_new')
     User.current.admin? ? default_base : default_base
   end
 
@@ -1114,4 +1525,7 @@ class UsersController < ApplicationController
       impl.save
     end
   end
+
+
+
 end

app/controllers/words_controller.rb

@@ -70,7 +70,8 @@ class WordsController < ApplicationController
   end
   
   def destroy
-    @journal_destroyed = JournalsForMessage.delete_message(params[:object_id])
+    @journal_destroyed = JournalsForMessage.find params[:object_id]
+    if @journal_destroyed.destroy
       if @journal_destroyed.jour_type == "Bid"
         @bid = Bid.find(@journal_destroyed.jour_id)
         @jours_count =  @bid.journals_for_messages.where('m_parent_id IS NULL').count
@@ -86,6 +87,7 @@ class WordsController < ApplicationController
         format.js
       end
     end
+  end
 
   def destroyJournal
     @journalP=JournalsForMessage.find(params[:object_id])

app/helpers/application_helper.rb

@@ -1852,7 +1852,8 @@ module ApplicationHelper
         candown = true
       elsif attachment.container.class.to_s=="StudentWork"
         candown = true
-
+      elsif attachment.container.class.to_s == "User"
+        candown = (attachment.is_public == 1 || attachment.is_public == true || attachment.author_id == User.current.id)
       elsif  attachment.container_type == "Bid" && attachment.container && attachment.container.courses
         course = attachment.container.courses.first
         candown = User.current.member_of_course?(attachment.container.courses.first) || (course.is_public == 1 && attachment.is_public == 1)

app/helpers/repositories_helper.rb

@@ -19,7 +19,7 @@
 
 module RepositoriesHelper
   if Rails.env.development?
-    ROOT_PATH="/tmp/" if Rails.env.development?
+    ROOT_PATH="/private/tmp/"
   else
     ROOT_PATH="/home/pdl/redmine-2.3.2-0/apache2/"
   end

app/helpers/users_helper.rb

@@ -29,6 +29,29 @@ module UsersHelper
                         ["#{l(:status_locked)} (#{user_count_by_status[3].to_i})", '3']], selected.to_s)
   end
 
+  def get_resource_type type
+    case type
+      when 'Course'
+        '课程资源'
+      when 'Project'
+        '项目资源'
+      when 'Issue'
+        '缺陷附件'
+      when 'Message'
+        '讨论区附件'
+      when 'Document'
+        '文档附件'
+      when 'News'
+        '通知附件'
+      when 'HomewCommon'
+        '作业附件'
+      when 'StudentWorkScore'
+        '批改附件'
+      when 'Principal'
+        '用户资源'
+    end
+  end
+
   def user_mail_notification_options(user)
     user.valid_notification_options.collect {|o| [l(o.last), o.first]}
   end
@@ -402,6 +425,14 @@ module UsersHelper
     return str.html_safe
   end
 
+  def get_issue_des_update(journal)
+    arr = details_to_strings(journal.details,true)
+    arr << journal.notes
+    str = ''
+    arr.each { |item| str = str+item }
+    return str
+  end
+
   def get_activity_act_showname(activity)
     case activity.act_type
       when "HomeworkCommon"

app/models/comment.rb

@@ -21,6 +21,10 @@ class Comment < ActiveRecord::Base
   has_many_kindeditor_assets :assets, :dependent => :destroy
 
   has_many :ActivityNotifies,:as => :activity, :dependent => :destroy
+  # 课程/项目 消息
+  has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
+  has_many :forge_messages, :class_name => 'ForgeMessage', :as => :forge_message, :dependent => :destroy
+  #end
   acts_as_event :datetime => :updated_on,
                 :description => :comments,
                 :type => 'news',
@@ -31,7 +35,19 @@ class Comment < ActiveRecord::Base
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
   validates_presence_of :commented, :author, :comments
   safe_attributes 'comments'
-  after_create :send_mail
+  after_create :send_mail, :act_as_system_message
+
+  def act_as_system_message
+    if self.commented.course
+      if self.author_id != self.commented.author_id
+        self.course_messages << CourseMessage.new(:user_id => self.commented.author_id, :course_id => self.commented.course.id, :viewed => false)
+      end
+    else  # 项目相关
+      if self.author_id != self.commented.author_id
+        self.forge_messages << ForgeMessage.new(:user_id => self.commented.author_id, :project_id => self.commented.project.id, :viewed => false)
+      end
+    end
+  end
 
   def send_mail
     if self.commented.is_a?(News) && Setting.notified_events.include?('news_comment_added')

app/models/course_activity.rb

@@ -4,4 +4,27 @@ class CourseActivity < ActiveRecord::Base
   belongs_to :course_act ,:polymorphic => true
   belongs_to :course
   belongs_to :user
+  has_many :user_acts, :class_name => 'UserAcivity',:as =>:act
+  after_save :add_user_activity
+  before_destroy :destroy_user_activity
+
+  #在个人动态里面增加当前动态
+  def add_user_activity
+    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 = "Course"
+      user_activity.container_id = self.course_id
+      user_activity.save
+    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
 end

app/models/forge_activity.rb

@@ -19,5 +19,27 @@ class ForgeActivity < ActiveRecord::Base
   validates :project_id,presence: true
   validates :forge_act_id,presence: true
   validates :forge_act_type, presence: true
+  has_many :user_acts, :class_name => 'UserAcivity',:as =>:act
+  after_save :add_user_activity
+  before_destroy :destroy_user_activity
 
+  #在个人动态里面增加当前动态
+  def add_user_activity
+    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 = "Project"
+      user_activity.container_id = self.project_id
+      user_activity.save
+    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
 end

app/models/forum.rb

@@ -39,6 +39,7 @@ class Forum < ActiveRecord::Base
     logger.debug "send mail for forum add."
       Mailer.run.forum_add(self) if Setting.notified_events.include?('forum_add')
   end
+
   # Updates topic_count, memo_count and last_memo_id attributes for +board_id+
   def self.reset_counters!(forum_id)
     forum_id = forum_id.to_i

app/models/issue.rb

@@ -83,7 +83,7 @@ class Issue < ActiveRecord::Base
   
   # fq
   after_create :act_as_activity,:be_user_score_new_issue,:act_as_forge_activity, :act_as_forge_message
-  after_update :be_user_score
+  after_update :be_user_score, :act_as_forge_message_update
   after_destroy :down_user_score
   # after_create :be_user_score
   # end
@@ -151,6 +151,15 @@ class Issue < ActiveRecord::Base
     end
   end
 
+  # 更新缺陷
+  def act_as_forge_message_update
+    unless self.author_id == self.assigned_to_id
+      self.forge_messages << ForgeMessage.new(:user_id => self.assigned_to_id,
+                                                 :project_id => self.project_id,
+                                                 :viewed => false)
+    end
+  end
+  
   
   # Returns a SQL conditions string used to find all issues visible by the specified user
   def self.visible_condition(user, options={})

app/models/journal.rb

@@ -171,10 +171,12 @@ class Journal < ActiveRecord::Base
 
   # 缺陷状态更改，消息提醒
   def act_as_forge_message
+    if self.user_id != self.issue.author_id
       self.forge_messages << ForgeMessage.new(:user_id => self.issue.author_id,
                                               :project_id => self.issue.project_id,
                                               :viewed => false)
     end
+  end
 
   # 更新用户分数     -by zjc
   def be_user_score

app/models/journals_for_message.rb

@@ -58,9 +58,12 @@ class JournalsForMessage < ActiveRecord::Base
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
   # 课程动态
   has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy
+  # 消息关联
+  has_many :course_messages, :class_name => 'CourseMessage',:as =>:course_message ,:dependent => :destroy
+  has_many :user_feedback_messages, :class_name => 'UserFeedbackMessage', :as =>:journals_for_message, :dependent => :destroy
 
   validates :notes, presence: true, if: :is_homework_jour?
-  after_create :act_as_activity, :act_as_course_activity
+  after_create :act_as_activity, :act_as_course_activity, :act_as_course_message, :act_as_user_feedback_message
   after_create :reset_counters!
   after_destroy :reset_counters!
   after_save :be_user_score
@@ -186,4 +189,54 @@ class JournalsForMessage < ActiveRecord::Base
       self.course_acts << CourseActivity.new(:user_id => self.user_id,:course_id => self.jour_id)
     end
   end
+
+  # 课程作品留言消息通知
+  def act_as_course_message
+    if self.jour_type == 'StudentWorksScore'
+      if self.user_id != self.jour.user_id
+        self.course_messages << CourseMessage.new(:user_id => self.jour.user_id,:course_id => self.jour.student_work.homework_common.course.id, :viewed => false)
+      end
+    end
+  end
+
+  # 用户留言消息通知
+  def act_as_user_feedback_message
+    # 主留言
+    receivers = []
+    if self.reply_id == 0
+      if self.user_id != self.jour_id  # 过滤自己给自己的留言消息
+        receivers << self.jour
+      end
+    else # 留言回复
+      reply_to = User.find(self.reply_id)
+      if self.user_id != self.parent.user_id
+        receivers << reply_to
+        if self.reply_id != self.parent.user_id
+          receivers << self.parent.user
+        end
+      else
+        receivers << reply_to
+      end
+
+      # 添加留言回复人
+      #reply_to = User.find(self.reply_id)
+      #if self.user_id != self.parent.user_id && self.user_id != self.parent.jour_id  # 如果回帖人不是用户自己
+      #  receivers << self.parent.user
+      #  if self.reply_id != self.parent.user_id
+      #    receivers << reply_to
+      #  end
+      #else # 用户自己回复别人的，别人收到消息通知
+      #  if self.user_id != self.reply_id # 过滤掉自己回复自己的
+      #    receivers << reply_to
+      #  end
+      #end
+    end
+    if self.jour_type == 'Principal'
+
+        receivers.each do |r|
+          self.user_feedback_messages << UserFeedbackMessage.new(:user_id => r.id, :journals_for_message_id => self.id, :journals_for_message_type => "Principal", :viewed => false)
+        end
+
+    end
+  end
 end

app/models/memo.rb

@@ -16,6 +16,9 @@ class Memo < ActiveRecord::Base
 	acts_as_attachable
   has_many :user_score_details,  :class_name => 'UserScoreDetails',:as => :score_changeable_obj
   has_many :praise_tread, as: :praise_tread_object, dependent: :destroy
+  # 消息
+  has_many :memo_messages, :class_name =>'MemoMessage', :dependent => :destroy
+  # end
 	belongs_to :last_reply, :class_name => 'Memo', :foreign_key => 'last_reply_id'
 	# acts_as_searchable :column => ['subject', 'content'],
 	# 					#:include => { :forum => :p}
@@ -44,7 +47,7 @@ class Memo < ActiveRecord::Base
 					"parent_id",
 					"replies_count"
 
-	after_create :add_author_as_watcher, :reset_counters!, :send_mail
+	after_create :add_author_as_watcher, :reset_counters!, :send_mail, :send_message
 	# after_update :update_memos_forum
 	after_destroy :reset_counters!,:delete_kindeditor_assets#,:down_user_score  -- 公共区发帖暂不计入得分
 	# after_create :send_notification
@@ -59,6 +62,32 @@ class Memo < ActiveRecord::Base
       Mailer.run.forum_message_added(self) if Setting.notified_events.include?('forum_message_added')
   end
 
+  # 公共贴吧消息记录
+  # 原则：贴吧创始人；发帖人，wanglingchun（特殊用户）
+  def send_message
+    receivers = []
+    u = User.find(6)
+    receivers << u
+    # 主贴
+    if self.parent_id.nil?
+      if self.author_id != self.forum.creator_id # 发帖人不是吧主
+        receivers << self.forum.creator
+      end
+    else # 回帖
+      # 添加吧主
+      if self.author_id != self.forum.creator_id
+        receivers << self.forum.creator
+      end
+      # 添加发帖人
+      if  self.forum.creator_id != self.parent.author_id
+        receivers << self.parent.author
+      end
+    end
+    receivers.each do |r|
+      self.memo_messages << MemoMessage.new(:user_id => r.id, :forum_id => self.forum_id, :memo_id => self.id, :memo_type => "Memo", :viewed => false)
+    end
+  end
+
 	def cannot_reply_to_locked_topic
 		errors.add :base, l(:label_memo_locked) if root.locked? && self != root
 	end

app/models/memo_message.rb

@@ -0,0 +1,11 @@
+class MemoMessage < ActiveRecord::Base
+  attr_accessible :forum_id, :memo_id, :memo_type, :user_id, :viewed
+
+  belongs_to :memo
+  belongs_to :user
+
+  validates :user_id,presence: true
+  validates :forum_id,presence: true
+  validates :memo_id,presence: true
+  validates :memo_type, presence: true
+end

app/models/message.rb

@@ -35,8 +35,9 @@ class Message < ActiveRecord::Base
   # 课程动态
   has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy
   # end
-  # 课程消息
+  # 课程/项目 消息
   has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
+  has_many :forge_messages, :class_name => 'ForgeMessage', :as => :forge_message, :dependent => :destroy
   #end
 
   has_many :ActivityNotifies,:as => :activity, :dependent => :destroy
@@ -73,7 +74,7 @@ class Message < ActiveRecord::Base
   after_update :update_messages_board
   after_destroy :reset_counters!,:down_user_score,:delete_kindeditor_assets
   
-  after_create :act_as_activity,:act_as_course_activity,:be_user_score,:act_as_forge_activity, :act_as_course_message, :send_mail
+  after_create :act_as_activity,:act_as_course_activity,:be_user_score,:act_as_forge_activity, :act_as_system_message, :send_mail
   #before_save :be_user_score
 
   scope :visible, lambda {|*args|
@@ -198,58 +199,48 @@ class Message < ActiveRecord::Base
     end
   end
 
-  # 课程讨论区添加消息
+  # 课程讨论区添加消息:
   # 老师发帖所有人都能收到消息
   # 学生发帖，有人回复则给该学生消息，没回复则不给其它人发送消息
   # 帖子被回复的可以收到消息通知
-  def act_as_course_message
+  # 项目讨论区添加消息：
+  # 主贴项目成员都能收到
+  # 回帖：帖子的发布人收到
+  def act_as_system_message
     if self.course
-      if self.parent_id.nil?   #主贴
+      if self.parent_id.nil?   # 主贴
         self.course.members.each do |m|
-          if self.author.allowed_to?(:as_teacher, self.course)   # 老师
+          if self.author.allowed_to?(:as_teacher, self.course) &&  m.user_id != self.author_id   # 老师 自己的帖子不给自己发送消息
-            if m.user_id != self.author_id      # 自己的帖子不给自己发送消息
             self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.board.course_id, :viewed => false)
           end
         end
-        end
       else    # 回帖
-        #if self.author.allowed_to?(:as_teacher, self.course)   # 老师
         self.course.members.each do |m|
           if m.user_id ==  Message.find(self.parent_id).author_id  && m.user_id != self.author_id  # 只针对主贴回复，回复自己的帖子不发消息
             self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.board.course_id, :viewed => false)
           end
         end
-        #end
+      end
+    else  # 项目相关
+      if self.parent_id.nil?   # 主贴
+        self.project.members.each do |m|
+          if  m.user_id != self.author_id
+            self.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => self.board.project_id, :viewed => false)
+          end
+        end
+      else    # 回帖
+        self.project.members.each do |m|
+          if m.user_id ==  Message.find(self.parent_id).author_id  && m.user_id != self.author_id  # 只针对主贴回复，回复自己的帖子不发消息
+            self.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => self.board.project_id, :viewed => false)
+          end
+        end
       end
     end
-    #  if self.author.allowed_to?(:as_teacher, self.course)    # 如果发帖人是老师
-    #    self.course.members.each do |m|
-    #      if self.parent_id.nil?     # 主贴
-    #        if m.user_id != self.author_id      # 自己的帖子不给自己发送消息
-    #          self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.board.course_id, :viewed => false)
-    #        end
-    #      else   # 回帖只针对主贴发送消息
-    #        if m.user_id ==  Message.find(self.parent_id).author_id
-    #          self.course_messages << CourseMessage.new(:user_id => self.parent_id, :course_id => self.board.course_id, :viewed => false)
-    #        end
-    #      end
-    #    end
-    #  else       # 学生只针对主贴回复
-    #    unless self.parent_id.nil?
-    #      self.course.members.each do |m|
-    #        if m.user_id ==  Message.find(self.parent_id).author_id  && m.user_id != self.author_id  # 只针对主贴回复，回复自己的帖子不发消息
-    #          self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.board.course_id, :viewed => false)
-    #        end
-    #      end
-    #    end
-    #  end
-    #end
   end
   
   #更新用户分数     -by zjc
   def be_user_score
     #新建message且无parent的为发帖
-
     if self.parent_id.nil? && !self.board.project.nil?
       UserScore.joint(:post_message, self.author,nil,self, { message_id: self.id })
       update_memo_number(self.author,1)

app/models/news.rb

@@ -23,7 +23,7 @@ class News < ActiveRecord::Base
   #added by nwb
   belongs_to :course
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
-  has_many :comments, :as => :commented, :dependent => :delete_all, :order => "created_on"
+  has_many :comments, :as => :commented, :dependent => :destroy, :order => "created_on"
   # fq
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
   # 被ForgeActivity虚拟关联
@@ -31,8 +31,9 @@ class News < ActiveRecord::Base
   # 课程动态
   has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy
   # end
-  # 课程消息
+  # 课程/项目消息关联
   has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
+  has_many :forge_messages, :class_name => 'ForgeMessage', :as => :forge_message, :dependent => :destroy
   #end
 
   has_many :ActivityNotifies,:as => :activity, :dependent => :destroy
@@ -54,7 +55,7 @@ class News < ActiveRecord::Base
                             :author_key => :author_id
   acts_as_watchable
 
-  after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity,:act_as_course_messge, :add_author_as_watcher, :send_mail
+  after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity,:act_as_system_message, :add_author_as_watcher, :send_mail
 
   after_destroy :delete_kindeditor_assets
 
@@ -133,15 +134,23 @@ class News < ActiveRecord::Base
     end
   end
 
-  #课程通知 消息发送
+  #课程/项目通知 消息发送
   #消息发送原则：除了消息的发布者，课程的其它成员都能收到消息提醒
-  def act_as_course_messge
+  def act_as_system_message
     if self.course
       self.course.members.each do |m|
         if m.user_id != self.author_id
           self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.course_id, :viewed => false)
         end
       end
+    else
+      if !self.project.nil?
+        self.project.members.each do |m|
+          if m.user_id != self.author_id
+            self.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => self.project_id, :viewed => false)
+          end
+        end
+      end
     end
   end
 

app/models/poll.rb

@@ -13,7 +13,7 @@ class Poll < ActiveRecord::Base
   after_create :act_as_activity, :act_as_course_activity
   # 课程消息
   has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
-  after_create :act_as_activity, :act_as_course_activity, :act_as_course_message
+  after_save :act_as_course_message, :act_as_activity, :act_as_course_activity
 
   acts_as_event :title => Proc.new {|o| "#{l(:label_course_poll)}: #{o.polls_name}" },
                :description => :polls_description,
@@ -46,11 +46,15 @@ class Poll < ActiveRecord::Base
   # 发布问卷，出了发布者外，其他人都能收到消息通知
   def act_as_course_message
     if self.polls_type == "Course"
+      if self.polls_status == 2 #问卷是发布状态
         Course.find(self.polls_group_id).members.each do |m|
           if m.user_id != self.user_id
             self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.polls_group_id, :viewed => false)
           end
         end
+      elsif self.polls_status == 1 #问卷是新建状态
+        self.course_messages.destroy_all
+      end
     end
   end
 

app/models/student_works_score.rb

@@ -5,6 +5,17 @@ class StudentWorksScore < ActiveRecord::Base
   belongs_to :user
   belongs_to :student_work
   has_many :journals_for_messages, :as => :jour, :dependent => :destroy
+  has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
 
   acts_as_attachable
+
+  after_create :act_as_course_message
+
+  # 评阅作品消息提示
+  def act_as_course_message
+    if self.student_work
+      receiver = self.student_work.user
+        self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id, :viewed => false)
+    end
+  end
 end

app/models/user.rb

@@ -127,10 +127,11 @@ class User < Principal
   has_many :messages, :foreign_key => 'author_id'
   has_one :user_score, :dependent => :destroy
   has_many :documents # 项目中关联的文档再次与人关联
-# 关联虚拟表
+# 关联消息表
   has_many :forge_messages
   has_many :course_messages
-# end
+  has_many :memo_messages
+  has_many :user_feedback_messages
 
 # 虚拟转换
   has_many :new_jours, :as => :jour, :class_name => 'JournalsForMessage', :conditions => "status=1"
@@ -156,7 +157,8 @@ class User < Principal
     nil
   }
   
-
+  acts_as_attachable :view_permission => :view_files,
+                     :delete_permission => :manage_files
   acts_as_customizable
   ############################added by william
   acts_as_taggable 
@@ -255,7 +257,11 @@ class User < Principal
 
   # 新消息统计
   def count_new_message
-     count = CourseMessage.where("user_id =? and viewed =?", User.current.id, 0).count
+    course_count = CourseMessage.where("user_id =? and viewed =?", User.current.id, 0).count
+    forge_count = ForgeMessage.where("user_id =? and viewed =?", User.current.id, 0).count
+    user_feedback_count = UserFeedbackMessage.where("user_id =? and viewed =?", User.current.id, 0).count
+    user_memo_count = MemoMessage.where("user_id =? and viewed =?", User.current.id, 0).count
+    messages_count = course_count + forge_count + user_feedback_count + user_memo_count
   end
   # 查询指派给我的缺陷记录
   def issue_status_update
@@ -267,6 +273,12 @@ class User < Principal
     self.user_extensions ||= UserExtensions.new
   end
 
+  # User现在可以作为一个Container_type,而Attachment的Container方法会有一个Container.try(:project),
+  # 所以这里定义一个空方法，保证不报错
+  def project
+
+  end
+
   def user_score_attr
     self.user_score ||= UserScore.new
   end

app/models/user_feedback_message.rb

@@ -0,0 +1,10 @@
+class UserFeedbackMessage < ActiveRecord::Base
+  attr_accessible :journals_for_message_id, :journals_for_message_type, :user_id, :viewed
+
+  belongs_to :journals_for_message
+  belongs_to :user
+
+  validates :user_id,presence: true
+  validates :journals_for_message_id,presence: true
+  validates :journals_for_message_type, presence: true
+end

app/views/admin/course_messages.html.erb

@@ -11,8 +11,8 @@
       <th style="width: 30px;">
         序号
       </th>
-      <th style="width: 30px;">
+      <th style="width: 30px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="来源(课程ID)">
-        来源
+        来源(课程ID)
       </th>
       <th style="width: 50px;">
         作者
@@ -29,7 +29,7 @@
     </tr>
     </thead>
     <tbody>
-    <% @count=0%>
+    <% @count=@page*30%>
     <% for course in @course_ms -%>
 
         <% @count=@count + 1 %>
@@ -51,10 +51,10 @@
             <%= format_date(course.created_on) %>
           </td>
           <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title='<%=course.subject %>'>
-            <%= course.subject %>
+            <%= link_to(course.subject, course_boards_path(Board.where('id=?',course.board_id).first.course_id)) %>
           </td>
           <td class="center">
-            <%=course.replies_count  %>
+            <%= link_to(course.replies_count, course_boards_path(Board.where('id=?',course.board_id).first.course_id)) %>
           </td>
         </tr>
 
@@ -62,5 +62,8 @@
     </tbody>
   </table>
 </div>
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>
 
 <% html_title(l(:label_message_plural)) -%>

app/views/admin/homework.html.erb

@@ -27,7 +27,7 @@
     </tr>
     </thead>
     <tbody>
-      <%@count=0 %>
+      <%@count=@page*30 %>
       <% for homework in @homework do %>
           <% @count+=1 %>
           <tr>
@@ -48,7 +48,7 @@
               <% end %>
             </td>
             <td align="center">
-              <%=StudentWork.where('homework_common_id=?',homework.id).count %>
+              <%=link_to(StudentWork.where('homework_common_id=?',homework.id).count, student_work_index_path(:homework => homework.id))%>
             </td>
             <td align="center">
               <%=format_date(homework.end_time) %>
@@ -59,4 +59,8 @@
   </table>
 </div>
 
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>
+
 <% html_title(l(:label_user_homework)) -%>

app/views/admin/latest_login_users.html.erb

@@ -1,7 +1,26 @@
+<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', :media => 'all' %>
 <h3>
   <%=l(:label_latest_login_user_list)%>
 </h3>
 
+<%= form_tag({}, :method => :get) do %>
+    <fieldset>
+      <legend>
+        <%= l(:label_filter_plural) %>
+      </legend>
+      <label style="float:left">开始日期：</label>
+      <%= text_field_tag 'startdate', params[:startdate], :size => 15, :onchange=>"$('#ui-datepicker-div').hide()", :style=>"float:left"%>
+      <%= calendar_for('startdate')%><span style="float: left ">&nbsp;&nbsp;&nbsp;</span>
+      <label style="float:left">结束日期：</label>
+      <%= text_field_tag 'enddate', params[:enddate], :size => 15, :onchange =>"$('#ui-datepicker-div').hide()", :style=>"float:left"%>
+      <%= calendar_for('enddate')%> &nbsp;
+      <%= submit_tag l(:button_apply), :class => "small", :name => nil %>
+      <%= link_to l(:button_clear), {:controller => 'admin', :action => 'latest_login_users'}, :class => 'icon icon-reload' %>
+    </fieldset>
+<% end %>
+&nbsp;
+
+
 <div class="autoscroll">
   <table class="list" style="width: 100%;table-layout: fixed">
     <thead>
@@ -27,7 +46,7 @@
     </tr>
     </thead>
     <tbody>
-        <% @count=0 %>
+        <% @count=@page * 30 %>
         <% for user in @user do %>
             <tr>
               <% @count +=1 %>
@@ -70,4 +89,8 @@
   </table>
 </div>
 
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>
+
 <% html_title(l(:label_latest_login_user_list)) -%>

app/views/admin/leave_messages.html.erb

@@ -13,8 +13,8 @@
       <th style="width: 50px;">
         类型
       </th>
-      <th style="width: 30px;">
+      <th style="width: 30px; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="来源(课程或用户ID)">
-        来源
+        来源(课程或用户ID)
       </th>
       <th style="width: 50px;">
         留言人
@@ -31,7 +31,7 @@
     </tr>
     </thead>
     <tbody>
-    <% @count=0%>
+    <% @count = @page * 30 %>
     <% for journal in @jour -%>
         <% @count=@count + 1 %>
         <tr class="<%= cycle("odd", "even") %>">
@@ -49,20 +49,39 @@
           <td align="center">
             <%= journal.jour_id %>
           </td>
-          <td align="center" title='<%= journal.try(:user).try(:realname)%>'>
+          <td align="center" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title='<% if journal.try(:user).try(:realname) == ' '%><%= journal.try(:user)%><% else %><%=journal.try(:user).try(:realname) %><% end %>'>
-            <%= link_to(journal.try(:user).try(:realname).truncate(6, omission: '...'), user_path(journal.user)) %>
+            <% if journal.try(:user).try(:realname) == ' '%>
+                <%= link_to(journal.try(:user), user_path(journal.user)) %>
+            <% else %>
+                <%= link_to(journal.try(:user).try(:realname), user_path(journal.user)) %>
+            <% end %>
           </td>
           <td class="center">
             <%= format_date(journal.created_on) %>
           </td>
-          <td title='<%=journal.notes %>'>
+          <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title='<%=journal.notes %>'>
-            <%= journal.notes.truncate(15, omission: '...') %>
+            <%case journal.jour_type %>
+            <% when 'Principal' %>
+                <%= link_to(journal.notes.html_safe, feedback_path(journal.jour_id)) %>
+            <% when 'Course' %>
+                <%= link_to(journal.notes.html_safe, course_feedback_path(journal.jour_id)) %>
+            <% end %>
           </td>
           <td class="center">
             <% if(journal.m_reply_count) %>
-            <%=journal.m_reply_count%>
+                <%case journal.jour_type %>
+                <% when 'Principal' %>
+                    <%= link_to(journal.m_reply_count, feedback_path(journal.jour_id)) %>
+                <% when 'Course' %>
+                    <%= link_to(journal.m_reply_count, course_feedback_path(journal.jour_id)) %>
+                <% end %>
             <% else %>
-            <%=0 %>
+                <%case journal.jour_type %>
+                <% when 'Principal' %>
+                    <%= link_to(0, feedback_path(journal.jour_id)) %>
+                <% when 'Course' %>
+                    <%= link_to(0, course_feedback_path(journal.jour_id)) %>
+                <% end %>
             <% end %>
           </td>
         </tr>
@@ -71,9 +90,7 @@
   </table>
 </div>
 <div class="pagination">
-  <ul>
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
-    <%= pagination_links_full @jour_pages, @jour_count %>
-  </ul>
 </div>
 
 <% html_title(l(:label_leave_message_list)) -%>

app/views/admin/messages_list.html.erb

@@ -11,8 +11,8 @@
       <th style="width: 30px;">
         序号
       </th>
-      <th style="width: 30px;">
+      <th style="width: 30px; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="来源(贴吧ID)">
-        来源
+        来源(贴吧ID)
       </th>
       <th style="width: 50px;">
         作者
@@ -29,7 +29,7 @@
     </tr>
     </thead>
     <tbody>
-    <% @count=0%>
+    <% @count=@page * 30%>
     <% for memo in @memo -%>
         <% @count=@count + 1 %>
         <tr class="<%= cycle("odd", "even") %>">
@@ -50,20 +50,22 @@
             <%= format_date(memo.created_at) %>
           </td>
           <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title='<%=memo.subject %>'>
-            <%= memo.subject %>
+            <% if memo.parent_id.nil? || memo.subject.starts_with?('RE:')%>
+                <%= link_to(memo.subject, forum_memo_path(memo.forum, memo)) %>
+            <% else %>
+                <%= link_to("RE:"+memo.subject, forum_memo_path(memo.forum, memo)) %>
+            <% end %>
           </td>
           <td class="center">
-            <%=memo.replies_count  %>
+            <%= link_to(memo.replies_count, forum_memo_path(memo.forum, memo)) %>
           </td>
         </tr>
     <% end %>
     </tbody>
   </table>
 </div>
-<!--<div class="pagination">
+<div class="pagination">
-  <ul>
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
-    <#%= pagination_links_full @memo_pages, @memo_count %>
+</div>
-  </ul>
-</div>-->
 
 <% html_title(l(:label_message_plural)) -%>

app/views/admin/notices.html.erb

@@ -33,7 +33,7 @@
     </tr>
     </thead>
     <tbody>
-    <% @count=0%>
+    <% @count=@page * 30%>
     <% for news in @news -%>
         <% @count=@count + 1 %>
         <tr class="<%= cycle("odd", "even") %>">
@@ -63,7 +63,7 @@
             <%= link_to(news.title, news_path(news)) %>
           </td>
           <td class="center">
-            <%=news.comments_count %>
+            <%= link_to(news.comments_count, news_path(news)) %>
           </td>
         </tr>
     <% end %>
@@ -71,4 +71,8 @@
   </table>
 </div>
 
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>
+
 <% html_title(l(:label_notification_list)) -%>

app/views/admin/project_messages.html.erb

@@ -11,8 +11,8 @@
       <th style="width: 30px;">
         序号
       </th>
-      <th style="width: 30px;">
+      <th style="width: 30px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="来源(项目ID)">
-        来源
+        来源(项目ID)
       </th>
       <th style="width: 50px;">
         作者
@@ -29,7 +29,7 @@
     </tr>
     </thead>
     <tbody>
-    <% @count=0%>
+    <% @count=@page * 30 %>
     <% for project in @project_ms -%>
 
         <% @count=@count + 1 %>
@@ -51,10 +51,10 @@
             <%= format_date(project.created_on) %>
           </td>
           <td title='<%=project.subject %>' style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name">
-            <%= project.subject %>
+            <%= link_to(project.subject, project_boards_path(Board.where('id=?',project.board_id).first.project_id)) %>
           </td>
           <td class="center">
-            <%=project.replies_count  %>
+            <%= link_to(project.replies_count, project_boards_path(Board.where('id=?',project.board_id).first.project_id)) %>
           </td>
         </tr>
 
@@ -63,4 +63,8 @@
   </table>
 </div>
 
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>
+
 <% html_title(l(:label_message_plural)) -%>

app/views/layouts/_logined_header.html.erb

@@ -8,7 +8,7 @@
         <a href="javascript:void(0);" class="homepageWhite f16">首页</a>
       </li>
       <li class="navHomepageMenu fl">
-        <a href="javascript:void(0);" class="homepageWhite f16">资源库</a></li>
+        <a href="<%=url_for(:controller => 'users', :action => 'user_resource',:id=>@user.id,:type=>1)%>" class="homepageWhite f16">资源库</a></li>
       <li class="navHomepageMenu fl">
         <a href="javascript:void(0);" class="homepageWhite f16">作业</a>
       </li>
@@ -18,11 +18,34 @@
     </ul>
   </div>
 
-  <div class="fl">
+  <div class="fl" id="navHomepageSearch">
     <form class="navHomepageSearchBox">
       <input type="text" name="navHomepageSearch" class="navHomepageSearchInput" />
       <a href="javascript:void(0);" class="homepageSearchIcon"></a>
     </form>
+
+    <div class="navSearchTypeBox" id="navHomepageSearchType">
+      <div class="fl mr15">
+        <div class="fl mt5">
+          <input type="radio" value="课程" name="navSearchType" checked/>
+        </div>
+        课程
+      </div>
+      <div class="fl mr15">
+        <div class="fl mt5">
+          <input type="radio" value="项目" name="navSearchType" />
+        </div>
+        项目
+      </div>
+      <div class="fl mr15">
+        <div class="fl mt5">
+          <input type="radio" value="用户" name="navSearchType" />
+        </div>
+        用户</div>
+      <div id="navSearchAlert" class="fr mr10">
+        <span class="c_red">请选择搜索类型</span>
+      </div>
+    </div>
   </div>
 
   <div class="navHomepageProfile">
@@ -38,7 +61,10 @@
     </ul>
   </div>
   <div class="navHomepageNews">
-    <a href="javascript:void(0);" class="homepageNewsIcon">
+    <%= link_to image_tag("/images/news_icon_small.png" , :width => "21", :height => "24"), {:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user} %>
+    <% if User.current.count_new_message >0 %>
         <div class="newsActive"></div>
-  </a></div>
+    <% end %>
+    <div class="newsActive"></div>
+  </div>
 </div>

app/views/layouts/_unlogin_header.html.erb

@@ -1,40 +1,47 @@
 <div class="navHomepage">
   <div class="navHomepageLogo fl">
-    <%=link_to image_tag("../images/logo.png",weight:"51px", height: "45px",class: "mt3")%>
+    <%=link_to image_tag("../images/logo.png",width:"51px", height: "45px",class: "mt3"), "javascript:void(0);"%>
   </div>
   <div class="fl">
     <ul>
-      <li class="navHomepageMenu fl"><a href="javascript:void(0);" class="homepageWhite f16">首页</a></li>
+      <li class="navHomepageMenu fl">
-      <li class="navHomepageMenu fl"><a href="javascript:void(0);" class="homepageWhite f16">资源库</a></li>
+        <a href="javascript:void(0);" class="c_white f16">帮助中心</a>
-      <li class="navHomepageMenu fl"><a href="javascript:void(0);" class="homepageWhite f16">作业</a></li>
+      </li>
-      <li class="navHomepageMenu fl"><a href="javascript:void(0);" class="homepageWhite f16">联系人</a></li>
     </ul>
   </div>
-  <div class="fl">
+
+  <div class="fl" id="navHomepageSearch">
     <form class="navHomepageSearchBox">
-      <input type="text" name="navHomepageSearch" class="navHomepageSearchInput" />
+      <input type="text" name="navHomepageSearch" class="navHomepageSearchInput"/>
       <a href="javascript:void(0);" class="homepageSearchIcon"></a>
     </form>
+    <div class="navSearchTypeBox" id="navHomepageSearchType">
+      <div class="fl mr15">
+        <div class="fl mt5">
+          <input type="radio" value="课程" name="navSearchType" checked/>
         </div>
-  <div class="navHomepageProfile">
+        课程
-    <ul>
+      </div>
-      <li class="homepageProfileMenuIcon">
+      <div class="fl mr15">
-        <a href="javascript:void(0);">
+        <div class="fl mt5">
-          <div class="mt5 mb8">
+          <input type="radio" value="项目" name="navSearchType" />
-            <img src="images/homepageProfileImage.png" width="40" height="40" />
+        </div>
-          </div>
+        项目
-        </a>
+      </div>
-        <ul class="topnav_login_list">
+      <div class="fl mr15">
-          <li><a href="javascript:void(0);" class="menuGrey">修改资料</a> </li>
+        <div class="fl mt5">
-          <li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>
+          <input type="radio" value="用户" name="navSearchType" />
-          <li><a href="javascript:void(0);" class="menuGrey">退出</a></li>
+        </div>
-        </ul>
+        用户</div>
-      </li>
+      <div id="navSearchAlert" class="fr mr10">
-    </ul>
+        <span class="c_red">请选择搜索类型</span>
+      </div>
+    </div>
+  </div>
+  <div id="loginInButton" class="fr ml20">
+    <a href="javascript:void(0);" class="c_white db">登录</a>
   </div>
-  <div class="navHomepageNews">
+  <div id="loginSignButton" class="fr">
-    <a href="javascript:void(0);" class="homepageNewsIcon">
+    <a href="javascript:void(0);" class="c_white db">注册</a>
-      <div class="newsActive"></div>
-    </a>
   </div>
 </div>

app/views/layouts/_user_brief_introduction.html.erb

@@ -0,0 +1,10 @@
+<% if user.user_extensions && user.user_extensions.brief_introduction && !user.user_extensions.brief_introduction.empty? %>
+    <%= user.user_extensions.brief_introduction %>&nbsp;
+<% else%>
+    这位童鞋很懒，什么也没有留下～&nbsp;
+<% end %>
+<% if User.current == user%>
+    <a href="javascript:void(0);" onclick="show_edit_user_introduction();">
+      <img src="../images/signature_edit.png" width="12" height="12" />
+    </a>
+<% end%>

app/views/layouts/_user_courses.html.erb

@@ -0,0 +1,12 @@
+<% courses.each do |course|%>
+    <li class="homepageLeftMenuCoursesLine">
+      <%= link_to (course_endTime_timeout?(course) ? "[已关闭]&nbsp;#{course.name}" : "#{course.name}").html_safe, course_path(course.id,:host=>Setting.host_course), :class => "coursesLineGrey"%>
+    </li>
+<% end %>
+
+<% if courses.size == 5%>
+    <li class="homepageLeftMenuMore" id="user_show_more_course">
+      <input type="hidden" value="<%= page%>" id="course_page_num">
+      <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="show_more_course('<%=  user_courses4show_user_path(user.id)%>');"></a>
+    </li>
+<% end%>

app/views/layouts/_user_projects.html.erb

@@ -0,0 +1,11 @@
+<% projects.each do |project|%>
+    <li class="homepageLeftMenuCoursesLine">
+      <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :class => "coursesLineGrey"%>
+    </li>
+<% end %>
+<% if projects.size == 5%>
+    <li class="homepageLeftMenuMore" id="user_show_more_project">
+      <input type="hidden" value="<%= page%>" id="project_page_num">
+      <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="show_more_project('<%=  user_projects4show_user_path(user.id)%>');"></a>
+    </li>
+<% end%>

app/views/layouts/_user_watch_btn.html.erb

@@ -1,11 +1,7 @@
 <% if User.current.logged?%>
-    <% if User.current == target%>
-        <a href="<%= url_for(:controller => 'my', :action => 'account') %>" class="fr gz_btn mr10 ">编辑资料</a>
-    <%else%>
     <%if(target.watched_by?(User.current))%>
-            <a id="user_watch_id" href="<%= watch_path(:object_type=> 'user',:object_id=>target.id,:target_id=>target.id) %>" class="fr qx_btn mr10" data-method="delete" data-remote="true" title="取消关注">取消关注</a>
+        <%= link_to "",watch_path(:object_type=> 'user',:object_id=>target.id,:target_id=>target.id),:class => "homepageFollow", :method => "delete",:remote => "true", :title => "取消关注"%>
     <% else %>
-            <a id="user_watch_id" href="<%= watch_path(:object_type=>'user',:object_id=>target.id,:target_id=>target.id) %>" class="fr gz_btn mr10" data-method="post" data-remote="true" title="添加关注">添加关注</a>
+        <%= link_to "",watch_path(:object_type=> 'user',:object_id=>target.id,:target_id=>target.id),:class => "homepageFollowCancel", :method => "post",:remote => "true", :title => "添加关注"%>
     <% end %>
-    <% end%>
 <% end %>

app/views/layouts/base_users_new.html.erb

@@ -146,6 +146,12 @@
               <span style="font-weight:normal;font-size:12px;color:#FF5722;">(<%=@user.projects.count%>)</span>
             </a>
           </div>
+            <div class="subNav">
+              <a href="<%=url_for(:controller => 'users', :action => 'user_resource',:id=>@user.id,:type=>1)%>" class=" f14 c_blue02">
+                我的资源库
+                <span style="font-weight:normal;font-size:12px;color:#FF5722;">(<%=Attachment.where("(author_id = #{@user.id} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) or (container_type = 'Course'  and container_id in (#{@user.courses.map{|c| c.id}.empty? ? '0' : @user.courses.map{|c| c.id}.join(',')}))").count%>)</span>
+              </a>
+            </div>
 
         <% else%>
             <div class="subNav">
@@ -160,6 +166,12 @@
                 <span style="font-weight:normal;font-size:12px;color:#FF5722;">(<%=@user.projects.visible.count%>)</span>
               </a>
             </div>
+            <!--<div class="subNav">-->
+              <!--<a href="<%#=url_for(:controller => 'users', :action => 'user_resource',:id=>@user.id,:type=>1)%>" class=" f14 c_blue02">-->
+                <!--TA的资源库-->
+                <!--<span style="font-weight:normal;font-size:12px;color:#FF5722;">(<%#=Attachment.where("(author_id = #{@user.id} and is_public = 1 and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) or (container_type = 'Course' and is_public = 1  and container_id in (#{@user.courses.visible.map{|c| c.id}.join(',')}))").count%>)</span>-->
+              <!--</a>-->
+            <!--</div>-->
         <% end %>
         <div class="subNav ">
           <%= link_to "留言",feedback_path(@user),:class => "f14 c_blue02"%>

app/views/layouts/login.html.erb

@@ -0,0 +1,131 @@
+  <%= stylesheet_link_tag 'new_public'%>
+  <%= stylesheet_link_tag 'leftside'%>
+  <%= javascript_heads %>
+  <%= javascript_include_tag 'javascripts/jquery-1.3.2' %>
+  <%= javascript_include_tag 'bootstrap' %>
+  <script>
+      $(document).ready(function(){
+          $("#loginSignButton").click(function(){
+              $("#signUpBox").css({display:"block"});
+              $("#loginInBox").css({display:"none"});
+          });
+          $("#loginInButton").click(function(){
+              $("#signUpBox").css({display:"none"});
+              $("#loginInBox").css({display:"block"});
+          });
+      });
+
+      $(document).ready(function(){
+          $(".homepageSearchIcon").click(function(){
+              var val=$('input:radio[name="navSearchType"]:checked').val();
+              if(val==null){
+                  $("#navSearchAlert").css({display:"block"});
+              }
+              else {
+                  $("#navSearchAlert").css({display:"none"});
+              }
+          });
+          $("#loginInButton").click(function(){
+              $("#signUpBox").css({display:"none"});
+              $("#loginInBox").css({display:"block"});
+          });
+      });
+
+      $(document).ready(function(){
+          $(".navHomepageSearchBoxcontainer").mouseover(function(){
+              $(".navSearchTypeBox").css({display:"block"});
+          });
+          $(".navHomepageSearchBoxcontainer").mouseout(function(){
+              $(".navSearchTypeBox").css({display:"none"});
+          });
+      })
+  </script>
+
+<div class="navContainer">
+  <div class="navHomepage">
+    <div class="navHomepageLogo fl"><a href="javascript:void(0);"><img src="images/nav_logo.png" width="51" height="45" alt="确实Trustie" class="mt3" /></a></div>
+    <div class="fl">
+      <ul>
+        <li class="navHomepageMenu fl"><a href="javascript:void(0);" class="c_white f16">帮助中心</a></li>
+      </ul>
+    </div>
+    <div class="navHomepageSearchBoxcontainer fl">
+      <form class="navHomepageSearchBox">
+        <input type="text" name="navHomepageSearch" class="navHomepageSearchInput" />
+        <a href="javascript:void(0);" class="homepageSearchIcon"></a>
+      </form>
+      <div class="navSearchTypeBox">
+        <form class="mt8">
+          <div class="fl mr15"><div class="fl mt5"><input type="radio" value="课程" name="navSearchType" /></div>
+            课程</div>
+          <div class="fl mr15"><div class="fl mt5"><input type="radio" value="项目" name="navSearchType" /></div>
+            项目</div>
+          <div class="fl mr15"><div class="fl mt5"><input type="radio" value="用户" name="navSearchType" /></div>
+            用户</div>
+          <div id="navSearchAlert" class="fr mr10"><span class="c_red">请选择搜索类型</span></div>
+        </form>
+      </div>
+    </div>
+    <div id="loginInButton" class="fr ml20"><a href="javascript:void(0);" class="c_white db">登录</a></div>
+    <div id="loginSignButton" class="fr"><a href="javascript:void(0);" class="c_white db">注册</a></div>
+  </div>
+</div>
+<div class="loginContentContainer">
+  <div class="loginContent">
+    <div class="loginLeft">
+      <div class="loginLogo"><img src="images/trustie_big_log.png" width="100" height="88" alt="Trustie Logo" /></div>
+      <div class="loginInro">欢迎加入Trustie高校创新实践社区，老师、学生和科研人员可以在此开展各种在线协同学习、协同作业、协同开发等活动。Trustie是在中国推行大规模开放在线研究模式（MOORE）的支撑平台。</div>
+    </div>
+    <div class="loginRight">
+      <div id="loginInBox">
+        <div class="loginChooseBox">
+          <ul class="loginChooseList">
+            <li class="loginChoose fl"><span class="loginChooseTab">登陆</span></li>
+            <li class="loginChooseBorder fl"></li>
+          </ul>
+        </div>
+        <div class="loginIn">
+          <div class="mb20">
+            <input type="text" placeholder="请输入邮箱地址或昵称" class="loginSignBox" />
+          </div>
+          <div>
+            <input type="text" placeholder="请输密码" class="loginSignBox" />
+          </div>
+          <div class="loginSignOption">
+            <div class="fl mt3 mr5">
+              <input type="checkbox" />
+            </div>
+            <a href="javascript:void(0);">自动登录</a><a href="javascript:void(0);" class="newsBlue mr40 fr"><u>忘记密码?</u></a></div>
+          <div class="loginInButton"><a href="javascript:void(0);" class="c_white db">登陆</a></div>
+        </div>
+      </div>
+      <div id="signUpBox">
+        <div class="loginChooseBox">
+          <ul class="loginChooseList">
+            <li class="loginChoose fl"><span class="loginChooseTab">注册</a></span>
+            <li class="loginChooseBorder fl"></li>
+          </ul>
+        </div>
+        <div class="loginIn">
+          <div>
+            <input type="text" placeholder="请输入邮箱地址" class="loginSignBox" />
+            <div class="loginSignAlert mb8">请输入有效邮箱地址</div>
+          </div>
+          <div>
+            <input type="text" placeholder="请输入密码" class="loginSignBox" />
+            <div class="loginSignAlert mb8">至少需要 6 个字符</div>
+          </div>
+          <div class="mb20">
+            <input type="text" placeholder="请再次输入密码" class="loginSignBox" />
+          </div>
+          <div>
+            <input type="text" placeholder="请输入用户昵称" class="loginSignBox" />
+            <div class="loginSignAlert mb8">用户昵称为2-18个中英文，数字或下划线</div>
+          </div>
+          <div class="loginUpButton"><a href="javascript:void(0);" class="c_white db">注册</a></div>
+        </div>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div>

app/views/layouts/new_base_user.html.erb

@@ -10,7 +10,7 @@
   <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'new_public', 'user_leftside', :media => 'all' %>
   <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
   <%= javascript_heads %>
-  <%= javascript_include_tag "bootstrap","avatars"%>
+  <%= javascript_include_tag "bootstrap","avatars","new_user"%>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
   <%= yield :header_tags -%>
@@ -18,6 +18,7 @@
 
 <body>
 <div class="navContainer">
+  <% is_current_user = User.current.logged? && User.current == @user%>
   <% if User.current.logged? %>
       <%= render :partial => 'layouts/logined_header' %>
   <% else%>
@@ -27,25 +28,20 @@
 
 <div class="homepageContentContainer">
   <div class="homepageContent">
-    <div class="homepageLeft">
+    <div class="homepageLeft" id="LSide">
       <div class="homepagePortraitContainer">
-        <div class="homepagePortraitImage">
+        <div class="homepagePortraitImage" id="homepage_portrait_image">
           <%= image_tag(url_to_avatar(@user),width:"206", height: "206", :id=>'nh_user_tx') %>
           <% if User.current.logged?%>
-            <% if User.current == @user%>
+            <% if is_current_user%>
-              <div>
+              <div id="edit_user_file_btn" class="none">
                 <div class="homepageEditProfile">
                   <a href="<%= url_for(:controller => 'my', :action => 'clear_user_avatar_temp') %>" data-remote="true" class="homepageEditProfileIcon"></a>
                 </div>
               </div>
             <% else %>
-              <div>
+              <div id="watch_user_btn" class="none">
-                <a href="javascript:void(0);" class="homepageFollow"></a>
+                <%= render :partial => 'layouts/user_watch_btn', :locals => {:target => @user} %>
-                <%if(@user.watched_by?(User.current))%>
-                    <%= link_to "",watch_path(:object_type=> 'user',:object_id=>@user.id,:target_id=>@user.id),:class => "homepageFollow", :method => "delete",:remote => "true", :title => "取消关注"%>
-                <% else %>
-                    <%= link_to "",watch_path(:object_type=> 'user',:object_id=>@user.id,:target_id=>@user.id),:class => "homepageFollow", :method => "post",:remote => "true", :title => "添加关注"%>
-                <% end %>
               </div>
             <% end %>
           <% end%>
@@ -54,30 +50,19 @@
           <div class="homepageImageName hidden">
             <%= @user.login %>
           </div>
-          <div class="homepageImageSex"></div>
+          <% if (@user.user_extensions && (@user.user_extensions.identity != 2) ) %>
-          <%= link_to "编辑资料", my_account_path, :class => "fr gz_btn mr10"%>
+              <div class="<%= @user.user_extensions.gender == 1 ? 'homepageImageSexWomen' : 'homepageImageSexMan' %> "></div>
+          <% end %>
+          <%= link_to("编辑资料", my_account_path, :class => "fr gz_btn mr10") if is_current_user%>
           <div class="cl"></div>
         </div>
         <div>
           <div class="homepageSignature">
-            <% if @user.user_extensions && @user.user_extensions.brief_introduction && !@user.user_extensions.brief_introduction.empty? %>
+            <p id="user_brief_introduction_show">
-                <p>
+              <%= render :partial => 'layouts/user_brief_introduction', :locals => {:user => @user} %>
-                  <%= @user.user_extensions.brief_introduction %>&nbsp;
-                  <a href="javascript:void(0);">
-                    <img src="../images/signature_edit.png" width="12" height="12" />
-                  </a>
             </p>
-            <% else%>
-                <% if User.current == @user%>
-                    <p>
-                      这位童鞋很懒，什么也没有留下～&nbsp;
-                      <a href="javascript:void(0);">
-                        <img src="../images/signature_edit.png" width="12" height="12" />
-                      </a>
-                    </p>
-                <% end%>
-            <% end %>
           </div>
+          <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">
@@ -89,7 +74,7 @@
           <div class="homepageVerDiv"></div>
           <div class="homepageImageBlock">
             <div>
-              <%= link_to @user.watcher_users.count.to_s, {:controller=>"users", :action=>"user_fanslist",:id=>@user.id},:class=>"homepageImageNumber"%>
+              <%= 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>
@@ -117,18 +102,7 @@
         <div class="homepageLeftMenuCourses">
           <ul>
             <% courses = @user.courses.visible.select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5)%>
-            <% courses.each do |course|%>
+            <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => @user, :page => 0} %>
-                <li class="homepageLeftMenuCoursesLine">
-                  <a href="<%= url_for(:controller => 'courses', :action=>"show", :id=>course.id, :host=>Setting.host_course) %>" class="coursesLineGrey">
-                    <%= course.name %>
-                  </a>
-                </li>
-            <% end %>
-            <% if courses.size == 5%>
-                <li class="homepageLeftMenuMore">
-                  <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon"></a>
-                </li>
-            <% end%>
           </ul>
         </div>
         <div class="homepageLeftMenuBlock">
@@ -140,18 +114,7 @@
         <div class="homepageLeftMenuCourses">
           <ul>
             <% projects = @user.projects.visible.select("projects.*,(SELECT MAX(created_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5)%>
-            <% projects.each do |project|%>
+            <%= render :partial => 'layouts/user_projects', :locals => {:projects => projects,:user => @user, :page => 0} %>
-                <li class="homepageLeftMenuCoursesLine">
-                  <a href="<%= url_for(:controller => 'projects', :action=>"show", :id=>project.id, :host=>Setting.host_name) %>" class="coursesLineGrey">
-                    <%= project.name %>
-                  </a>
-                </li>
-            <% end %>
-            <% if projects.size == 5%>
-                <li class="homepageLeftMenuMore">
-                  <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon"></a>
-                </li>
-            <% end%>
           </ul>
         </div>
         <div class="homepageLeftMenuBlock">
@@ -168,7 +131,7 @@
         </div>
       </div>
     </div>
-    <div class="homepageRight">
+    <div class="homepageRight" id="RSide">
       <%= yield %>
     </div>
   </div>
@@ -223,17 +186,5 @@
     <div class="cl"></div>
   </div><!--floatbox end-->
 </div>
-
-<script type="text/javascript">
-    $(function(){
-        if($(".top_new").length==0){
-            $("#RSide").css("min-height",$("#LSide").height()-30);
-        }
-        else{
-            $("#RSide").css("min-height",$("#LSide").height()-87);
-        }
-
-    });
-</script>
 </body>
 </html>

app/views/projects/settings/_new_repositories.html.erb

@@ -62,15 +62,6 @@
 <%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form',:method=>"post"} 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>
@@ -84,11 +75,6 @@
          <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>

app/views/repositories/show.html.erb

@@ -33,8 +33,9 @@
 <div id="repos_git_more">
   <br>
   <div class=" c_dark f14">
+    <p color="red">git 克隆和提交的用户名和密码为登录用户名和密码 </p>
     <p>项目代码请设置好正确的编码方式（utf-8），否则中文会出现乱码。</p>
-    <p>通过cmd命令提示符进入代码对应文件夹的根目录，假设当前用户的登录名为user，版本库名称为demo，需要操作的版本库分支为branch。
+    <p>通过cmd命令提示符进入代码对应文件夹的根目录，
       如果是首次提交代码，执行如下命令：</p>
   </div>
   <div class="repos_explain">
@@ -45,19 +46,19 @@
     <p>git commit -m "first commit"</p>
 
     <p>git remote add origin
-      http://user_demo@repository.trustie.net/user/demo.git
+    <%= @repos_url %>
     </p>
 
     <p>git config http.postBuffer 524288000 #设置本地post缓存为500MB</p>
 
-    <p>git push -u origin branch:branch</p>
+    <p>git push -u origin master</p>
   </div>
   <!--repos_explain end-->
   <div class="c_dark f14">
     <p>已经有本地库，还没有配置远程地址，打开命令行执行如下：</p>
   </div>
   <div class="repos_explain">
-    <p>git remote add origin http://user_demo@repository.trustie.net/user/demo.git</p>
+    <p>git remote add origin <%= @repos_url %></p>
 
     <p>git add .</p>
 
@@ -65,14 +66,14 @@
 
     <p>git config http.postBuffer 524288000 #设置本地post缓存为500MB</p>
 
-    <p>git push -u origin branch:branch</p>
+    <p>git push -u origin master</p>
   </div>
   <!--repos_explain end-->
   <div class="c_dark f14">
     <p>已有远程地址，创建一个远程分支，并切换到该分支，打开命令行执行如下：</p>
   </div>
   <div class="repos_explain">
-    <p>git clone http://user_demo@repository.trustie.net/user/demo.git</p>
+    <p>git clone <%= @repos_url %></p>
 
     <p>git push</p>
 
@@ -86,7 +87,7 @@
   </div>
   <div class="repos_explain">
     <p>git remote add trustie
-      http://user_demo@repository.trustie.net/user/demo.git
+    <%= @repos_url %>
     </p>
 
     <p>git add .</p>

app/views/users/_attachment_list.html.erb

@@ -0,0 +1,30 @@
+
+
+<!--<button name="button" class="sub_btn" onclick="_file.click()" onmouseover="this.focus()" style="<%#= ie8? ? 'display:none' : ''%>" type="button" ><%#= l(:label_browse) %></button>-->
+<a href="javascript:void(0);" class="uploadIcon f14" name="button"   onclick="_file.click()" onmouseover="" style="<%= ie8? ? 'display:none' : ''%>">
+        <span class="chooseFile">选择文件</span></a>
+<%= 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) %>
+<!--)-->

app/views/users/_resource_search_form.html.erb

@@ -0,0 +1,7 @@
+<%= form_tag( url_for(:controller => 'users',:action => 'resource_search',:id=>user.id),
+              :remote=>true ,:method => 'get',:class=>'resourcesSearchloadBox',:id=>'resource_search_form') do %>
+    <input type="text" name="search" placeholder="输入资源关键词进行搜索" class="searchResource" />
+    <%= hidden_field_tag(:type,type) %>
+    <%= submit_tag '',:class=>'homepageSearchIcon',:onfocus=>'this.blur();',:style=>'border-style:none' %>
+    <!--<a href="javascript:void(0);" onclick='this.parent.submit();return false;' class="searchIcon"></a>-->
+<% end %>

app/views/users/_resource_share_for_project_popup.html.erb

@@ -0,0 +1,51 @@
+
+
+<div class="resourceSharePopup">
+  <div>
+    <div class="sendText fl">将资源发送至</div>
+    <div class="resourcesSendTo">
+      <select class="resourcesSendType" onclick="chooseSendType('<%= send_id%>','<%= send_ids%>');">
+        <option value="1">课程</option>
+        <option value="2" selected>项目</option>
+      </select>
+    </div>
+  </div>
+  <div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose" onclick="closeModal();"></a></div>
+  <div class="fl">
+    <%= form_tag  search_user_project_user_path(user),:method => 'get',
+                  :remote=>true,:id=>'search_user_project_form',:class=>'resourcesSearchBox' do %>
+        <%= hidden_field_tag(:send_id, send_id) %>
+        <%= hidden_field_tag(:send_ids, send_ids) %>
+      <input type="text" name="search" placeholder="输入项目ID或者名称搜索" class="searchResourcePopup" />
+      <!--<a href="javascript:void(0);"  class="searchIconPopup"></a>-->
+        <%= submit_tag '',:class=>'searchIconPopup',:onfocus=>"this.blur();",:style=>'border-style:none' %>
+    <% end %>
+  </div>
+  <%= form_tag add_exist_file_to_project_user_path(user),:remote=>true,:id=>'projects_list_form' %>
+  <div>
+
+    <%= hidden_field_tag(:send_id, send_id) %>
+    <%= hidden_field_tag(:send_ids, send_ids) %>
+    <div class="courseReferContainer">
+    <% if !projects.empty?  %>
+        <% projects.each do |project| %>
+        <ul class="courseSend fl">
+          <li class="fl">
+            <input name="projects_ids[]" type="checkbox" value="<%= project.id %>" class="courseSendCheckbox"/>
+          </li>
+          <li class="sendCourseName fl"><%= truncate( project.name,:length=>18)%></li>
+        </ul>
+        <% end %>
+    </div>
+  </div>
+  <div>
+    <div class="courseSendSubmit">
+      <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
+      <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
+    </div>
+    <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="closeModal();">取消</a></div>
+  </div>
+  <div class="cl"></div>
+    <% end %>
+</div>
+

app/views/users/_resource_share_popup.html.erb

@@ -0,0 +1,51 @@
+
+
+<div class="resourceSharePopup">
+  <div>
+    <div class="sendText fl">将资源发送至</div>
+    <div class="resourcesSendTo">
+      <select class="resourcesSendType" onclick="chooseSendType('<%= send_id%>','<%= send_ids%>');">
+        <option value="1">课程</option>
+        <option value="2">项目</option>
+      </select>
+    </div>
+  </div>
+  <div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose" onclick="closeModal();"></a></div>
+  <div class="fl">
+    <%= form_tag  search_user_course_user_path(user),:method => 'get',
+                  :remote=>true,:id=>'search_user_course_form',:class=>'resourcesSearchBox' do %>
+        <%= hidden_field_tag(:send_id, send_id) %>
+        <%= hidden_field_tag(:send_ids, send_ids) %>
+      <input type="text" name="search" placeholder="输入课程ID或者名称搜索" class="searchResourcePopup" />
+      <!--<a href="javascript:void(0);"  class="searchIconPopup"></a>-->
+        <%= submit_tag '',:class=>'searchIconPopup',:onfocus=>"this.blur();",:style=>'border-style:none' %>
+    <% end %>
+  </div>
+  <%= form_tag add_exist_file_to_course_user_path(user),:remote=>true,:id=>'course_list_form' %>
+  <div>
+
+    <%= hidden_field_tag(:send_id, send_id) %>
+    <%= hidden_field_tag(:send_ids, send_ids) %>
+    <div class="courseReferContainer">
+    <% if !courses.empty?  %>
+        <% courses.each do |course| %>
+        <ul class="courseSend fl">
+          <li class="fl">
+            <input name="course_ids[]" type="checkbox" value="<%= course.id %>" class="courseSendCheckbox"/>
+          </li>
+          <li class="sendCourseName fl"><%= truncate(course.name,:length=>18)%></li>
+        </ul>
+        <% end %>
+      </div>
+  </div>
+  <div>
+    <div class="courseSendSubmit">
+      <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
+      <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
+    </div>
+    <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText mt10" onclick="closeModal();">取消</a></div>
+  </div>
+  <div class="cl"></div>
+    <% end %>
+</div>
+

app/views/users/_resource_upload_popup.html.erb

@@ -0,0 +1,43 @@
+
+<script>
+$(document).ready(function(){
+	var popupHeight = $(".resourceUploadPopup").outerHeight(true);
+	$(".resourceUploadPopup").css("marginTop",-popupHeight/2);
+
+
+	$(".resourcePopupClose").click(function(){
+		$(".resourceUploadPopup").css("display","none");
+		});
+	});
+</script>
+
+
+
+<div class="resourceUploadPopup"><span class="uploadText">上传资源 </span>
+  <div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose"></a></div>
+  <div class="uploadBoxContainer">
+    <div class="uploadBox"><a href="javascript:void(0);" class="uploadIcon f14"><span class="chooseFile">选择文件</span></a></div>
+    <div class="uploadResourceIntr">
+      <div class="uploadResourceName">(未选择文件)</div>
+      <div class="uploadResourceIntr2">您可以上传小于<span class="c_red">50MB</span>的文件</div>
+    </div>
+  </div>
+  <div>
+    <select class="uploadType">
+      <option value="">资源类型</option>
+      <option value="课件资源">课件资源</option>
+      <option value=“"项目资源">项目资源</option>
+      <option value="附件">附件</option>
+      <option value="无">无</option>
+    </select>
+  </div>
+  <div>
+    <input type="text" name="" placeholder="关键词" class="uploadKeyword" />
+  </div>
+  <div>
+    <div class="courseSendSubmit"><a href="javascript:void(0);" class="sendSourceText">确定</a></div>
+    <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText">取消</a></div>
+  </div>
+  <div class="cl"></div>
+</div>
+

app/views/users/_resources_list.html.erb

@@ -0,0 +1,22 @@
+
+<% if attachments.nil? || attachments.empty? %>
+<% else %>
+    <% attachments.each do |attach| %>
+    <ul class="resourcesList">
+      <li class="resourcesListCheckbox fl">
+        <input name="checkbox1[]" type="checkbox" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="resourcesCheckbox" />
+      </li>
+    <li class="resourcesListName fl">
+      <!--<a href="javascript:void(0);" class="resourcesBlack"><%#=truncate(attach.filename,:length=>18)%></a>-->
+      <%= link_to truncate(attach.filename,:length=>18), download_named_attachment_path(attach.id, attach.filename),
+                  :title => attach.filename,:class=>'resourcesBlack'%>
+    </li>
+    <li class="resourcesListSize fl"><%= number_to_human_size(attach.filesize) %></li>
+    <li class="resourcesListType fl"><%= get_resource_type(attach.container_type)%></li>
+    <li class="resourcesListUploader fl"><%=User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li>
+      <li style="display: none"><%= attach.author_id %></li>
+    <li class="resourcesListTime fl"><%= format_date(attach.created_on) %></li>
+    <li style="display: none"><%= attach.id %></li>
+    </ul>
+   <% end %>
+<% end %>

app/views/users/_upload_resource.html.erb

@@ -0,0 +1,53 @@
+<div class="resourceUploadPopup"><span class="uploadDialogText">上传资源 </span>
+  <div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose" onclick="closeModal();"></a></div>
+  <div class="uploadBoxContainer">
+    <%= form_tag(user_resource_create_user_path, :multipart => true,:remote => !ie8?,:name=>"upload_form",:id=>'upload_form') do %>
+        <div>
+        <span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
+        <% if defined?(container) && container && container.saved_attachments %>
+           <script>alert('<% container%>')</script>
+          <% 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 => 'remove-upload')%>
+              <%= 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>
+          <% end %>
+        <% end %>
+        </span>
+        </div>
+        <div class="uploadBox">
+
+          <input type="hidden" name="attachment_type" value="1">
+          <%= render :partial => 'attachment_list' %>
+          <div class="cl"></div>
+          <!--<a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="closeModal();"><%#= l(:button_cancel)%></a>-->
+          <!--<a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%#= l(:button_confirm)%></a>-->
+
+        </div>
+        <div class="uploadResourceIntr">
+          <div class="uploadResourceName"><span id="upload_file_count">(未选择文件)</span></div>
+          <div class="uploadResourceIntr2">您可以上传小于<span class="c_red">50MB</span>的文件</div>
+        </div>
+        </div>
+        <div class="cl"></div>
+        <div style="margin-top: 10px" >
+          <div class="courseSendSubmit">
+            <!--<a href="javascript:void(0);" class="sendSourceText" onclick="">确定</a>-->
+            <%= submit_tag '确定',:onclick=>'submit_files();',:onfocus=>'this.blur()',:class=>'sendSourceText' %>
+          </div>
+          <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="closeModal();">取消</a></div>
+        </div>
+    <% end %>
+    <div class="cl"></div>
+    </div>

app/views/users/add_exist_file_to_course.js.erb

@@ -0,0 +1,2 @@
+alert('发送成功')
+closeModal();

app/views/users/add_exist_file_to_project.js.erb

@@ -0,0 +1,2 @@
+alert('发送成功');
+closeModal();

app/views/users/edit_brief_introduction.js.erb

@@ -0,0 +1,3 @@
+$("#user_brief_introduction_show").html("<%= escape_javascript render(:partial => "layouts/user_brief_introduction", :locals => {:user => @user}) %>");
+$("#user_brief_introduction_show").show();
+$("#user_brief_introduction_edit").hide();

app/views/users/rename_resource.js.erb

@@ -0,0 +1 @@
+alert(1)

app/views/users/resource_preview.js.erb

@@ -0,0 +1,5 @@
+<% if @preview_able %>
+top.location.href = '<%=download_named_attachment_path(@file.id, @file.filename, preview: true) %>'
+<% else %>
+window.alert('该资源不可预览')
+<% end %>

app/views/users/resource_search.js.erb

@@ -0,0 +1,2 @@
+$("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
+$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');

app/views/users/search_user_course.js.erb

@@ -0,0 +1,11 @@
+//var screenWidth = $(window).width();
+//var screenHeight = $(window).height(); //当前浏览器窗口的 宽高
+//var scrolltop = $(document).scrollTop();//获取当前窗口距离页面顶部高度
+//var objLeft = (screenWidth - 2)/2.5 ;   //2 可以根据需要修改
+//var objTop = (screenHeight - 100)/2 + scrolltop;  //100可以根据需要修改
+var popupHeight = $(".resourceSharePopup").outerHeight(true);
+$(".resourceSharePopup").css("marginTop",-popupHeight/2);
+
+$("#upload_box").css('left','').css('top','');
+$("#upload_box").html('<%= escape_javascript( render :partial => "resource_share_popup" ,:locals => {:courses=>@course,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
+$("#upload_box").css('display','block');

app/views/users/search_user_project.js.erb

@@ -0,0 +1,11 @@
+//var screenWidth = $(window).width();
+//var screenHeight = $(window).height(); //当前浏览器窗口的 宽高
+//var scrolltop = $(document).scrollTop();//获取当前窗口距离页面顶部高度
+//var objLeft = (screenWidth - 2)/2.5 ;   //2 可以根据需要修改
+//var objTop = (screenHeight - 100)/2 + scrolltop;  //100可以根据需要修改
+var popupHeight = $(".resourceSharePopup").outerHeight(true);
+$(".resourceSharePopup").css("marginTop",-popupHeight/2);
+
+$("#upload_box").css('left','').css('top','');
+$("#upload_box").html('<%= escape_javascript( render :partial => "resource_share_for_project_popup" ,:locals => {:projects=>@projects,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
+$("#upload_box").css('display','block');

app/views/users/show_new_score.js.erb

@@ -1,4 +1,9 @@
 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_new_score') %>');
 showModal('ajax-modal', '400px');
-$('#ajax-modal').siblings().show();
+$('#ajax-modal').css('height','auto');
-$('#ajax-modal').addClass('new-watcher');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'>" +
+"<a href='javascript:void(0)' onclick='hideModal();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+//$('#ajax-modal').parent().removeClass("alert_praise");
+$('#ajax-modal').parent().css("top","30%").css("left","35%");
+$('#ajax-modal').parent().addClass("alert_box");

app/views/users/user_courses4show.html.erb

@@ -1,16 +0,0 @@
-<% for item in @list %>
-
-<div class="home_courses_list fl" nhname="rec" data-id="<%= item.id %>" data-time="<%= item.updated_at %>">
-  <div class="courses_list_pic fl ml10 mr10">
-    <a href="<%= url_for(:controller => 'courses', :action=>"show", :id=>item.id, :host=>Setting.host_course) %>"><%= image_tag(url_to_avatar(item), :style => 'width:64px;height:64px;') %></a>
-  </div>
-  <span class="fl" style="width:260px;">
-    <a href="<%= url_for(:controller => 'courses', :action=>"show", :id=>item.id, :host=>Setting.host_course) %>" class="home_list_title c_blue02 fl mb10" title="<%= item.name %>"><%= item.name %></a>
-  </span>
-  <div class="fl c_dgrey">
-    <p>主讲老师：<a href="<%= user_path(item.teacher) %>" title="<%= item.teacher.show_name %>"><%= item.teacher.show_name %></a></p>
-    <p>课程作业：<a href="<%=url_for(:controller => 'homework_common', :action => 'index',:course=>item.id, :host=>Setting.host_course)%>"><%= item.homework_commons.count %></a> <span class="ml10"></span>学生：<a href="<%= url_for(:controller => 'courses', :action=>"member", :id=>item.id,:role=>2, :host=>Setting.host_course) %>"><%= studentCount(item) %></a></p>
-  </div>
-  <div class="cl"></div>
-</div>
-<% end %>

app/views/users/user_courses4show.js.erb

@@ -0,0 +1 @@
+$("#user_show_more_course").replaceWith("<%= escape_javascript( render :partial =>  'layouts/user_courses',:locals => {:courses => @courses,:user => @user, :page => @page} )%>");

app/views/users/user_messages.html.erb

@@ -1,33 +1,62 @@
 <div id="RSide" class="fl">
-  <div class="homepageRight">
+<div class="homepageRight">
-    <div class="resources">
+
-      <div class="resourcesBanner">
+<div class="resourcesBanner">
   <div class="bannerName">消息</div>
   <ul class="resourcesSelect">
-          <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
+    <li class="resourcesSelected2"><a href="javascript:void(0);" class="resourcesIcon2"></a>
       <ul class="newsType">
         <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "全部",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user} %></a></li>
-              <!--<li><a href="javascript:void(0);" class="resourcesGrey">@我</a></li>-->
+        <%# 课程相关消息 %>
         <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "作业消息",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'homework'} %></a></li>
-              <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "讨论区",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'message'} %></a></li>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "课程讨论区",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'course_message'} %></a></li>
-              <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "课程通知",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'news'} %></a></li>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "课程通知",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'course_news'} %></a></li>
-              <!--<li><a href="javascript:void(0);" class="resourcesGrey">指派给我</a></li>-->
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "通知回复",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'course_news_reply'} %></a></li>
-              <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "问卷调查",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'poll'} %></a></li>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "课程问卷",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'poll'} %></a></li>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "作品评阅",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'works_reviewers'} %></a></li>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "作品讨论",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'works_reply'} %></a></li>
+        <%# 项目相关消息 %>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "指派给我",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'issue'} %></a></li>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "更新了问题",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'issue_update'} %></a></li>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "项目讨论区",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forge_message'} %></a></li>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "项目新闻",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forge_news'} %></a></li>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "新闻回复",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forge_news_reply'} %></a></li>
+        <%# 项目相关消息 %>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "贴吧帖子",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forum'} %></a></li>
+        <%# 系统贴吧 %>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "用户留言",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'user_feedback'} %></a></li>
+
       </ul>
     </li>
   </ul>
-      </div>
+</div>
 
-      <div>
+<div>
-      <% if !@user_course_messages.blank? %>
+<% if @new_message_count >0 %>
+    <%# 课程消息 %>
+    <% unless @user_course_messages.nil? %>
         <% @user_course_messages.each do |ucm| %>
             <% if ucm.course_message_type == "News" %>
+                <ul class="homepageNewsList fl">
+                  <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ucm.course_message.author), :width => "30", :height => "30") %></a></li>
+                  <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="<%=ucm.viewed == 0?"newsBlack":"newsBlue"%>"><%= ucm.course_message.author %></a></li>
+                  <li class="<%= ucm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布通知</li>
+                  <li class="homepageNewsContent fl">
+                    <%= link_to "#{ucm.course_message.title.html_safe}", {:controller => 'news', :action => 'show', :id => ucm.course_message.id },
+                    :class =>"#{ucm.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                    :title => "#{ucm.course_message.title.html_safe}" %></li>
+                  <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_on).html_safe %> </li>
+                </ul>
+            <% end %>
+            <% if ucm.course_message_type == "Comment" %>
                 <ul class="homepageNewsList fl">
                   <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ucm.course_message.author), :width => "30", :height => "30") %></a></li>
                   <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="newsBlue"><%= ucm.course_message.author %></a></li>
-                  <li class="homepageNewsType fl">发布通知</li>
+                  <li class="<%= ucm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">回复了通知</li>
-                  <li class="homepageNewsContent fl"><a href="javascript:void(0);"  class="newsGrey">
+                  <li class="homepageNewsContent fl">
-                    <%= link_to format_activity_title(" #{ucm.course_message.title}"), {:controller => 'news', :action => 'show', :id => ucm.course_message.id} %></a></li>
+                    <%= link_to "#{ucm.course_message.comments.html_safe}", {:controller => 'news', :action => 'show', :id => ucm.course_message.commented.id },
+                    :class =>"#{ucm.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                    :title => "#{ucm.course_message.comments.html_safe}" %></li>
                   <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_on).html_safe %> </li>
                 </ul>
             <% end %>
@@ -37,43 +66,189 @@
                   <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="newsBlue"><%= ucm.course_message.user %></a></li>
                   <li class="homepageNewsType fl">发布作业</li>
                   <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                    <%= link_to ("#{ucm.course_message.name}"), student_work_index_path(:homework => ucm.course_message.id) %></a></li>
+                    <%= link_to ("#{ucm.course_message.name}"), student_work_index_path(:homework => ucm.course_message.id),:class => "newsGrey", :title => "#{ucm.course_message.name}" %></a></li>
                   <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_at).html_safe %> </li>
                 </ul>
             <% end %>
             <% if ucm.course_message_type == "Poll" %>
                 <ul class="homepageNewsList fl">
                   <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ucm.course_message.user), :width => "30", :height => "30") %></a></li>
-                  <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="newsBlue"><%= ucm.course_message.user %></a></li>
+                  <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="<%=ucm.viewed == 0?"newsBlack":"newsBlue"%>"><%= ucm.course_message.user %></a></li>
-                  <li class="homepageNewsType fl">发布问卷</li>
+                  <li class="<%= ucm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布问卷</li>
                   <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                    <%= link_to format_activity_title(" #{ucm.course_message.polls_name}"), poll_index_path(:polls_type => "Course", :polls_group_id => ucm.course_id) %></a></li>
+                    <%= link_to format_activity_title(" #{ucm.course_message.polls_name.nil? ? "未命名问卷" : ucm.course_message.polls_name}"), poll_index_path(:polls_type => "Course", :polls_group_id => ucm.course_id),
+                    :class=>"#{ucm.viewed==0?"newsBlack":"newsGrey"}",
+                    :title => "#{ucm.course_message.polls_name}" %></a></li>
                   <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_at).html_safe %> </li>
                 </ul>
             <% end %>
             <% if ucm.course_message_type == "Message" %>
                 <ul class="homepageNewsList fl">
                   <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ucm.course_message.author), :width => "30", :height => "30") %></a></li>
-                  <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="newsBlue"><%= ucm.course_message.author %></a></li>
+                  <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="<%=ucm.viewed == 0?"newsBlack":"newsBlue"%>"><%= ucm.course_message.author %></a></li>
                   <% if ucm.course_message.parent_id.nil? %>
-                    <li class="homepageNewsType fl">发布帖子</li>
+                      <li class="<%= ucm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布帖子</li>
                       <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                      <%=link_to ucm.course_message.subject, course_boards_path(ucm.course_message.course,:parent_id => ucm.course_message.parent_id ? ucm.course_message.parent_id : ucm.course_message.id, :topic_id => ucm.course_message.id) %></a></li>
+                        <%=link_to ucm.course_message.subject.html_safe, course_boards_path(ucm.course_message.course,:parent_id => ucm.course_message.parent_id ? ucm.course_message.parent_id : ucm.course_message.id,
+                        :topic_id => ucm.course_message.id),:class=>"#{ucm.viewed==0?"newsBlack":"newsGrey"}",
+                        :title => "#{ucm.course_message.subject.html_safe}" %></a></li>
                       <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_on).html_safe %> </li>
                   <% else %>
-                    <li class="homepageNewsType fl">回复帖子</li>
+                      <li class="<%= ucm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">回复帖子</li>
                       <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                      <%=link_to ucm.course_message.subject, course_boards_path(ucm.course_message.course,:parent_id => ucm.course_message.parent_id ? ucm.course_message.parent_id : ucm.course_message.id, :topic_id => ucm.course_message.id) %> </a></li>
+                        <%=link_to ucm.course_message.subject.html_safe, course_boards_path(ucm.course_message.course,:parent_id => ucm.course_message.parent_id ? ucm.course_message.parent_id : ucm.course_message.id,
+                        :topic_id => ucm.course_message.id),:class=>"#{ucm.viewed==0?"newsBlack":"newsGrey"}",
+                        :title => "#{ucm.course_message.subject.html_safe}" %> </a></li>
                       <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_on).html_safe %> </li>
                   <% end %>
                 </ul>
             <% end %>
+            <% if ucm.course_message_type == "StudentWorksScore" %>
+                <ul class="homepageNewsList fl">
+                  <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ucm.course_message.user), :width => "30", :height => "30") %></a></li>
+                  <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="newsBlue"><%= ucm.course_message.user %></a></li>
+                  <li class="homepageNewsType fl">评阅了作品</li>
+                  <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                    <%= link_to "#{ucm.course_message.comment.nil? ? "分数："+ucm.course_message.score.to_s : "分数："+ucm.course_message.score.to_s + "----" + "评语：" + ucm.course_message.comment}", student_work_index_path(:homework => ucm.course_message.student_work.homework_common_id),:class=>"newsGrey",:title => "#{ucm.course_message.comment}" %></a></li>
+                  <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_at).html_safe %> </li>
+                </ul>
+            <% end %>
+            <% if ucm.course_message_type == "JournalsForMessage" %>
+                <ul class="homepageNewsList fl">
+                  <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ucm.course_message.user), :width => "30", :height => "30") %></a></li>
+                  <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="newsBlue"><%= ucm.course_message.user %></a></li>
+                  <li class="homepageNewsType fl">回复了作品</li>
+                  <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                    <%= link_to ucm.course_message.notes, student_work_index_path(:homework => ucm.course_message.jour.student_work.homework_common_id),:class=>"newsGrey",:title => "#{ucm.course_message.notes}" %></a></li>
+                  <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_on).html_safe %> </li>
+                </ul>
+            <% end %>
             <div class="cl"></div>
         <% end %>
-      <% else %>
-        <div class="flash notice">暂无消息！</div>
     <% end %>
-      </div>
+    <!--项目消息-->
-    </div>
+    <% unless @user_forge_messages.nil? %>
-  </div>
+        <% @user_forge_messages.each do |ufm| %>
+            <% if ufm.forge_message_type == "Issue" %>
+                <ul class="homepageNewsList fl">
+                  <li class="homepageNewsPortrait fl">
+                    <a href="javascript:void(0);"><%= image_tag(url_to_avatar(ufm.forge_message.author), :width => "30", :height => "30") %></a>
+                  </li>
+                  <li class="homepageNewsPublisher fl">
+                    <a href="javascript:void(0);" class="<%= ufm.viewed == 0 ? "newsBlack" : "newsBlue" %>"><%= ufm.forge_message.author %></a>
+                  </li>
+                  <li class="<%= ufm.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">指派问题给我</li>
+                  <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                    <%= link_to ("#{ufm.forge_message.subject.html_safe}"), issue_path(:id => ufm.forge_message.id), :class => "#{ufm.viewed == 0 ? "newsBlack" : "newsGrey"}",:title => "#{ufm.forge_message.subject.html_safe}" %></a>
+                  </li>
+                  <li class="homepageNewsTime fl"><%= time_tag(ufm.forge_message.created_on).html_safe %> </li>
+                </ul>
+            <% end %>
+            <% if ufm.forge_message_type == "Journal" %>
+                <ul class="homepageNewsList fl">
+                  <li class="homepageNewsPortrait fl">
+                    <a href="javascript:void(0);"><%= image_tag(url_to_avatar(ufm.forge_message.user), :width => "30", :height => "30") %></a>
+                  </li>
+                  <li class="homepageNewsPublisher fl">
+                    <a href="javascript:void(0);" class="<%= ufm.viewed == 0 ? "newsBlack" : "newsBlue" %>"><%= ufm.forge_message.user %></a>
+                  </li>
+                  <li class="<%= ufm.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">
+                    更新了问题
+                  <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                    <%= link_to get_issue_des_update(ufm.forge_message),
+                    issue_path(:id => ufm.forge_message.journalized_id), :class => "#{ufm.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                    :title => "#{get_issue_des_update(ufm.forge_message)}" %></a>
+                  </li>
+                  <li class="homepageNewsTime fl"><%= time_tag(ufm.forge_message.created_on).html_safe %> </li>
+                </ul>
+            <% end %>
+            <% if ufm.forge_message_type == "Message" %>
+                <ul class="homepageNewsList fl">
+                  <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ufm.forge_message.author), :width => "30", :height => "30") %></a></li>
+                  <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="<%=ufm.viewed == 0?"newsBlack":"newsBlue"%>"><%= ufm.forge_message.author %></a></li>
+
+                  <li class="<%= ufm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ufm.forge_message.parent_id.nil? ? "发布帖子" : "回复帖子" %></li>
+                  <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                    <%=link_to ufm.forge_message.subject.html_safe, project_boards_path(ufm.forge_message.project,
+                    :parent_id => ufm.forge_message.parent_id ? ufm.forge_message.parent_id : ufm.forge_message.id,
+                    :topic_id => ufm.forge_message.id),:class=>"#{ufm.viewed==0?"newsBlack":"newsGrey"}",
+                    :title => "#{ufm.forge_message.subject.html_safe}" %></a></li>
+                  <li class="homepageNewsTime fl"><%= time_tag(ufm.forge_message.created_on).html_safe %> </li>
+
+                </ul>
+            <% end %>
+            <% if ufm.forge_message_type == "News" %>
+                <ul class="homepageNewsList fl">
+                  <li class="homepageNewsPortrait fl">
+                    <a href="javascript:void(0);"><%= image_tag(url_to_avatar(ufm.forge_message.author), :width => "30", :height => "30") %></a>
+                  </li>
+                  <li class="homepageNewsPublisher fl">
+                    <a href="javascript:void(0);" class="newsBlue"><%= ufm.forge_message.author %></a>
+                  </li>
+                  <li class="homepageNewsType fl">发布新闻</li>
+                  <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                    <%= link_to ("#{ufm.forge_message.title.html_safe}"), {:controller => 'news', :action => 'show', :id => ufm.forge_message.id}, :class => "newsGrey", :title => "#{ufm.forge_message.title.html_safe}" %></a>
+                  </li>
+                  <li class="homepageNewsTime fl"><%= time_tag(ufm.forge_message.created_on).html_safe %> </li>
+                </ul>
+            <% end %>
+            <% if ufm.forge_message_type == "Comment" %>
+                <ul class="homepageNewsList fl">
+                  <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ufm.forge_message.author), :width => "30", :height => "30") %></a></li>
+                  <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="newsBlue"><%= ufm.forge_message.author %></a></li>
+                  <li class="homepageNewsType fl">回复了新闻</li>
+                  <li class="homepageNewsContent fl">
+                    <%= link_to "#{ufm.forge_message.comments.html_safe}",
+                                {:controller => 'news', :action => 'show', :id => ufm.forge_message.commented.id },:class =>"#{ufm.viewed == 0 ? "newsBlack" : "newsGrey"}", :title => "#{ufm.forge_message.comments.html_safe}"%></li>
+                  <li class="homepageNewsTime fl"><%= time_tag(ufm.forge_message.created_on).html_safe %> </li>
+                </ul>
+            <% end %>
+        <% end %>
+    <% end %>
+    <%# 公共贴吧　%>
+    <% unless @user_memo_messages.nil? %>
+        <% @user_memo_messages.each do |urm| %>
+            <% if urm.memo_type == "Memo" %>
+                <ul class="homepageNewsList fl">
+                  <li class="homepageNewsPortrait fl">
+                    <a href="javascript:void(0);"><%= image_tag(url_to_avatar(urm.memo.author), :width => "30", :height => "30") %></a>
+                  </li>
+                  <li class="homepageNewsPublisher fl">
+                    <a href="javascript:void(0);" class="newsBlue"><%= urm.memo.author %></a>
+                  </li>
+                  <li class="homepageNewsType fl" >新建贴吧帖子</li>
+                  <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                    <%= link_to urm.memo.content.html_safe, forum_memo_path(urm.memo.forum_id, urm.memo.parent_id ? urm.memo.parent_id: urm.memo.id),:class => "newsGrey" , :title => "#{urm.memo.content.html_safe}" %></a>
+                  </li>
+                  <li class="homepageNewsTime fl"><%= time_tag(urm.memo.created_at).html_safe %> </li>
+                </ul>
+            <% end %>
+        <% end %>
+    <% end %>
+    <%# 用户留言消息 %>
+    <% unless @user_feedback_messages.nil? %>
+        <% @user_feedback_messages.each do |ufm| %>
+            <% if ufm.journals_for_message_type == "JournalsForMessage" %>
+                <ul class="homepageNewsList fl">
+                  <li class="homepageNewsPortrait fl">
+                    <a href="javascript:void(0);"><%= image_tag(url_to_avatar(ufm.journals_for_message.user), :width => "30", :height => "30") %></a>
+                  </li>
+                  <li class="homepageNewsPublisher fl">
+                    <a href="javascript:void(0);" class="newsBlue"><%= ufm.journals_for_message.user %></a>
+                  </li>
+                      <li class="homepageNewsType fl"><%= ufm.journals_for_message.reply_id == 0 ? "给你留言了" : "回复了你的留言" %></li>
+                      <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                        <%= link_to ufm.journals_for_message.notes.html_safe, feedback_path(ufm.journals_for_message.jour_id), :class => "newsGrey", :title => "#{ufm.journals_for_message.notes.html_safe}" %></a>
+                      </li>
+                  <li class="homepageNewsTime fl"><%= time_tag(ufm.journals_for_message.created_on).html_safe %> </li>
+                </ul>
+            <% end %>
+        <% end %>
+    <% end %>
+<% else %>
+    <div class="flash notice">暂无消息！</div>
+<% end %>
+</div>
+</div>
+
 </div>

app/views/users/user_projects4show.html.erb

@@ -1,16 +0,0 @@
-<% for item in @list %>
-<div class="home_courses_list fl" nhname="rec" data-id="<%= item.id %>" data-time="<%= item.updated_on %>">
-  <div class="courses_list_pic fl ml10 mr10">
-    <a href="<%= url_for(:controller => 'projects', :action=>"show", :id=>item.id, :host=>Setting.host_name) %>"><%= image_tag(url_to_avatar(item), :style => 'width:64px;height:64px;') %></a>
-  </div>
-  <span class="fl" style="width:260px;">
-    <a href="<%= url_for(:controller => 'projects', :action=>"show", :id=>item.id, :host=>Setting.host_name) %>" class="home_list_title c_blue02 fl mb10" title="<%= item.name %>"><%= item.name %></a>
-  </span>
-  <div class="fl c_dgrey">
-    <!--<p>项目评分：<a href="<%#= url_for(:controller => 'projects', :action => 'show_projects_score', :id => item.id,:host=>Setting.host_name) %>" data-remote="true"><%#= format( "%.2f" , project_scores(item) ).to_i %></a></p>-->
-    <p>项目评分：<a href="<%= url_for(:controller => 'projects', :action => 'show_projects_score', :id => item.id) %>" data-remote="true"><%= format( "%.2f" , project_scores(item) ).to_i %></a></p>
-    <p>发布缺陷：<a href="<%= url_for(:controller => 'issues', :action=>"index", :project_id=>item.id, :host=>Setting.host_name) %>"><%= item.issues.count %></a> <span class="ml10"></span>成员：<a href="<%= url_for(:controller => 'projects', :action=>"member", :id=>item.id, :host=>Setting.host_name) %>"><%= item.members.count %></a></p>
-  </div>
-  <div class="cl"></div>
-</div>
-<% end %>

app/views/users/user_projects4show.js.erb

@@ -0,0 +1 @@
+$("#user_show_more_project").replaceWith("<%= escape_javascript( render :partial =>  'layouts/user_projects',:locals => {:projects => @projects,:user => @user, :page => @page} )%>");

app/views/users/user_resource.html.erb

@@ -0,0 +1,500 @@
+
+<%= javascript_include_tag 'bootstrap'%>
+<%= stylesheet_link_tag 'project' %>
+<%= stylesheet_link_tag 'leftside' %>
+<%= javascript_include_tag 'attachments'%>
+<!--<script type="text/css">-->
+    <!--html,body{ overflow-y:scroll;}-->
+    <!--html,body{ overflow:scroll; min-height:101%;}-->
+    <!--html{ overflow:-moz-scrollbars-vertical;}-->
+<!--</script>-->
+<script>
+    function remote_get_resources(user_id,type){
+
+    }
+    function remote_search(){
+        $("#resource_search_form").submit();
+    }
+
+    function show_upload(){
+        var screenWidth = $(window).width();
+        var screenHeight = $(window).height(); //当前浏览器窗口的 宽高
+        var scrolltop = $(document).scrollTop();//获取当前窗口距离页面顶部高度
+        var objLeft = (screenWidth - 2)/2.5 ;   //2 可以根据需要修改
+        var objTop = (screenHeight - 100)/2 + scrolltop;  //100可以根据需要修改
+        var popupHeight = $(".resourceUploadPopup").outerHeight(true);
+        $(".resourceUploadPopup").css("marginTop",-popupHeight/2);
+
+        $("#upload_box").css('left',objLeft).css('top',objTop);
+        $("#upload_box").html('<%= escape_javascript( render :partial => 'upload_resource' ,:locals => {:user=>@user})%>');
+        $("#upload_box").css('display','block');
+    }
+
+    function closeModal()
+    {
+        $("#upload_box").css("display","none");
+    }
+
+    function check_files(){
+        return $("#attachments_fields").children().length == 0;
+    }
+
+    function submit_files(){
+        $("#upload_form").submit();
+    }
+</script>
+<div class="resources">
+  <div class="homepageRightBanner">
+    <div class="NewsBannerName">资源库</div>
+    <ul class="resourcesSelect">
+      <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
+        <ul class="resourcesType">
+          <li>
+            <%= link_to '全部' ,user_resource_user_path(:id=>@user.id,:type=>1),:remote=>true,:method => 'get',:class=>'resourcesTypeAll resourcesGrey' %>
+          </li>
+          <li>
+            <%= link_to '课程资源' ,user_resource_user_path(:id=>@user.id,:type=>2),:remote=>true,:method => 'get',:class=>'homepagePostTypeAssignment postTypeGrey' %>
+          </li>
+          <li>
+            <%= link_to '项目资源' ,user_resource_user_path(:id=>@user.id,:type=>3),:remote=>true,:method => 'get',:class=>'homepagePostTypeQuiz postTypeGrey' %>
+          </li>
+          <li>
+            <%= link_to '附件' ,user_resource_user_path(:id=>@user.id,:type=>4),:remote=>true,:method => 'get',:class=>'resourcesTypeAtt resourcesGrey' %>
+          </li>
+        </ul>
+      </li>
+    </ul>
+  </div>
+  <div class="resourcesSearchBanner">
+    <div class="resourcesUploadBox">
+      <a href="javascript:void(0);" onclick="show_upload();" class="uploadBoxIcon">上传资源</a></div>
+    <div id="search_div">
+      <%= render :partial =>  'resource_search_form',:locals => {:user=>@user,:type=>@type} %>
+    </div>
+  </div>
+  <div class="resourcesListBanner">
+    <ul class="resourcesListTab">
+      <li class="resourcesListCheckbox fl"> </li>
+      <li class="resourcesListName fl">资源名称</li>
+      <li class="resourcesListSize fl">大小</li>
+      <li class="resourcesListType fl">类别</li>
+      <li class="resourcesListUploader fl">上传者</li>
+      <li class="resourcesListTime fl">上传时间</li>
+    </ul>
+  </div>
+  <form id="resources_list_form">
+  <div id="resources_list" class="resourcesList">
+
+     <%= render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments} %>
+
+  </div>
+  <div class="resourcesListOption">
+    <div class="resourcesCheckAll">
+      <input id="checkboxAll" type="checkbox" value="" onclick="all_select();"  class="resourcesCheckbox" />
+    </div>
+    <a href="javascript:void(0);" class="replyGrey1 mr15" onclick="all_select();">全选</a>
+    <a href="javascript:void(0);" class="replyGrey1" onclick="batch_delete();">删除</a>
+    <div class="resourcesSelectSend">
+      <div class="fl">选择&nbsp;<span class="c_red" id="res_count">0</span>&nbsp;个资源</div>
+      <div class="resourcesSelectSendButton" onclick="batch_send();">
+        <a href="javascript:void(0);" class="sendButtonBlue db" >发送</a>
+      </div>
+    </div>
+  </div>
+  </form>
+</div>
+<div>
+<ul class="wlist" id="pages">
+  <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
+</ul>
+</div>
+<div class="cl"></div>
+<div id="upload_box" style="display: none">
+   <%= render :partial => 'upload_resource' ,:locals => {:user=>@user}%>
+</div>
+<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" id="contextMenu">
+  <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)preview();" onfocus="this.blur()">预览</a></li>
+  <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)rename();" onfocus="this.blur()">重命名</a></li>
+  <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)show_send();" onfocus="this.blur()" >发送</a></li>
+  <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)delete_file();" onfocus="this.blur()">删除</a></li>
+</ul>
+
+<script>
+  var pageX = 0;
+  var pageY = 0;
+  //当前选中的行
+  var line;
+  //已经选中的行，和当前选中的行的区别是：右键选中为line，换一行右键后，line变为last_line,line变为换行后的line
+  var last_line;
+  //资源名称
+  var res_name;
+  //资源名称的链接
+  var res_link;
+  var id; //资源id
+  var sendType;  //发送到课程 1  发送到项目 2
+  var lastSendType;  //保存上次发送的发送类型
+$(".resourcesList").mousedown(function(e) {
+             //如果是右键的话
+            if (3 == e.which) {
+                 document.oncontextmenu = function() {return false;}
+                 pageX = e.clientX;
+                 pageY = e.clientY;
+                 $("#contextMenu").hide();
+                 $("#contextMenu").attr("style","display: block; position: fixed; top:"
+                 + pageY
+                 + "px; left:"
+                 + pageX
+                 + "px; width: 80px;");
+                 $("#contextMenu").show();
+                //当前光标所在的对象
+                var ele = document.elementFromPoint(pageX,pageY);
+                //转换为jquery对象
+                line = $(ele).parent();
+                //如果上一条存在被选中，那么将上一条的背景色改为白色
+                if(last_line != null){
+                   last_line.children().css("background-color", 'white');
+                    restore();
+                    last_line == null;
+                }
+                //如果当前的tag是li，那么还要li的父级元素
+                if(line.get(0).tagName === 'LI'){
+                   line = line.parent();
+                }
+                //将当前的元素的所有子元素的背景色改为蓝色
+                line.children().css("background-color", '#00ffff');
+                //将当前元素赋给 上一个对象 保存起来。
+                last_line = line;
+             }
+});  
+$(".resourcesList").click(function(e) {
+         //在列表上的任何单击事件都要恢复原来的样子
+         //隐藏右键菜单
+		$("#contextMenu").hide();
+		document.oncontextmenu = function() {return true;}
+        //如果当前行为空，那么要将当前行的拿到
+         var ele;
+         if(line == null){
+             ele = document.elementFromPoint(e.clientX, e.clientY);
+            line = $(ele).parent();
+            //如果是在li上点击事件，那么要获得父组件
+            if(line.get(0).tagName === 'LI'){
+                line = line.parent();
+            }
+        }
+        //将当前行改变为白色
+        line.children().css("background-color", 'white');
+        //当前行恢复编辑状态到链接状态
+       if(ele && ele.nodeName != 'INPUT') {
+           restore();
+       }
+        line = null;
+});
+  //只要有一个选中了就是true
+  function checkboxSelected(){
+      selected = false;
+      $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+          if($(this).attr('checked') == true){
+              selected = true;
+          }
+      });
+      return selected;
+  }
+  //只有全选才是true
+  function checkboxAllSelected(){
+      allSelected = true;
+      $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+          if($(this).attr('checked') == undefined){
+              allSelected = false;
+          }
+      });
+      return allSelected;
+  }
+  //只有全部不选才是true
+  function checkboxAllDeselected(){
+      allDeselected = true;
+      $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+          if($(this).attr('checked') == 'checked'){
+              allDeselected = false;
+          }
+      });
+      return allDeselected;
+  }
+  //查看所有的checkbox状态，并且按情况更改$("#checkboxAll")的状态
+  function checkAllBox(checkbox){
+    //只有选中当前checkbox且这个时候所有的checkbox都被选中了，$("#checkboxAll")才是被选中状态，其余都是非选中状态
+    if(checkbox.attr('checked') == 'checked' && checkboxAllSelected()){
+        $("#checkboxAll").attr('checked',true);
+    }else{
+        $("#checkboxAll").attr('checked',false);
+    }
+    $("#res_count").html(getCheckBoxSeletedCount());
+
+  }
+  //获取当前checkbox选中的数目
+  function getCheckBoxSeletedCount(){
+      var i = 0;
+      $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+          if($(this).attr('checked') == 'checked'){
+              i ++;
+          }
+      });
+      return i;
+  }
+  //全选反选
+  function all_select(){
+
+      if($("#checkboxAll").attr('checked')){
+          $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+              $(this).attr('checked',true);
+          });
+          $("#res_count").html(getCheckBoxSeletedCount());
+      }else{
+          $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+              $(this).attr('checked',false);
+          });
+          $("#res_count").html(0);
+      }
+  }
+  //批量删除
+  function batch_delete(){
+      var data = $("#resources_list_form").serialize();
+      if(data != "" && confirm('您可能会删不掉这其中上传者不是您的资源，确认要删除这些资源吗？')) {
+          $.post(
+                  '<%= user_resource_delete_user_path(@user)%>',
+                  $("#resources_list_form").serialize(),//只会对选中的控件进行序列化提交
+                  function (data) {
+
+                  }
+          );
+      }
+  }
+
+
+
+  function show_send(){
+      $("#contextMenu").hide();
+      document.oncontextmenu = function() {return true;}
+      line.children().css("background-color",'white');
+      id = line.children().last().html();
+      if (lastSendType === '1'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
+          $.ajax({
+              type: 'get',
+              url: '<%= search_user_course_user_path(@user)%>' + '?send_id=' + id
+          });
+      }else{
+          $.ajax({
+              type: 'get',
+              url: '<%= search_user_project_user_path(@user)%>' + '?send_id=' + id
+          });
+      }
+  }
+
+  function batch_send(){
+      if($("#resources_list_form").serialize() == ""){
+          alert('暂时不支持多页选择，您当前页没有选择任何资源');
+          return ;
+      }
+      if (lastSendType === '1'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
+          $.ajax({
+              type: 'get',
+              url: '<%= search_user_course_user_path(@user)%>' + '?'+ $("#resources_list_form").serialize()
+          });
+      }else{
+          $.ajax({
+              type: 'get',
+              url: '<%= search_user_project_user_path(@user)%>' + '?' +  $("#resources_list_form").serialize()
+          });
+      }
+  }
+
+  function preview(){
+      $("#contextMenu").hide();
+      document.oncontextmenu = function() {return true;}
+      line.children().css("background-color",'white');
+      id = line.children().last().html();
+      $.ajax({
+          type:'get',
+          url:'<%= resource_preview_user_path(@user)%>'+"?resource_id="+id
+      });
+  }
+
+  function rename(){
+      $("#contextMenu").hide();
+      document.oncontextmenu = function() {return true;}
+      line.children().css("background-color",'white');
+      id = line.children().last().html();
+      user_id = line.children().eq(5).html();
+      if(user_id === '<%= User.current.id%>') {
+          res_name = line.children().eq(1).children().attr('title');
+          res_link = line.children().eq(1).html();
+          line.children().eq(1).html('<%= form_tag(url_for(:controller => 'users',:action => 'rename_resource',:method => 'post',:remote=>true,:id=>@user.id),:id=>"res_name_form" ) do%>' +
+                  '<input name="res_name" id="res_name" ' +
+                  'style="height: 2em;line-height: 2em;overflow: hidden;" onblur="restore();" ' +
+                  'value="'+res_name+
+                  '"/>  <input type="hidden" id ="res_id" name="res_id" value="'+id+'"/>'+
+                  '<% end %>');
+          $("#res_name").focus();
+          $("html,body").animate({scrollTop:$("#res_name").offset().top},1000)
+      }else{
+          alert('您无法修改此资源！')
+      }
+  }
+  String.prototype.trim = function() {
+      var str = this,
+              str = str.replace(/^\s\s*/, ''),
+              ws = /\s/,
+              i = str.length;
+      while (ws.test(str.charAt(--i)));
+      return str.slice(0, i + 1);
+  }
+
+  //恢复编辑状态到链接状态
+  //如果当前是编辑状态，任何的不在输入框里的单击右键事件都需要将编辑状态变回链接状态
+  //如果是编辑状态，且做了修改，那么久要进行修改，并且将修改值经过处理替换到页面显示
+  function restore(){
+      //上一行不为空 且链接不为空
+      if( last_line != null && res_link != null && res_link != '') {
+          name = $("#res_name").lenght != 0 && $("#res_name").val() != undefined  ?  $("#res_name").val().trim() : undefined ;
+          if (name == undefined || name === 'undefined' ){ //只要res_name没有值，那么就不是编辑状态
+              return;
+          }
+          if( name && name != res_name.trim()){
+
+              if(confirm('确定修改为 '+name)){
+                  $.post(
+                          '<%=rename_resource_user_path(@user) %>',
+                          "res_name="+$('#res_name').val()+"&res_id="+$("#res_id").val(),
+                          function (data){
+                              if(data != 'fail'){//修改成功，那么将链接恢复，并且将链接的显示内容改变。链接可以不变
+                                  last_line.children().eq(1).html(res_link);
+                                  last_line.children().eq(1).children().attr('title',name);
+                                  last_line.children().eq(1).children().attr('href',data);
+                                  last_line.children().eq(1).children().html(name.length > 17? name.substring(0,17)+'...' : name);
+                              }else{
+                                  last_line.children().eq(1).html(res_link);
+                                  res_link = null; //如果修改失败，恢复之后将res_link置空
+                              }
+                          },
+                          'text'
+                  );
+              }else{
+                 last_line.children().eq(1).html(res_link);
+                  res_link = null; //如果没有做修改，恢复之后将res_link置空
+              }
+          }else {
+              last_line.children().eq(1).html(res_link);
+              res_link = null;//如果没有做修改，恢复之后将res_link置空
+          }
+
+
+      }
+  }
+
+  function delete_file() {
+      $("#contextMenu").hide();
+      document.oncontextmenu = function () {
+          return true;
+      }
+      line.children().css("background-color", 'white');
+      id = line.children().last().html();
+      user_id = line.children().eq(5).html();
+      if(user_id === '<%= User.current.id%>') {
+          if (confirm('确定要删除资源"' + line.children().eq(1).children().attr('title').trim() + '"么?')) {
+              $.ajax({
+                  type: 'post',
+                  url: '<%= user_resource_delete_user_path(@user)%>' + '?resource_id=' + id + '&type=' + $('#type').val()
+              });
+          }
+      }else{
+          alert('您无法删除此资源！')
+      }
+  }
+
+  //id 发送的id
+  //发送的id数组
+  function chooseSendType(res_id,res_ids){
+
+          sendType = $(".resourcesSendType").val();
+          if (sendType === lastSendType) {
+              return;
+          } else if (lastSendType != null) { //不是第一次点击的时候
+              if(res_ids == "") {//如果是单个发送
+                  if (sendType === '1') {
+                      $.ajax({
+                          type: 'get',
+                          url: '<%= search_user_course_user_path(@user)%>' + '?send_id=' + id
+                      });
+                  } else {
+                      $.ajax({
+                          type: 'get',
+                          url: '<%= search_user_project_user_path(@user)%>' + '?send_id=' + id
+                      });
+                  }
+              }else{//如果是多个发送
+                  if (sendType === '1'){
+                      $.ajax({
+                          type: 'get',
+                          url: '<%= search_user_course_user_path(@user)%>' + '?'+ $("#resources_list_form").serialize()
+                      });
+                  }else{
+                      $.ajax({
+                          type: 'get',
+                          url: '<%= search_user_project_user_path(@user)%>' + '?' +  $("#resources_list_form").serialize()
+                      });
+                  }
+              }
+          }
+
+      lastSendType = sendType;
+  }
+//  var iWidth = document.documentElement.clientWidth;
+//  var iHeight = document.documentElement.clientHeight;
+//  var moveX = 0;
+//  var moveY = 0;
+//  var moveTop = 0;
+//  var moveLeft = 0;
+//  var moveable = false;
+//  var docMouseMoveEvent = document.onmousemove;
+//  var docMouseUpEvent = document.onmouseup;
+//  $("#upload_box").mousedown(function() {
+//      var evt = getEvent();
+//      moveable = true;
+//      moveX = evt.clientX;
+//      moveY = evt.clientY;
+//
+//      moveTop = parseInt($("#upload_box").css('top'));
+//      moveLeft = parseInt($("#upload_box").css('left'));
+//
+//      $(document).mousemove( function() {
+//          if (moveable) {
+//              var evt = getEvent();
+//              var x = moveLeft + evt.clientX - moveX;
+//              var y = moveTop + evt.clientY - moveY;
+//              if ( x > 0 &&( x + 322 < iWidth) && y > 0 && (y + 257 < iHeight) ) {
+//                  $("#upload_box").css('left',  x + "px");
+//                  $("#upload_box").css('top', y + "px");
+//                  console.log( moveX)
+//                  console.log( moveY)
+//              }
+//          }
+//      });
+//      $(document).mouseup (function () {
+//          if (moveable) {
+//              document.onmousemove = docMouseMoveEvent;
+//              document.onmouseup = docMouseUpEvent;
+//              moveable = false;
+//              moveX = 0;
+//              moveY = 0;
+//              moveTop = 0;
+//              moveLeft = 0;
+//          }
+//      });
+//  });
+//
+//  // 获得事件Event对象，用于兼容IE和FireFox
+//  function getEvent() {
+//      return window.event || arguments.callee.caller.arguments[0];
+//  }
+
+</script>
+

app/views/users/user_resource.js.erb

@@ -0,0 +1,3 @@
+$("#search_div").html('<%= escape_javascript( render :partial =>  'resource_search_form',:locals => {:user=>@user,:type=>@type} ) %>');
+$("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
+$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');

app/views/users/user_resource_create.js.erb

@@ -0,0 +1,4 @@
+
+closeModal();
+$("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
+//这里不能将翻页的更新

app/views/users/user_resource_delete.js.erb

@@ -0,0 +1,2 @@
+$("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
+$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');

app/views/watchers/_set_watcher.js.erb

@@ -1,57 +1,15 @@
 <% if( params[:object_type] == 'user') %>
+  //点击头像下面的添加关注按钮
   <% if( params[:target_id] == params[:object_id] ) %>
-    <% target = User.find_by_id(params[:target_id]) %>
+    $("#watch_user_btn").html("<%= escape_javascript render(:partial => "layouts/user_watch_btn", :locals => {:target => watched.first}) %>");
-    //btn
+    $("#user_fans_number").html("<%= watched.first.watcher_users.count.to_s%>");
-    var btn_html = "<%= escape_javascript( render( :partial => 'layouts/user_watch_btn', :locals => {:target => target} ) )%>";
+  //在当前用户的粉丝、关注页面
-    $('#user_watch_id').replaceWith(btn_html);
-    //count
-    $("*[nh_name='fans_count']").html("<%= target.watcher_users.count.to_s %>");
-    //left list
-    var list_left_html = "<%= escape_javascript( render( :partial => 'layouts/user_fans_list', :locals => {:user => target} ) )%>";
-    $('#fans_nav_list').replaceWith(list_left_html);
-    //list
-    if( $("#nh_fans_list") != undefined && $("#nh_fans_list").length != 0 ){
-      <% if( opt == 'add') %>
-        var list_html = "<%= escape_javascript( render( :partial => 'users/user_fans_item', :locals => {:item=>User.current,:target => target} ) )%>";
-        $("#nh_fans_list").after(list_html);
-        $("#nodata").hide();
-      <% else %>
-        $("#fans_item_<%= User.current.id %>",$("#nh_fans_list").parent('div')).remove();
-        if( $('>div',$("#nh_fans_list").parent('div')).length == 1 ){
-          $("#nodata").show();
-        }
-      <% end %>
-    }
-
   <% elsif( params[:target_id] == User.current.id.to_s )%>
-    <% target = User.find_by_id(params[:target_id]) %>
-    <% item = User.find_by_id(params[:object_id]) %>
-    //count
-    $("*[nh_name='watcher_count']").html("<%= User.watched_by(target.id).count.to_s %>");
-    //left list
-    var list_left_html = "<%= escape_javascript( render( :partial => 'layouts/user_watch_list', :locals => {:user => target} ) )%>";
-    $('#watcher_nav_list').replaceWith(list_left_html);
-    //list
-    if( $("#nh_wacth_list") != undefined && $("#nh_wacth_list").length != 0 ){
-      <% if( opt == 'delete') %>
-        $("#fans_item_<%= item.id %>",$("#nh_wacth_list").parent('div')).remove();
-        if( $('>div',$("#nh_wacth_list").parent('div')).length == 1 ){
-          $("#nodata").show();
-        }
-      <% end %>
-    }else if($("#nh_fans_list") != undefined && $("#nh_fans_list").length != 0){
-      var list_html = "<%= escape_javascript( render( :partial => 'users/user_fans_item', :locals => {:item=>item,:target => target} ) )%>";
-      $('#fans_item_<%= item.id %>').replaceWith(list_html);
-    }
 
+  //在其他用户的粉丝、关注页面
   <% else %>
-    <% target = User.find_by_id(params[:target_id]) %>
-    <% item = User.find_by_id(params[:object_id]) %>
-    //list
-    var list_html = "<%= escape_javascript( render( :partial => 'users/user_fans_item', :locals => {:item=>item,:target => target} ) )%>";
-    $('#fans_item_<%= item.id %>').replaceWith(list_html);
-  <% end %>
 
+  <% end %>
 <% else %>
 
 <% selector = ".#{watcher_css(watched)}" %>

config/configuration.yml

@@ -197,9 +197,12 @@ default:
   #max_concurrent_ajax_uploads: 2
   #pic_types: "bmp,jpeg,jpg,png,gif"
 
+  repository_root_path: '/tmp/htdocs'
+
 # specific configuration options for production environment
 # that overrides the default ones
 production:
+  repository_root_path: '/home/pdl/redmine-2.3.2-0/apache2/htdocs'
   cookie_domain: ".trustie.net"
   rmagick_font_path: /usr/share/fonts/ipa-mincho/ipam.ttf
   email_delivery:

config/routes.rb

@@ -28,6 +28,9 @@
 RedmineApp::Application.routes.draw do
   mount Mobile::API => '/api'
 
+  # Enable Grack support
+  mount Trustie::Grack.new, at: '/', constraints: lambda { |request| /[-\/\w\.]+\.git\//.match(request.path_info) }, via: [:get, :post]
+
   resources :homework_users
   resources :no_uses
   delete 'no_uses', :to => 'no_uses#delete'
@@ -345,6 +348,17 @@ RedmineApp::Application.routes.draw do
       match 'file_score_index', :to => 'projects#file_score_index', :via => [:get, :post]
       match 'code_submit_score_index', :to => 'projects#code_submit_score_index', :via => [:get, :post]
       match 'projects_topic_score_index', :to => 'projects#projects_topic_score_index', :via => [:get, :post]
+      get 'edit_brief_introduction'
+      get "user_resource"
+      get "resource_search"
+      post "user_resource_create"
+      post "user_resource_delete"
+      get "search_user_course"
+      post "add_exist_file_to_course"
+      post "add_exist_file_to_project"
+      get 'resource_preview'
+      post 'rename_resource'
+      get 'search_user_project'
     # end
     end
   end
@@ -352,6 +366,8 @@ RedmineApp::Application.routes.draw do
   match 'users/:id/user_projects', :to => 'users#user_projects',  :via => :get
   match 'users/:id/user_messages', :to => 'users#user_messages', :via => :get
 
+
+
   #end
   match 'my/account',  :via => [:get, :post]
   match 'my/account/destroy', :to => 'my#destroy', :via => [:get, :post]
@@ -850,6 +866,7 @@ RedmineApp::Application.routes.draw do
   match 'system_log/clear'
   ##ended by lizanle
 
+
   resources :git_callback do
     collection do
       post 'post_update'

db/migrate/20150819090720_create_memo_messages.rb

@@ -0,0 +1,13 @@
+class CreateMemoMessages < ActiveRecord::Migration
+  def change
+    create_table :memo_messages do |t|
+      t.integer :user_id
+      t.integer :forum_id
+      t.integer :memo_id
+      t.string :memo_type
+      t.integer :viewed
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20150820004659_create_user_feedback_messages.rb

@@ -0,0 +1,12 @@
+class CreateUserFeedbackMessages < ActiveRecord::Migration
+  def change
+    create_table :user_feedback_messages do |t|
+      t.integer :user_id
+      t.integer :journals_for_message_id
+      t.string :journals_for_message_type
+      t.integer :viewed
+
+      t.timestamps
+    end
+  end
+end

db/schema.rb

@@ -842,6 +842,16 @@ ActiveRecord::Schema.define(:version => 20150820025358) do
   add_index "members", ["user_id", "project_id", "course_id"], :name => "index_members_on_user_id_and_project_id", :unique => true
   add_index "members", ["user_id"], :name => "index_members_on_user_id"
 
+  create_table "memo_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "forum_id"
+    t.integer  "memo_id"
+    t.string   "memo_type"
+    t.integer  "viewed"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
   create_table "memos", :force => true do |t|
     t.integer  "forum_id",                         :null => false
     t.integer  "parent_id"
@@ -1418,6 +1428,15 @@ ActiveRecord::Schema.define(:version => 20150820025358) do
     t.string   "description",        :default => ""
   end
 
+  create_table "user_feedback_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "journals_for_message_id"
+    t.string   "journals_for_message_type"
+    t.integer  "viewed"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+  end
+
   create_table "user_grades", :force => true do |t|
     t.integer  "user_id",                     :null => false
     t.integer  "project_id",                  :null => false

lib/grack/.travis.yml

@@ -0,0 +1,14 @@
+language: ruby
+env:
+  - TRAVIS=true
+branches:
+  only:
+    - 'master'
+rvm:
+  - 1.9.3-p327
+  - 2.0.0
+before_script:
+  - "bundle install"
+  - "git submodule init"
+  - "git submodule update"
+script: "bundle exec rake"

lib/grack/CHANGELOG

@@ -0,0 +1,16 @@
+2.0.2
+ - Revert MR that broke smart HTTP clients.
+
+2.0.1
+  - Make sure child processes get reaped after popen, again.
+
+2.0.0
+  - Use safer shell commands and avoid Dir.chdir
+  - Restrict the environment for shell commands
+  - Make Grack::Server thread-safe (zimbatm)
+  - Make sure child processes get reaped after popen
+  - Verify requested path is actually a Git directory (Ryan Canty)
+
+
+1.1.0
+  - Modifies service_rpc to use chunked transfer (https://github.com/gitlabhq/grack/pull/1)

lib/grack/Gemfile

@@ -0,0 +1,10 @@
+source "http://ruby.taobao.org"
+
+gemspec
+
+group :development do
+  gem 'byebug'
+  gem 'rake'
+  gem 'pry'
+  gem 'rack-test'
+end

lib/grack/Gemfile.lock

@@ -0,0 +1,37 @@
+PATH
+  remote: .
+  specs:
+    gitlab-grack (2.0.2)
+      rack (~> 1.5.1)
+
+GEM
+  remote: http://ruby.taobao.org/
+  specs:
+    byebug (4.0.5)
+      columnize (= 0.9.0)
+    coderay (1.1.0)
+    columnize (0.9.0)
+    metaclass (0.0.1)
+    method_source (0.8.2)
+    mocha (0.14.0)
+      metaclass (~> 0.0.1)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rake (10.1.0)
+    slop (3.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  byebug
+  gitlab-grack!
+  mocha (~> 0.11)
+  pry
+  rack-test
+  rake

lib/grack/README.md

@@ -0,0 +1,95 @@
+Grack - Ruby/Rack Git Smart-HTTP Server Handler
+===============================================
+
+[![Build Status](https://travis-ci.org/gitlabhq/grack.png)](https://travis-ci.org/gitlabhq/grack)
+[![Code Climate](https://codeclimate.com/github/gitlabhq/grack.png)](https://codeclimate.com/github/gitlabhq/grack)
+
+This project aims to replace the builtin git-http-backend CGI handler
+distributed with C Git with a Rack application.  This reason for doing this
+is to allow far more webservers to be able to handle Git smart http requests.
+
+The default git-http-backend only runs as a CGI script, and specifically is
+only targeted for Apache 2.x usage (it requires PATH_INFO to be set and 
+specifically formatted).  So, instead of trying to get it to work with
+other CGI capable webservers (Lighttpd, etc), we can get it running on nearly
+every major and minor webserver out there by making it Rack capable.  Rack 
+applications can run with the following handlers:
+
+* CGI
+* FCGI
+* Mongrel (and EventedMongrel and SwiftipliedMongrel)
+* WEBrick
+* SCGI
+* LiteSpeed
+* Thin
+
+These web servers include Rack handlers in their distributions:
+
+* Ebb
+* Fuzed
+* Phusion Passenger (which is mod_rack for Apache and for nginx)
+* Unicorn
+* Puma
+
+With [Warbler](http://caldersphere.rubyforge.org/warbler/classes/Warbler.html),
+and JRuby, we can also generate a WAR file that can be deployed in any Java
+web application server (Tomcat, Glassfish, Websphere, JBoss, etc).
+
+Since the git-http-backend is really just a simple wrapper for the upload-pack
+and receive-pack processes with the '--stateless-rpc' option, it does not 
+actually re-implement very much.
+
+Dependencies
+========================
+* Ruby - http://www.ruby-lang.org
+* Rack - http://rack.rubyforge.org
+* A Rack-compatible web server
+* Git >= 1.7 (currently the 'pu' branch)
+* Mocha (only for running the tests)
+
+Quick Start
+========================
+	$ gem install rack
+	$ (edit config.ru to set git project path)
+	$ rackup --host 127.0.0.1 -p 8080 config.ru
+	$ git clone http://127.0.0.1:8080/schacon/grit.git 
+
+Contributing
+========================
+If you would like to contribute to the Grack project, I prefer to get
+pull-requests via GitHub.  You should include tests for whatever functionality
+you add.  Just fork this project, push your changes to your fork and click
+the 'pull request' button.  To run the tests, you first need to install the 
+'mocha' mocking library and initialize the submodule.
+
+	$ sudo gem install mocha
+	$ git submodule init
+	$ git submodule update
+
+Then you should be able to run the tests with a 'rake' command.  You can also
+run coverage tests with 'rake rcov' if you have rcov installed.
+
+License
+========================
+	(The MIT License)
+
+	Copyright (c) 2009 Scott Chacon <schacon@gmail.com>
+
+	Permission is hereby granted, free of charge, to any person obtaining
+	a copy of this software and associated documentation files (the
+	'Software'), to deal in the Software without restriction, including
+	without limitation the rights to use, copy, modify, merge, publish,
+	distribute, sublicense, and/or sell copies of the Software, and to
+	permit persons to whom the Software is furnished to do so, subject to
+	the following conditions:
+
+	The above copyright notice and this permission notice shall be
+	included in all copies or substantial portions of the Software.
+
+	THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+	EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

lib/grack/Rakefile

@@ -0,0 +1,27 @@
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
+
+task :default => :test
+
+desc "Run the tests."
+task :test do
+  Dir.glob("tests/*_test.rb").each do |f|
+  	system "ruby #{f}"
+  end
+end
+
+desc "Run test coverage."
+task :rcov do
+  system "rcov tests/*_test.rb -i lib/git_http.rb -x rack -x Library -x tests"
+  system "open coverage/index.html"
+end
+
+namespace :grack do
+  desc "Start Grack"
+  task :start do
+    system('./bin/testserver')
+  end
+end
+
+desc "Start everything."
+multitask :start => [ 'grack:start' ]

lib/grack/bin/console

@@ -0,0 +1,6 @@
+#! /bin/bash
+
+set -e
+
+cd $(dirname "$0")/..
+exec /usr/bin/env bundle exec pry -Ilib -r grack

lib/grack/bin/testserver

@@ -0,0 +1,24 @@
+#! /usr/bin/env ruby
+libdir = File.absolute_path( File.join( File.dirname(__FILE__), '../lib' ) )
+$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
+
+Bundler.require(:default, :development)
+
+
+require 'grack'
+require 'rack'
+root = File.absolute_path( File.join( File.dirname(__FILE__), '../examples' ) )
+app = Grack::Server.new({
+	project_root: root,
+	upload_pack: true,
+	receive_pack:true
+})
+
+app1= Rack::Builder.new do
+  use Grack::Auth do |username, password|
+    [username, password] == ['123', '455']
+  end
+  run app
+end
+
+Rack::Server.start app: app1, Port: 3001

lib/grack/examples/111.git/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/master

lib/grack/examples/111.git/config

@@ -0,0 +1,6 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = true
+	ignorecase = true
+	precomposeunicode = true

lib/grack/examples/111.git/description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

lib/grack/examples/111.git/hooks/applypatch-msg.sample

@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.  The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/commit-msg" &&
+	exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
+:

lib/grack/examples/111.git/hooks/commit-msg.sample

@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "commit-msg".
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
+	echo >&2 Duplicate Signed-off-by lines.
+	exit 1
+}

lib/grack/examples/111.git/hooks/post-update.sample

@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script to prepare a packed repository for use over
+# dumb transports.
+#
+# To enable this hook, rename this file to "post-update".
+
+exec git update-server-info

lib/grack/examples/111.git/hooks/pre-applypatch.sample

@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed
+# by applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-applypatch".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/pre-commit" &&
+	exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
+:

lib/grack/examples/111.git/hooks/pre-commit.sample

@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git commit" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+if git rev-parse --verify HEAD >/dev/null 2>&1
+then
+	against=HEAD
+else
+	# Initial commit: diff against an empty tree object
+	against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
+fi
+
+# If you want to allow non-ASCII filenames set this variable to true.
+allownonascii=$(git config --bool hooks.allownonascii)
+
+# Redirect output to stderr.
+exec 1>&2
+
+# Cross platform projects tend to avoid non-ASCII filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if [ "$allownonascii" != "true" ] &&
+	# Note that the use of brackets around a tr range is ok here, (it's
+	# even required, for portability to Solaris 10's /usr/bin/tr), since
+	# the square bracket bytes happen to fall in the designated range.
+	test $(git diff --cached --name-only --diff-filter=A -z $against |
+	  LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
+then
+	cat <<\EOF
+Error: Attempt to add a non-ASCII file name.
+
+This can cause problems if you want to work with people on other platforms.
+
+To be portable it is advisable to rename the file.
+
+If you know what you are doing you can disable this check using:
+
+  git config hooks.allownonascii true
+EOF
+	exit 1
+fi
+
+# If there are whitespace errors, print the offending file names and fail.
+exec git diff-index --check --cached $against --

lib/grack/examples/111.git/hooks/pre-push.sample

@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# An example hook script to verify what is about to be pushed.  Called by "git
+# push" after it has checked the remote status, but before anything has been
+# pushed.  If this script exits with a non-zero status nothing will be pushed.
+#
+# This hook is called with the following parameters:
+#
+# $1 -- Name of the remote to which the push is being done
+# $2 -- URL to which the push is being done
+#
+# If pushing without using a named remote those arguments will be equal.
+#
+# Information about the commits which are being pushed is supplied as lines to
+# the standard input in the form:
+#
+#   <local ref> <local sha1> <remote ref> <remote sha1>
+#
+# This sample shows how to prevent push of commits where the log message starts
+# with "WIP" (work in progress).
+
+remote="$1"
+url="$2"
+
+z40=0000000000000000000000000000000000000000
+
+while read local_ref local_sha remote_ref remote_sha
+do
+	if [ "$local_sha" = $z40 ]
+	then
+		# Handle delete
+		:
+	else
+		if [ "$remote_sha" = $z40 ]
+		then
+			# New branch, examine all commits
+			range="$local_sha"
+		else
+			# Update to existing branch, examine new commits
+			range="$remote_sha..$local_sha"
+		fi
+
+		# Check for WIP commit
+		commit=`git rev-list -n 1 --grep '^WIP' "$range"`
+		if [ -n "$commit" ]
+		then
+			echo >&2 "Found WIP commit in $local_ref, not pushing"
+			exit 1
+		fi
+	fi
+done
+
+exit 0

lib/grack/examples/111.git/hooks/pre-rebase.sample

@@ -0,0 +1,169 @@
+#!/bin/sh
+#
+# Copyright (c) 2006, 2008 Junio C Hamano
+#
+# The "pre-rebase" hook is run just before "git rebase" starts doing
+# its job, and can prevent the command from running by exiting with
+# non-zero status.
+#
+# The hook is called with the following parameters:
+#
+# $1 -- the upstream the series was forked from.
+# $2 -- the branch being rebased (or empty when rebasing the current branch).
+#
+# This sample shows how to prevent topic branches that are already
+# merged to 'next' branch from getting rebased, because allowing it
+# would result in rebasing already published history.
+
+publish=next
+basebranch="$1"
+if test "$#" = 2
+then
+	topic="refs/heads/$2"
+else
+	topic=`git symbolic-ref HEAD` ||
+	exit 0 ;# we do not interrupt rebasing detached HEAD
+fi
+
+case "$topic" in
+refs/heads/??/*)
+	;;
+*)
+	exit 0 ;# we do not interrupt others.
+	;;
+esac
+
+# Now we are dealing with a topic branch being rebased
+# on top of master.  Is it OK to rebase it?
+
+# Does the topic really exist?
+git show-ref -q "$topic" || {
+	echo >&2 "No such branch $topic"
+	exit 1
+}
+
+# Is topic fully merged to master?
+not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
+if test -z "$not_in_master"
+then
+	echo >&2 "$topic is fully merged to master; better remove it."
+	exit 1 ;# we could allow it, but there is no point.
+fi
+
+# Is topic ever merged to next?  If so you should not be rebasing it.
+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
+only_next_2=`git rev-list ^master           ${publish} | sort`
+if test "$only_next_1" = "$only_next_2"
+then
+	not_in_topic=`git rev-list "^$topic" master`
+	if test -z "$not_in_topic"
+	then
+		echo >&2 "$topic is already up-to-date with master"
+		exit 1 ;# we could allow it, but there is no point.
+	else
+		exit 0
+	fi
+else
+	not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
+	/usr/bin/perl -e '
+		my $topic = $ARGV[0];
+		my $msg = "* $topic has commits already merged to public branch:\n";
+		my (%not_in_next) = map {
+			/^([0-9a-f]+) /;
+			($1 => 1);
+		} split(/\n/, $ARGV[1]);
+		for my $elem (map {
+				/^([0-9a-f]+) (.*)$/;
+				[$1 => $2];
+			} split(/\n/, $ARGV[2])) {
+			if (!exists $not_in_next{$elem->[0]}) {
+				if ($msg) {
+					print STDERR $msg;
+					undef $msg;
+				}
+				print STDERR " $elem->[1]\n";
+			}
+		}
+	' "$topic" "$not_in_next" "$not_in_master"
+	exit 1
+fi
+
+exit 0
+
+################################################################
+
+This sample hook safeguards topic branches that have been
+published from being rewound.
+
+The workflow assumed here is:
+
+ * Once a topic branch forks from "master", "master" is never
+   merged into it again (either directly or indirectly).
+
+ * Once a topic branch is fully cooked and merged into "master",
+   it is deleted.  If you need to build on top of it to correct
+   earlier mistakes, a new topic branch is created by forking at
+   the tip of the "master".  This is not strictly necessary, but
+   it makes it easier to keep your history simple.
+
+ * Whenever you need to test or publish your changes to topic
+   branches, merge them into "next" branch.
+
+The script, being an example, hardcodes the publish branch name
+to be "next", but it is trivial to make it configurable via
+$GIT_DIR/config mechanism.
+
+With this workflow, you would want to know:
+
+(1) ... if a topic branch has ever been merged to "next".  Young
+    topic branches can have stupid mistakes you would rather
+    clean up before publishing, and things that have not been
+    merged into other branches can be easily rebased without
+    affecting other people.  But once it is published, you would
+    not want to rewind it.
+
+(2) ... if a topic branch has been fully merged to "master".
+    Then you can delete it.  More importantly, you should not
+    build on top of it -- other people may already want to
+    change things related to the topic as patches against your
+    "master", so if you need further changes, it is better to
+    fork the topic (perhaps with the same name) afresh from the
+    tip of "master".
+
+Let's look at this example:
+
+		   o---o---o---o---o---o---o---o---o---o "next"
+		  /       /           /           /
+		 /   a---a---b A     /           /
+		/   /               /           /
+	       /   /   c---c---c---c B         /
+	      /   /   /             \         /
+	     /   /   /   b---b C     \       /
+	    /   /   /   /             \     /
+    ---o---o---o---o---o---o---o---o---o---o---o "master"
+
+
+A, B and C are topic branches.
+
+ * A has one fix since it was merged up to "next".
+
+ * B has finished.  It has been fully merged up to "master" and "next",
+   and is ready to be deleted.
+
+ * C has not merged to "next" at all.
+
+We would want to allow C to be rebased, refuse A, and encourage
+B to be deleted.
+
+To compute (1):
+
+	git rev-list ^master ^topic next
+	git rev-list ^master        next
+
+	if these match, topic has not merged in next at all.
+
+To compute (2):
+
+	git rev-list master..topic
+
+	if this is empty, it is fully merged to "master".

lib/grack/examples/111.git/hooks/prepare-commit-msg.sample

@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# An example hook script to prepare the commit log message.
+# Called by "git commit" with the name of the file that has the
+# commit message, followed by the description of the commit
+# message's source.  The hook's purpose is to edit the commit
+# message file.  If the hook fails with a non-zero status,
+# the commit is aborted.
+#
+# To enable this hook, rename this file to "prepare-commit-msg".
+
+# This hook includes three examples.  The first comments out the
+# "Conflicts:" part of a merge commit.
+#
+# The second includes the output of "git diff --name-status -r"
+# into the message, just before the "git status" output.  It is
+# commented because it doesn't cope with --amend or with squashed
+# commits.
+#
+# The third example adds a Signed-off-by line to the message, that can
+# still be edited.  This is rarely a good idea.
+
+case "$2,$3" in
+  merge,)
+    /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
+
+# ,|template,)
+#   /usr/bin/perl -i.bak -pe '
+#      print "\n" . `git diff --cached --name-status -r`
+#	 if /^#/ && $first++ == 0' "$1" ;;
+
+  *) ;;
+esac
+
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"

lib/grack/examples/111.git/hooks/update.sample

@@ -0,0 +1,128 @@
+#!/bin/sh
+#
+# An example hook script to blocks unannotated tags from entering.
+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
+#
+# To enable this hook, rename this file to "update".
+#
+# Config
+# ------
+# hooks.allowunannotated
+#   This boolean sets whether unannotated tags will be allowed into the
+#   repository.  By default they won't be.
+# hooks.allowdeletetag
+#   This boolean sets whether deleting tags will be allowed in the
+#   repository.  By default they won't be.
+# hooks.allowmodifytag
+#   This boolean sets whether a tag may be modified after creation. By default
+#   it won't be.
+# hooks.allowdeletebranch
+#   This boolean sets whether deleting branches will be allowed in the
+#   repository.  By default they won't be.
+# hooks.denycreatebranch
+#   This boolean sets whether remotely creating branches will be denied
+#   in the repository.  By default this is allowed.
+#
+
+# --- Command line
+refname="$1"
+oldrev="$2"
+newrev="$3"
+
+# --- Safety check
+if [ -z "$GIT_DIR" ]; then
+	echo "Don't run this script from the command line." >&2
+	echo " (if you want, you could supply GIT_DIR then run" >&2
+	echo "  $0 <ref> <oldrev> <newrev>)" >&2
+	exit 1
+fi
+
+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
+	echo "usage: $0 <ref> <oldrev> <newrev>" >&2
+	exit 1
+fi
+
+# --- Config
+allowunannotated=$(git config --bool hooks.allowunannotated)
+allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --bool hooks.denycreatebranch)
+allowdeletetag=$(git config --bool hooks.allowdeletetag)
+allowmodifytag=$(git config --bool hooks.allowmodifytag)
+
+# check for no description
+projectdesc=$(sed -e '1q' "$GIT_DIR/description")
+case "$projectdesc" in
+"Unnamed repository"* | "")
+	echo "*** Project description file hasn't been set" >&2
+	exit 1
+	;;
+esac
+
+# --- Check types
+# if $newrev is 0000...0000, it's a commit to delete a ref.
+zero="0000000000000000000000000000000000000000"
+if [ "$newrev" = "$zero" ]; then
+	newrev_type=delete
+else
+	newrev_type=$(git cat-file -t $newrev)
+fi
+
+case "$refname","$newrev_type" in
+	refs/tags/*,commit)
+		# un-annotated tag
+		short_refname=${refname##refs/tags/}
+		if [ "$allowunannotated" != "true" ]; then
+			echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
+			echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,delete)
+		# delete tag
+		if [ "$allowdeletetag" != "true" ]; then
+			echo "*** Deleting a tag is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,tag)
+		# annotated tag
+		if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
+		then
+			echo "*** Tag '$refname' already exists." >&2
+			echo "*** Modifying a tag is not allowed in this repository." >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,commit)
+		# branch
+		if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
+			echo "*** Creating a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,delete)
+		# delete branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/remotes/*,commit)
+		# tracking branch
+		;;
+	refs/remotes/*,delete)
+		# delete tracking branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a tracking branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	*)
+		# Anything else (is there anything else?)
+		echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
+		exit 1
+		;;
+esac
+
+# --- Finished
+exit 0

lib/grack/examples/111.git/info/exclude

@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~

lib/grack/examples/111.git/objects/e1/022324d23146d29075a3e7c6f637cb67f091b5

@@ -0,0 +1,3 @@
+x
•ÍM
+à @á®=ÅìÁñgœ<67>Rz£Æ5B0÷o®Ðíƒ<C3AD>—Fïmúð˜g)@(†eCâš	)‹c‘Í$Y)ÊEÆ$FÅkîã„zÅ£x1“eã>µÇö]Òèo@g½g
+<EFBFBD>à©Yku×û5ËJµ£Mõíæ/0

lib/grack/examples/111.git/objects/info/packs

@@ -0,0 +1 @@
+

lib/grack/examples/111.git/refs/heads/master

@@ -0,0 +1 @@
+e1022324d23146d29075a3e7c6f637cb67f091b5