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

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

@@ -25,21 +25,29 @@ class AccountController < ApplicationController
   # Login request and validation
   def login
     if request.get?
+      @login = params[:login] || true
       if User.current.logged?
         redirect_to home_url
+      else
+         render :layout =>   'login'
       end
     else
       authenticate_user
     end
   end
 
+  # 服务协议
+  def agreement
+    render :layout => 'static_base'
+  end
+
   # Log out current user and redirect to welcome page
   def logout
     if User.current.anonymous?
-      redirect_to home_url
+      redirect_to signin_path
     elsif request.post?
       logout_user
-      redirect_to home_url
+      redirect_to signin_path
     end
     # display the logout form
   end
@@ -71,7 +79,7 @@ class AccountController < ApplicationController
           return
         end
       end
-      render :template => "account/password_recovery"
+      render :layout => 'static_base', :template => "account/password_recovery"
       return
     else
       if request.post?
@@ -79,6 +87,7 @@ class AccountController < ApplicationController
         # user not found or not active
         unless user && user.active?
           flash.now[:error] = l(:notice_account_unknown_email)
+          render :layout => 'static_base'
           return
         end
         # user cannot change its password
@@ -91,10 +100,11 @@ class AccountController < ApplicationController
         if token.save
             Mailer.run.lost_password(token)
             flash[:notice] = l(:notice_account_lost_email_sent)
-            redirect_to signin_url
+            redirect_to  lost_password_path
           return                      
         end
       end
+      render :layout => 'static_base'
     end
   end
 
@@ -128,10 +138,12 @@ class AccountController < ApplicationController
           end
         when '3'
           #register_automatically(@user)
-          unless @user.new_record?
+          if !@user.new_record?
             self.logged_user = @user
             flash[:notice] = l(:notice_account_activated)
             redirect_to my_account_url
+          else
+            redirect_to signin_path
           end
         else
           #register_manually_by_administrator(@user)
@@ -354,11 +366,13 @@ class AccountController < ApplicationController
   def invalid_credentials
     logger.warn "Failed login for '#{params[:username]}' from #{request.remote_ip} at #{Time.now.utc}"
     flash.now[:error] = l(:notice_account_invalid_creditentials)
+    render :layout => 'login'
   end
   
   def invalid_credentials_new
     logger.warn "Failed login for '#{params[:username]}' from #{request.remote_ip} at #{Time.now.utc}"
     flash.now[:error] = l(:notice_account_invalid_creditentials_new)
+    render :layout => 'login'
   end
 
   # Register a user for email activation.

app/controllers/boards_controller.rb

@@ -68,6 +68,28 @@ class BoardsController < ApplicationController
   end
 
   def show
+    #¸üжÔÓ¦µÄforge_messages±íµÄviewed×Ö¶Î
+    if @project
+      query_forge_messages = @board.messages
+      query_forge_messages.each do |query_forge_message|
+        query = query_forge_message.forge_messages
+        query.each do |forge_message|
+          if User.current.id == forge_message.user_id
+            forge_message.update_attributes(:viewed => true)
+          end
+        end
+      end
+    elsif @course
+      query_course_messages = @board.messages
+      query_course_messages.each do |query_course_message|
+        query = query_course_message.course_messages
+        query.each do |course_message|
+          if User.current.id == course_message.user_id
+            course_message.update_attributes(:viewed => true)
+          end
+        end
+      end
+    end
     respond_to do |format|
       format.js
       format.html {

app/controllers/courses_controller.rb

@@ -113,7 +113,8 @@ class CoursesController < ApplicationController
       courses = Course.visible.where("LOWER(name) like '%#{params[:name].to_s.downcase}%'")
       @courses = paginateHelper courses,10
     end
-
+   @name = params[:name]
+   @type = 'courses'
     respond_to do |format|
       format.html {
         render :layout => 'course_base'

app/controllers/memos_controller.rb

@@ -115,6 +115,8 @@ class MemosController < ApplicationController
   
   REPLIES_PER_PAGE = 20 unless const_defined?(:REPLIES_PER_PAGE)
   def show
+    #更新贴吧帖子留言对应的memo_messages的viewed字段
+    query_memo_messages = @memo.memo_messages
     pre_count = REPLIES_PER_PAGE
 
     @memo = @memo.root # 取出楼主，防止输入帖子id让回复作为主贴显示

app/controllers/my_controller.rb

@@ -137,7 +137,7 @@ class MyController < ApplicationController
         @se.identity = params[:identity].to_i if params[:identity]
         @se.technical_title = params[:technical_title] if params[:technical_title]
         @se.student_id = params[:no] if params[:no]
-        @se.brief_introduction = params[:brief_introduction]
+       # @se.brief_introduction = params[:brief_introduction]
         @se.description = params[:description]
 
         if @user.save && @se.save
@@ -157,7 +157,7 @@ class MyController < ApplicationController
       File.delete(diskfile1) if File.exist?(diskfile1)
     end
 
-    render :layout=>'base_users_new'
+    render :layout=>'new_base_user'
   end
 
   # Destroys user's account

app/controllers/news_controller.rb

@@ -99,6 +99,31 @@ class NewsController < ApplicationController
    end
 
   def show
+    #更新news对应的forge_messages的viewed字段
+    query_forge_news = @news.forge_messages
+    query_forge_news.each do |query|
+      if User.current.id == query.user_id
+        query.update_attributes(:viewed => true)
+      end
+    end
+    #更新news对应的course_messages的viewed字段
+    query_course_news = @news.course_messages
+    query_course_news.each do |query|
+      if User.current.id == query.user_id
+        query.update_attributes(:viewed => true)
+      end
+    end
+    #更新项目新闻的评阅的viewed字段
+    current_forge_comments = @news.comments
+    current_forge_comments.each do |current_forge_comment|
+      query_forge_comment = current_forge_comment.forge_messages
+      query_forge_comment.each do |query|
+        if User.current.id == query.user_id
+          query.update_attributes(:viewed => true)
+        end
+      end
+    end
+
     cs = CoursesService.new
     result = cs.show_course_news params,User.current
     @news = result[:news]

app/controllers/poll_controller.rb

@@ -28,6 +28,12 @@ class PollController < ApplicationController
       render_403
       return
     end
+    query_course_poll = @poll.course_messages
+    query_course_poll.each do |query|
+      if User.current.id == query.user_id
+        query.update_attributes(:viewed => true)
+      end
+    end
     #已提交问卷的用户不能再访问该界面
     if has_commit_poll?(@poll.id,User.current.id) && (!User.current.admin?)
       redirect_to poll_index_url(:polls_type => "Course", :polls_group_id => @course.id)

app/controllers/projects_controller.rb

@@ -93,7 +93,8 @@ class ProjectsController < ApplicationController
 
     @project_count = Project.project_entities.visible.like(params[:name]).page(params[:page]).count
     @project_pages = Paginator.new @project_count, @limit, params['page']
-
+    @name = params[:name]
+    @type = 'projects'
     respond_to do |format|
       format.html {
         render :layout => 'base'

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/student_work_controller.rb

@@ -11,6 +11,13 @@ class StudentWorkController < ApplicationController
   protect_from_forgery :except => :set_program_score
 
   def index
+    #设置作业对应的forge_messages表的viewed字段
+    query_student_work = @homework.course_messages
+    query_student_work.each do |query|
+      if User.current.id == query.user_id
+        query.update_attributes(:viewed => true)
+      end
+    end
     @order,@b_sort,@name,@group = params[:order] || "score",params[:sort] || "desc",params[:name] || "",params[:group]
     @is_teacher = User.current.allowed_to?(:as_teacher,@course)
     course_group = CourseGroup.find_by_id(@group) if @group

app/controllers/users_controller.rb

@@ -45,14 +45,14 @@ class UsersController < ApplicationController
     :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_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]
+    :search_user_project,:resource_preview,:resource_search,:add_exist_file_to_project,:user_messages,:edit_brief_introduction,:user_new_homework]
   #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,: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
@@ -74,7 +74,10 @@ class UsersController < ApplicationController
   include WordsHelper
   include GitlabHelper
   include UserScoreHelper
+
+  include PollHelper
   helper :user_score
+  helper :journals
 
   # added by liuping 关注 
 
@@ -119,65 +122,62 @@ class UsersController < ApplicationController
       user_querys.update_all(:viewed => true)
       forum_querys.update_all(:viewed => true)
     end
-    @new_message_count = @user.forge_messages.count + @user.memo_messages.count + @user.course_messages.count + @user.user_feedback_messages.count
+    @new_message_count = forge_querys.count + forum_querys.count + course_querys.count + user_querys.count
     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
+        @message_alls = []
+        messages = MessageAll.where("user_id =?",@user).order("created_at desc")
+        messages.each do |message_all|
+          @message_alls << message_all.message
+        end
       when 'homework'
-        @user_course_messages = CourseMessage.where("course_message_type =? and user_id =?", "HomeworkCommon", @user).order("created_at desc")
-        @user_course_messages_count = @user_course_messages.count
+        @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "HomeworkCommon", @user).order("created_at desc")
+        @message_alls_count = @message_alls.count
       when 'course_message'
-        @user_course_messages = CourseMessage.where("course_message_type =? and user_id =?", "Message", @user).order("created_at desc")
-        @user_course_messages_count = @user_course_messages.count
+        @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Message", @user).order("created_at desc")
+        @message_alls_count = @message_alls.count
       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
+        @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Message", @user).order("created_at desc")
+        @message_alls_count = @message_alls.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
+        @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "News", @user).order("created_at desc")
+        @message_alls_count = @message_alls.count
+      #@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
+        @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "News", @user).order("created_at desc")
+        @message_alls_count = @message_alls.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
+        @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Comment", @user).order("created_at desc")
       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
+        @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Comment", @user).order("created_at desc")
+        @message_alls_count = @message_alls.count
       when 'poll'
-        @user_course_messages = CourseMessage.where("course_message_type =? and user_id =?", "Poll", @user).order("created_at desc")
-        @user_course_messages_count = @user_course_messages.count
+        @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Poll", @user).order("created_at desc")
+        @message_alls_count = @message_alls.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
+        @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "StudentWorksScore", @user).order("created_at desc")
+        @message_alls_count = @message_alls.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
+        @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "JournalsForMessage", @user).order("created_at desc")
+        @message_alls_count = @message_alls.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
+        @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Issue", @user).order("created_at desc")
+        @message_alls_count = @message_alls.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
+        @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Journal", @user).order("created_at desc")
+        @message_alls_count = @message_alls.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
+        @message_alls = MemoMessage.where("memo_type =? and user_id =?", "Memo", @user).order("created_at desc")
+        @message_alls_count = @message_alls.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
+        @message_alls = UserFeedbackMessage.where("journals_for_message_type =? and user_id =?", "JournalsForMessage", @user).order("created_at desc")
+        @message_alls_count = @message_alls.count
       else
         render_404
         return
     end
     respond_to do |format|
-      format.html{render :layout=>'base_users_new'}
+      format.html{render :layout=>'new_base_user'}
     end
   end
 
@@ -302,26 +302,47 @@ class UsersController < ApplicationController
   end
   # end
 
-  # added by huang
+  #用户作业列表
   def user_homeworks
-      # @membership = @user.memberships.all(:conditions => Project.visible_condition(User.current))
-      # @memberships = []
-      # @membership.each do |membership|
-      #   if membership.project.project_type == 1
-      #     @memberships << membership
-      #   end
-      # end
-      # @bid = []
-      # @memberships.each do |membership|
-      # @bid += membership.project.homeworks
-      # end
-      # @bid = @bid.group_by {|bid| bid.courses.first.id}
-      # unless User.current.admin?
-      # if !@user.active?
-      #   render_404
-      # return
-      # end
-      # end
+    @page = params[:page] ? params[:page].to_i + 1 : 0
+    user_course_ids = "(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
+    @homework_commons = HomeworkCommon.where("course_id in #{user_course_ids}").order("created_at desc").limit(10).offset(@page * 10)
+    respond_to do |format|
+      format.js
+      format.html {render :layout => 'new_base_user'}
+  end
+  end
+
+  def user_new_homework
+    if params[:homework_common]
+      homework = HomeworkCommon.new
+      homework.name = params[:homework_common][:name]
+      homework.description = params[:homework_common][:description]
+      homework.end_time = params[:homework_common][:end_time]
+      homework.publish_time = Time.now
+      homework.homework_type = 1
+      homework.late_penalty = 2
+      homework.user_id = User.current.id
+      homework.course_id = params[:course_id]
+
+      homework.save_attachments(params[:attachments])
+      render_attachment_warning_if_needed(homework)
+
+      #匿评作业相关属性
+      homework_detail_manual = HomeworkDetailManual.new
+      homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
+      homework_detail_manual.comment_status = 1
+      homework_detail_manual.evaluation_start = Time.now
+      homework_detail_manual.evaluation_end = Time.now
+      homework_detail_manual.evaluation_num = params[:evaluation_num] || 3
+      homework_detail_manual.absence_penalty = 2
+      homework.homework_detail_manual = homework_detail_manual
+
+      if homework.save
+        homework_detail_manual.save if homework_detail_manual
+        redirect_to user_homeworks_user_path(User.current.id)
+      end
+    end
   end
 
 
@@ -356,7 +377,7 @@ class UsersController < ApplicationController
     end
     @jour = paginateHelper jours,10
     @state = false
-    render :layout=>'base_users_new'
+    render :layout=>'new_base_user'
   end
 
   def user_comments
@@ -464,6 +485,8 @@ class UsersController < ApplicationController
       end
       @users = scope.offset(@offset).limit(limit).all.reverse
     end
+    @name = params[:name]
+    @type = 'users'
     respond_to do |format|
       format.html {
         @groups = Group.all.sort
@@ -473,40 +496,16 @@ class UsersController < ApplicationController
     end
   end
 
+  #显示更多用户课程
   def user_courses4show
-    query = Course.joins("join members m on #{Course.table_name}.id=m.course_id")
-    query = query.where("m.user_id = ?",@user.id).order("#{Course.table_name}.id desc")
-    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],)
+    @page = params[:page].to_i + 1
+    @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)
       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")
-    query = query.where("m.user_id = ? and #{Project.table_name}.project_type=?",@user.id,Project::ProjectType_project)
-    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
+    @page = params[:page].to_i + 1
+    @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)
     end
 
   def user_course_activities
@@ -584,7 +583,37 @@ class UsersController < ApplicationController
   end
 
   def show
-    render :layout=>'base_users_new'
+    @page = params[:page] ? params[:page].to_i + 1 : 0
+    @type = params[:type]
+    user_project_ids = @user.projects.visible.empty? ? "(-1)" : "(" + @user.projects.visible.map{|project| project.id}.join(",") + ")"
+    user_course_ids = @user.courses.visible.empty? ? "(-1)" : "(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
+    course_types = "('Message','News','HomeworkCommon','poll')"
+    project_types = "('Message','Issue')"
+    if @type
+      case @type
+        when "course_homework"
+          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'HomeworkCommon'").order('created_at desc').limit(10).offset(@page * 10)
+        when "course_news"
+          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'News'").order('created_at desc').limit(10).offset(@page * 10)
+        when "course_message"
+          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'Message'").order('created_at desc').limit(10).offset(@page * 10)
+        when "course_poll"
+          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'Poll'").order('created_at desc').limit(10).offset(@page * 10)
+        when "project_issue"
+          @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Issue'").order('created_at desc').limit(10).offset(@page * 10)
+        when "project_message"
+          @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Message'").order('created_at desc').limit(10).offset(@page * 10)
+        else
+          @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids}) and act_type in #{course_types}").order('created_at desc').limit(10).offset(@page * 10)
+  end
+    else
+      @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids}) and act_type in #{course_types}").order('created_at desc').limit(10).offset(@page * 10)
+    end
+    # @user_activities = paginateHelper @user_activities,500
+    respond_to do |format|
+      format.js
+      format.html {render :layout => 'new_base_user'}
+    end
   end
 
   def show_old
@@ -1282,8 +1311,8 @@ class UsersController < ApplicationController
     @obj_count = query.count();
     @obj_pages = Paginator.new @obj_count,limit,params['page']
     @list = query.order("#{Watcher.table_name}.id desc").limit(limit).offset(@obj_pages.offset).all();
-
-    render :template=>'users/user_fanslist',:layout=>'base_users_new'
+    @action = 'watch'
+    render :template=>'users/user_fanslist',:layout=>'new_base_user'
   end
   ###add by huang
   def user_fanslist
@@ -1293,7 +1322,7 @@ class UsersController < ApplicationController
     @obj_pages = Paginator.new @obj_count,limit,params['page']
     @list = query.order("#{Watcher.table_name}.id desc").limit(limit).offset(@obj_pages.offset).all();
     @action = 'fans'
-    render :layout=>'base_users_new'
+    render :layout=>'new_base_user'
   end
   def user_visitorlist
     limit = 10;
@@ -1317,49 +1346,18 @@ class UsersController < ApplicationController
     end
   end
 
-# added by bai
-  def topic_score_index
-
-  end
-
-  def project_score_index
-
-  end
-
-  def activity_score_index
-
-  end
-
-  def influence_score_index
-
-  end
-
-  def score_index
-
-  end
-# end
-  def topic_new_score_index
-
-  end
-
-  def project_new_score_index
-
-  end
-
-  def activity_new_score_index
-
+  def update_score
+    @user = User.find(params[:id])
   end
 
-  def influence_new_score_index
-
+  #修改个人简介
+  def edit_brief_introduction
+    if @user && @user.extensions
+      @user.extensions.update_column("brief_introduction",params[:brief_introduction])
     end
-
-  def score_new_index
-
+    respond_to do |format|
+      format.js
     end
-
-  def update_score
-    @user = User.find(params[:id])
   end
 
   # 资源库 分为全部  课程资源 项目资源 附件
@@ -1414,7 +1412,7 @@ class UsersController < ApplicationController
     @attachments = paginateHelper @attachments,15
     respond_to do |format|
       format.js
-      format.html {render :layout => 'base_users_new'}
+      format.html {render :layout => 'new_base_user'}
     end
   end
 

app/controllers/watchers_controller.rb

@@ -22,9 +22,26 @@ class WatchersController < ApplicationController
   def watch
     s = WatchesService.new
     watchables = s.watch params.merge(:current_user_id => User.current.id)
+    if params[:action_name] == 'watch'
+      limit = 10;
+      query = User.watched_by(params[:target_id]);
+      @obj_count = query.count();
+      @obj_pages = Paginator.new @obj_count,limit,params['page']
+      @list = query.order("#{Watcher.table_name}.id desc").limit(limit).offset(@obj_pages.offset).all();
+      @action = 'watch'
+    elsif params[:action_name] == 'fans'
+      limit = 10;
+      query = User.find(params[:target_id]).watcher_users;
+      @obj_count = query.count();
+      @obj_pages = Paginator.new @obj_count,limit,params['page']
+      @list = query.order("#{Watcher.table_name}.id desc").limit(limit).offset(@obj_pages.offset).all();
+      @action = 'fans'
+    else
+
+    end
     respond_to do |format|
       format.html { redirect_to_referer_or {render :text => (true ? 'Watcher added.' : 'Watcher removed.'), :layout => true}}
-      format.js { render :partial => 'set_watcher', :locals => {:user => User.current, :watched => watchables,:params=>params,:opt=>'add'} }
+      format.js { render :partial => 'set_watcher', :locals => {:user => User.current, :watched => watchables,:params=>params,:opt=>'add',:list => @list,:action_name=>params[:action_name],:page=>params[:page],:count=>@obj_count} }
     end
   rescue Exception => e
     if e.message == "404"
@@ -38,9 +55,25 @@ class WatchersController < ApplicationController
   def unwatch
     s = WatchesService.new
     watchables = s.unwatch  params.merge(:current_user_id => User.current.id)
+    if params[:action_name] == 'watch'
+      limit = 10;
+      query = User.watched_by(params[:target_id]);
+      @obj_count = query.count();
+      @obj_pages = Paginator.new @obj_count,limit,params['page']
+      @list = query.order("#{Watcher.table_name}.id desc").limit(limit).offset(@obj_pages.offset).all();
+      @action = 'watch'
+    elsif params[:action_name] == 'fans'
+      limit = 10;
+      query = User.find(params[:target_id]).watcher_users;
+      @obj_count = query.count();
+      @obj_pages = Paginator.new @obj_count,limit,params['page']
+      @list = query.order("#{Watcher.table_name}.id desc").limit(limit).offset(@obj_pages.offset).all();
+      @action = 'fans'
+    else
+    end
     respond_to do |format|
       format.html { redirect_to_referer_or {render :text => (false ? 'Watcher added.' : 'Watcher removed.'), :layout => true}}
-      format.js { render :partial => 'set_watcher', :locals => {:user => User.current, :watched => watchables,:params=>params,:opt=>'delete'} }
+      format.js { render :partial => 'set_watcher', :locals => {:user => User.current, :watched => watchables,:params=>params,:opt=>'delete',:list=>@list,:action_name=>params[:action_name],:page=>params[:page],:count=>@obj_count} }
     end
   rescue Exception => e
     if e.message == "404"

app/helpers/application_helper.rb

@@ -2314,7 +2314,27 @@ module ApplicationHelper
       elsif homework.homework_type == 2 #编程作业不能修改作品
         "<span class='fr mr10 pr_join_span ' title='编程作业不可修改作品'>作品已交</span>".html_safe
       else
-        link_to l(:label_edit_homework),  edit_student_work_path(work.id),:class => 'fr mr10 work_edit'
+        link_to l(:label_edit_homework),  edit_student_work_path(work.id),:class => 'fr mr10 work_edit c_blue'
+      end
+    end
+  end
+
+  #根据传入作业确定显示为编辑作品还是新建作品,或者显示作品数量
+  def user_for_homework_common homework,is_teacher
+    if is_teacher #老师显示作品数量
+      link_to "提交（#{homework.student_works.count}）",student_work_index_path(:homework => homework.id),:class => "c_blue"
+    else #学生显示提交作品、修改作品等按钮
+      work = cur_user_works_for_homework homework
+      if work.nil?
+        link_to "提交作品",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
+      else
+        if homework.homework_type == 1 && homework.homework_detail_manual && homework.homework_detail_manual.comment_status != 1 #匿评作业，且作业状态不是在开启匿评之前
+          link_to "修改作品",  "", :class => 'c_blue', :title => "开启匿评后不可修改作品"
+        elsif homework.homework_type == 2 #编程作业不能修改作品
+          link_to "作品已交",  "",:class => 'c_blue',:title => "编程作业不可修改作品"
+        else
+          link_to "修改作品",  edit_student_work_path(work.id),:class => 'c_blue'
+        end
       end
     end
   end

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

@@ -537,4 +537,16 @@ module UsersHelper
     end
   end
 
+  #获取指定用户作为老师的课程
+  def get_as_teacher_courses user
+    type = []
+    user.courses.select{|c| user.allowed_to?(:as_teacher,c)}.each do |course|
+      option = []
+      option << course.name
+      option << course.id
+      type << option
+    end
+    type
+  end
+
 end

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.course_act_id
+      user_activity.act_type = self.course_act_type
+      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/course_message.rb

@@ -1,12 +1,19 @@
 class CourseMessage < ActiveRecord::Base
-  attr_accessible :course_id, :course_message_id, :course_message_type, :user_id, :viewed
+  attr_accessible :course_id, :course_message_id, :course_message_type, :user_id, :viewed, :content, :status
 
   # 多态 虚拟关联
   belongs_to :course_message ,:polymorphic => true
   belongs_to :course
   belongs_to :user
+  has_many :message_alls, :class_name => 'MessageAll',:as =>:message,  :dependent => :destroy
+
   validates :user_id,presence: true
   validates :course_id,presence: true
   validates :course_message_id,presence: true
   validates :course_message_type, presence: true
+  after_create :add_user_message
+
+  def add_user_message
+    self.message_alls << MessageAll.new(:user_id => self.user_id)
+  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.forge_act_id
+      user_activity.act_type = self.forge_act_type
+      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/forge_message.rb

@@ -13,8 +13,15 @@ class ForgeMessage < ActiveRecord::Base
   belongs_to :forge_message ,:polymorphic => true
   belongs_to :project
   belongs_to :user
+  has_many :message_alls, :class_name => 'MessageAll',:as =>:message, :dependent => :destroy
+
   validates :user_id,presence: true
   validates :project_id,presence: true
   validates :forge_message_id,presence: true
   validates :forge_message_type, presence: true
+  after_create :add_user_message
+
+  def add_user_message
+    self.message_alls << MessageAll.new(:user_id => self.user_id)
+  end
 end

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, :act_as_forge_message_update
+  after_update :be_user_score
   after_destroy :down_user_score
   # after_create :be_user_score
   # end
@@ -145,20 +145,16 @@ class Issue < ActiveRecord::Base
   def act_as_forge_message
     # 指派给自己的缺陷不提示消息
     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)
+      self.forge_messages << ForgeMessage.new(:user_id => self.assigned_to_id, :project_id => self.project_id, :viewed => false)
     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
+  #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

app/models/journal.rb

@@ -172,9 +172,10 @@ 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)
+      self.forge_messages << ForgeMessage.new(:user_id => self.issue.author_id, :project_id => self.issue.project_id, :viewed => false)
+    end
+    if self.user_id != self.issue.assigned_to_id   # 指派人不是自己的话，则给指派人发送
+      self.forge_messages << ForgeMessage.new(:user_id => self.issue.assigned_to_id, :project_id => self.issue.project_id, :viewed => false)
     end
   end
 

app/models/journals_for_message.rb

@@ -209,14 +209,20 @@ class JournalsForMessage < ActiveRecord::Base
       end
     else # 留言回复
       reply_to = User.find(self.reply_id)
-      if self.user_id != self.parent.user_id
+      if self.user_id != self.reply_id # 添加我回复的那个人
         receivers << reply_to
-        if self.reply_id != self.parent.user_id
-          receivers << self.parent.user
       end
-      else
-        receivers << reply_to
+      if self.user_id != self.parent.jour_id # 给东家发信息
+        receivers << self.parent.jour
       end
+      # 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)

app/models/memo.rb

@@ -79,7 +79,7 @@ class Memo < ActiveRecord::Base
         receivers << self.forum.creator
       end
       # 添加发帖人
-      if  self.forum.creator_id != self.parent.author_id
+      if  self.author_id != self.parent.author_id
         receivers << self.parent.author
       end
     end

app/models/memo_message.rb

@@ -3,9 +3,15 @@ class MemoMessage < ActiveRecord::Base
 
   belongs_to :memo
   belongs_to :user
+  has_many :message_alls, :class_name => 'MessageAll',:as =>:message,  :dependent => :destroy
 
   validates :user_id,presence: true
   validates :forum_id,presence: true
   validates :memo_id,presence: true
   validates :memo_type, presence: true
+  after_create :add_user_message
+
+  def add_user_message
+    self.message_alls << MessageAll.new(:user_id => self.user_id)
+  end
 end

app/models/message_all.rb

@@ -0,0 +1,5 @@
+class MessageAll < ActiveRecord::Base
+  attr_accessible :message_id, :message_type, :user_id
+  # 虚拟关联---项目消息表/课程消息表/用户留言消息表/贴吧消息表
+  belongs_to :message ,:polymorphic => true
+end

app/models/student_works_score.rb

@@ -1,3 +1,4 @@
+#encoding=UTF-8
 class StudentWorksScore < ActiveRecord::Base
   #reviewer_role: 1:教师评分;2:教辅评分;3:学生匿评
   attr_accessible :student_work_id, :user_id, :score, :comment, :reviewer_role
@@ -9,13 +10,31 @@ class StudentWorksScore < ActiveRecord::Base
 
   acts_as_attachable
 
-  after_create :act_as_course_message
+  after_save :act_as_course_message
 
   # 评阅作品消息提示
   def act_as_course_message
-    if self.student_work
+    if self.student_work && self.student_work.user && self.student_work.homework_common.course
       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)
+      # 判断是第一次评阅还是更新 status:0 新建；1 更新
+      if self.created_at == self.updated_at
+        if self.comment.nil?
+          self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id,
+                                                       :viewed => false, :content => "作业评分：#{self.score}", :status=> false)
+        else
+          self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id,
+                                                    :viewed => false, :content => "作业评分：#{self.score}&nbsp;&nbsp;&nbsp; 评语：#{self.comment}", :status=> false)
         end
+      else # 更新
+        if self.comment.nil?
+          self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id,
+                                                       :viewed => false, :content => "作业评分：#{self.score}", :status=> true)
+        else
+          self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id,
+                                                       :viewed => false, :content => "作业评分：#{self.score}&nbsp;&nbsp;&nbsp; 评语：#{self.comment}", :status=> true)
         end
       end
+    end
+  end
+
+end

app/models/user_activity.rb

@@ -0,0 +1,7 @@
+class UserActivity < ActiveRecord::Base
+  attr_accessible :act_type,:act_id,:container_type,:container_id
+  # 虚拟关联---项目动态表/课程动态表
+  belongs_to :act ,:polymorphic => true
+  # 虚拟关联---项目/课程
+  belongs_to :container ,:polymorphic => true
+end

app/models/user_feedback_message.rb

@@ -3,8 +3,14 @@ class UserFeedbackMessage < ActiveRecord::Base
 
   belongs_to :journals_for_message
   belongs_to :user
+  has_many :message_alls, :class_name => 'MessageAll',:as =>:message, :dependent => :destroy
 
   validates :user_id,presence: true
   validates :journals_for_message_id,presence: true
   validates :journals_for_message_type, presence: true
+  after_create :add_user_message
+
+  def add_user_message
+    self.message_alls << MessageAll.new(:user_id => self.user_id)
+  end
 end

app/views/account/agreement.html.erb

@@ -0,0 +1,51 @@
+<%= stylesheet_link_tag 'new_user'%>
+<!--<div class="homepageContentContainer mb20" >-->
+  <div class="homepageContent BgBox">
+  	<h2 class="BgBox_h2">Trustie服务协议</h2>
+   	<div class="AgreementBox">
+    	<p>尊敬的用户，您好！<br />
+欢迎使用Trustie平台，在您使用Trustie平台前，请您认真阅读并遵守《Trustie服务协议》（以下简称"本协议"），请您务必审慎阅读、充分理解协议的各条款内容。<br />
+当您在注册过程中点击查看"看过并同意本服务协议"，按照注册流程成功注册为Trustie平台的用户即表示您已充分阅读、理解并完全接受本协议中的全部条款。您承诺接受并遵守本协议的约定，届时您不应以未阅读本协议的内容等理由，主张本协议无效或本协议中的某些条款无效，或要求撤销本协议。</p>
+		<h4 class="Agreementh4">一、Trustie平台权利和义务</h4>
+        <p>1、尊重用户隐私：尊重用户隐私，保障用户隐私安全是Trustie平台的一项基本政策；<br />
+2、管理平台用户：Trustie平台依据国家法律、地方法律和国际法律等的标准以及本行业的规则来管理平台注册用户；<br />
+3、处理用户反馈：Trustie平台的相关人员会及时处理用户反馈的问题并给予及时回复。</p>
+		<h4 class="Agreementh4">二、用户权利和义务</h4>
+        <p>用户在使用Trustie平台的过程中，必须遵守如下原则：<br />
+1、遵守中国的有关法律和法规；<br />
+2、使用网络服务不作非法用途；<br />
+3、不干扰和混乱网络服务；<br />
+4、遵守所有使用网络服务的网络协议、规定、程序和惯例；<br />
+5、不传输任何非法的、骚扰性的、中伤他人的、辱骂性的、恐吓性的、伤害性的、庸俗的，淫秽等信息资料；<br />
+6、不传输任何教唆他人构成犯罪行为的资料；<br />
+7、用户不得故意或者过失损害Trustie平台合法权利和利益。及时回复。</p>
+		<h4 class="Agreementh4">三、关于责任</h4>
+        <p>鉴于网络服务的特殊性，用户同意Trustie团队有权在事先通知的情况下，变更、中断、升级部分网络服务。Trustie团队不担保网络服务不会中断，但承诺在用户可承受的时间内快速恢复服务，同时确保用户数据的安全性和可靠性。</p>
+        <h4 class="Agreementh4">四、服务条款的修改</h4>
+        <p>Trustie团队保留在必要时对本协议修改的权利，一旦发生变动，这些条款可由Trustie团队及时更新，且毋须另行通知，修改后的条款一旦在网页上公布即有效代替原来的服务条款。您可随时查阅最新版服务条款。</p>
+        <p class=" mt15 fb">本协议最终解释权归Trustie团队所有。</p>
+    </div>
+    
+    
+  </div><!---BgBox end--->
+<!--</div>&lt;!&ndash;-homepageContentContainer end-&ndash;&gt;-->
+<script>
+$(".resourcesList").mousedown(function(e) {  
+if (3 == e.which) {  
+         document.oncontextmenu = function() {return false;}  
+         $("#contextMenu").hide();  
+         $("#contextMenu").attr("style","display: block; position: fixed; top:"  
+         + e.pageY  
+         + "px; left:"  
+         + e.pageX  
+         + "px; width: 80px;");  
+         $("#contextMenu").show();  
+         }
+		 
+});
+$(".resourcesList").click(function(e) {  
+		 $("#contextMenu").hide();
+		 document.oncontextmenu = function() {return true;}
+}); 
+</script>
+

app/views/account/login.html.erb

@@ -1,11 +1,52 @@
-<% @nav_dispaly_home_path_label = 1
-   @nav_dispaly_main_course_label = 1
-   @nav_dispaly_main_project_label = 1
-   @nav_dispaly_main_contest_label = 1 %>
-<% @nav_dispaly_forum_label = 1%>
-<%= call_hook :view_account_login_top %>
-
-<script type="text/javascript" language="javascript">
+<%= stylesheet_link_tag 'new_user'%>
+<%= stylesheet_link_tag 'leftside'%>
+
+<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="search_type"]: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"});
+        });
+    })
+    $(document).ready(function(){
+        if(<%= @login%>){
+            $("#signUpBox").css({display:"none"});
+            $("#loginInBox").css({display:"block"});
+        }else{
+            $("#signUpBox").css({display:"block"});
+            $("#loginInBox").css({display:"none"});
+        }
+    });
     function clearInfo(id, content) {
                 var text = $('#' + id);
                 if (text.val() == content) {
@@ -19,80 +60,201 @@
             $('#' + id).val(content);
         }
     }
+
+    function login(){
+        $('#main_login_form').submit(); //表单提交没有任何反应的原因：js冲突
+    }
+
+    function register(){
+        if($login_correct && $mail_correct && $passwd_correct &&  $passwd_comfirm_correct && $("#read_and_confirm").attr("checked") == 'checked'){
+            $("#main_reg_form").submit();
+        }else{
+            $('#user_login').blur();
+            $('#user_mail').blur();
+            $('#user_password').blur();
+            $('#user_password_confirmation').blur();
+        }
+    }
+    var $login_correct = false;
+    var $mail_correct = false;
+    var $passwd_correct = false;
+    var $passwd_comfirm_correct = false;
+    jQuery(document).ready(function () {
+        var $login = $('#user_login')
+        var $mail = $('#user_mail')
+        var $password = $('#user_password')
+        var $password_confirmation = $('#user_password_confirmation')
+        $login.blur(function (event) {
+            if ($(this).is('#user_login')) {
+                $.get(
+                        '<%=account_valid_ajax_path%>',
+                        { valid: "login",
+                            value: this.value },
+                        function (data) {
+                            if (data.valid) {
+                                $('#login_req').html('<span style="color: green">'+data.message+'</span>');
+                                $login_correct = true;
+                            } else {
+                                $('#login_req').html( '<span style="color: red">'+data.message+'</span>');
+                                $login_correct = false;
+                            }
+                            $('#login_req').css('display','block');
+                        });
+            }
+            ;
+        });
+
+        $mail.blur(function (event) {
+            if ($(this).is('#user_mail')) {
+                $.get('<%=account_valid_ajax_path%>',
+                        { valid: "mail",
+                            value: this.value },
+                        function (data) {
+                            if (data.valid) {
+                                $('#mail_req').html( '<span style="color: green">'+data.message+'</span>' );
+                                 $mail_correct = true;
+                            } else {
+                                $('#mail_req').html( '<span style="color: red">'+data.message+'</span>' );
+                                 $mail_correct = false;
+                            }
+                            $('#mail_req').css('display','block');
+                        });
+            }
+            ;
+        });
+        $password.blur(function () {
+            var pas1 = document.getElementById("user_password").value;
+            var password_min_length = <%= Setting.password_min_length.to_i %>
+            if (pas1.length >= password_min_length) {
+                $('#passwd_req').html('');
+                 $passwd_correct = true;
+            }
+            else {
+                $('#passwd_req').html( '<span style="color: red">'+'<%= l(:setting_password_min_length_limit, :count => Setting.password_min_length.to_i) %>'+'</span>');
+                 $passwd_correct = false;
+            }
+            $('#passwd_req').css('display','block');
+
+
+        });
+        $password_confirmation.blur(function () {
+            var password_min_length = <%= Setting.password_min_length.to_i %>
+            var pas1 = document.getElementById("user_password").value;
+            var pas2 = document.getElementById("user_password_confirmation").value;
+            if (pas1.length >= password_min_length && pas1 == pas2 ) {
+                $('#confirm_req').html('<span style="color: green">'+'<%= l(:setting_password_success) %>'+'</span>');
+                 $passwd_comfirm_correct = true;
+            }
+            else {
+                $('#confirm_req').html('<span style="color: red">'+'<%= l(:setting_password_error) %>'+'</span>');
+                 $passwd_comfirm_correct = false;
+
+            }
+            $('#confirm_req').css('display','block');
+
+
+
+        });
+    });
 </script>
-<head>
-  <meta http-equiv="X-UA-Compatible" content="IE=9">
-  <meta http-equiv="Content-Type" content="text/html; charset={CHARSET}" />
-</head>
-<div id="login-form">
-<%= form_tag(signin_path) do %>
+<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">
+          <div class="mb5">
+          <ul class="loginChooseList">
+            <li class="loginChoose fl"><span class="loginChooseTab">登录</span></li>
+            <li class="loginChooseBorder fl"></li>
+          </ul>
+        </div>
+        <div class="loginSignAlert" style="color: red"><%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe  %></div>
+        </div>
+        <div class="loginIn">
+
+          <%= form_tag(signin_path,:id=>'main_login_form',:method=>'post') do %>
           <%= back_url_hidden_field_tag %>
-<table>
-<tr>
-    <td align="right">
-      <label for="username">
-        <%=l(:lable_user_name)%>:
-      </label>
-    </td>
-    <td align="left">
-      <%= text_field_tag 'username', params[:username], :tabindex => '1' , :value => "#{l(:label_login_prompt)}",
-                         :onfocus => "clearInfo('username','#{l(:label_login_prompt)}')",
-                         :onblur => "showInfo('username','#{l(:label_login_prompt)}')",
-                         :style => "resize: none;font-size: 12px;color: #818283;"%>
-    </td>
-</tr>
-<tr>
-    <td align="right">
-      <label for="password">
-        <%=l(:field_password)%>:
-      </label>
-    </td>
-    <td align="left">
-      <%= password_field_tag 'password', nil, :tabindex => '2' %>
-    </td>
-</tr>
+          <div class="mb20">
+            <%= text_field_tag 'username', params[:username], :tabindex => '1' ,
+                               :class=>'loginSignBox',:placeholder=>'请输入邮箱地址或昵称'%>
+            <!--<input type="text" placeholder="请输入邮箱地址或昵称" class="loginSignBox" />-->
+          </div>
           <% if Setting.openid? %>
-<tr>
-  <td align="right">
-    <label for="openid_url">
-      <%=l(:field_identity_url)%>
-    </label>
-  </td>
-  <td align="left">
-    <%= text_field_tag "openid_url", nil, :tabindex => '3' %>
-  </td>
-</tr>
+                  <div class="mb20">
+                    <%= text_field_tag "openid_url", nil, :tabindex => '3',:placeholder=>'请输入OpenId URL' %>
+                  </div>
           <% end %>
-<tr>
-    <td></td>
-    <td align="left">
+          <div>
+            <!--<input type="text" placeholder="请输密码" class="loginSignBox" />-->
+            <%= password_field_tag 'password', nil, :tabindex => '2',:class=>'loginSignBox' ,:placeholder=>'请输密码'%>
+          </div>
+          <div class="loginSignOption">
             <% if Setting.autologin? %>
-        <label for="autologin">
+                <div class="fl mt3 mr5">
                   <%= check_box_tag 'autologin', 1, true, :tabindex => 4 %>
+                </div>
                 <%= l(:label_stay_logged_in) %>
-        </label>
             <% end %>
-    </td>
-</tr>
-<tr>
-    <td colspan="2" >
-    	
-       <span style="float: left">
+            <a href="<%= lost_password_path %>" class="newsBlue mr40 fr">
               <% if Setting.lost_password? %>
-            <%= link_to l(:label_password_lost), lost_password_path %>
-        <% end %></span>
-   
-    <span style="float: right">
-        <input type="submit" class="small" name="login" value="<%=l(:button_login)%> &#187;" tabindex="5"/></span>
-    </td>
-</tr>
-</table>
+              <u>忘记密码?</u>
+                  <% end %>
+            </a></div>
         <% end %>
+          <div class="loginInButton" >
+            <a href="javascript:void(0);" class="c_white db" onclick="$('#main_login_form').submit();">登录</a>
+          </div>
+
+        </div>
+
+      </div>
+      <div id="signUpBox">
+        <div class="loginChooseBox">
+          <ul class="loginChooseList">
+            <li class="loginChoose fl"><span class="loginChooseTab">注册<%= link_to l(:label_login_with_open_id_option), signin_url if Setting.openid? %></a></span>
+            <li class="loginChooseBorder fl"></li>
+          </ul>
+        </div>
+        <div class="loginIn">
+          <%= form_for :user, :url => register_path,:method=>'post',:html=>{:id=>'main_reg_form'} do |f| %>
+              <%= error_messages_for 'user' %>
+          <div class="loginSignRow">
+            <!--<input type="text" placeholder="请输入邮箱地址" class="loginSignBox" />-->
+            <%= f.text_field :mail,:size => 25, :class=>'loginSignBox' ,:placeholder=>"请输入邮箱地址"%>
+            <div class="loginSignAlert" id="mail_req" style="display: none"  >请输入有效邮箱地址</div>
+          </div>
+          <div  class="loginSignRow">
+            <!--<input type="text" placeholder="请输入密码" class="loginSignBox" />-->
+            <%= f.password_field :password, :size => 25,:placeholder=>"请输入密码",:class=>'loginSignBox' %>
+            <div class="loginSignAlert" id="passwd_req" style="display: none">至少需要 6 个字符</div>
+          </div>
+          <div  class="loginSignRow">
+            <!--<input type="text" placeholder="请再次输入密码" class="loginSignBox" />-->
+            <%= f.password_field :password_confirmation, :size => 25,:placeholder=>"请再次输入密码",:class=>'loginSignBox' %>
+            <div class="loginSignAlert" id="confirm_req" style="display: none">密码不一致</div>
+          </div>
+          <div  class="loginSignRow">
+            <!--<input type="text" placeholder="请输入用户昵称" class="loginSignBox" />-->
+            <%= f.text_field :login, :size => 25,:placeholder=>"请输入用户昵称",:class=>'loginSignBox'%>
+            <div class="loginSignAlert" id="login_req" style="display: none">用户昵称为2-18个中英文，数字或下划线</div>
+          </div>
+              <div class="loginSignOption">
+                <div class="fl mt3 mr5">
+                  <input type="checkbox" id="read_and_confirm"/>
                 </div>
-<%= call_hook :view_account_login_bottom %>
+                我已阅读并接受<a href="<%= agreement_path %>" class="newsBlue"><u>Trustie服务协议</u></a>条款</div>
+          <div class="loginUpButton">
+            <a href="javascript:void(0);" class="c_white db" onclick="register();">注册</a>
 
-<% if params[:username].present? %>
-<%= javascript_tag "$('#password').focus();" %>
-<% else %>
-<%= javascript_tag "$('#username').focus();" %>
+          </div>
           <% end %>
+        </div>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div>

app/views/account/lost_password.html.erb

@@ -1,16 +1,26 @@
-<% @nav_dispaly_home_path_label = 1
-   @nav_dispaly_main_course_label = 1
-   @nav_dispaly_main_project_label = 1
-   @nav_dispaly_main_contest_label = 1 %>
-<% @nav_dispaly_forum_label = 1%>
-<h3><%=l(:label_password_forget)%></h3>
+<%= stylesheet_link_tag 'new_user'%>
 
+<div class="homepageContentContainer " style="margin-top:20px;">
+  <div class="homepageContent BgBox">
+  	<h2 class="BgBox_h2">忘记密码</h2>
+    <div class="BgBoxCon">
       <%= form_tag(lost_password_path) do %>
-  <div class="box tabular">
-    <p>
-      <label for="mail"><%=l(:field_mail)%> <span class="required">*</span></label>
-      <%= text_field_tag 'mail', nil, :size => 40, :placeholder => '请输入注册邮箱'%>
-      <%= submit_tag l(:button_submit) %>
-    </p>
-  </div>
+    	<p class="BgBoxConP mb5">通过注册邮箱链接重设密码</p>
+    	 <!--<input type="text"  class="NomalInput mb20 " value="请输入登录邮箱地址"  />-->
+          <%= text_field_tag 'mail', nil, :size => 40, :placeholder => '请输入注册邮箱',:class=>'NomalInput mb20'%>
+          <% if  flash[:error] %>
+              <p class="c_red mb5"><%=  flash[:error]%></p>
+              <!--<div style="color: red" class="mb5" ><%#=  flash[:error]%></div>-->
+          <% elsif  flash[:notice] %>
+              <p class="c_green mb5"><%=  flash[:notice]%></p>
+              <!--<div style="color: green" class="mb5" ><%#=  flash[:notice]%></div>-->
+          <% end %>
+          <div class="LoginButton"><a href="javascript:void(0);" class="c_white db" onclick="$(this).parent().parent().submit();">提交</a></div>
       <% end %>
+    </div>
+    
+    
+  </div><!---BgBox end--->
+</div><!---homepageContentContainer end--->
+</body>
+</html>

app/views/forums/index.html.erb

@@ -19,10 +19,10 @@
 			</td>
 			<td rowspan="2" width="250px" >
 				<div class="top-content-search">
-					<%= form_tag(:controller => 'forums', :action => "search_forum", :method => :get) do %>
-					<%= text_field_tag 'name', params[:name], :size => 20 %>
-					<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>	
-					<% end %>
+					<%#= form_tag(:controller => 'forums', :action => "search_forum", :method => :get) do %>
+					<%#= text_field_tag 'name', params[:name], :size => 20 %>
+					<%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
+					<%# end %>
 				</div>
 			</td>
 		</tr>

app/views/layouts/_base_header_new.html.erb

@@ -56,9 +56,9 @@
             </li><!---level1 end--->
             <!--消息提醒-->
             <div class="navHomepageNews">
-              <%= 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} %>
+              <%= link_to image_tag("/images/news_icon_small.png" , :width => "21", :height => "24"), user_message_path(User.current) %>
               <% if User.current.count_new_message >0 %>
-                  <div class="newsActive"></div>
+                  <div class="newsActive"><%= link_to "" , user_message_path(User.current) %></div>
               <% end %>
             </div>
             <!--消息提醒end-->

app/views/layouts/_footer.html.erb

@@ -0,0 +1,40 @@
+<div id="Footer">
+  <div class="footerAboutContainer">
+    <ul class="footerAbout">
+      <li class="fl"><a href="javascript:void(0);" class="f_grey mw20" target="_blank"><%= l(:label_about_us)%></a>|</li>
+      <li class="fl"><a href="http://forge.trustie.net/projects/2/member" class="f_grey mw20" target="_blank"><%= l(:label_contact_us)%></a>|</li>
+      <li class="fl"><a href="javascript:void(0);" class="f_grey mw20" target="_blank"><%= l(:label_recruitment_information)%></a>|</li>
+      <li class="fl"><a href="http://forge.trustie.net/forums/1/memos/1168" class="f_grey mw20" target="_blank"><%= l(:label_surpport_group)%></a>|</li>
+      <li class="fl"><a href="javascript:void(0);" class="f_grey mw20" target="_blank"><%= l(:label_forums)%></a></li>
+
+    </ul>
+  </div>
+
+  <div class="cl"></div>
+  <ul class="departments">
+    <li class="fl mr10">
+      <strong><%= l(:label_hosted_organization)%></strong><a href="http://www.nudt.edu.cn/ArticleShow.asp?ID=47" class=" ml10 f_grey" target="_blank"><%= l(:label_hosted_by)%></a>
+    </li>
+    <li class="fl">
+      <a href="http://www.nudt.edu.cn/ArticleShow.asp?ID=41" class="mr45 f_grey" target="_blank"><%= l(:label_sponsor)%></a>
+    </li>
+    <li class="fl mr10">
+      <strong><%= l(:label_partners)%></strong><a href="http://eecs.pku.edu.cn" class="ml10 f_grey" target="_blank"><%= l(:label_co_organizer_EECS)%></a>
+    </li>
+    <li class="fl">
+      <a href="http://scse.buaa.edu.cn/" class="mr10 f_grey" target="_blank"><%= l(:label_co_organizer_BHU)%></a>
+    </li>
+    <li class="fl">
+      <a href="http://www.iscas.ac.cn/" class="mr10 f_grey" target="_blank"><%= l(:label_co_organizer_CAS)%></a>
+    </li>
+    <li class="fl">
+      <a href="http://www.inforbus.com/" class="f_grey" target="_blank"><%= l(:label_co_organizer_InforS)%></a>
+    </li>
+  </ul>
+  <div class="cl"></div>
+  <ul class="copyright">
+    <li class="fl"><%= l(:label_rights_reserved)%></li>
+    <span class="fl mw15">|</span>
+    <li class="fl"><a href="http://www.miibeian.gov.cn/" class="fl f_grey" target="_blank"><%= l(:label_license)%></a></li>
+  </ul>
+</div><!--Footer end-->

app/views/layouts/_logined_header.html.erb

@@ -0,0 +1,100 @@
+<div class="navHomepage">
+  <div class="navHomepageLogo fl">
+    <%=link_to image_tag("../images/logo.png",width:"51px", height: "45px",class: "mt3"), user_activities_path(User.current.id)%>
+  </div>
+  <div class="fl">
+    <ul>
+      <li class="navHomepageMenu fl">
+        <%= link_to "首页",user_activities_path(User.current.id), :class => "homepageWhite f16"%>
+      </li>
+      <li class="navHomepageMenu fl">
+        <a href="<%=url_for(:controller => 'users', :action => 'user_resource',:id=>User.current.id,:type=>1)%>" class="homepageWhite f16">资源库</a></li>
+      <li class="navHomepageMenu fl">
+        <%= link_to "作业",  user_homeworks_user_path(User.current.id), :class => "homepageWhite f16"%>
+      </li>
+      <li class="navHomepageMenu fl">
+        <a href="http://forge.trustie.net/forums/1/memos/1168" class="homepageWhite f16">帮助中心</a>
+      </li>
+    </ul>
+  </div>
+  <script>
+      <% type = type%>
+      $(document).ready(function (){
+          if('<%= type %>' != null && '<%= type %>' == 'courses' ){
+              $('input:radio[value="courses"]').attr('checked','checked');
+          }
+          if('<%= type %>' != null && '<%= type %>' == 'projects' ){
+              $('input:radio[value="projects"]').attr('checked','checked');
+          }
+          if('<%= type %>' != null && '<%= type %>' == 'users' ){
+              $('input:radio[value="users"]').attr('checked','checked');
+          }
+      });
+  </script>
+  <div class="fl" id="navHomepageSearch">
+    <!--<form class="navHomepageSearchBox">-->
+    <% name = name%>
+
+    <%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>
+      <input type="text" name="q" value="<%= name.nil? ? "" : name%>" class="navHomepageSearchInput" />
+        <input type="hidden" name="search_type" id="type" value=""/>
+        <a href="javascript:void(0);" class="homepageSearchIcon" onclick="$('#type').val($('input[type=radio]:checked').val());$(this).parent().submit();"></a>
+     <% end %>
+    <div class="navSearchTypeBox" id="navHomepageSearchType">
+      <div class="fl mr15 mt8">
+        <input type="radio"  value="courses" name="search_type" checked/>
+        课程
+      </div>
+      <div class="fl mr15 mt8">
+        <input type="radio"  value="projects" name="search_type" />
+        项目
+      </div>
+      <div class="fl mr15 mt8">
+        <input type="radio" value="users" name="search_type"  />
+        用户
+      </div>
+      <div id="navSearchAlert" class="fr mr10">
+        <span class="c_red">请选择搜索类型</span>
+      </div>
+    </div>
+  </div>
+
+  <div class="navHomepageProfile">
+    <ul>
+      <li class="homepageProfileMenuIcon">
+        <%= link_to "<div class='mt5 mb8'>#{image_tag(url_to_avatar(User.current),:width =>"40",:height => "40",:alt=>"头像", :id => "nh_user_logo")}</div>".html_safe,user_activities_path(User.current.id)%>
+        <ul class="topnav_login_list">
+          <li>
+            <%= link_to "修改资料", my_account_path, :class => "menuGrey"%>
+          </li>
+          <!--<li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>-->
+          <li>
+            <%= link_to "退出",signout_path,:class => "menuGrey",:method => "post"%>
+          </li>
+        </ul>
+      </li>
+    </ul>
+  </div>
+  <div class="navHomepageNews">
+    <%= link_to "", user_message_path(User.current), :class => "homepageNewsIcon" %>
+    <% if User.current.count_new_message >0 %>
+        <div ><%= link_to "" , user_message_path(User.current), :class => "newsActive" %></div>
+    <% end %>
+  </div>
+</div>
+
+<script type="text/javascript">
+    //搜索相关
+    $("#navHomepageSearch").mouseover(function(){
+        $("#navHomepageSearchType").show();
+    }).mouseout(function(){
+        $("#navHomepageSearchType").hide();
+    });
+
+    function signout(){
+        $.post(
+                '<%= signout_path%>',
+                {}
+        );
+    }
+</script>

app/views/layouts/_new_feedback.html.erb

@@ -21,14 +21,15 @@
               </a>
           <% end %>
         </div>
-        <div class="msgserver">
+        <div class="mt5">
           <a target="hiddentab" href="http://wpa.qq.com/msgrd?v=1&uin=1554253403&site=qq&menu=yes" style="color: #15BCCF;">
             <%= l(:label_technical_support) %>白&nbsp;&nbsp;&nbsp;羽</a>
-            <iframe name="hiddentab" style="display: none"></iframe>
         </div>
       </div>
       <div class="side_bottom"></div>
     </div>
   </div>
-  <div class="show_btn"><span>在线客服</span></div>
+  <div class="show_btn">
+    <span>在线客服</span>
+  </div>
 </div>

app/views/layouts/_unlogin_header.html.erb

@@ -0,0 +1,78 @@
+<div class="navHomepage">
+  <div class="navHomepageLogo fl">
+    <%=link_to image_tag("../images/logo.png",width:"51px", height: "45px",class: "mt3"), signin_path%>
+  </div>
+  <div class="fl">
+    <ul>
+      <li class="navHomepageMenu fl">
+        <a href="http://forge.trustie.net/forums/1/memos/1168" class="c_white f16">帮助中心</a>
+      </li>
+    </ul>
+  </div>
+ <script>
+     function search(doc){
+         //alert(1)
+        // val = $('input:radio[name="search_type"]:checked').val();
+        // alert(2)
+        // $("#search_type").val(val);
+       //  alert(3)
+         $(doc).parent().submit();
+     }
+     <% type = type%>
+     $(document).ready(function (){
+         if('<%= type %>' != null && '<%= type %>' == 'courses' ){
+             $('input:radio[value="courses"]').attr('checked','checked');
+         }
+         if('<%= type %>' != null && '<%= type %>' == 'projects' ){
+             $('input:radio[value="projects"]').attr('checked','checked');
+         }
+         if('<%= type %>' != null && '<%= type %>' == 'users' ){
+             $('input:radio[value="users"]').attr('checked','checked');
+         }
+     });
+ </script>
+  <div class="fl" id="navHomepageSearch">
+    <!--<form class="navHomepageSearchBox">-->
+    <% name = name%>
+
+    <%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>
+      <input type="text" name="q" value="<%= name.nil? ? "" : name%>" class="navHomepageSearchInput"/>
+      <input type="hidden" name="search_type" id="type" value=""/>
+      <a href="javascript:void(0);" class="homepageSearchIcon" onclick="$('#type').val($('input[type=radio]:checked').val());$(this).parent().submit();"></a>
+    <% end %>
+    <div class="navSearchTypeBox" id="navHomepageSearchType">
+      <div class="fl mr15 mt8">
+        <input type="radio" value="courses" name="search_type"  checked/>
+        课程
+      </div>
+      <div class="fl mr15 mt8">
+        <input type="radio" value="projects" name="search_type" />
+        项目
+      </div>
+      <div class="fl mr15 mt8">
+        <input type="radio" value="users" name="search_type" />
+        用户
+      </div>
+      <div id="navSearchAlert" class="fr mr10">
+        <span class="c_red">请选择搜索类型</span>
+      </div>
+    </div>
+
+  </div>
+  <div id="loginInButton" class="fr ml20">
+    <a href="<%= signin_path(:login=>true) %>" class="c_white db">登录</a>
+  </div>
+  <div id="loginSignButton" class="fr">
+    <a href="<%= signin_path(:login=>false) %>" class="c_white db">注册</a>
+  </div>
+</div>
+
+<script type="text/javascript">
+    //搜索相关
+    $("#navHomepageSearch").mouseover(function(){
+        $("#navHomepageSearchType").show();
+    }).mouseout(function(){
+        $("#navHomepageSearchType").hide();
+    });
+
+</script>

app/views/layouts/_user_brief_introduction.html.erb

@@ -0,0 +1,8 @@
+<% 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%>
+    <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);", :onclick => "show_edit_user_introduction();"%>
+<% end%>

app/views/layouts/_user_courses.html.erb

@@ -0,0 +1,12 @@
+<% courses.each do |course|%>
+    <li class="homepageLeftMenuCoursesLine">
+      <%= link_to course.name, course_path(course.id,:host=>Setting.host_course), :class => "coursesLineGrey hidden #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}", :title => course.name%>
+    </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 hidden", :title => project.name%>
+    </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>
-        <% end %>
+        <%= link_to "",watch_path(:object_type=> 'user',:object_id=>target.id,:target_id=>target.id),:class => "homepageFollowCancel", :method => "post",:remote => "true", :title => "添加关注"%>
     <% end %>
 <% end %>

app/views/layouts/base.html.erb

@@ -17,19 +17,30 @@
 <%= call_hook :view_layouts_base_html_head %>
 <!-- page specific tags -->
 <%= yield :header_tags -%>
+  <%= stylesheet_link_tag 'base','header', :media => 'all'%>
 </head>
 <body class="<%=h body_css_classes %>">
+
+<div class="cl"></div>
+<div class="navContainer mb10">
+  <% if User.current.logged? %>
+      <%= render :partial => 'layouts/logined_header',:locals=>{:name=>@name,:type=>@type} %>
+  <% else%>
+      <%= render :partial => 'layouts/unlogin_header',:locals=>{:name=>@name,:type=>@type} %>
+  <% end%>
+</div>
+<div class="cl"></div>
+
 <div id="wrapper">
 <div id="wrapper2">
 <div id="wrapper3">
-<%=render :partial => 'layouts/base_header'%>
 <div id="main" class="nosidebar">
     <div id="content_">
         <%= render_flash_messages %>
         <%= yield %>
         <%= call_hook :view_layouts_base_content %>
         <div style="clear:both;"></div>
-        <%=render :partial => 'layouts/base_footer'%>
+        <%#=render :partial => 'layouts/base_footer'%>
     </div>
 
 </div>
@@ -41,6 +52,9 @@
 
 </div>
 </div>
+<div class="cl"></div>
+<%= render :partial => 'layouts/footer' %>
+<div class="cl"></div>
 <%= call_hook :view_layouts_base_body_bottom %>
 </body>
 </html>

app/views/layouts/base_courses.html.erb

@@ -1,4 +1,4 @@
-<% course_model %>
+<%# course_model %>
 <% teacher_num = teacherCount(@course) %>
 <% student_num = studentCount(@course) %>
 <% course_file_num = visable_attachemnts_incourse(@course).count%>
@@ -17,17 +17,22 @@
   <%= javascript_heads %>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
-  <%= stylesheet_link_tag 'public', 'leftside', 'jquery/jquery-ui-1.9.2', 'courses'%>
+  <%= stylesheet_link_tag 'public', 'leftside', 'jquery/jquery-ui-1.9.2', 'courses','header'%>
   <%= javascript_include_tag "course","header","attachments" %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
 </head>
 <!--add by huang-->
 <body>
-<div id="Container">
-  <%= render :partial => 'layouts/new_header' %>
+<div class="navContainer mb10">
+  <% if User.current.logged? %>
+      <%= render :partial => 'layouts/logined_header' %>
+  <% else%>
+      <%= render :partial => 'layouts/unlogin_header' %>
+  <% end%>
+</div>
 <div class="cl"></div>
-
+<div id="Container">
   <div id="TopBar">
     <div class="topbar_info02 fl">
       <h2>
@@ -46,16 +51,16 @@
         <%= link_to @course.name, course_path(@course) %>
       </p>
     </div>
-    <div class="search fl">
-      <%= form_tag({:controller => 'courses', :action => 'search'},:id => "course_search_form", :method => :get, :class => "search_form") do %>
-          <input class="search_text fl" id="name" name="name" onkeyup="regexName('搜索条件不能为空');" placeholder="课程名称" type="text">
-          <a href="javascript:void(0)" onclick="submitSerch('<%= l(:label_search_conditions_not_null) %>');" class="search_btn fl f14 c_white" >
-            <%= l(:label_search)%>
-          </a>
-          <div class="cl"></div>
-          <span id="project_name_span" style="float: left"></span>
-      <% end %>
-    </div>
+    <!--<div class="search fl">-->
+      <!--<%#= form_tag({:controller => 'courses', :action => 'search'},:id => "course_search_form", :method => :get, :class => "search_form") do %>-->
+          <!--<input class="search_text fl" id="name" name="name" onkeyup="regexName('搜索条件不能为空');" placeholder="课程名称" type="text">-->
+          <!--<a href="javascript:void(0)" onclick="submitSerch('<%#= l(:label_search_conditions_not_null) %>');" class="search_btn fl f14 c_white" >-->
+            <!--<%#= l(:label_search)%>-->
+          <!--</a>-->
+          <!--<div class="cl"></div>-->
+          <!--<span id="project_name_span" style="float: left"></span>-->
+      <!--<%# end %>-->
+    <!--</div>-->
   </div><!--TopBar end-->
   <div class="cl"></div>
   <div id="content">
@@ -178,11 +183,12 @@
     <div style="clear:both;"></div>
 
   </div><!--Content end-->
-  <div class="cl"></div>
+</div><!--Container end-->
 
-  <%= render :partial => 'layouts/new_footer' %>
     <div class="cl"></div>
-</div><!--Container end-->
+    <%= render :partial => 'layouts/footer' %>
+    <div class="cl"></div>
+
 <%= render :partial => 'layouts/new_feedback' %>
 <div id="ajax-indicator" style="display:none;">
   <span><%= l(:label_loading) %></span>

app/views/layouts/base_forums.html.erb

@@ -1,8 +1,3 @@
-<% @nav_dispaly_home_path_label = 1
-   @nav_dispaly_main_course_label = 1
-   @nav_dispaly_main_project_label = 1
-   @nav_dispaly_main_contest_label = 1 %>
-<% @nav_dispaly_forum_label = 1%>
 <!DOCTYPE html>
 <html lang="en">
 	<head>
@@ -20,12 +15,23 @@
 
 		<%= call_hook :view_layouts_base_html_head %>
 		<%= yield :header_tags -%>
+      <%= stylesheet_link_tag 'base','header', :media => 'all'%>
 	</head>
 	<body class="<%= h body_css_classes %>">
+
+    <div class="cl"></div>
+    <div class="navContainer mb10">
+      <% if User.current.logged? %>
+          <%= render :partial => 'layouts/logined_header' %>
+      <% else%>
+          <%= render :partial => 'layouts/unlogin_header' %>
+      <% end%>
+    </div>
+    <div class="cl"></div>
+
 		<div id="wrapper">
 			<div id="wrapper2">
 				<div id="wrapper3">
-					<%=render :partial => 'layouts/base_header'%>					
 					<div id="main">
 						<div class="top-content">
 							<table>
@@ -34,11 +40,11 @@
 									<td style="width: 430px; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
 									<td rowspan="2" width="250px">
 										<div class="top-content-search">
-											<%= form_tag(:controller => 'forums', :action => "search_memo", :id => params[:id], :method => :get) do %>
-											<%= text_field_tag 'name', params[:name], :size => 20 %>
-											<%= hidden_field_tag 'forum_id', params[:id] %>
-											<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>	
-											<% end %>
+											<%#= form_tag(:controller => 'forums', :action => "search_memo", :id => params[:id], :method => :get) do %>
+											<%#= text_field_tag 'name', params[:name], :size => 20 %>
+											<%#= hidden_field_tag 'forum_id', params[:id] %>
+											<%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
+											<%# end %>
 										</div>
 									</td>
 								</tr>
@@ -85,7 +91,7 @@
 							<div style="clear:both;"></div>
 
 						</div>
-						<%= render :partial => 'layouts/base_footer'%>
+						<%#= render :partial => 'layouts/base_footer'%>
 					</div>
 					<div id="ajax-indicator" style="display:none;">
 						<span><%= l(:label_loading) %></span>
@@ -94,6 +100,9 @@
 				</div>
 			</div>
 		</div>
+    <div class="cl"></div>
+    <%= render :partial => 'layouts/footer' %>
+    <div class="cl"></div>
 		<%= call_hook :view_layouts_base_body_bottom %>
 	</body>
 </html>

app/views/layouts/base_memos.html.erb

@@ -1,8 +1,3 @@
-<% @nav_dispaly_home_path_label = 1
-   @nav_dispaly_main_course_label = 1
-   @nav_dispaly_main_project_label = 1
-   @nav_dispaly_main_contest_label = 1 %>
-<% @nav_dispaly_forum_label = 1%>
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -20,13 +15,24 @@
 	<%= javascript_include_tag "ckeditor/ckeditor.js" %>
 	<!-- page specific tags -->
 	<%= yield :header_tags -%>
+  <%= stylesheet_link_tag 'base','header', :media => 'all'%>
 </head>
 <!--add by huang-->
 <body class="<%= h body_css_classes %>">
+
+<div class="cl"></div>
+<div class="navContainer mb10">
+  <% if User.current.logged? %>
+      <%= render :partial => 'layouts/logined_header' %>
+  <% else%>
+      <%= render :partial => 'layouts/unlogin_header' %>
+  <% end%>
+</div>
+<div class="cl"></div>
+
 	<div id="wrapper">
 		<div id="wrapper2">
 			<div id="wrapper3">
-				<%=render :partial => 'layouts/base_header'%>					
 				<div id="main">
 					<!-- added by bai -->
 
@@ -78,7 +84,7 @@
 						<%= call_hook :view_layouts_base_content %>
 						<div style="clear:both;"></div>
 					</div>
-					<%= render :partial => 'layouts/base_footer'%>
+					<%#= render :partial => 'layouts/base_footer'%>
 				</div>
 
 				<div id="ajax-indicator" style="display:none;">
@@ -87,6 +93,9 @@
 				<div id="ajax-modal" style="display:none;"></div>
 			</div>
 		</div>
+      <div class="cl"></div>
+      <%= render :partial => 'layouts/footer' %>
+      <div class="cl"></div>
 		<%= call_hook :view_layouts_base_body_bottom %>
 	</div>
 </body>

app/views/layouts/base_projects.html.erb

@@ -12,7 +12,7 @@
   <%= favicon %>
   <%= javascript_heads %>
   <%= heads_for_theme %>
-  <%= stylesheet_link_tag 'public', 'pleft', 'project','jquery/jquery-ui-1.9.2' %>
+  <%= stylesheet_link_tag 'public', 'pleft', 'project','jquery/jquery-ui-1.9.2','header' %>
   <%= javascript_include_tag 'cookie','project', 'header','select_list_move' %>
   <%= call_hook :view_layouts_base_html_head %>
   <!-- page specific tags -->
@@ -22,9 +22,18 @@
 </head>
 <!--add by huang-->
 <body>
+<div class="navContainer mb10">
+  <% if User.current.logged? %>
+      <%= render :partial => 'layouts/logined_header' %>
+  <% else%>
+      <%= render :partial => 'layouts/unlogin_header' %>
+  <% end%>
+</div>
+<div class="cl"></div>
+
 <div id="Container">
 
-  <%= render :partial => 'layouts/new_header'%>
+  <%#= render :partial => 'layouts/new_header'%>
   <div class="cl"></div>
 
   <!--TopBar begin-->
@@ -40,16 +49,16 @@
         <%= link_to l(:field_homepage), home_path %> > <a href="http://<%= Setting.host_name %>"><%=l(:label_project_hosting_platform) %> </a>><%= link_to @project.name, project_path(@project.id) %>
       </p>
     </div>
-    <div class="search fl">
-      <%= form_tag(projects_search_path, :method => :get, :id => "project_search_form", :class => "search_form") do %>
-        <%= text_field_tag 'name', params[:name], :placeholder => "项目名称", :class => "search_text fl", :onkeyup => "regexName('#{l(:label_search_conditions_not_null)}');" %>
-        <a href="#" onclick="submitSerch('<%= l(:label_search_conditions_not_null) %>');" class="search_btn fl f14 c_white" >
-          <%= l(:label_search)%>
-        </a>
-        <div class="cl"></div>
-        <span id="project_name_span" class="fl"></span>
-      <% end %>
-    </div>
+    <!--<div class="search fl">-->
+      <!--<%#= form_tag(projects_search_path, :method => :get, :id => "project_search_form", :class => "search_form") do %>-->
+        <!--<%#= text_field_tag 'name', params[:name], :placeholder => "项目名称", :class => "search_text fl", :onkeyup => "regexName('#{l(:label_search_conditions_not_null)}');" %>-->
+        <!--<a href="#" onclick="submitSerch('<%#= l(:label_search_conditions_not_null) %>');" class="search_btn fl f14 c_white" >-->
+          <!--<%#= l(:label_search)%>-->
+        <!--</a>-->
+        <!--<div class="cl"></div>-->
+        <!--<span id="project_name_span" class="fl"></span>-->
+      <!--<%# end %>-->
+    <!--</div>-->
   </div><!--TopBar end-->
 
   <div id="content">
@@ -172,10 +181,13 @@
     <div style="clear:both;"></div>
   </div>
   <div style="clear:both;"></div>
+</div><!--Container end-->
+
 <div class="cl"></div>
-  <%= render :partial => 'layouts/new_footer'%>
+<%= render :partial => 'layouts/footer' %>
 <div class="cl"></div>
-</div><!--Container end-->
+
+
 <div id="light" class="white_content02">
   <!-- 这里写需弹出框的HTML代码 -->
   <% text = @project.project_new_type == 1 ? "development_group" : (@project.project_new_type == 2 ? "research_group" : "friend_organization")%>

app/views/layouts/course_base.html.erb

@@ -21,19 +21,29 @@
   <%= call_hook :view_layouts_base_html_head %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
+  <%= stylesheet_link_tag 'base','header', :media => 'all'%>
 </head>
 <body class="<%=h body_css_classes %>">
+<div class="cl"></div>
+<div class="navContainer mb10">
+  <% if User.current.logged? %>
+      <%= render :partial => 'layouts/logined_header' ,:locals=>{:name=>@name,:type=>@type}%>
+  <% else%>
+      <%= render :partial => 'layouts/unlogin_header' ,:locals=>{:name=>@name,:type=>@type}%>
+  <% end%>
+</div>
+<div class="cl"></div>
 <div id="wrapper">
   <div id="wrapper2">
     <div id="wrapper3">
-      <%=render :partial => 'layouts/base_header'%>
+      <%#=render :partial => 'layouts/base_header'%>
       <div id="main" class="nosidebar">
         <div id="content_">
           <%= render_flash_messages %>
           <%= yield %>
           <%= call_hook :view_layouts_base_content %>
-          <div style="clear:both;"></div>
-          <%=render :partial => 'layouts/base_footer'%>
+          <!--<div style="clear:both;"></div>-->
+          <!--<%#=render :partial => 'layouts/base_footer'%>-->
         </div>
 
       </div>
@@ -45,6 +55,10 @@
 
   </div>
 </div>
+<div class="cl"></div>
+<%= render :partial => 'layouts/footer' %>
+<div class="cl"></div>
+
 <%= call_hook :view_layouts_base_body_bottom %>
 </body>
 </html>

app/views/layouts/login.html.erb

@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta charset="utf-8" />
+  <title><%= h html_title %></title>
+  <meta name="description" content="<%= Redmine::Info.app_name %>" />
+  <meta name="keywords" content="issue,bug,tracker" />
+  <%= csrf_meta_tag %>
+  <%= favicon %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'new_user', 'user_leftside', :media => 'all' %>
+  <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
+  <%= javascript_heads %>
+  <%= javascript_include_tag "bootstrap","avatars","new_user"%>
+  <%= heads_for_theme %>
+  <%= call_hook :view_layouts_base_html_head %>
+  <%= yield :header_tags -%>
+</head>
+
+<div class="navContainer">
+    <% is_current_user = User.current.logged? && User.current == @user%>
+    <% if User.current.logged? %>
+        <%= render :partial => 'layouts/logined_header' %>
+    <% else%>
+        <%= render :partial => 'layouts/unlogin_header' %>
+    <% end%>
+</div>
+
+<%= yield %>

app/views/layouts/new_base.html.erb

@@ -13,15 +13,25 @@
   <%= javascript_heads %>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
-  <%= stylesheet_link_tag 'public', 'leftside', 'courses'%>
+  <%= stylesheet_link_tag 'public', 'leftside', 'courses','header'%>
   <%= javascript_include_tag "course","header" %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
 </head>
 <!--add by huang-->
 <body>
+
+<div class="navContainer mb10">
+  <% if User.current.logged? %>
+      <%= render :partial => 'layouts/logined_header' %>
+  <% else%>
+      <%= render :partial => 'layouts/unlogin_header' %>
+  <% end%>
+</div>
+<div class="cl"></div>
+
 <div id="Container">
-  <%= render :partial => 'layouts/new_header' %>
+  <%#= render :partial => 'layouts/new_header' %>
   <div class="cl"></div>
 
   <div id="content02" >
@@ -31,9 +41,12 @@
   </div><!--Content end-->
   <div class="cl"></div>
 
-  <%= render :partial => 'layouts/new_footer' %>
+  <%#= render :partial => 'layouts/new_footer' %>
   <div class="cl"></div>
 </div><!--Container end-->
+<div class="cl"></div>
+<%= render :partial => 'layouts/footer' %>
+<div class="cl"></div>
 <%= render :partial => 'layouts/new_feedback' %>
 <div id="ajax-indicator" style="display:none;">
   <span><%= l(:label_loading) %></span>

app/views/layouts/new_base_user.html.erb

@@ -0,0 +1,199 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta charset="utf-8" />
+  <title><%= h html_title %></title>
+  <meta name="description" content="<%= Redmine::Info.app_name %>" />
+  <meta name="keywords" content="issue,bug,tracker" />
+  <%= csrf_meta_tag %>
+  <%= favicon %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'new_user', 'user_leftside','users',:media => 'all' %>
+  <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
+  <%= javascript_heads %>
+  <%= javascript_include_tag "bootstrap","avatars","new_user"%>
+  <%= heads_for_theme %>
+  <%= call_hook :view_layouts_base_html_head %>
+  <%= yield :header_tags -%>
+</head>
+
+<body>
+<div class="navContainer">
+  <% is_current_user = User.current.logged? && User.current == @user%>
+  <% if User.current.logged? %>
+      <%= render :partial => 'layouts/logined_header' %>
+  <% else%>
+      <%= render :partial => 'layouts/unlogin_header' %>
+  <% end%>
+</div>
+
+<div class="homepageContentContainer">
+  <div class="homepageContent">
+    <div class="homepageLeft" id="LSide">
+      <div class="homepagePortraitContainer">
+        <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 is_current_user%>
+              <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 id="watch_user_btn" class="none">
+                <%= render :partial => 'layouts/user_watch_btn', :locals => {:target => @user} %>
+              </div>
+            <% end %>
+          <% end%>
+        </div>
+        <div>
+          <div class="homepageImageName hidden db">
+            <%= @user.login %>
+          </div>
+          <% if (@user.user_extensions && (@user.user_extensions.identity != 2) ) %>
+              <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">
+            <p id="user_brief_introduction_show">
+              <%= render :partial => 'layouts/user_brief_introduction', :locals => {:user => @user} %>
+            </p>
+          </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">
+            <div id="watch_user_number_div">
+              <%= link_to User.watched_by(@user.id).count.to_s, {:controller=>"users", :action=>"user_watchlist",:id=>@user.id},:class=>"homepageImageNumber" %>
+            </div>
+            <div class="homepageImageText">关注</div>
+          </div>
+          <div class="homepageVerDiv"></div>
+          <div class="homepageImageBlock">
+            <div id="fans_user_number_div">
+              <%= link_to @user.watcher_users.count.to_s, {:controller=>"users", :action=>"user_fanslist",:id=>@user.id},:class=>"homepageImageNumber", :id => "user_fans_number"%>
+            </div>
+            <div class="homepageImageText">粉丝</div>
+          </div>
+          <div class="homepageVerDiv"></div>
+          <div class="homepageImageBlock">
+            <div>
+              <%= link_to(format("%.2f" ,get_option_number(@user,1).total_score ).to_i,
+                          {:controller => 'users', :action => 'show_new_score', :remote => true, :id => @user.id }, :class => 'homepageImageNumber',:id => 'user_score') %>
+            </div>
+            <div class="homepageImageText">积分</div>
+          </div>
+          <div class="cl"></div>
+        </div>
+      </div>
+      <div class="homepageLeftMenuContainer">
+        <div class="homepageLeftMenuBlock">
+          <%= link_to "动态",user_activities_path(@user.id),:class => "homepageMenuText"%>
+        </div>
+        <div class="homepageLeftMenuBlock">
+          <a href="javascript:void(0);" class="homepageMenuText">课程</a>
+          <% if is_current_user%>
+              <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
+                  <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting"), new_course_path%>
+              <% else%>
+                  <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting"), join_private_courses_courses_path ,:remote => true%>
+              <% end%>
+          <% end%>
+        </div>
+        <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)%>
+            <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => @user, :page => 0} %>
+          </ul>
+        </div>
+        <div class="homepageLeftMenuBlock">
+          <a href="javascript:void(0);" class="homepageMenuText">项目</a>
+
+          <% if is_current_user%>
+              <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting"), new_project_path%>
+          <% end%>
+        </div>
+        <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)%>
+            <%= render :partial => 'layouts/user_projects', :locals => {:projects => projects,:user => @user, :page => 0} %>
+          </ul>
+        </div>
+        <div class="homepageLeftMenuBlock">
+          <!--<a href="javascript:void(0);" class="homepageMenuText">留言</a>-->
+          <%= link_to '留言',feedback_path(@user),:class=>'homepageMenuText'%>
+        </div>
+      </div>
+      <div class="homepageLeftLabelContainer">
+        <div class="project_Label_New">
+          <span class="homepageLabelText">标签</span>
+          <div class="tag_h ml10" >
+            <%= render :partial => 'tags/user_tag', :locals => {:obj => @user,:object_flag => "1"}%>
+          </div>
+          <div class="cl"></div>
+        </div>
+      </div>
+    </div>
+    <div class="homepageRight" id="RSide">
+      <%= yield %>
+    </div>
+  </div>
+  <%= render :partial => 'layouts/new_feedback' %>
+</div>
+<div class="cl"></div>
+<%= render :partial => 'layouts/footer' %>
+<div class="cl"></div>
+
+<div id="ajax-modal" style="display:none;"></div>
+<div id="ajax-indicator" style="display:none;">
+  <span><%= l(:label_loading) %></span>
+</div>
+<div id="nh_tx_dialog_html" class="white_content" style="display:none;">
+  <div>
+    <div><a href="javascript:hideModal();" class="box_close"></a></div>
+    <div class="cl"></div>
+    <div class="pro_new">
+      <h3 class="box_h3 mb10">头像设置</h3>
+      <div class="uppicBox">
+        <%= file_field_tag 'avatar[image]',
+                           :id => nil,
+                           :class => 'uppic_btn',
+                           :style => 'width:70px;',#added by young
+                           :size => "1",
+                           :multiple => false,
+                           :onchange => 'addInputAvatar(this);',
+                           :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,
+                                   :file_type => Redmine::Configuration['pic_types'].to_s,
+                                   :type_support_message => l(:error_pic_type),
+                                   :upload_path => upload_avatar_path(:format => 'js'),
+                                   :description_placeholder => nil ,# l(:label_optional_description)
+                                   :source_type => @user.class.to_s,
+                                   :source_id => @user.id.to_s
+                           } %>
+        <!--<br/>-->
+        <!--<span>只支持jpg,png,gif,大小不超过5M</span>-->
+      </div>
+      <div class="showpicBox">
+        <p>预览</p>
+        <%= image_tag(url_to_avatar(@user), :style=>"width:96px;height:96px;",:class=>"mb5 mt10",:nhname=>'avatar_image') %>
+        <span >96px*96px</span> <br />
+        <div class="mb20"></div>
+        <%= image_tag(url_to_avatar(@user), :style=>"width:48px;height:48px;",:class=>"mb5",:nhname=>'avatar_image') %>
+        <br />
+        <span>48px*48px</span> <br />
+      </div>
+      <div class="cl mb10"></div>
+      <a href="javascript:hideModal();" class=" fr grey_btn mr15"> 取&nbsp;&nbsp;消</a>
+      <a href="<%= url_for(:controller => 'my', :action => 'save_user_avatar') %>" data-remote="true" class="blue_btn fr mr10">确&nbsp;&nbsp;定</a>
+    </div><!--talknew end-->
+    <div class="cl"></div>
+  </div><!--floatbox end-->
+</div>
+</body>
+</html>

app/views/layouts/static_base.html.erb

@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html lang="<%= current_language %>">
+<head>
+  <meta charset="utf-8" />
+  <title><%=h html_title %></title>
+  <meta name="description" content="<%= Redmine::Info.app_name %>" />
+  <meta name="keywords" content="issue,bug,tracker" />
+  <%= csrf_meta_tag %>
+  <%= favicon %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
+  <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
+  <%= javascript_heads %>
+  <%= javascript_include_tag "jquery.leanModal.min" %>
+  <%= javascript_include_tag 'seems_rateable/jRating', 'seems_rateable/rateable'%>
+  <%= heads_for_theme %>
+  <%= call_hook :view_layouts_base_html_head %>
+  <!-- page specific tags -->
+  <%= yield :header_tags -%>
+  <%= stylesheet_link_tag 'base','header', :media => 'all'%>
+</head>
+<body>
+<div class="cl"></div>
+<div class="navContainer mb10">
+  <% if User.current.logged? %>
+      <%= render :partial => 'layouts/logined_header',:locals=>{:name=>@name,:type=>@type} %>
+  <% else%>
+      <%= render :partial => 'layouts/unlogin_header',:locals=>{:name=>@name,:type=>@type} %>
+  <% end%>
+</div>
+<div class="cl"></div>
+<div>
+          <%= yield %>
+  <div style="clear:both;"></div>
+</div>
+<div class="cl"></div>
+<%= render :partial => 'layouts/footer' %>
+<div class="cl"></div>
+
+<%= call_hook :view_layouts_base_body_bottom %>
+</body>
+</html>

app/views/layouts/users_base.html.erb

@@ -1,8 +1,3 @@
-<% @nav_dispaly_home_path_label = 1
-   @nav_dispaly_user_label = 1
-   @nav_dispaly_store_all_label = 1
- %>
-<% @nav_dispaly_forum_label = 1%>
 <!DOCTYPE html>
 <html lang="<%= current_language %>">
 <head>
@@ -21,19 +16,29 @@
   <%= call_hook :view_layouts_base_html_head %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
+  <%= stylesheet_link_tag 'base','header', :media => 'all'%>
 </head>
-<body class="<%=h body_css_classes %>">
+<body>
+<div class="cl"></div>
+<div class="navContainer mb10">
+  <% if User.current.logged? %>
+      <%= render :partial => 'layouts/logined_header',:locals=>{:name=>@name,:type=>@type} %>
+  <% else%>
+      <%= render :partial => 'layouts/unlogin_header',:locals=>{:name=>@name,:type=>@type} %>
+  <% end%>
+</div>
+<div class="cl"></div>
+
 <div id="wrapper">
   <div id="wrapper2">
     <div id="wrapper3">
-      <%=render :partial => 'layouts/base_header'%>
+      <%#=render :partial => 'layouts/base_header'%>
       <div id="main" class="nosidebar">
         <div id="content_">
           <%= render_flash_messages %>
           <%= yield %>
           <%= call_hook :view_layouts_base_content %>
           <div style="clear:both;"></div>
-          <%=render :partial => 'layouts/base_footer'%>
         </div>
 
       </div>
@@ -45,6 +50,11 @@
 
   </div>
 </div>
+
+<div class="cl"></div>
+<%= render :partial => 'layouts/footer' %>
+<div class="cl"></div>
+
 <%= call_hook :view_layouts_base_body_bottom %>
 </body>
 </html>

app/views/memos/_topic_form.html.erb

@@ -7,10 +7,11 @@
     <!--<script type="text/javascript">var ckeditor=CKEDITOR.replace('editor01');</script> -->
     <div class="cl"></div>
 
-    <label class="fl" style="margin-left: -80px;margin-top: 10px;"><%= l(:label_attachment_plural) %></label>
-    <div style="margin-left: 110px;margin-top: 10px;margin-bottom: 10px;" class="fl">
+    <label class="fl" style="margin-left: -80px;margin-top: 5px;"><%= l(:label_attachment_plural) %></label>
+    <div style="margin-left: 10px;" class="fl">
       <%= render :partial => 'attachments/form', :locals => {:container => @memo} %>
     </div>
+    <div class="cl"></div>
    <%= f.submit :value => l(:label_memo_create), :style => "margin-left: 100px;"%> <%= link_to l(:button_back), forum_path(@forum) %>
   </div>
 <% end %>

app/views/my/account.html.erb

@@ -1,9 +1,4 @@
-<style>
-  div.content{padding-top:10px;}
-  .pcontent>.school_list,.content>.school_list { padding-left: 5px;}
-</style>
-
-<div id="RSide" class="fl">
+<div class="fl">
   <div id="users_setting">
     <div id="users_tb_" class="users_tb_">
       <ul>
@@ -30,7 +25,7 @@
           <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">工作单位&nbsp;:&nbsp;</li>
           <li>地区&nbsp;:&nbsp;</li>
           <li>邮件通知&nbsp;:&nbsp;</li>
-          <li>个人签名&nbsp;:&nbsp;</li>
+          <!--<li>个人签名&nbsp;:&nbsp;</li>-->
           <li>个人简介&nbsp;:&nbsp;</li>
           <li>&nbsp;&nbsp;</li>
         </ul>
@@ -141,7 +136,7 @@
             <%= select_tag( 'user[mail_notification]', options_for_select( user_mail_notification_options(@user), @user.mail_notification) ) %>
             <label>不要发送对我自己提交的修改的通知<%= check_box_tag 'no_self_notified', 1, @user.pref[:no_self_notified],:style=>"height:14px;" %></label>
           </li>
-          <li><input name="brief_introduction" class="w450" type="text" maxlength="255" value="<%= (@user.user_extensions.nil?) ? '' : @user.user_extensions.brief_introduction %>"></li>
+          <!--<li><input name="brief_introduction" class="w450" type="text" maxlength="255" value="<%#= (@user.user_extensions.nil?) ? '' : @user.user_extensions.brief_introduction %>"></li>-->
           <li style="height:auto;"><textarea name="description" class="w450 h200" maxlength="255" style="resize:none;"><%= (@user.user_extensions.nil?) ? '' : @user.user_extensions.description %></textarea></li>
           <li style="display:none;"><%= f.select :language, :Chinese => :zh, :English => :en %></li>
           <li class="ml2">

app/views/my/save_user_avatar.js.erb

@@ -1,2 +1,3 @@
 $("#nh_user_tx").replaceWith('<%= image_tag(url_to_avatar(@user), :id=>'nh_user_tx',:style=>"width:214px;height:214px;overflow:hidden",:alt=>"头像") %>');
+$("#nh_user_logo").replaceWith('<%= image_tag(url_to_avatar(@user), :id=>'nh_user_logo',:width =>"40",:height => "40",:alt=>"头像") %>');
 hideModal();

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/_course_attachment.html.erb

@@ -0,0 +1,39 @@
+<div class="resources mt15">
+  <div class="homepagePostBrief" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
+    <div class="homepagePostPortrait">
+     <!-- <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a>-->
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
+    </div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo">
+        <% if activity.try(:author).try(:realname) == ' ' %>
+            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% else %>
+            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% end %>
+         TO
+        <%= link_to activity.course.name.to_s+"(课程名称)", course_path(activity.container_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
+        <!--<a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a>-->
+      </div>
+      <div class="homepagePostTitle">
+        <a href="javascript:void(0);" class="postGrey"><%=activity.filename.to_s(附件名称)%></a>
+      </div>
+      <div class="homepagePostSubmitContainer">
+        <div class="homepagePostDeadline">时间：<%= format_date(activity.created_on) %></div>
+      </div>
+      <div class="homepagePostIntro">（附件描述）<%=activity.description.to_s%></div>
+      <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <ul class="homepagePostSettiongText">
+              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div>

app/views/users/_course_create.html.erb

@@ -0,0 +1,29 @@
+<div class="resources mt15">
+  <div class="homepagePostBrief" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
+    <div class="homepagePostPortrait">
+      <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a></div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
+        <a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a></div>
+      <div class="homepagePostTitle">
+        <a href="javascript:void(0);" class="postGrey">ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（课程创建）</a></div>
+      <div class="homepagePostSubmitContainer">
+        <div class="homepagePostSubmit"><a href="javascript:void(0);" class="c_blue">提交（10）</a></div>
+        <div class="homepagePostDeadline">截止时间：2015-08-20</div>
+      </div>
+      <div class="homepagePostIntro">（作业描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；</div>
+      <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <ul class="homepagePostSettiongText">
+              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div>

app/views/users/_course_homework.html.erb

@@ -0,0 +1,39 @@
+<div class="resources mt15">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait">
+      <%= link_to image_tag(url_to_avatar(activity.user), :width => "90", :height => "90"), user_path(activity.user_id), :alt => "用户头像" %>
+    </div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo" style="word-break:break-all;">
+        <% if activity.try(:user).try(:realname) == ' ' %>
+            <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %>
+        <% else %>
+            <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id), :class => "newsBlue mr15" %>
+        <% end %> TO
+        <%= link_to activity.course.name.to_s+"(课程名称)", course_path(activity.course_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
+      </div>
+      <div class="homepagePostTitle" style="word-break:break-all;">
+        <%= link_to activity.name.to_s+"(作业名称)", student_work_index_path(:homework => activity.id), :class => "postGrey", :style=>"word-break:break-all" %>
+      </div>
+      <div class="homepagePostSubmitContainer">
+        <div class="homepagePostSubmit">
+          <%= link_to "提交("+activity.student_works.count.to_s+")", student_work_index_path(:homework => activity.id), :class=> "c_blue" %>
+        </div>
+        <div class="homepagePostDeadline">截止时间：<%= format_date(activity.end_time) %></div>
+      </div>
+      <div class="homepagePostIntro" style="word-break:break-all">（作业描述）<%= activity.description.html_safe %></div>
+      <div class="homepagePostSetting" style="visibility: hidden"  id="act-<%=user_activity.id %>">
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <ul class="homepagePostSettiongText">
+              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div>

app/views/users/_course_journalsformessage.html.erb

@@ -0,0 +1,29 @@
+<div class="resources mt15">
+  <div class="homepagePostBrief" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
+    <div class="homepagePostPortrait">
+      <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a></div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
+        <a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a></div>
+      <div class="homepagePostTitle">
+        <a href="javascript:void(0);" class="postGrey">ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（留言）</a></div>
+      <div class="homepagePostSubmitContainer">
+        <div class="homepagePostSubmit"><a href="javascript:void(0);" class="c_blue">提交（10）</a></div>
+        <div class="homepagePostDeadline">截止时间：2015-08-20</div>
+      </div>
+      <div class="homepagePostIntro">（作业描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；</div>
+      <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <ul class="homepagePostSettiongText">
+              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div>

app/views/users/_course_message.html.erb

@@ -0,0 +1,102 @@
+    <div class="resources mt15">
+      <div class="homepagePostBrief"> <!--  onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')"-->
+        <div class="homepagePostPortrait">
+          <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
+        </div>
+        <div class="homepagePostDes">
+          <div class="homepagePostTo" style="word-break:break-all;">
+            <% if activity.try(:author).try(:realname) == ' ' %>
+                <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+            <% else %>
+                <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+            <% end %>
+            TO
+            <%= link_to activity.course.name.to_s+"(课程讨论区)", course_path(activity.course), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%>
+          </div>
+          <div class="homepagePostTitle" style="word-break:break-all;">
+            <% if activity.parent_id.nil? %>
+              <%= link_to activity.subject.to_s.html_safe+"(帖子标题)", course_boards_path(activity.course,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all" %>
+            <% else %>
+                <%= link_to activity.parent.subject.to_s.html_safe+"(帖子标题)", course_boards_path(activity.course,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all"%>
+            <% end %>
+          </div>
+          <div class="homepagePostSubmitContainer">
+            <div class="homepagePostDeadline">时间：<%= format_date(activity.created_on) %></div>
+          </div>
+          <div class="homepagePostIntro" style="word-break:break-all">（描述）
+          <% if activity.parent_id.nil? %>
+              <%= activity.content.to_s.html_safe%>
+          <% else %>
+              <%= activity.parent.content.to_s.html_safe%>
+          <% end %>
+          </div>
+          <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
+                  <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
+                  <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
+                </ul>
+              </li>
+            </ul>
+          </div>
+        </div>
+        <div class="cl"></div>
+      </div>
+      <!--<div class="homepagePostReply">
+        <div class="homepagePostReplyBanner">
+          <div class="homepagePostReplyBannerCount">回复（
+             <%# if activity.parent_id.nil? %>
+                <%#=activity.replies_count %>
+            <%# else %>
+                <%#=activity.parent.replies_count %>
+            <%# end %>
+            ）</div>
+          <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
+          <div class="homepagePostReplyBannerMore"><a href="javascript:void(0);" class="replyGrey">点击展开更多回复</a>
+          </div>
+        </div>
+        <div class="homepagePostReplyInputContainer">
+          <textarea class="homepagePostReplyInput" placeholder="请输入回复"></textarea>
+        </div>
+        <div class="homepagePostReplyInputContainer">
+          <div class="homepagePostReplyEmotion"><a href="javascript:void(0);" class="replyGrey">表情</a></div>
+          <div class="homepagePostReplyCancel"><a href="javascript:void(0);" class="postReplyCancel">取消</a>
+          </div>
+          <div class="homepagePostReplySubmit"><a href="javascript:void(0);" class="postReplySubmit">发送</a>
+          </div>
+          <div class="cl"></div>
+        </div>
+        <%# activity= activity.parent_id.nil? ? activity:activity.parent%>
+        <%# activity.children.reorder("created_on desc").each do |reply| unless activity.children.nil?%>
+        <div class="homepagePostReplyContainer">
+          <div class="homepagePostReplyPortrait">
+            <%#= link_to image_tag(url_to_avatar(reply.author), :width => "45", :height => "45"), user_path(reply.author_id), :alt => "用户头像" %>
+          </div>
+          <div class="homepagePostReplyDes">
+            <div class="homepagePostReplyPublisher">
+              <%# if reply.try(:author).try(:realname) == ' ' %>
+                  <%#= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
+              <%# else %>
+                  <%#= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
+              <%# end %>
+              <%#=format_date(reply.created_on)%>
+              <%#= link_to(
+                          l(:button_delete),
+                          {:controller => 'messages', :action => 'destroy',  :id => reply.id, :board_id => reply.board_id, :is_board => 'false'},
+                          :method => :post,
+                          :data => {:confirm => l(:text_are_you_sure)},
+                          :title => l(:button_delete),
+                          :class => 'replyGrey fr ml10'
+                  ) if reply.course_destroyable_by?(User.current) %>
+              &lt;!&ndash;<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>&ndash;&gt;
+            </div>
+            <div class="homepagePostReplyContent" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="<%#= reply.content.html_safe %>"><%#= reply.content.html_safe %></div>
+          </div>
+          <div class="cl"></div>
+        </div>
+        <%# end %>
+        <%# end %>
+      </div>-->
+    </div>

app/views/users/_course_news.html.erb

@@ -0,0 +1,81 @@
+<div class="resources mt15">
+  <div class="homepagePostBrief" >
+    <div class="homepagePostPortrait">
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
+    </div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo" style="word-break:break-all;">
+        <% if @ctivity.try(:author).try(:realname) == ' ' %>
+            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% else %>
+            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% end %> TO
+        <%= link_to activity.course.name.to_s+"(课程名称)", course_path(activity.course), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
+      </div>
+      <div class="homepagePostTitle" style="word-break:break-all;">
+        <%=link_to activity.title.to_s+"(通知标题)", news_path(activity), :class=> "postGrey", :style=>"word-break:break-all" %>
+      </div>
+      <div class="homepagePostSubmitContainer">
+        <div class="homepagePostDeadline">发布时间：<%= format_date(activity.created_on) %></div>
+      </div>
+      <div class="homepagePostIntro" style="word-break:break-all">（通知描述）<%= activity.description.html_safe %></div>
+      <div class="homepagePostSetting"  id="act-<%=user_activity.id %>" style="visibility: hidden">
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <ul class="homepagePostSettiongText">
+              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <!--<div class="homepagePostReply">
+    <div class="homepagePostReplyBanner">
+      <div class="homepagePostReplyBannerCount">回复（<%#=activity.comments_count %>）</div>
+      <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
+      <div class="homepagePostReplyBannerMore"><a href="javascript:void(0);" class="replyGrey">点击展开更多回复</a>
+      </div>
+    </div>
+    <%#= render :partial => 'course_news_reply',:locals => { :contest => @contest, :journals => @jour, :state => false}%>
+
+  <div class="homepagePostReplyInputContainer">
+    <%#= form_tag({:controller => 'comments', :action => 'create', :id => activity}, :id => "add_reply_form") do %>
+        <textarea id="new_reply" class="homepagePostReplyInput" placeholder="请输入回复"></textarea>
+        <div class="homepagePostReplyCancel">
+          <a href="javascript:void(0);" class="postReplyCancel" onclick="$('#new_reply').value('');">取消</a>
+        </div>
+        <div class="homepagePostReplySubmit">
+          <a href="javascript:void(0);" class="postReplySubmit" onclick="$('#add_reply_form').submit();">发送</a>
+        </div>
+        <div class="cl"></div>
+    <%# end %>
+  </div>
+    <%# activity.comments.reorder("created_on desc").each do |comment| unless activity.comments.nil?%>
+            <div class="homepagePostReplyContainer">
+              <div class="homepagePostReplyPortrait">
+                <%#= link_to image_tag(url_to_avatar(comment.author), :width => "45", :height => "45"), user_path(comment.author_id), :alt => "用户头像" %>
+              </div>
+              <div class="homepagePostReplyDes">
+                <div class="homepagePostReplyPublisher">
+                  <%# if comment.try(:author).try(:realname) == ' ' %>
+                      <%#= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
+                  <%# else %>
+                      <%#= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
+                  <%# end %>
+                  <%#=format_date(comment.created_on)%>
+                  <%#= link_to_if_authorized_course l(:button_delete), {:controller => 'comments', :action => 'destroy', :id => activity, :comment_id => comment},
+                                                  :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %>
+                  &lt;!&ndash;<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>&ndash;&gt;
+                </div>
+                <div class="homepagePostReplyContent" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="<%#= comment.comments.html_safe %>"><%#= comment.comments.html_safe %></div>
+              </div>
+              <div class="cl"></div>
+            </div>
+    <%# end %>
+    <%# end %>
+  </div>-->
+</div>

app/views/users/_course_news_reply.html.erb

@@ -0,0 +1,177 @@
+
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+
+<% if @news.commentable? %>
+    <div class="msg_box fl">
+      <h4><%= l(:label_comment_add) %></h4>
+      <%= form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form") do %>
+          <div class="box"  id="news_comment">
+            <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+            <%= kindeditor_tag :comment, '',:height=>'100',:editor_id =>'comment_editor', :placeholder=>"最多250个字"%>
+          </div>
+          <p class="mt10">
+            <a href="javascript:void(0)" class="grey_btn fr ml10" onclick="KindEditor.instances[0].html('');">
+              <%= l(:label_cancel_with_space) %>
+            </a>
+            <a href="javascript:void(0)" class="blue_btn fr" onclick="submitComment();">
+              <%= l(:label_comment_with_space) %>
+            </a>
+          </p>
+      <% end %>
+    </div>
+<% end %>
+
+<div class="homepagePostReplyInputContainer" id='leave-message' nhname="new_message">
+
+  <%= form_for('new_form', :method => :post,
+               :url => {:controller => 'words', :action => 'leave_course_message'},:html => {:id=>'leave_message_form'}) do |f|%>
+      <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+      <textarea class="homepagePostReplyInput" nhname="new_message_textarea" name="new_form[course_message]" placeholder="请输入回复"></textarea>
+      <p nhname="contentmsg"></p>
+  <% end %>
+  <div class="cl"></div>
+  <div>
+    <div class="fl" style="padding-top:5px;" nhname="toolbar_container"></div>
+    <a href="javascript:void(0)" class="grey_btn fr ml10 mt10" nhname="cancel_btn">取&nbsp;&nbsp;消</a>
+    <a href="javascript:void(0)"  onclick='$("#leave_message_form").submit();' class="blue_btn fr mt10">
+      发送
+    </a>
+  </div>
+</div>
+
+<div class="cl"></div>
+
+<script type="text/javascript">
+    $(function(){
+
+        function init_editor(params){
+            var editor = params.kindutil.create(params.textarea, {
+                resizeType : 1,minWidth:"1px",width:"100%",height:"45px",
+                items:['emoticons'],
+                afterChange:function(){//按键事件
+                    nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
+                },
+                afterCreate:function(){
+                    var toolbar = $("div[class='ke-toolbar']",params.div_form);
+                    $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
+                    params.toolbar_container.append(toolbar);
+                }
+            }).loadPlugin('paste');
+            return editor;
+        }
+
+        function nh_check_field(params){
+            var result=true;
+            if(params.content!=undefined){
+                if(params.content.isEmpty()){
+                    result=false;
+                }
+                if(params.content.html()!=params.textarea.html() || params.issubmit==true){
+                    params.textarea.html(params.content.html());
+                    params.content.sync();
+                    if(params.content.isEmpty()){
+                        params.contentmsg.html('内容不能为空');
+                        params.contentmsg.css({color:'#ff0000'});
+                    }else{
+                        params.contentmsg.html('填写正确');
+                        params.contentmsg.css({color:'#008000'});
+                    }
+                    params.contentmsg.show();
+                }
+            }
+            return result;
+        }
+        function init_form(params){
+            params.form.submit(function(){
+                var flag = false;
+                if(params.form.attr('data-remote') != undefined ){
+                    flag = true
+                }
+                var is_checked = nh_check_field({
+                    issubmit:true,
+                    content:params.editor,
+                    contentmsg:params.contentmsg,
+                    textarea:params.textarea
+                });
+                if(is_checked){
+                    if(flag){
+                        return true;
+                    }else{
+                        $(this)[0].submit();
+                        return false;
+                    }
+                }
+                return false;
+            });
+        }
+        function nh_reset_form(params){
+            params.form[0].reset();
+            params.textarea.empty();
+            if(params.editor != undefined){
+                params.editor.html(params.textarea.html());
+            }
+            params.contentmsg.hide();
+        }
+
+        KindEditor.ready(function(K){
+            $("a[nhname='reply_btn']").live('click',function(){
+                var params = {};
+                params.kindutil = K;
+                params.container = $(this).parent('div').parent('div');
+                params.div_form = $(">.respond-form",params.container);
+                params.form = $("form",params.div_form);
+                params.textarea = $("textarea[name='user_notes']",params.div_form);
+                params.contentmsg = $("p[nhname='contentmsg']",params.div_form);
+                params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form);
+                params.cancel_btn = $("input[nhname='cancel_btn']",params.div_form);
+                if(params.textarea.data('init') == undefined){
+                    params.editor = init_editor(params);
+                    init_form(params);
+                    params.cancel_btn.click(function(){
+                        nh_reset_form(params);
+                    });
+                }
+                params.cancel_btn.click();
+                toggleAndSettingWordsVal(params.div_form, params.textarea);
+                setTimeout(function(){
+                    if(!params.div_form.is(':hidden')){
+                        params.textarea.show();
+                        params.textarea.focus();
+                        params.textarea.hide();
+                    }
+                },300);
+                params.textarea.data('init',1);
+            });
+
+            $("div[nhname='new_message']").each(function(){
+                var params = {};
+                params.kindutil = K;
+                params.div_form = $(this);
+                params.form = $("form",params.div_form);
+                if(params.form==undefined || params.form.length==0){
+                    return;
+                }
+                params.textarea = $("textarea[nhname='new_message_textarea']",params.div_form);
+                params.contentmsg = $("p[nhname='contentmsg']",params.div_form);
+                params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form);
+                if(params.textarea.data('init') == undefined){
+                    params.editor = init_editor(params);
+                    init_form(params);
+                    $("a[nhname='cancel_btn']",params.div_form).click(function(){
+                        nh_reset_form(params);
+                    });
+                    params.textarea.data('init',1);
+                }
+            });
+        });
+    });
+</script>
+
+
+<!--
+<textarea class="homepagePostReplyInput" placeholder="请输入回复"></textarea>
+<div class="homepagePostReplyEmotion"><a href="javascript:void(0);" class="replyGrey">表情</a></div>
+<div class="homepagePostReplyCancel"><a href="javascript:void(0);" class="postReplyCancel">取消</a>
+</div>
+<div class="homepagePostReplySubmit"><a href="javascript:void(0);" class="postReplySubmit">发送</a>
+</div>-->

app/views/users/_course_poll.html.erb

@@ -0,0 +1,46 @@
+<%# has_commit = has_commit_poll?(activity.id ,User.current)%>
+<% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
+<div class="resources mt15">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait">
+      <!-- <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a>-->
+      <%= link_to image_tag(url_to_avatar(activity.user), :width => "90", :height => "90"), user_path(activity.user_id), :alt => "用户头像" %>
+    </div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo" style="word-break:break-all;">
+        <% if activity.try(:user).try(:realname) == ' ' %>
+            <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %>
+        <% else %>
+            <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id), :class => "newsBlue mr15" %>
+        <% end %>
+        TO
+        <%= link_to Course.find(activity.polls_group_id).name.to_s+"(课程名称)", course_path(activity.polls_group_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
+        <!--<a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a>-->
+      </div>
+      <div class="homepagePostTitle" style="word-break:break-all;">
+        <%#= link_to activity.polls_name.to_s+"(问卷名称)", %>
+        <%# if has_commit %>
+            <%#= link_to poll_name, poll_result_poll_path(activity.id), :class => "polls_title polls_title_w fl c_dblue"%>
+        <%# else %>
+            <%= link_to poll_name+"(问卷名称)", poll_path(activity.id), :class => "postGrey"%>
+        <%# end %>
+      </div>
+      <div class="homepagePostSubmitContainer">
+        <div class="homepagePostDeadline">时间：<%= format_date(activity.created_at) %></div>
+      </div>
+      <div class="homepagePostIntro" style="word-break:break-all;">（问卷描述）<%=activity.polls_description.to_s%></div>
+      <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <ul class="homepagePostSettiongText">
+              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div>

app/views/users/_project_attachment.html.erb

@@ -0,0 +1,29 @@
+<div class="resources mt15">
+  <div class="homepagePostBrief" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
+    <div class="homepagePostPortrait">
+      <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a></div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
+        <a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a></div>
+      <div class="homepagePostTitle">
+        <a href="javascript:void(0);" class="postGrey">ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（项目附件）</a></div>
+      <div class="homepagePostSubmitContainer">
+        <div class="homepagePostSubmit"><a href="javascript:void(0);" class="c_blue">提交（10）</a></div>
+        <div class="homepagePostDeadline">截止时间：2015-08-20</div>
+      </div>
+      <div class="homepagePostIntro">（作业描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；</div>
+      <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <ul class="homepagePostSettiongText">
+              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div>

app/views/users/_project_create.html.erb

@@ -0,0 +1,29 @@
+<div class="resources mt15">
+  <div class="homepagePostBrief" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
+    <div class="homepagePostPortrait">
+      <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a></div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
+        <a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a></div>
+      <div class="homepagePostTitle">
+        <a href="javascript:void(0);" class="postGrey">ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（项目创建）</a></div>
+      <div class="homepagePostSubmitContainer">
+        <div class="homepagePostSubmit"><a href="javascript:void(0);" class="c_blue">提交（10）</a></div>
+        <div class="homepagePostDeadline">截止时间：2015-08-20</div>
+      </div>
+      <div class="homepagePostIntro">（作业描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；</div>
+      <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <ul class="homepagePostSettiongText">
+              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div>

app/views/users/_project_document.html.erb

@@ -0,0 +1,29 @@
+<div class="resources mt15">
+  <div class="homepagePostBrief" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
+    <div class="homepagePostPortrait">
+      <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a></div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
+        <a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a></div>
+      <div class="homepagePostTitle">
+        <a href="javascript:void(0);" class="postGrey">ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（文档名称）</a></div>
+      <div class="homepagePostSubmitContainer">
+        <div class="homepagePostSubmit"><a href="javascript:void(0);" class="c_blue">提交（10）</a></div>
+        <div class="homepagePostDeadline">截止时间：2015-08-20</div>
+      </div>
+      <div class="homepagePostIntro">（作业描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；</div>
+      <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <ul class="homepagePostSettiongText">
+              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div>

app/views/users/_project_issue.html.erb

@@ -0,0 +1,120 @@
+<div class="resources mt15">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait">
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
+    </div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo"  style="word-break:break-all;">
+        <% if activity.try(:author).try(:realname) == ' ' %>
+            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% else %>
+            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% end %>  TO
+        <%= link_to activity.project.name.to_s+"(项目名称)", project_path(activity.project), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
+        </div>
+      <div class="homepagePostTitle" style="word-break:break-all;">
+        <%= link_to activity.subject.to_s+"(缺陷标题)", issue_path(activity), :class => "postGrey", :style=>"word-break:break-all" %>
+        <span class="homepagePostProjectState"><%=activity.status.name %></span>
+      </div>
+      <div class="homepagePostSubmitContainer">
+        <div class="homepagePostAssignTo">指派给&nbsp;&nbsp;
+          <% unless activity.assigned_to_id.nil? %>
+            <% if activity.try(:assigned_to).try(:realname) == ' ' %>
+              <%= link_to activity.try(:assigned_to), user_path(activity.assigned_to_id), :class => "newsBlue mr15" %>
+            <% else %>
+              <%= link_to activity.try(:assigned_to).try(:realname), user_path(activity.assigned_to_id), :class => "newsBlue mr15" %>
+            <% end %>
+          <% end %>
+        </div>
+        <div class="homepagePostDeadline">时间：<%=format_date(activity.created_on) %></div>
+      </div>
+      <div class="homepagePostIntro" style="word-break:break-all;">（缺陷描述）<%=activity.description.html_safe %></div>
+      <div class="mt10" style="font-weight:normal;">
+        <% if activity.attachments.any? %>
+            <% activity.attachments.each do |attachment| %>
+                  <div style="white-space: nowrap; overflow: hidden;  text-overflow: ellipsis;">
+                  <span title="<%= attachment.filename %>" id="attachment_">
+                    <%= link_to_short_attachment attachment, :class => 'homepagePostFileAtt newsBlue', :download => true -%>
+                  </span>
+                   <% if attachment.is_text? %>
+                        <%= link_to image_tag('magnifier.png'),
+                                    :controller => 'attachments',
+                                    :action => 'show',
+                                    :id => attachment,
+                                    :filename => attachment.filename %>
+                    <% end %>
+                   <span class="postAttSize">(
+                    <%= number_to_human_size attachment.filesize %>)
+                  </span>
+                  </div>
+            <% end %>
+        <% end %>
+      </div>
+      <!--<div class="mt10">
+        <a href="javascript:void(0);" class="homepagePostFileAtt newsBlue">文件附件.zip</a><span class="postAttSize">(123KB)</span>
+      </div>
+      <div>
+        <a href="javascript:void(0);" class="homepagePostImageAtt newsBlue">图片附件.png</a><span class="postAttSize">(123KB)</span>
+      </div>-->
+      <div class="homepagePostSetting" id="act-<%=user_activity.id %>" style="visibility: hidden">
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <ul class="homepagePostSettiongText">
+              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <!--<div class="homepagePostReply">
+
+    <div class="homepagePostReplyBanner">
+      <div class="homepagePostReplyBannerCount">回复（<%#=activity.journals.count %>）</div>
+      <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
+      <div class="homepagePostReplyBannerMore"><a href="javascript:void(0);" class="replyGrey">点击展开更多回复</a>
+      </div>
+    </div>
+    <div class="homepagePostReplyInputContainer">
+      <textarea class="homepagePostReplyInput" placeholder="请输入回复"></textarea>
+    </div>
+    <div class="homepagePostReplyInputContainer">
+      <div class="homepagePostReplyEmotion"><a href="javascript:void(0);" class="replyGrey">表情</a></div>
+      <div class="homepagePostReplyCancel"><a href="javascript:void(0);" class="postReplyCancel">取消</a></div>
+      <div class="homepagePostReplySubmit"><a href="javascript:void(0);" class="postReplySubmit">发送</a></div>
+      <div class="cl"></div>
+    </div>
+
+    <%# activity.journals.reorder("created_on desc").each do |reply| unless activity.journals.nil?%>
+            <div class="homepagePostReplyContainer">
+              <div class="homepagePostReplyPortrait">
+                <%#= link_to image_tag(url_to_avatar(reply.user), :width => "45", :height => "45"), user_path(reply.user_id), :alt => "用户头像" %>
+              </div>
+              <div class="homepagePostReplyDes">
+                <div class="homepagePostReplyPublisher">
+                  <%# if reply.try(:user).try(:realname) == ' ' %>
+                      <%#= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
+                  <%# else %>
+                      <%#= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
+                  <%# end %>
+                  <%#= format_date(reply.created_on) %>
+
+                  #&lt;!&ndash;<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>&ndash;&gt;
+                </div>
+                <%# if reply.details.any? %>
+                    <%# details_to_strings(reply.details).each do |string| %>
+                        <div class="homepagePostReplyContent" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"><%#=string %></div>
+                    <%# end %>
+                <%# else %>
+                    <div class="homepagePostReplyContent" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"><%#=reply.notes.html_safe %></div>
+              <%# end %>
+              </div>
+              <div class="cl"></div>
+            </div>
+        <%# end %>
+    <%# end %>
+  </div>-->
+</div>

app/views/users/_project_journal.html.erb

@@ -0,0 +1,29 @@
+<div class="resources mt15">
+  <div class="homepagePostBrief" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
+    <div class="homepagePostPortrait">
+      <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a></div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
+        <a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a></div>
+      <div class="homepagePostTitle">
+        <a href="javascript:void(0);" class="postGrey">ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（项目日志）</a></div>
+      <div class="homepagePostSubmitContainer">
+        <div class="homepagePostSubmit"><a href="javascript:void(0);" class="c_blue">提交（10）</a></div>
+        <div class="homepagePostDeadline">截止时间：2015-08-20</div>
+      </div>
+      <div class="homepagePostIntro">（作业描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；</div>
+      <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <ul class="homepagePostSettiongText">
+              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div>

app/views/users/_project_message.html.erb

@@ -0,0 +1,96 @@
+<div class="resources mt15">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait">
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
+    </div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo" style="word-break:break-all;">
+        <% if activity.try(:author).try(:realname) == ' ' %>
+            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% else %>
+            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% end %>
+        TO
+        <%= link_to activity.project.name.to_s+"(项目讨论区)", project_path(activity.project), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%>
+        <!--<a href="javascript:void(0);" class="newsBlue ml15 mr5"><%= activity.project.name %>(项目讨论区)</a>-->
+      </div>
+      <div class="homepagePostTitle" style="word-break:break-all;">
+        <% if activity.parent_id.nil? %>
+            <%= link_to activity.subject.to_s.html_safe+"(帖子标题)", project_boards_path(activity.project,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all" %>
+        <% else %>
+            <%= link_to activity.parent.subject.to_s.html_safe+"(帖子标题)", project_boards_path(activity.project,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all"%>
+        <% end %>
+      </div>
+      <div class="homepagePostSubmitContainer">
+        <div class="homepagePostDeadline">时间：<%= format_date(activity.created_on) %></div>
+      </div>
+      <div class="homepagePostIntro" style="word-break:break-all">（描述）<%= activity.content.html_safe %></div>
+      <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <ul class="homepagePostSettiongText">
+              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <!--<div class="homepagePostReply">
+    <div class="homepagePostReplyBanner">
+      <div class="homepagePostReplyBannerCount">回复（
+        <%# if activity.parent_id.nil? %>
+            <%#=activity.replies_count %>
+        <%# else %>
+            <%#=activity.parent.replies_count %>
+        <%# end %>）</div>
+      <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
+      <div class="homepagePostReplyBannerMore"><a href="javascript:void(0);" class="replyGrey">点击展开更多回复</a>
+      </div>
+    </div>
+    <div class="homepagePostReplyInputContainer">
+      <textarea class="homepagePostReplyInput" placeholder="请输入回复"></textarea>
+    </div>
+    <div class="homepagePostReplyInputContainer">
+      <div class="homepagePostReplyEmotion"><a href="javascript:void(0);" class="replyGrey">表情</a></div>
+      <div class="homepagePostReplyCancel"><a href="javascript:void(0);" class="postReplyCancel">取消</a>
+      </div>
+      <div class="homepagePostReplySubmit"><a href="javascript:void(0);" class="postReplySubmit">发送</a>
+      </div>
+      <div class="cl"></div>
+    </div>
+    <%# activity= activity.parent_id.nil? ? activity:activity.parent%>
+    <%# activity.children.reorder("created_on desc").each do |reply| unless activity.children.nil?%>
+      <div class="homepagePostReplyContainer">
+        <div class="homepagePostReplyPortrait">
+          <%#= link_to image_tag(url_to_avatar(reply.author), :width => "45", :height => "45"), user_path(reply.author_id), :alt => "用户头像" %>
+        </div>
+        <div class="homepagePostReplyDes">
+          <div class="homepagePostReplyPublisher">
+            <%# if reply.try(:author).try(:realname) == ' ' %>
+                <%#= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
+            <%# else %>
+                <%#= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
+            <%# end %>
+            <%#= format_date(reply.created_on) %>
+            <%#= link_to(
+                        l(:button_delete),
+                        {:controller => 'messages', :action => 'destroy', :id => reply.id, :board_id => reply.board_id, :is_board => 'false'},
+                        :method => :post,
+                        :data => {:confirm => l(:text_are_you_sure)},
+                        :title => l(:button_delete),
+                        :class => 'replyGrey fr ml10'
+                ) if reply.course_destroyable_by?(User.current) %>
+           # &lt;!&ndash;<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>&ndash;&gt;
+          </div>
+          <div class="homepagePostReplyContent" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="<%#= reply.content.html_safe %>"><%#= reply.content.html_safe %></div>
+        </div>
+        <div class="cl"></div>
+      </div>
+    <%# end %>
+    <%# end %>
+  </div>-->
+</div>

app/views/users/_project_news.html.erb

@@ -0,0 +1,29 @@
+<div class="resources mt15">
+  <div class="homepagePostBrief" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
+    <div class="homepagePostPortrait">
+      <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a></div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
+        <a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a></div>
+      <div class="homepagePostTitle">
+        <a href="javascript:void(0);" class="postGrey">ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（项目新闻）</a></div>
+      <div class="homepagePostSubmitContainer">
+        <div class="homepagePostSubmit"><a href="javascript:void(0);" class="c_blue">提交（10）</a></div>
+        <div class="homepagePostDeadline">截止时间：2015-08-20</div>
+      </div>
+      <div class="homepagePostIntro">（作业描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；</div>
+      <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <ul class="homepagePostSettiongText">
+              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div>

app/views/users/_resource_share_for_project_popup.html.erb

@@ -26,6 +26,7 @@
 
     <%= 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">
@@ -35,7 +36,7 @@
           <li class="sendCourseName fl"><%= truncate( project.name,:length=>18)%></li>
         </ul>
         <% end %>
-
+    </div>
   </div>
   <div>
     <div class="courseSendSubmit">

app/views/users/_resource_share_popup.html.erb

@@ -26,6 +26,7 @@
 
     <%= 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">
@@ -35,14 +36,14 @@
           <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" onclick="closeModal();">取消</a></div>
+    <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText mt10" onclick="closeModal();">取消</a></div>
   </div>
   <div class="cl"></div>
     <% end %>

app/views/users/_user_activities.html.erb

@@ -0,0 +1,46 @@
+<% user_activities.each do |user_activity|
+  unless user_activities.nil? %>
+        <% act= user_activity.act unless user_activity.act_type == "ProjectCreateInfo" %>
+        <% case user_activity.container_type.to_s %>
+        <% when 'Course' %>
+            <% if act  %>
+                <% case user_activity.act_type.to_s %>
+                <% when 'HomeworkCommon' %>
+                    <%= render :partial => 'course_homework', :locals => {:activity => act,:user_activity =>user_activity} %>
+                <% when 'News' %>
+                    <%= render :partial => 'course_news', :locals => {:activity => act,:user_activity =>user_activity} %>
+                <% when 'Message'%>
+                    <%= render :partial => 'course_message', :locals => {:activity => act,:user_activity =>user_activity} %>
+                    <%# when 'Course'%>
+                    <%#= render :partial => 'course_create', :locals => {:activity => act,:user_activity =>user_activity} %>
+                    <%# when 'Attachment' %>
+                    <%#= render :partial => 'course_attachment', :locals => {:activity => act, :user_activity => user_activity} %>
+                    <%# when 'JournalsForMessage' %>
+                    <%#= render :partial => 'course_journalsformessage', :locals => {:activity => act, :user_activity => user_activity} %>
+                <% when 'Poll' %>
+                    <%= render :partial => 'course_poll', :locals => {:activity => act, :user_activity => user_activity} %>
+                <% end %>
+            <% end %>
+        <% when 'Project' %>
+            <% if act  %>
+                <% case user_activity.act_type.to_s %>
+                <% when 'Issue' %>
+                    <%= render :partial => 'project_issue', :locals => {:activity => act,:user_activity =>user_activity} %>
+                <% when 'Message' %>
+                    <%= render :partial => 'project_message', :locals => {:activity => act,:user_activity =>user_activity} %>
+                    <%# when 'Journal' %>
+                    <%#= render :partial => 'project_journal', :locals => {:activity => act,:user_activity =>user_activity} %>
+                    <%# when 'News' %>
+                    <%#= render :partial => 'project_news', :locals => {:activity => act,:user_activity =>user_activity} %>
+                    <%# when 'Document' %>
+                    <%#= render :partial => 'project_document', :locals => {:activity => act,:user_activity =>user_activity} %>
+                    <%# when 'Attachment' %>
+                    <%#= render :partial => 'project_attachment', :locals => {:activity => act,:user_activity =>user_activity} %>
+                    <%# when 'ProjectCreateInfo' %>
+                    <%#= render :partial => 'project_create', :locals => {:activity => act,:user_activity =>user_activity} %>
+                <% end %>
+            <% end %>
+        <% end %>
+    <% end %>
+<% end %>
+<input type="hidden" value="<%= page%>" id="show_more_activities" />

app/views/users/_user_fans_item.html.erb

@@ -1,3 +1,5 @@
+<% unless list.nil?%>
+<% for item in list %>
     <div class="courses_list line" id="fans_item_<%=item.id%>">
       <div class="courses_list_pic fl">
         <a href="<%= user_path(item) %>">
@@ -39,12 +41,15 @@
           </tr></tbody></table>
         </div>
       </div>
+      <!-- 如果只有自己的关注页面才能关注人 取消关注操作，那么还要加 一句&& User.current.id == target.id-->
       <% if(User.current.logged? && User.current != item )%>
         <%if(item.watched_by?(User.current))%>
-          <a href="<%= watch_path(:object_type=>'user',:object_id=>item.id,:target_id=>target.id) %>" class="grey_n_btn fr mt20" data-method="delete" data-remote="true" title="取消关注">取消关注</a>
+          <a href="<%= watch_path(:object_type=>'user',:object_id=>item.id,:target_id=>target.id,:action_name=>action_name,:page=>page) %>" class="grey_n_btn fr mt20" data-method="delete" data-remote="true"  title="取消关注">取消关注</a>
         <% else %>
-          <a href="<%= watch_path(:object_type=>'user',:object_id=>item.id,:target_id=>target.id) %>" class="blue_n_btn fr mt20" data-method="post" data-remote="true" title="添加关注">添加关注</a>
+          <a href="<%= watch_path(:object_type=>'user',:object_id=>item.id,:target_id=>target.id,:action_name=>action_name,:page=>page) %>" class="blue_n_btn fr mt20" data-method="post" data-remote="true"  title="添加关注">添加关注</a>
         <% end %>
       <% end %>
       <div class="cl"></div>
     </div>
+<% end %>
+<% end %>

app/views/users/_user_homework_attachment.html.erb

@@ -0,0 +1,53 @@
+<div class="mt10">
+  <span id="attachments_fields" class="attachments_fields">
+    <% if defined?(container) && container && container.saved_attachments %>
+      <% container.attachments.each_with_index do |attachment, i| %>
+        <span id="attachments_p<%= i %>">
+          <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename link_file', :readonly=>'readonly')%>
+          <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
+          <span class="ispublic-label"><%= l(:field_is_public)%>:</span>
+          <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => 'is_public')%>
+          <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') unless attachment.id.nil? %>
+          <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
+        </span>
+      <% end %>
+      <% container.saved_attachments.each_with_index do |attachment, i| %>
+        <span id="attachments_p<%= i %>">
+          <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
+          <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
+          <span class="ispublic-label"><%= l(:field_is_public)%>:</span>
+          <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => 'is_public')%>
+          <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') unless attachment.id.nil? %>
+          <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
+        </span>
+      <% end %>
+    <% end %>
+  </span>
+  <%= 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',:project =>nil),
+                             :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)
+                     } %>
+</div>
+<div class="cl"></div>
+
+<div class="mt5 fl">
+  <a href="javascript:void(0);" class="AnnexBtn fl mt3" onclick="$('#_file').click();">上传附件</a>
+  <!--<a href="javascript:void(0);" class="FilesBtn fl mr15 mt3">资源库</a>-->
+</div>
+
+<% content_for :header_tags do %>
+    <%= javascript_include_tag 'attachments' %>
+<% end %>

app/views/users/_user_homework_form.html.erb

@@ -0,0 +1,42 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<div class="HomeWorkCon">
+  <div class="mt15">
+    <input  type="text" name="homework_common[name]" id="homework_name" class="InputBox  W700" maxlength="255" onkeyup="regex_homework_name();" placeholder="请输入作业标题" value="<%= homework.name%>" >
+    <p id="homework_name_span" class="c_red mt5"></p>
+  </div>
+  <div class="cl"></div>
+
+  <div class=" mt10">
+    <a href="javascript:void(0);" class="BlueCirBtn fl mr10">导入作业</a>
+    <div class="calendar_div fl">
+      <input  type="text" name="homework_common[end_time]" id="homework_end_time" placeholder="截止日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= homework.end_time || (Time.now  + 3600 * 24).strftime('%Y-%m-%d')%>" >
+      <%= calendar_for('homework_end_time')%>
+    </div>
+  </div>
+  <div class="cl"></div>
+
+  <div class="mt10">
+    <% if edit_mode %>
+        <%= f.kindeditor :description,:editor_id => 'homework_description_editor',:height => "150px",:owner_id => homework.id,:owner_type =>OwnerTypeHelper::HOMEWORKCOMMON %>
+    <% else %>
+        <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+        <%= f.kindeditor :description,:editor_id => 'homework_description_editor',:height => "150px" %>
+    <% end %>
+  </div>
+  <div class="cl"></div>
+
+  <div class="mt10">
+    <!--<input type="text" class="InputBox  W700 SearchIcon" placeholder="发送到课程" />-->
+    <%= select_tag :course_id,options_for_select(get_as_teacher_courses(User.current),homework.course_id), {:class => "InputBox  W700 SearchIcon"}  %>
+  </div>
+  <div class="cl"></div>
+
+  <%= render :partial => 'users/user_homework_attachment', :locals => { :container => homework } %>
+
+  <div class="mt5 fr">
+    <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick=" submit_homework('new_homework_common');">发送</a>
+    <span class="fr mr10 mt3">或</span>
+    <a href="javascript:void(0);" class=" fr mr10 mt3">取消</a>
+  </div>
+</div>
+<div class="cl"></div>

app/views/users/_user_homework_list.html.erb

@@ -0,0 +1,56 @@
+<% homework_commons.each do |homework_common|%>
+    <% is_teacher = User.current.allowed_to?(:as_teacher,homework_common.course) %>
+    <div class="HomeWork mb10">
+      <div class="homepagePostBrief">
+        <div class="homepagePostPortrait">
+          <%=link_to image_tag(url_to_avatar(homework_common.user),width:"90px", height: "90px"), user_activities_path(homework_common.user.id)%>
+        </div>
+        <div class="homepagePostDes">
+          <div class="homepagePostTo">
+            <%= link_to homework_common.user.show_name, user_activities_path(homework_common.user_id), :class => "newsBlue mr15"%>
+            TO
+            <%= link_to homework_common.course.name, course_path(homework_common.course_id), :class => "newsBlue ml15"%>
+          </div>
+          <div class="homepagePostTitle">
+            <%= link_to homework_common.name,student_work_index_path(:homework => homework_common.id),:class => "postGrey"%>
+          </div>
+
+          <div class="homepagePostSubmitContainer">
+            <div class="homepagePostSubmit">
+              <%= user_for_homework_common homework_common,is_teacher %>
+            </div>
+            <div class="homepagePostDeadline">
+              <%= l(:label_end_time)%>：<%= homework_common.end_time%>
+            </div>
+          </div>
+          <div class="homepagePostIntro upload_img break_word">
+            <%= homework_common.description.html_safe %>
+          </div>
+          <div class="mt10">
+            <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => homework_common.attachments} %>
+            <div class="cl"></div>
+          </div>
+          <%# if is_teacher%>
+          <% if false%>
+              <div class="homepagePostSetting">
+                <ul>
+                  <li class="homepagePostSettingIcon">
+                    <ul class="homepagePostSettiongText">
+                      <li>
+                        <%= link_to l(:button_edit),edit_homework_common_path(homework_common), :class => "postOptionLink"%>
+                      </li>
+                      <li>
+                        <%= link_to(l(:label_bid_respond_delete), homework_common_path(homework_common),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink")  %>
+                      </li>
+                    </ul>
+                  </li>
+                </ul>
+              </div>
+          <% end%>
+        </div>
+        <div class="cl"></div>
+      </div>
+    </div><!----HomeWork end-->
+<% end%>
+
+<input type="hidden" value="<%= page%>" id="user_show_more_homework" />

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/search.html.erb

@@ -28,14 +28,14 @@
 			<td rowspan="2">				
 			</td>
 			<td rowspan="2" >	
-			<div class="project-search" style="float: right">
-              <!--label for="user_browse_label"><%#= l(:label_user_search_type) %></label-->
-              <%= select_tag(:search_by,options_for_select([["昵称","0"],["姓名","1"],["邮箱","2"]],@search_by), :onchange => "searchByChange();",:style=>'display:none;' )  %>
-			  <%= text_field_tag 'name', params[:name], :size => 30, :placeholder=>'昵称/姓名/邮箱' %>
-              <input type="text" name="search_by_input" hidden="hidden;" id="search_by_input" value="0">
-            <input type="button" class="enterprise" value="<%= l(:label_search) %>" onclick="searchUser();"/>
-			<%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
-			</div>			
+			<!--<div class="project-search" style="float: right">-->
+              <!--&lt;!&ndash;label for="user_browse_label"><%#= l(:label_user_search_type) %></label&ndash;&gt;-->
+              <!--<%#= select_tag(:search_by,options_for_select([["昵称","0"],["姓名","1"],["邮箱","2"]],@search_by), :onchange => "searchByChange();",:style=>'display:none;' )  %>-->
+			  <!--<%#= text_field_tag 'name', params[:name], :size => 30, :placeholder=>'昵称/姓名/邮箱' %>-->
+              <!--<input type="text" name="search_by_input" hidden="hidden;" id="search_by_input" value="0">-->
+            <!--<input type="button" class="enterprise" value="<%= l(:label_search) %>" onclick="searchUser();"/>-->
+			<!--<%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>-->
+			<!--</div>			-->
 			</td>
 		</tr>
 		<tr>

app/views/users/show.html.erb

@@ -1,40 +1,58 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"user" %>
-<% @center_flag = (User.current == @user) %>
-<div class="top_new">
-    <span class="<%= (@user.user_extensions.identity == 0 && @user.allowed_to?(:add_course, nil, :global => true)) ? 'top_new_bg' : 'top_newcourses_bg'%> fl"></span>
-    <% if @user.allowed_to?(:add_project, nil, :global => true) %>
-      <a href="<%= url_for(:controller => 'projects', :action => 'new',:host=>Setting.host_name) %>" class="bgreen_n_btn fr ml10 mt2" target="_blank">新建项目</a>
-    <% else %>
-      <a href="<%= join_project_projects_path %>" data-remote ="true" class="bgreen_n_btn fr mt2">加入项目</a>
-    <% end %>
+<script type="text/javascript">
+    var scrollHandler = function(){
+        if ($(window).scrollTop() == $(document).height() - $(window).height()) {
+            $.get(
+                    '<%= user_activities_path(@user.id)%>',
+                    { page : $("#show_more_activities").val(),
+                    type: $("#user_activities_type").val()},
+                    function (data) {
 
-    <% if @user.user_extensions.identity == 0 && @user.allowed_to?(:add_course, nil, :global => true) %>
-      <a href="<%= url_for(:controller => 'courses', :action => 'new',:host=>Setting.host_course) %>" class="bgreen_n_btn fr mt2" target="_blank">新建课程</a>
-    <% else %>
-      <!--<a href="<%#= url_for(:controller => 'courses', :action => 'join_private_courses',:host=>Setting.host_course) %>" data-remote ="true" class="green_n_btn fr mt2">加入课程</a>-->
-      <a href="<%= join_private_courses_courses_path %>" data-remote ="true" class="bgreen_n_btn fr mt2">加入课程</a>
-    <% end %>
-  <div class="cl"></div>
-</div>
-
-<div id="RSide" class="fl">
-
-  <div class="users_courses_box line_box mb10" nhname="list_more_div" style="display:none;">
-    <h4 class="users_h4">课程动态</h4>
-    <div nhname="container" data-nodatamsg="暂无动态" data-url="<%= url_for(:controller => 'users', :action => 'user_course_activities') %>" data-isclose="0" data-currpage="0" data-hasmore="1"></div>
-    <div class="message_list_more">
-      <a nhname="expand" href="javascript:void(0)" class="c_blue02">点击展开更多</a> <a nhname="close" style="display:none" href="javascript:void(0)" class="c_lgrey fr">收起</a>
-      <div class="cl"></div>
-    </div>
-  </div>
+                    }
+            );
+        }
+    };
+    $(window).scroll(scrollHandler);
+</script>
 
-  <div class="users_courses_box line_box mb10" nhname="list_more_div" style="display:none;">
-    <h4 class="users_h4">项目动态</h4>
-    <div nhname="container" data-nodatamsg="暂无动态" data-url="<%= url_for(:controller => 'users', :action => 'user_project_activities') %>" data-isclose="0" data-currpage="0" data-hasmore="1"></div>
-    <div class="message_list_more">
-      <a nhname="expand" href="javascript:void(0)" class="c_blue02">点击展开更多</a> <a nhname="close" style="display:none" href="javascript:void(0)" class="c_lgrey fr">收起</a>
-      <div class="cl"></div>
+<input type="hidden" value="<%= @type%>" id="user_activities_type">
+<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="homepagePostType">
+          <li>
+            <ul class="homepagePostTypeHomework fl">
+              <li class="f14">课程动态</li>
+              <li><%= link_to "作业动态", {:controller => "users", :action => "show", :type => "course_homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%>
+                <!--<a href="javascript:void(0);" class="homepagePostTypeAssignment postTypeGrey">作业动态</a>--></li>
+              <li><%= link_to "通知动态", {:controller => "users", :action => "show", :type => "course_news"}, :class => "homepagePostTypeNotice postTypeGrey"%>
+              <!--<li><a href="javascript:void(0);" class="homepagePostTypeNotice postTypeGrey">通知动态</a></li>-->
+              <li><%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "course_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
+              <li><%= link_to "问卷动态", {:controller => "users", :action => "show", :type => "course_poll"}, :class => "homepagePostTypeQuiz postTypeGrey"%>
+                <!--<li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
+              <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuiz postTypeGrey">问卷动态</a></li>-->
+            </ul>
+          </li>
+          <li>
+            <ul class="homepagePostTypeProject fl">
+              <li class="f14">项目动态</li>
+              <li><%= link_to "问题动态", {:controller => "users", :action => "show", :type => "project_issue"}, :class => "homepagePostTypeQuestion postTypeGrey"%>
+              <li><%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "project_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
+              <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuestion postTypeGrey">问题动态</a></li>
+              <li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
+            </ul>
+          </li>
+          <li>
+            <ul class="homepagePostTypeProject fl">
+              <li class="f14">更多</li>
+              <li><%= link_to "全部动态", {:controller => "users", :action => "show", :type => nil}, :class =>"homepagePostTypeAssignment postTypeGrey"%>
+            </ul>
+          </li>
+        </ul>
+      </li>
+    </ul>
   </div>
 </div>
 
-</div>
+<%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => @page} %>

app/views/users/show.js.erb

@@ -0,0 +1,4 @@
+$("#show_more_activities").replaceWith("<%= escape_javascript( render :partial =>  'users/user_activities',:locals => {:user_activities => @user_activities, :page => @page} )%>");
+<% if @user_activities.count < 10%>
+$(window).off("scroll", scrollHandler);
+<% end%>

app/views/users/show_chen.erb

@@ -0,0 +1,279 @@
+<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="homepagePostType">
+          <li>
+            <ul class="homepagePostTypeHomework fl">
+              <li class="f14">课程动态</li>
+              <li><a href="javascript:void(0);" class="homepagePostTypeAssignment postTypeGrey">作业动态</a></li>
+              <li><a href="javascript:void(0);" class="homepagePostTypeNotice postTypeGrey">通知动态</a></li>
+              <li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>
+              <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuiz postTypeGrey">问卷动态</a></li>-->
+            </ul>
+          </li>
+          <li>
+            <ul class="homepagePostTypeProject fl">
+              <li class="f14">项目动态</li>
+              <li><a href="javascript:void(0);" class="homepagePostTypeQuestion postTypeGrey">问题动态</a></li>
+              <li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>
+            </ul>
+          </li>
+        </ul>
+      </li>
+    </ul>
+  </div>
+
+  <div class="homepagePostBrief" onmouseover="$('.homepagePostSetting').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
+    <div class="homepagePostPortrait">
+      <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a></div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
+        <a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a></div>
+      <div class="homepagePostTitle">
+        <a href="javascript:void(0);" class="postGrey">ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（作业名称）</a></div>
+      <div class="homepagePostSubmitContainer">
+        <div class="homepagePostSubmit"><a href="javascript:void(0);" class="c_blue">提交（10）</a></div>
+        <div class="homepagePostDeadline">截止时间：2015-08-20</div>
+      </div>
+      <div class="homepagePostIntro">（作业描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；</div>
+      <div class="homepagePostSetting" style="visibility: hidden">
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <ul class="homepagePostSettiongText">
+              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div>
+<div class="resources mt15">
+  <div class="homepagePostBrief" onmouseover="$('.homepagePostSetting').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
+    <div class="homepagePostPortrait">
+      <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a></div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
+        <a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a></div>
+      <div class="homepagePostTitle">
+        <a href="javascript:void(0);" class="postGrey">ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（作业名称）</a></div>
+      <div class="homepagePostSubmitContainer">
+        <div class="homepagePostSubmit"><a href="javascript:void(0);" class="c_blue">提交（10）</a></div>
+        <div class="homepagePostDeadline">截止时间：2015-08-20</div>
+      </div>
+      <div class="homepagePostIntro">（作业描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；</div>
+      <div class="homepagePostSetting" style="visibility: hidden">
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <ul class="homepagePostSettiongText">
+              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div>
+
+<!--  <div class="homepagePostReply">
+    <div class="homepagePostReplyBanner">
+      <div class="homepagePostReplyBannerCount">回复（5）</div>
+      <div class="homepagePostReplyBannerTime">2015-07-28</div>
+      <div class="homepagePostReplyBannerMore"><a href="javascript:void(0);" class="replyGrey">点击展开更多回复</a></div>
+    </div>
+    <div class="homepagePostReplyInputContainer">
+      <textarea class="homepagePostReplyInput" placeholder="请输入回复"></textarea>
+    </div>
+    <div class="homepagePostReplyInputContainer">
+      <div class="homepagePostReplyEmotion"><a href="javascript:void(0);" class="replyGrey">表情</a></div>
+      <div class="homepagePostReplyCancel"><a href="javascript:void(0);" class="postReplyCancel">取消</a></div>
+      <div class="homepagePostReplySubmit"><a href="javascript:void(0);" class="postReplySubmit">发送</a></div>
+      <div class="cl"></div>
+    </div>
+    <div class="homepagePostReplyContainer">
+      <div class="homepagePostReplyPortrait"><a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="45" height="45" alt="用户头像" /></a></div>
+      <div class="homepagePostReplyDes">
+        <div class="homepagePostReplyPublisher"><a href="javascript:void(0);" class="newsBlue mr10 f14">尹教授</a> 2015-08-01<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a><a href="javascript:void(0);" class="newsBlue fr">回复</a></div>
+        <div class="homepagePostReplyContent">请大家说下软件工程是什么！</div>
+      </div>
+      <div class="cl"></div>
+    </div>
+    <div class="homepagePostReplyContainer">
+      <div class="homepagePostReplyPortrait"><a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="45" height="45" alt="用户头像" /></a></div>
+      <div class="homepagePostReplyDes">
+        <div class="homepagePostReplyPublisher"><a href="javascript:void(0);" class="newsBlue mr10 f14">Tang 学生</a> 2015-08-02<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a><a href="javascript:void(0);" class="newsBlue fr">回复</a></div>
+        <div class="homepagePostReplyContent">软件工程是一门研究用工程化方法构建和维护有效的、实用的和高质量的软件的学科。它涉及程序设计语言、数据库、软件开发工具、系统平台、标准、设计模式等方面。</div>
+        <div class="homepagePostReplyInputContainer2">
+          <textarea class="homepagePostReplyInput2" placeholder="请输入回复"></textarea>
+        </div>
+        <div class="homepagePostReplyInputContainer2 mb10">
+          <div class="homepagePostReplyEmotion"><a href="javascript:void(0);" class="replyGrey">表情</a></div>
+          <div class="homepagePostReplyCancel"><a href="javascript:void(0);" class="postReplyCancel">取消</a></div>
+          <div class="homepagePostReplySubmit"><a href="javascript:void(0);" class="postReplySubmit">发送</a></div>
+          <div class="cl"></div>
+        </div>
+      </div>
+      <div class="cl"></div>
+    </div>
+    <div class="homepagePostReplyContainer borderBottomNone">
+      <div class="homepagePostReplyPortrait"><a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="45" height="45" alt="用户头像" /></a></div>
+      <div class="homepagePostReplyDes">
+        <div class="homepagePostReplyPublisher"><a href="javascript:void(0);" class="newsBlue mr15 f14">尹教授</a><span class="f14">回复</span><a href="javascript:void(0);" class="newsBlue mr10 ml15 f14">Tang学生</a>刚刚<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a><a href="javascript:void(0);" class="newsBlue fr">回复</a></div>
+        <div class="homepagePostReplyContent">回答非常好！</div>
+      </div>
+      <div class="cl"></div>
+    </div>
+  </div>-->
+
+<div class="resources mt15">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait">
+      <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a></div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
+        <a href="javascript:void(0);" class="newsBlue ml15 mr5">黄井泉</a><span class="c_blue">，</span><a href="javascript:void(0);" class="newsBlue ml5">陈正东</a>
+      </div>
+      <div class="homepagePostTitle"><a href="javascript:void(0);" class="postGrey">假期开心吗？（讨论区内容）</a></div>
+      <div class="homepagePostSubmitContainer">
+        <div class="homepagePostDeadline">时间：2015-07-31</div>
+      </div>
+      <div class="homepagePostSetting">
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <ul class="homepagePostSettiongText">
+              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <div class="homepagePostReply">
+    <div class="homepagePostReplyBanner">
+      <div class="homepagePostReplyBannerCount">回复（5）</div>
+      <div class="homepagePostReplyBannerTime">2015-07-31</div>
+      <div class="homepagePostReplyBannerMore"><a href="javascript:void(0);" class="replyGrey">点击展开更多回复</a></div>
+    </div>
+    <div class="homepagePostReplyInputContainer">
+      <textarea class="homepagePostReplyInput" placeholder="请输入回复"></textarea>
+    </div>
+    <div class="homepagePostReplyInputContainer">
+      <div class="homepagePostReplyEmotion"><a href="javascript:void(0);" class="replyGrey">表情</a></div>
+      <div class="homepagePostReplyCancel"><a href="javascript:void(0);" class="postReplyCancel">取消</a></div>
+      <div class="homepagePostReplySubmit"><a href="javascript:void(0);" class="postReplySubmit">发送</a></div>
+      <div class="cl"></div>
+    </div>
+    <div class="homepagePostReplyContainer">
+      <div class="homepagePostReplyPortrait">
+        <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="45" height="45" alt="用户头像"/></a>
+      </div>
+      <div class="homepagePostReplyDes">
+        <div class="homepagePostReplyPublisher"><a href="javascript:void(0);" class="newsBlue mr10 f14">黄井泉 学生</a>
+          2015-08-01<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a><!--<a href="javascript:void(0);" class="newsBlue fr">回复</a>-->
+        </div>
+        <div class="homepagePostReplyContent">很开心！</div>
+      </div>
+      <div class="cl"></div>
+    </div>
+    <div class="homepagePostReplyContainer borderBottomNone">
+      <div class="homepagePostReplyPortrait">
+        <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="45" height="45" alt="用户头像"/></a>
+      </div>
+      <div class="homepagePostReplyDes">
+        <div class="homepagePostReplyPublisher"><a href="javascript:void(0);" class="newsBlue mr10 f14">陈正东 学生</a>
+          2015-08-02<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a><!--<a href="javascript:void(0);" class="newsBlue fr">回复</a>-->
+        </div>
+        <div class="homepagePostReplyContent">假期好热，没出去。</div>
+      </div>
+      <div class="cl"></div>
+    </div>
+  </div>
+</div>
+<div class="resources mt15">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait">
+      <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a></div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
+        <a href="javascript:void(0);" class="newsBlue ml15">Trustie Forge（项目名称）</a></div>
+      <div class="homepagePostTitle">
+        <a href="javascript:void(0);" class="postGrey">上传资源未显示在项目动态中（缺陷标题）</a><span class="homepagePostProjectState">正常</span>
+      </div>
+      <div class="homepagePostSubmitContainer">
+        <div class="homepagePostAssignTo">指派给&nbsp;&nbsp;<a href="javascript:void(0);" class="newsBlue mr15">苏稳</a>
+        </div>
+        <div class="homepagePostDeadline">时间：2015-08-20</div>
+      </div>
+      <div class="homepagePostIntro">（缺陷描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；</div>
+      <div class="mt10">
+        <a href="javascript:void(0);" class="homepagePostFileAtt newsBlue">文件附件.zip</a><span class="postAttSize">(123KB)</span>
+      </div>
+      <div>
+        <a href="javascript:void(0);" class="homepagePostImageAtt newsBlue">图片附件.png</a><span class="postAttSize">(123KB)</span>
+      </div>
+      <div class="homepagePostSetting">
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <ul class="homepagePostSettiongText">
+              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <div class="homepagePostReply">
+    <div class="homepagePostReplyBanner">
+      <div class="homepagePostReplyBannerCount">回复（5）</div>
+      <div class="homepagePostReplyBannerTime">2015-07-26</div>
+      <div class="homepagePostReplyBannerMore"><a href="javascript:void(0);" class="replyGrey">点击展开更多回复</a></div>
+    </div>
+    <div class="homepagePostReplyInputContainer">
+      <textarea class="homepagePostReplyInput" placeholder="请输入回复"></textarea>
+    </div>
+    <div class="homepagePostReplyInputContainer">
+      <div class="homepagePostReplyEmotion"><a href="javascript:void(0);" class="replyGrey">表情</a></div>
+      <div class="homepagePostReplyCancel"><a href="javascript:void(0);" class="postReplyCancel">取消</a></div>
+      <div class="homepagePostReplySubmit"><a href="javascript:void(0);" class="postReplySubmit">发送</a></div>
+      <div class="cl"></div>
+    </div>
+    <div class="homepagePostReplyContainer">
+      <div class="homepagePostReplyPortrait">
+        <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="45" height="45" alt="用户头像"/></a>
+      </div>
+      <div class="homepagePostReplyDes">
+        <div class="homepagePostReplyPublisher"><a href="javascript:void(0);" class="newsBlue mr10 f14">尹教授</a>
+          2015-08-01<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a><!--<a href="javascript:void(0);" class="newsBlue fr">回复</a>-->
+        </div>
+        <div class="homepagePostReplyContent">请大家说下软件工程是什么！</div>
+      </div>
+      <div class="cl"></div>
+    </div>
+    <div class="homepagePostReplyContainer">
+      <div class="homepagePostReplyPortrait">
+        <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="45" height="45" alt="用户头像"/></a>
+      </div>
+      <div class="homepagePostReplyDes">
+        <div class="homepagePostReplyPublisher"><a href="javascript:void(0);" class="newsBlue mr10 f14">Tang 学生</a>
+          2015-08-01<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a><!--<a href="javascript:void(0);" class="newsBlue fr">回复</a>-->
+        </div>
+        <div class="homepagePostReplyContent">软件工程是一门研究用工程化方法构建和维护有效的、实用的和高质量的软件的学科。它涉及程序设计语言、数据库、软件开发工具、系统平台、标准、设计模式等方面。</div>
+      </div>
+      <div class="cl"></div>
+    </div>
+  </div>
+</div>

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').addClass('new-watcher');
+$('#ajax-modal').css('height','auto');
+$('#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_fanslist.html.erb

@@ -1,25 +1,35 @@
-<div id="RSide" class="fl">
-  <div class="courses_box">
+<!--<div id="RSide" class="fl">-->
+<script>
+    function addWatch(){
+
+    }
+    function cancelWatch(){
+
+    }
+</script>
+  <div class="courses_box" id="users_setting">
     <div class="courses_top mb10" id="<%= (@action == 'fans' || @action == 'visitor' ) ? 'nh_fans_list' : 'nh_wacth_list' %>">
       <% if @action == 'fans' %>
         <h2 class="courses_h2 fl">粉丝</h2>
-        <div class="courses_select fr">共有<span class="c_orange" nh_name="fans_count"><%=@obj_count%></span>名粉丝</div>
+        <div class="courses_select fr">共有<span class="c_orange" nh_name="fans_count" id="fans_span"><%=@obj_count%></span>名粉丝</div>
       <% elsif @action == 'visitor' %>
         <h2 class="courses_h2 fl">访客</h2>
         <div class="courses_select fr">共有<span class="c_orange"><%=@obj_count%></span>访客</div>
       <% else %>
         <h2 class="courses_h2 fl">关注</h2>
-        <div class="courses_select fr">一共关注<span class="c_orange" nh_name="watcher_count"><%=@obj_count%></span>人</div>
+        <div class="courses_select fr">一共关注<span class="c_orange" nh_name="watcher_count" id="watch_span"><%=@obj_count%></span>人</div>
       <% end %>
       <div class="cl"></div>
     </div>
-    <% for item in @list %>
-      <%= render :partial => 'users/user_fans_item', :locals => {:item => item,:target=>@user} %>
-    <% end %>
+    <div id="users_list">
+    <%# for item in @list %>
+      <%= render :partial => 'users/user_fans_item', :locals => {:list => @list,:target=>@user,:action_name=>@action,:page=>params[:page]} %>
+    <%# end %>
+    </div>
     <p id="nodata" class="nodata" style="display:<%= @list.count > 0 ? 'none' : 'block' %>;"><%= l(:label_no_data) %></p>
   </div>
   <ul class="wlist" style=" border:none;">
     <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
   </ul>
   <div class="cl"></div>
-</div>
+<!--</div>-->

app/views/users/user_homeworks.html.erb

@@ -1,9 +1,37 @@
-<!-- added by fq -->u
-<!--huang-->
-	<% if @user.user_extensions.identity == 0  %>	
-	<%= render :partial => 'my_create_homework' %>
-	<% else %>
-	<%= render :partial => 'my_homework' %>
+<script type="text/javascript">
+  var scrollHandler = function(){
+      if ($(window).scrollTop() == $(document).height() - $(window).height()) {
+          $.get(
+                  '<%= user_homeworks_user_path(User.current.id)%>',
+                  { page : $("#user_show_more_homework").val()},
+                  function (data) {
+
+                  }
+          );
+      }
+  };
+  $(window).scroll(scrollHandler);
+</script>
+
+<% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
+    <!-- 老师身份才可以发布作业 -->
+    <div class="HomeWork mb10">
+      <div class="RightBanner">
+        <div class="NewsBannerName">发布作业</div>
+      </div>
+      <% homework = HomeworkCommon.new %>
+      <%= labelled_form_for homework,:url => user_new_homework_users_path,:method => "post" do |f| %>
+          <%= render :partial => 'users/user_homework_form', :locals => { :homework => homework,:f => f,:edit_mode => false } %>
       <% end%>
+    </div><!----HomeWork end-->
 
+<%else%>
+    <div class="resources mb10">
+      <div class="homepageRightBanner">
+        <div class="NewsBannerName">作业</div>
+      </div>
+    </div>
+    <div class="cl"></div>
+<% end%>
 
+<%= render :partial => 'users/user_homework_list', :locals => {:homework_commons => @homework_commons,:page => 0} %>

app/views/users/user_homeworks.js.erb

@@ -0,0 +1,4 @@
+$("#user_show_more_homework").replaceWith("<%= escape_javascript( render :partial =>  'users/user_homework_list',:locals => {:homework_commons => @homework_commons, :page => @page} )%>");
+<% if @homework_commons.count < 10%>
+    $(window).off("scroll", scrollHandler);
+<% end%>

app/views/users/user_messages.html.erb

@@ -1,254 +1,260 @@
-<div id="RSide" class="fl">
-<div class="homepageRight">
 
-<div class="resourcesBanner">
-  <div class="bannerName">消息</div>
+  <div class="resources">
+    <div class="homepageRightBanner">
+      <div class="NewsBannerName">消息</div>
       <ul class="resourcesSelect">
-    <li class="resourcesSelected2"><a href="javascript:void(0);" class="resourcesIcon2"></a>
+        <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></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><%= link_to "全部",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user}, :class => "resourcesGrey" %></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 => '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 => 'course_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_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 => '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><%= link_to "作业消息",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'homework'}, :class => "resourcesGrey" %></li>
+            <li><%= link_to "课程讨论区",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'course_message'}, :class => "resourcesGrey"  %></li>
+            <li><%= link_to "课程通知",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'course_news'}, :class => "resourcesGrey"  %></li>
+            <li><%= link_to "通知回复",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'course_news_reply'}, :class => "resourcesGrey" %></li>
+            <li><%= link_to "课程问卷",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'poll'}, :class => "resourcesGrey"  %></a></li>
+            <li><%= link_to "作品评阅",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'works_reviewers'}, :class => "resourcesGrey"  %></li>
+            <li><%= link_to "作品讨论",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'works_reply'}, :class => "resourcesGrey"  %></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><%= link_to "指派问题",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'issue'}, :class => "resourcesGrey"  %></li>
+            <li><%= link_to "问题更新",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'issue_update'}, :class => "resourcesGrey"  %></li>
+            <li><%= link_to "项目讨论区",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forge_message'}, :class => "resourcesGrey"  %></li>
+            <li><%= link_to "项目新闻",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forge_news'}, :class => "resourcesGrey"  %></li>
+            <li><%= link_to "新闻回复",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forge_news_reply'}, :class => "resourcesGrey"  %></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><%= link_to "贴吧帖子",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forum'}, :class => "resourcesGrey"  %></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>
+            <li><%= link_to "用户留言",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'user_feedback'}, :class => "resourcesGrey"  %></li>
 
           </ul>
         </li>
       </ul>
     </div>
-
     <div>
     <% if @new_message_count >0 %>
         <%# 课程消息 %>
-    <% unless @user_course_messages.nil? %>
-        <% @user_course_messages.each do |ucm| %>
-            <% if ucm.course_message_type == "News" %>
+        <% unless @message_alls.nil? %>
+            <% @message_alls.each do |ma| %>
+                <% if ma.class == CourseMessage %>
+                    <% if ma.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="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"),user_path(ma.course_message.author) %></a></li>
+                          <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue" %></li>
+                          <li class="<%= ma.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>
+                            <%= link_to ma.course_message.title, {:controller => 'news', :action => 'show', :id => ma.course_message.id },
+                                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                                        :title => "#{ma.course_message.title}" %></li>
+                          <li class="homepageNewsTime fl"><%= time_tag(ma.course_message.created_on).html_safe %> </li>
                         </ul>
                     <% end %>
-            <% if ucm.course_message_type == "Comment" %>
+                    <% if ma.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="<%= ucm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">回复了通知</li>
+                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %></a></li>
+                          <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue" %></li>
+                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">评论了通知</li>
                           <li class="homepageNewsContent fl">
-                    <%= 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>
+                            <%= link_to ma.course_message.comments.html_safe, {:controller => 'news', :action => 'show', :id => ma.course_message.commented.id },
+                                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                                        :title => "#{ma.course_message.comments.html_safe}" %></li>
+                          <li class="homepageNewsTime fl"><%= time_tag(ma.course_message.created_on).html_safe %> </li>
                         </ul>
                     <% end %>
-            <% if ucm.course_message_type == "HomeworkCommon" %>
+                    <% if ma.course_message_type == "HomeworkCommon" %>
                         <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="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
+                          <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue" %></a></li>
+                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"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),:class => "newsGrey", :title => "#{ucm.course_message.name}" %></a></li>
-                  <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_at).html_safe %> </li>
+                            <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),:class => "newsGrey", :title => "#{ma.course_message.name}" %></a></li>
+                          <li class="homepageNewsTime fl"><%= time_tag(ma.course_message.created_at).html_safe %> </li>
                         </ul>
                     <% end %>
-            <% if ucm.course_message_type == "Poll" %>
+                    <% if ma.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="<%=ucm.viewed == 0?"newsBlack":"newsBlue"%>"><%= ucm.course_message.user %></a></li>
-                  <li class="<%= ucm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布问卷</li>
+                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
+                          <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue" %></a></li>
+                          <li class="<%= ma.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.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>
+                            <%= link_to format_activity_title(" #{ma.course_message.polls_name.nil? ? "未命名问卷" : ma.course_message.polls_name}"), poll_path(ma.course_message.id),
+                                        :class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}",
+                                        :title => "#{ma.course_message.polls_name}" %></a></li>
+                          <li class="homepageNewsTime fl"><%= time_tag(ma.course_message.created_at).html_safe %> </li>
                         </ul>
                     <% end %>
-            <% if ucm.course_message_type == "Message" %>
+                    <% if ma.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="<%=ucm.viewed == 0?"newsBlack":"newsBlue"%>"><%= ucm.course_message.author %></a></li>
-                  <% if ucm.course_message.parent_id.nil? %>
-                      <li class="<%= ucm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布帖子</li>
+                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %></a></li>
+                          <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue" %></li>
+                          <% if ma.course_message.parent_id.nil? %>
+                              <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了帖子</li>
                               <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                        <%=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>
+                                <%=link_to ma.course_message.subject.html_safe, course_boards_path(ma.course_message.course,:parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id,
+                                                                                                   :topic_id => ma.course_message.id),:class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}",
+                                           :title => "#{ma.course_message.subject.html_safe}" %></a></li>
+                              <li class="homepageNewsTime fl"><%= time_tag(ma.course_message.created_on).html_safe %> </li>
                           <% else %>
-                      <li class="<%= ucm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">回复帖子</li>
+                              <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">回复了帖子</li>
                               <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                        <%=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>
+                                <%=link_to ma.course_message.subject.html_safe, course_boards_path(ma.course_message.course,:parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id,
+                                                                                                   :topic_id => ma.course_message.id),:class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}",
+                                           :title => "#{ma.course_message.subject.html_safe}" %> </a></li>
+                              <li class="homepageNewsTime fl"><%= time_tag(ma.course_message.created_on).html_safe %> </li>
                           <% end %>
                         </ul>
                     <% end %>
-            <% if ucm.course_message_type == "StudentWorksScore" %>
+                    <% if ma.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="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
+                          <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue" %></li>
+                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.status == 0 ? "评阅了作品" : "重新评阅了作品" %></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>
+                            <% unless ma.content.nil? %>
+                                <%= link_to ma.content.html_safe, student_work_index_path(:homework => ma.course_message.student_work.homework_common_id),:class=>"newsGrey",:title => "#{ma.content.html_safe}" %></a></li>
+                            <% end %>
+                            <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                         </ul>
                     <% end %>
-            <% if ucm.course_message_type == "JournalsForMessage" %>
+                    <% if ma.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="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
+                          <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue" %></li>
+                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"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>
+                            <%= link_to ma.course_message.notes, student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id),:class=>"newsGrey",:title => "#{ma.course_message.notes}" %></a></li>
+                          <li class="homepageNewsTime fl"><%= time_tag(ma.course_message.created_on).html_safe %> </li>
                         </ul>
                     <% end %>
-            <div class="cl"></div>
-        <% end %>
                 <% end %>
                 <!--项目消息-->
-    <% unless @user_forge_messages.nil? %>
-        <% @user_forge_messages.each do |ufm| %>
-            <% if ufm.forge_message_type == "Issue" %>
+                <% if ma.class == ForgeMessage %>
+                    <% if ma.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>
+                            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a>
                           </li>
                           <li class="homepageNewsPublisher fl">
-                    <a href="javascript:void(0);" class="<%= ufm.viewed == 0 ? "newsBlack" : "newsBlue" %>"><%= ufm.forge_message.author %></a>
+                            <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue" %>
                           </li>
-                  <li class="<%= ufm.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">指派问题给我</li>
+                          <li class="<%= ma.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>
+                            <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",:title => "#{ma.forge_message.subject}" %></a>
                           </li>
-                  <li class="homepageNewsTime fl"><%= time_tag(ufm.forge_message.created_on).html_safe %> </li>
+                          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                         </ul>
                     <% end %>
-            <% if ufm.forge_message_type == "Journal" %>
+                    <% if ma.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>
+                            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.user), :width => "30", :height => "30"), user_path(ma.forge_message.user) %></a>
                           </li>
                           <li class="homepageNewsPublisher fl">
-                    <a href="javascript:void(0);" class="<%= ufm.viewed == 0 ? "newsBlack" : "newsBlue" %>"><%= ufm.forge_message.user %></a>
+                            <%=link_to ma.forge_message.user, user_path(ma.forge_message.user), :class => "newsBlue" %>
                           </li>
-                  <li class="<%= ufm.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">
-                    更新了问题
+                          <li class="<%= ma.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>
+                            <%= link_to get_issue_des_update(ma.forge_message),
+                                        issue_path(:id => ma.forge_message.journalized_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                                        :title => "#{get_issue_des_update(ma.forge_message)}" %></a>
                           </li>
-                  <li class="homepageNewsTime fl"><%= time_tag(ufm.forge_message.created_on).html_safe %> </li>
+                          <li class="homepageNewsTime fl"><%= time_tag(ma.forge_message.created_on).html_safe %> </li>
                         </ul>
                     <% end %>
-            <% if ufm.forge_message_type == "Message" %>
+                    <% if ma.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="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a></li>
+                          <li class="homepageNewsPublisher fl"><%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue" %></li>
 
-                  <li class="<%= ufm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ufm.forge_message.parent_id.nil? ? "发布帖子" : "回复帖子" %></li>
+                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.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>
-
+                            <%=link_to ma.forge_message.subject.html_safe, project_boards_path(ma.forge_message.project,
+                                                                                               :parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id,
+                                                                                               :topic_id => ma.forge_message.id),:class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}",
+                                       :title => "#{ma.forge_message.subject.html_safe}" %></a></li>
+                          <li class="homepageNewsTime fl"><%= time_tag(ma.forge_message.created_on).html_safe %> </li>
                         </ul>
                     <% end %>
-            <% if ufm.forge_message_type == "News" %>
+                    <% if ma.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>
+                            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a>
                           </li>
                           <li class="homepageNewsPublisher fl">
-                    <a href="javascript:void(0);" class="newsBlue"><%= ufm.forge_message.author %></a>
+                            <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue" %>
                           </li>
-                  <li class="homepageNewsType fl">发布新闻</li>
+                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"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>
+                            <%= link_to ("#{ma.forge_message.title.html_safe}"), {:controller => 'news', :action => 'show', :id => ma.forge_message.id}, :class => "newsGrey", :title => "#{ma.forge_message.title.html_safe}" %></a>
                           </li>
-                  <li class="homepageNewsTime fl"><%= time_tag(ufm.forge_message.created_on).html_safe %> </li>
+                          <li class="homepageNewsTime fl"><%= time_tag(ma.forge_message.created_on).html_safe %> </li>
                         </ul>
                     <% end %>
-            <% if ufm.forge_message_type == "Comment" %>
+                    <% if ma.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="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a></li>
+                          <li class="homepageNewsPublisher fl"><%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue" %></li>
+                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"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>
+                            <%= link_to "#{ma.forge_message.comments.html_safe}",
+                                        {:controller => 'news', :action => 'show', :id => ma.forge_message.commented.id },:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :title => "#{ma.forge_message.comments.html_safe}"%></li>
+                          <li class="homepageNewsTime fl"><%= time_tag(ma.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" %>
+                <!--公共贴吧-->
+                <% if ma.class == MemoMessage %>
+                    <% if ma.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>
+                            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.memo.author), :width => "30", :height => "30"), user_path(ma.memo.author) %></a>
                           </li>
                           <li class="homepageNewsPublisher fl">
-                    <a href="javascript:void(0);" class="newsBlue"><%= urm.memo.author %></a>
+                            <%=link_to ma.memo.author, user_path(ma.memo.author), :class => "newsBlue" %>
                           </li>
-                  <li class="homepageNewsType fl" >新建贴吧帖子</li>
+                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>" ><%= ma.memo.parent_id.nil? ? "在贴吧发布帖子" : "回复了贴吧帖子" %></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>
+                            <%= link_to ma.memo.subject, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id),:class => "newsGrey" , :title => "#{ma.memo.content.html_safe}" %></a>
                           </li>
-                  <li class="homepageNewsTime fl"><%= time_tag(urm.memo.created_at).html_safe %> </li>
+                          <li class="homepageNewsTime fl"><%= time_tag(ma.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 == "Principal" %>
+                <!--用户留言-->
+                <% if ma.class == UserFeedbackMessage %>
+                    <% if ma.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>
+                            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.journals_for_message.user), :width => "30", :height => "30"), user_path(ma.journals_for_message.user) %></a>
                           </li>
                           <li class="homepageNewsPublisher fl">
-                    <a href="javascript:void(0);" class="newsBlue"><%= ufm.journals_for_message.user %></a>
+                            <%=link_to ma.journals_for_message.user, user_path(ma.journals_for_message.user), :class => "newsBlue" %>
                           </li>
-                      <li class="homepageNewsType fl"><%= ufm.journals_for_message.reply_id == 0 ? "给你留言了" : "回复了你的留言" %></li>
+                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.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>
+                            <%= link_to ma.journals_for_message.notes.html_safe, feedback_path(ma.journals_for_message.jour_id), :class => "newsGrey", :title => "#{ma.journals_for_message.notes}" %></a>
                           </li>
-                  <li class="homepageNewsTime fl"><%= time_tag(ufm.journals_for_message.created_on).html_safe %> </li>
+                          <li class="homepageNewsTime fl"><%= time_tag(ma.journals_for_message.created_on).html_safe %> </li>
                         </ul>
                     <% end %>
                 <% end %>
             <% end %>
+        <% end %>
+        <!--项目消息-->
     <% else %>
-    <div class="flash notice">暂无消息！</div>
+        <div class="flash notice">您目前还没有相关消息！</div>
     <% end %>
+    <div class="cl"></div>
     </div>
   </div>
 
-</div>
+
+
+
+
+
+
+
+
+
+
+

app/views/users/user_newfeedback.html.erb

@@ -1,16 +1,33 @@
-<div class="top_new">
-  <span class="<%= (@user.user_extensions.identity == 0 && @user.allowed_to?(:add_course, nil, :global => true)) ? 'top_new_bg' : 'top_newcourses_bg'%> fl"></span>
-  <% if @user.user_extensions.identity == 0 && @user.allowed_to?(:add_course, nil, :global => true) %>
-      <a href="<%= url_for(:controller => 'courses', :action => 'new',) %>" class="green_n_btn fr mt2" target="_blank">新建课程</a>
-  <% end %>
-  <div class="cl"></div>
-</div>
+<!--<div class="top_new">-->
+  <!--<span class="<%#= (@user.user_extensions.identity == 0 && @user.allowed_to?(:add_course, nil, :global => true)) ? 'top_new_bg' : 'top_newcourses_bg'%> fl"></span>-->
+  <!--<%# if @user.user_extensions.identity == 0 && @user.allowed_to?(:add_course, nil, :global => true) %>-->
+      <!--<a href="<%#= url_for(:controller => 'courses', :action => 'new',) %>" class="green_n_btn fr mt2" target="_blank">新建课程</a>-->
+  <!--<%# end %>-->
+  <!--<div class="cl"></div>-->
+<!--</div>-->
+<style type="text/css">
+    div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
+    span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
+    span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
+    div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
+    span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
+    span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
+    div.ke-toolbar .ke-outline{border:none;}
 
+    div.respond-form .reply_btn{margin-left:565px;margin-top:5px;}
+    div.recall_con{width:570px;}
+    div.recall_con .reply_btn{margin-left:525px;margin-top:5px;}
+    .fr.cr{ clear: right}
+</style>
 <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"user" %>
-<div id="RSide" class="fl">
+<!--<div id="RSide" class="fl">-->
   <!--<div class="users_r_top">-->
     <!--<h2 class="users_r_h2">用户留言</h2>-->
   <!--</div>-->
+<div id="users_setting">
+<div class="homepageRightBanner">
+  <div class="NewsBannerName">留言</div>
+</div>
   <div class="message_box mb10">
     <div nhname='new_message' style="display:none;">
       <%= form_for('new_form',:url =>  leave_user_message_path(@user.id),:method => "post") do |f|%>

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

@@ -92,8 +92,8 @@
     <div class="resourcesCheckAll">
       <input id="checkboxAll" type="checkbox" value="" onclick="all_select();"  class="resourcesCheckbox" />
     </div>
-    <a href="javascript:void(0);" class="replyGrey mr15" onclick="all_select();">全选</a>
-    <a href="javascript:void(0);" class="replyGrey" onclick="batch_delete();">删除</a>
+    <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();">
@@ -447,6 +447,54 @@ $(".resourcesList").click(function(e) {
 
       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_create.js.erb

@@ -1,5 +1,4 @@
 
 closeModal();
 $("#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,21 @@
 <% if( params[:object_type] == 'user') %>
+  //点击头像下面的添加关注按钮
   <% if( params[:target_id] == params[:object_id] ) %>
-    <% target = User.find_by_id(params[:target_id]) %>
-    //btn
-    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 %>
-    }
-
+    $("#watch_user_btn").html("<%= escape_javascript render(:partial => "layouts/user_watch_btn", :locals => {:target => watched.first}) %>");
+    $("#user_fans_number").html("<%= watched.first.watcher_users.count.to_s%>");
+  //在当前用户的粉丝、关注页面
   <% 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);
-    }
-
+    $("#users_list").html("<%= escape_javascript (render :partial => 'users/user_fans_item', :locals => {:list => list,:target=>User.current,:action_name=>action_name,:page=>params[:page]}) %>");
+    $("#watch_user_number_div").html('<%= escape_javascript ( link_to User.watched_by(params[:target_id]).count.to_s, {:controller=>"users", :action=>"user_watchlist",:id=>params[:target_id]},:class=>"homepageImageNumber") %>');
+   $("#fans_user_number_div").html('<%= escape_javascript ( link_to User.find(params[:target_id]).watcher_users.count.to_s, {:controller=>"users", :action=>"user_fanslist",:id=>params[:target_id]},:class=>"homepageImageNumber", :id => "user_fans_number") %>');
+   $("#fans_span").html('<%= count %>');
+   $("#watch_span").html('<%= count %>');
+  //在其他用户的粉丝、关注页面
   <% 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);
+$("#users_list").html("<%= escape_javascript (render :partial => 'users/user_fans_item', :locals => {:list => list,:target=>User.find(params[:target_id]),:action_name=>action_name,:page=>params[:page]}) %>");
+//在他人的用户分析下关注，不会改变他人的关注数，所以不必要刷新
+ //$("#watch_user_number").html('<%#= escape_javascript ( link_to User.watched_by(params[:target_id]).count.to_s, {:controller=>"users", :action=>"user_watchlist",:id=>params[:target_id]},:class=>"homepageImageNumber") %>');
   <% end %>
-
 <% else %>
 
 <% selector = ".#{watcher_css(watched)}" %>

app/views/welcome/_link_to_another.html.erb

@@ -1,5 +1,6 @@
 <%hidden_non_project = Setting.find_by_name("hidden_non_project")
-  visiable = hidden_non_project && hidden_non_project.value == "0"%>
+  visiable = true #hidden_non_project && hidden_non_project.value == "0"
+%>
 <% unless visiable%>
 <div class="linkother" style="margin-left: 30%; float: left">
   <a href="http://<%= Setting.host_name%>" class="link_other_item"><%=l(:label_projects_management_platform)%></a>

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: