Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course

Conflicts:
	app/views/users/_user_message_course.html.erb

Gemfile

@@ -50,10 +50,10 @@ gem 'elasticsearch-model'
 gem 'elasticsearch-rails'
 
 #rails 3.2.22.2 bug
- # gem "test-unit", "~>3.0"
+# gem "test-unit", "~>3.0"
 
 ### profile
- # gem 'oneapm_rpm'
+# gem 'oneapm_rpm'
 
 group :development do
   gem 'grape-swagger'

app/api/mobile/apis/users.rb

@@ -283,7 +283,6 @@ module Mobile
           requires :token, type: String
           requires :lastname, type: String
           requires :sex, type: Integer
-          requires :mail, type: String
         end
 
         post 'edit_userinfo' do
@@ -298,41 +297,11 @@ module Mobile
             status = -1
           end
 
-          if params[:mail].length > 60 then
-            message = "邮箱地址不能超过60个字符!"
-            status = -1
-          end
-
-          if !(params[:mail].match(/\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i))
-            message = "请输入正确的邮箱地址!"
-            status = -1
-          end
-
           if status == 0
-            # 修改邮箱的时候同步修改到gitlab
-            if user.mail != params[:mail]
-              g = Gitlab.client
-              begin
-                g.edit_user(user.gid, :email => params[:mail])
-              rescue
-                Rails.logger.error "sync user's email of gitlab failed!"
-              end
-            end
-
-            user.mail = params[:mail]
-
             user.lastname = params[:lastname]
-
+            user.update_attribute(:lastname, params[:lastname])
             se = user.extensions
-
-            se.gender = params[:sex]
-
-            if user.save && se.save
-              status = 0
-            else
-              message = "该邮箱地址已被使用！"
-              status = -1
-            end
+            se.update_attribute(:gender, params[:sex])
           end
 
           if status == 0

app/controllers/application_controller.rb

@@ -830,7 +830,7 @@ class ApplicationController < ActionController::Base
 
   # Returns a string that can be used as filename value in Content-Disposition header
   def filename_for_content_disposition(name)
-    request.env['HTTP_USER_AGENT'] =~ %r{MSIE|Trident} ? ERB::Util.url_encode(name) : name
+    request.env['HTTP_USER_AGENT'] =~ %r{MSIE|Trident|Edge} ? ERB::Util.url_encode(name) : name
   end
 
   def api_request?

app/controllers/pull_requests_controller.rb

@@ -5,7 +5,7 @@ class PullRequestsController < ApplicationController
   before_filter :authorize_logged
   before_filter :find_project_and_repository
   before_filter :connect_gitlab, :only => [:index, :show, :create, :accept_pull_request, :pull_request_commits, :pull_request_changes, :new,                                              :update_pull_request, :pull_request_comments, :create_pull_request_comment, :compare_pull_request]
-  before_filter :member_allowed, :only => [:new, :create]
+  before_filter :member_allowed, :only => [:new, :create, :create_pull_request_comment]
   before_filter :manager_allowed, :only => [:accept_pull_request]
 
   layout "base_projects"
@@ -188,15 +188,21 @@ class PullRequestsController < ApplicationController
   # @return [Gitlab::ObjectifiedHash]
   def accept_pull_request
     begin
-      status = @g.accept_merge_rquest(@project.gpid, params[:id], User.current.gid)
+      @status = @g.accept_merge_rquest(@project.gpid, params[:id], User.current.gid)
       # 接受后，给用户发消息
-      send_message_to_author(@project.id, status.author.try(:username), params[:id], 2)
+      send_message_to_author(@project.id, @status.author.try(:username), params[:id], 2)
 
       respond_to do |format|
-        format.js{redirect_to project_pull_request_path(status.id, :project_id => @project.id)}
+        format.js{redirect_to project_pull_request_path(@status.id, :project_id => @project.id)}
       end
+    rescue Gitlab::Error::Forbidden => e
+      @message = l(:label_pull_request_forbidden)
+    rescue Gitlab::Error::DataNotAccepted => e
+      @message = l(:label_pull_request_datanotaccepted)
+    rescue Gitlab::Error::NotFound => e
+      @message = l(:label_pull_request_notfound)
     rescue Exception => e
-      @message = e.message
+      puts e
     end
   end
 
@@ -310,7 +316,7 @@ class PullRequestsController < ApplicationController
       @offset ||= @pages.offset
       @changes = paginateHelper @changes, 10
 
-  end
+    end
 
   private
   # post 相关操作权限控制
@@ -318,7 +324,7 @@ class PullRequestsController < ApplicationController
   def manager_allowed
     unless is_project_manager?(User.current.id, @project.id)
       return render_403
-    end
+  end
   end
 
   # 项目成员可操作
@@ -328,6 +334,11 @@ class PullRequestsController < ApplicationController
     end
   end
 
+  def send_message user_id, project_id, pull_request_id
+    ForgeMessage.create(:user_id => user_id, :project_id => project_id,
+                                        :forge_message_id => pull_request_id, :forge_message_type => "PullRequest", :viewed => true)
+  end
+
   def send_message_to_manager project_id, pull_request_id, status
     project = Project.find(project_id)
     project.members.each do |member|

app/controllers/student_work_controller.rb

@@ -833,7 +833,7 @@ class StudentWorkController < ApplicationController
     @new_score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != ""
     @new_score.user_id = User.current.id
     @new_score.student_work_id = @work.id
-    if @is_teacher && @work.work_status == 0
+    if @is_teacher && !@new_score.score.nil? && @work.work_status == 0
       @work.update_attributes(:work_status => 1, :commit_time => Time.now)
     end
     if User.current.admin?

app/controllers/users_controller.rb

@@ -35,14 +35,14 @@ class UsersController < ApplicationController
 
   #
   before_filter :can_show_course, :only => [:user_courses,:user_homeworks]
-  before_filter :find_user, :only => [:user_fanslist, :user_watchlist, :show, :edit, :update, :destroy, :edit_membership, :user_courses,
-                                      :user_homeworks,:student_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,
+  before_filter :find_user, :only => [:user_fanslist, :user_watchlist, :show, :edit, :update, :destroy, :edit_membership, :user_courses, :unsolved_issues_list, :unfinished_homework_list,
+                                      :unfinished_poll_list, :user_homeworks,:student_homeworks, :destroy_membership, :user_activities, :user_projects, :user_newfeedback, :user_comments,
+                                      :anonymous_evaluation_list,:unfinished_test_list, :watch_contests, :info, :watch_projects, :show_score, :topic_score_index, :project_score_index,
+                                      :unapproval_applied_list, :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,:edit_brief_introduction,
                                       :user_import_homeworks,:user_search_homeworks,:user_import_resource, :user_system_messages,:choose_user_course,:user_courselist,:user_projectlist,:sort_syllabus_list,
-                                      :sort_project_list,:my_homeworks,:manage_or_receive_homeworks,:search_m_r_homeworks, :cancel_or_collect,:expand_courses,:homepage, :user_issues]
+                                      :sort_project_list,:my_homeworks,:manage_or_receive_homeworks,:search_m_r_homeworks, :cancel_or_collect,:expand_courses,:homepage, :user_issues, :course_community, :project_community]
   before_filter :auth_user_extension, only: :show
   #before_filter :rest_user_score, only: :show
   #before_filter :select_entry, only: :user_projects
@@ -72,7 +72,7 @@ class UsersController < ApplicationController
   helper :user_score
   helper :journals
 
-  # added by liuping 关注 
+  # added by liuping 关注
 
   helper :watchers
   helper :activities
@@ -90,53 +90,54 @@ class UsersController < ApplicationController
   # order 排序条件
   # subject 主题：搜索用（注意：搜索和列表调用同一方法，通过参数或者remote区分）
   def user_issues
-      @subject = params[:subject]
-      # author_id = params[:author_id]
-      params[:assigned_to_id].to_i == 0 ? @assigned_to = nil : @assigned_to = params[:assigned_to_id].to_i
-      params[:author_id].to_i == 0 ? author_id = nil : author_id = params[:author_id].to_i
-      params[:project_id].to_i == 0 ? @project_id = nil : @project_id = params[:project_id]
-      if @project_id.nil?
-        if @assigned_to.nil?
-          if author_id.nil?
-            @issues = Issue.where("(author_id =? or assigned_to_id =? ) and subject like ?",
-                                  @user.id , @user.id, "%#{@subject}%").order('updated_on desc')
-          else
-            @issues = Issue.where("author_id =?  and subject like ?",
-                                  author_id , "%#{@subject}%").order('updated_on desc')
-          end
+    @type = params[:type] unless params[:type].nil?
+    @subject = params[:subject]
+    # author_id = params[:author_id]
+    params[:assigned_to_id].to_i == 0 ? @assigned_to = nil : @assigned_to = params[:assigned_to_id].to_i
+    params[:author_id].to_i == 0 ? author_id = nil : author_id = params[:author_id].to_i
+    params[:project_id].to_i == 0 ? @project_id = nil : @project_id = params[:project_id]
+    if @project_id.nil?
+      if @assigned_to.nil?
+        if author_id.nil?
+          @issues = Issue.where("(author_id =? or assigned_to_id =? ) and subject like ?",
+                                @user.id , @user.id, "%#{@subject}%").order('updated_on desc')
         else
-          @issues = Issue.where("assigned_to_id =? and subject like ?", @assigned_to, "%#{@subject}%").order('updated_on desc')
+          @issues = Issue.where("author_id =?  and subject like ?",
+                                author_id , "%#{@subject}%").order('updated_on desc')
         end
-
       else
-        if @assigned_to.nil?
-          if author_id.nil?
-            @issues = Issue.where("(author_id =? or assigned_to_id =? ) and project_id=? and subject like ?",
-                                  (author_id ? author_id : @user.id) , @user.id, @project_id, "%#{@subject}%").order('updated_on desc')
-          else
-            @issues = Issue.where("author_id =? and project_id=? and subject like ?",
-                                  author_id , @project_id, "%#{@subject}%").order('updated_on desc')
-          end
-        else
-          @issues = Issue.where("assigned_to_id =? and project_id=? and subject like ?",
-                                @assigned_to, @project_id, "%#{@subject}%").order('updated_on desc')
-        end
+        @issues = Issue.where("assigned_to_id =? and subject like ?", @assigned_to, "%#{@subject}%").order('updated_on desc')
       end
-      @issues_filter = Issue.where("author_id =? or assigned_to_id =?", (author_id ? author_id : @user.id) , @user).order('updated_on desc')
-      @issues_assigned_count = Issue.where("assigned_to_id =? and subject like ?", @user.id, "%#{@subject}%").count
-      @issues_author_count = Issue.where("author_id =? and subject like ?", @user.id, "%#{@subject}%").count
-      @issue_open_count = Issue.where(" (author_id =? or assigned_to_id =?) and status_id in (1,2,3,4,6)", (author_id ? author_id : @user.id) , @user).count
-      @issue_close_count = Issue.where("(author_id =? or assigned_to_id =?) and status_id = 5",  (author_id ? author_id : @user.id) , @user.id).count
 
-      # 导出excel的issues
-      @excel_issues = @issues
+    else
+      if @assigned_to.nil?
+        if author_id.nil?
+          @issues = Issue.where("(author_id =? or assigned_to_id =? ) and project_id=? and subject like ?",
+                                (author_id ? author_id : @user.id) , @user.id, @project_id, "%#{@subject}%").order('updated_on desc')
+        else
+          @issues = Issue.where("author_id =? and project_id=? and subject like ?",
+                                author_id , @project_id, "%#{@subject}%").order('updated_on desc')
+        end
+      else
+        @issues = Issue.where("assigned_to_id =? and project_id=? and subject like ?",
+                              @assigned_to, @project_id, "%#{@subject}%").order('updated_on desc')
+      end
+    end
+    @issues_filter = Issue.where("author_id =? or assigned_to_id =?", (author_id ? author_id : @user.id) , @user).order('updated_on desc')
+    @issues_assigned_count = Issue.where("assigned_to_id =? and subject like ?", @user.id, "%#{@subject}%").count
+    @issues_author_count = Issue.where("author_id =? and subject like ?", @user.id, "%#{@subject}%").count
+    @issue_open_count = Issue.where(" (author_id =? or assigned_to_id =?) and status_id in (1,2,3,4,6)", (author_id ? author_id : @user.id) , @user).count
+    @issue_close_count = Issue.where("(author_id =? or assigned_to_id =?) and status_id = 5",  (author_id ? author_id : @user.id) , @user.id).count
 
-      @issue_count = @issues.count
-      @limit = 10
-      @is_remote = true
-      @issue_pages = Paginator.new @issue_count, @limit, params['page'] || 1
-      @offset ||= @issue_pages.offset
-      @issues = paginateHelper @issues, @limit
+    # 导出excel的issues
+    @excel_issues = @issues
+
+    @issue_count = @issues.count
+    @limit = 10
+    @is_remote = true
+    @issue_pages = Paginator.new @issue_count, @limit, params['page'] || 1
+    @offset ||= @issue_pages.offset
+    @issues = paginateHelper @issues, @limit
 
     respond_to do |format|
       format.html{render :layout => 'static_base'}
@@ -433,7 +434,8 @@ class UsersController < ApplicationController
         render_404
         return
     end
-    @message_alls = paginateHelper @message_alls,25
+
+    @message_alls = paginateHelper @message_alls, 25
     respond_to do |format|
       format.html{render :layout=>'new_base_user'}
     end
@@ -535,7 +537,7 @@ class UsersController < ApplicationController
           #将角色改为老师或者教辅
           member =  Course.find(@msg.course_id).members.where(:user_id=>apply_user.id).all[0]
           member.role_ids = integer_ids
-              #删除为学生的记录
+          #删除为学生的记录
           unless member.role_ids.include?(10)
             joined = StudentsForCourse.where('student_id = ? and course_id = ?', member.user_id,@msg.course_id)
             joined.each do |join|
@@ -956,15 +958,15 @@ class UsersController < ApplicationController
       visible_course = Course.where("is_public = 1 && is_delete = 0")
       visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")"
       @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'").order("#{@order} #{@b_sort}")
-    # elsif params[:type] == "3" #申请题库
-    #   none_visible_course = Course.where("is_delete = 1")
-    #   none_visible_course_ids = none_visible_course.empty? ? "(-1)" : "(" + none_visible_course.map{|course| course.id}.join(",") + ")"
-    #   #apply_homeworks = ApplyHomework.where("user_id = ?",@user.id).order('created_at desc')
-    #   #homework_ids = apply_homeworks.empty? ? "(-1)" : "(" + apply_homeworks.map{|ah| ah.homework_common_id}.join(",") + ")"
-    #   #@homeworks = HomeworkCommon.where("id in #{homework_ids} and course_id not in #{none_visible_course_ids}")
-    #
-    #   sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN apply_homeworks as ah ON homework_commons.id = ah.homework_common_id where ah.user_id = #{@user.id} and homework_commons.course_id not in #{none_visible_course_ids} order by ah.created_at desc"
-    #   @homeworks = HomeworkCommon.find_by_sql(sql)
+      # elsif params[:type] == "3" #申请题库
+      #   none_visible_course = Course.where("is_delete = 1")
+      #   none_visible_course_ids = none_visible_course.empty? ? "(-1)" : "(" + none_visible_course.map{|course| course.id}.join(",") + ")"
+      #   #apply_homeworks = ApplyHomework.where("user_id = ?",@user.id).order('created_at desc')
+      #   #homework_ids = apply_homeworks.empty? ? "(-1)" : "(" + apply_homeworks.map{|ah| ah.homework_common_id}.join(",") + ")"
+      #   #@homeworks = HomeworkCommon.where("id in #{homework_ids} and course_id not in #{none_visible_course_ids}")
+      #
+      #   sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN apply_homeworks as ah ON homework_commons.id = ah.homework_common_id where ah.user_id = #{@user.id} and homework_commons.course_id not in #{none_visible_course_ids} order by ah.created_at desc"
+      #   @homeworks = HomeworkCommon.find_by_sql(sql)
     end
     if params[:property]
       all_homework_ids = @homeworks.empty? ? "(-1)" : "(" + @homeworks.map{|h| h.id}.join(",") + ")"
@@ -1491,13 +1493,13 @@ class UsersController < ApplicationController
     @jour_count = jours.count
     @jour = jours.limit(10).offset(@page * 10)
     @type = params[:type]
-    if User.current == @user
-      @jour.update_all(:is_readed => true, :status => false)
-      @jour.each do |journal|
-        # fetch_user_leaveWord_reply(journal).update_all(:is_readed => true, :status => false)
-        journal.delay.set_children_readed_delay
-      end
-    end
+    # if User.current == @user
+    #   @jour.update_all(:is_readed => true, :status => false)
+    #   @jour.each do |journal|
+    #     # fetch_user_leaveWord_reply(journal).update_all(:is_readed => true, :status => false)
+    #     journal.delay.set_children_readed_delay
+    #   end
+    # end
     @state = false
     render :layout=>'new_base_user'
   end
@@ -1814,22 +1816,301 @@ class UsersController < ApplicationController
   end
 
   def show
-    #更新用户申请成为课程老师或教辅消息的状态
+    if is_current_user
+      # 自己的主页显示消息
+      # 系统消息为管理员发送，我的消息中包含有系统消息
+      @message_alls = []
+      messages = MessageAll.where("(user_id =? and message_type !=?) or message_type =?" ,@user.id, "SystemMessage", "SystemMessage").includes(:message).order("created_at desc")
+      messages.each do |message_all|
+        mess = message_all.message
+        unless (message_all.message_type == 'CourseMessage' && mess && mess.course && mess.course.is_delete == 1)
+          @message_alls << mess
+        end
+      end
+      @message_count = @message_alls.count
+      @message_alls = paginateHelper @message_alls, 20
+      @unsolved_issues_count = Issue.where(:assigned_to_id => @user.id, :status_id => [1, 2, 4, 6]).includes(:author, :project).order("updated_on desc").count
+      # 用户待完成的作业
+      my_course_ids = StudentsForCourse.includes(:course).where("student_id = #{@user.id} and courses.is_delete = 0").blank? ? "(-1)" : "(" + StudentsForCourse.includes(:course).where("student_id = #{@user.id} and courses.is_delete = 0").map{|sc| sc.course_id}.join(",") + ")"
+      homeworks = HomeworkCommon.where("course_id in #{my_course_ids} and publish_time <= '#{Date.today}'")
+      homework_ids = homeworks.blank? ? "(-1)" : "(" + homeworks.map{|homework| homework.id}.join(",") + ")"
+      student_works = StudentWork.where("user_id = #{@user.id} and homework_common_id in #{homework_ids} and work_status != 0")
+      @unfinished_homework_count = homeworks.count - student_works.count
+      # 用户待完成的测验
+      exercises = Exercise.where("course_id in #{my_course_ids} and exercise_status = 2")
+      exercise_ids = exercises.blank? ? "(-1)" : "(" + exercises.map{|ex| ex.id}.join(",") + ")"
+      exercise_users = ExerciseUser.where("user_id = #{@user.id} and exercise_id in #{exercise_ids}")
+      @unfinished_test_count = exercises.count - exercise_users.count
+      # 用户待完成的问卷
+      polls =  Poll.where("polls_type = 'Course' and polls_group_id in #{my_course_ids} and polls_status = 2")
+      poll_ids = polls.blank? ? "(-1)" : "(" + polls.map{|poll| poll.id}.join(",") + ")"
+      poll_users = PollUser.where("user_id = #{@user.id} and poll_id in #{poll_ids}")
+      @unfinished_poll_count = polls.count - poll_users.count
+      # 用户待匿评的作品
+      homeworks = HomeworkCommon.includes(:homework_detail_manual).where("homework_commons.course_id in #{my_course_ids} and homework_detail_manuals.comment_status in (1,2)")
+      homework_ids = homeworks.blank? ? "(-1)" : "(" + homeworks.map{|homework| homework.id}.join(",") + ")"
+      student_work_scores = @user.student_works_scores.where("reviewer_role = 3")
+      anonymous_evaluation_ids = student_work_scores.blank? ? "(-1)" : "(" + student_work_scores.map{|st| st.student_work_id}.join(",") + ")"
+      unfinished_evaluations = @user.student_works_evaluation_distributions.where("student_work_id not in #{anonymous_evaluation_ids}")
+      unfinished_evaluations_work_ids = unfinished_evaluations.blank? ? "(-1)" : "(" + unfinished_evaluations.map{|st| st.student_work_id}.join(",") + ")"
+      @anonymous_evaluation_count = StudentWork.where("student_works.id in #{unfinished_evaluations_work_ids} and homework_common_id in #{homework_ids}").count
+      # 待评阅的作业  暂不做
+      # @unreview_homework = 1
+
+      # 待审批的申请
+      @applied_message_alls = []
+      applied_messages_all = MessageAll.where(:user_id => @user.id, :message_type => ["OrgMessage", "AppliedMessage", "CourseMessage"]).includes(:message)
+      applied_messages_all.each do |message_all|
+        mess = message_all.message
+        if !mess.nil?
+          if (message_all.message_type == "OrgMessage")
+            if  mess.message_type == "ApplySubdomain" && OrgMessage.where(:organization_id => mess.organization_id, :message_type => "AgreeApplySubdomain").count == 0
+              @applied_message_alls << mess
+            end
+          elsif (message_all.message_type == "AppliedMessage" )
+            if (mess.applied_type == "AppliedProject" &&  mess.status == 1) || (mess.applied_type == "ApplyAddSchools" && mess.status == 0)
+              @applied_message_alls << mess
+            end
+          elsif message_all.message_type == "CourseMessage"
+            if (mess.course_message_type == "JoinCourse" && mess.status == 0)
+              @applied_message_alls << mess
+            end
+          end
+        end
+      end
+      @applied_message_alls_count = @applied_message_alls.count
+      # org_applied_messages = MessageAll.where(:message_type => "OrgMessage").includes(:message).order("created_at desc")
+      # org_applied_messages = org_applied_messages.message.map{|message| message.message_type == "ApplySubdomain" and OrgMessage.where(:organization_id => message.organization_id, :message_type => "AgreeApplySubdomain").count == 0}.length
+      # project_message_applied_count = AppliedMessage.where(:user_id => @user.id, :message_type => "AppliedProject", :status => 1)
+      # school_message_applied_count = AppliedMessage.where(:user_id => @user.id, :message_type => "ApplyAddSchools", :status => 0)
+      # course_message_applied_count = CourseMessage.where(:message_type => "JoinCourse", :satus => 0)
+      # @applied_message_count = org_message_applied_count + project_message_applied_count + school_message_applied_count + course_message_applied_count
+    else
+      # 看别人的主页显示动态
+      #更新用户申请成为课程老师或教辅消息的状态
+      if params[:course_id] != nil
+        join_course_messages = CourseMessage.where("course_id =? and course_message_type =? and user_id =? and course_message_id =? and viewed =?",
+                                                   params[:course_id],  'JoinCourseRequest', User.current.id, @user.id, false)
+        join_course_messages.update_all(:viewed => true)
+      end
+      shield_project_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{@user.id} and shield_type='Project'").map(&:shield_id)
+      shield_course_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{@user.id} and shield_type='Course'").map(&:shield_id)
+      @page = params[:page] ? params[:page].to_i + 1 : 0
+      user_project_ids = (@user.favorite_projects.visible.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (@user.favorite_projects.visible.map{|project| project.id}-shield_project_ids).join(",") + ")"
+      user_course_ids = (@user.favorite_courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (@user.favorite_courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).join(",") + ")"
+      course_types = "('Message','News','HomeworkCommon','Poll','Course','JournalsForMessage')"
+      project_types = "('Message','Issue','Project')"
+      principal_types = "JournalsForMessage"
+      container_type = ''
+      act_type = ''
+      # 他的动态
+      sql = "user_id = #{@user.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))"
+      if params[:type].present?
+        case params[:type]
+          when "course_homework"
+            container_type = 'Course'
+            act_type = 'HomeworkCommon'
+          when "course_news"
+            container_type = 'Course'
+            act_type = 'News'
+          when "course_message"
+            container_type = 'Course'
+            act_type = 'Message'
+          when "course_poll"
+            container_type = 'Course'
+            act_type = 'Poll'
+          when "course_journals"
+            container_type = 'Course'
+            act_type = 'JournalsForMessage'
+          when "project_issue"
+            container_type = 'Project'
+            act_type = 'Issue'
+          when "project_message"
+            container_type = 'Project'
+            act_type = 'Message'
+          when "user_journals"
+            container_type = 'Principal'
+            act_type = 'JournalsForMessage'
+          when "current_user"
+            container_type = 'Principal'
+            act_type = 'Principal'
+          when "all"
+            container_type = 'all'
+            act_type = 'all'
+        end
+      end
+      if container_type != '' && container_type != 'all'
+        if container_type == 'Course'
+          sql = "container_type = '#{container_type}' and container_id in #{user_course_ids} and act_type = '#{act_type}'"
+        elsif container_type == 'Project'
+          sql = "container_type = '#{container_type}' and container_id in #{user_project_ids} and act_type = '#{act_type}'"
+        elsif container_type == 'Principal' && act_type == 'JournalsForMessage'
+          sql = "container_type = '#{container_type}' and act_type= '#{act_type}' and container_id = #{@user.id}"
+        elsif container_type == 'Principal' && act_type == 'Principal'
+          sql = "user_id = #{@user.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))"
+        end
+        if User.current != @user
+          sql += " and user_id = #{@user.id}"
+        end
+      else
+        if User.current != @user
+          blog_ids = "("+@user.blog.id.to_s+")"
+        else
+          blog_ids = "("+@user.blog.id.to_s+","+((User.watched_by(@user.id).count == 0 )? '0' :User.watched_by(@user.id).map{|u| u.blog.id}.join(','))+")"
+        end
+        sql = "(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +
+            "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+
+            "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id}) " +
+            "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})"
+        if container_type != 'all' && User.current != @user
+          sql = "user_id = #{@user.id} and(" + sql + ")"
+        end
+      end
+      @user_activities_count = UserActivity.where("#{sql}").order('updated_at desc').count
+      @user_activities = UserActivity.where("#{sql}").order('updated_at desc').limit(10).offset(@page * 10)
+      @type = params[:type]
+    end
+    respond_to do |format|
+      format.js
+      format.html {render :layout => 'new_base_user'}
+    end
+  end
+
+  # 待解决的Issue
+  def unsolved_issues_list
+    @unsolved_issues = Issue.where(:assigned_to_id => @user.id, :status_id => [1, 2, 4, 6]).includes(:author, :project).order("updated_on desc")
+    @unsolved_issues_count = @unsolved_issues.count
+    @limit = 20
+    @is_remote = true
+    @unsolved_issues_pages = Paginator.new @unsolved_issues_count, @limit, params['page'] || 1
+    @offset ||= @unsolved_issues_pages.offset
+    @unsolved_issues = paginateHelper @unsolved_issues, @limit
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  # 待完成的作业
+  def unfinished_homework_list
+    my_course_ids = StudentsForCourse.includes(:course).where("student_id = #{@user.id} and courses.is_delete = 0").blank? ? "(-1)" : "(" + StudentsForCourse.includes(:course).where("student_id = #{@user.id} and courses.is_delete = 0").map{|sc| sc.course_id}.join(",") + ")"
+    homeworks = HomeworkCommon.where("course_id in #{my_course_ids} and publish_time <= '#{Date.today}'")
+    homework_ids = homeworks.blank? ? "(-1)" : "(" + homeworks.map{|homework| homework.id}.join(",") + ")"
+    student_works = StudentWork.where("user_id = #{@user.id} and homework_common_id in #{homework_ids} and work_status != 0")
+    finished_works_id = student_works.blank? ? "(-1)" : "(" + student_works.map{ |sw| sw.homework_common_id.to_i }.join(",") + ")"
+    @unfinished_homeworks = HomeworkCommon.where("course_id in #{my_course_ids} and publish_time <= '#{Date.today}' and id not in #{finished_works_id}").order("updated_at desc")
+    @unfinished_homeworks_count = @unfinished_homeworks.count
+    @limit = 20
+    @unfinished_homework_pages = Paginator.new @unfinished_homeworks_count, @limit, params['page'] || 1
+    @offset ||= @unfinished_homework_pages.offset
+    @unfinished_homeworks = paginateHelper @unfinished_homeworks, @limit
+
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  # 待完成的测验
+  def unfinished_test_list
+    my_course_ids = StudentsForCourse.includes(:course).where("student_id = #{@user.id} and courses.is_delete = 0").blank? ? "(-1)" : "(" + StudentsForCourse.includes(:course).where("student_id = #{@user.id} and courses.is_delete = 0").map{|sc| sc.course_id}.join(",") + ")"
+    exercises = Exercise.where("course_id in #{my_course_ids} and exercise_status = 2")
+    exercise_ids = exercises.blank? ? "(-1)" : "(" + exercises.map{|ex| ex.id}.join(",") + ")"
+    exercise_users = ExerciseUser.where("user_id = #{@user.id} and exercise_id in #{exercise_ids}")
+    finished_test_ids = exercise_users.blank? ? "(-1)" : "(" + exercise_users.map{|eu| eu.exercise_id }.join(",") + ")"
+    @unfinished_test = Exercise.where("course_id in #{my_course_ids} and exercise_status = 2 and id not in #{finished_test_ids}")
+    @unfinished_test_count = @unfinished_test.count
+    @limit = 20
+    @unfinished_test_pages = Paginator.new @unfinished_test_count, @limit, params['page'] || 1
+    @offset ||= @unfinished_test_pages.offset
+    @unfinished_test = paginateHelper @unfinished_test, @limit
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  # 待完成的问卷
+  def unfinished_poll_list
+    my_course_ids = StudentsForCourse.includes(:course).where("student_id = #{@user.id} and courses.is_delete = 0").blank? ? "(-1)" : "(" + StudentsForCourse.includes(:course).where("student_id = #{@user.id} and courses.is_delete = 0").map{|sc| sc.course_id}.join(",") + ")"
+    polls =  Poll.where("polls_type = 'Course' and polls_group_id in #{my_course_ids} and polls_status = 2")
+    poll_ids = polls.blank? ? "(-1)" : "(" + polls.map{|poll| poll.id}.join(",") + ")"
+    poll_users = PollUser.where("user_id = #{@user.id} and poll_id in #{poll_ids}")
+    finished_poll_ids = poll_users.blank? ? "(-1)" :  "(" + poll_users.map{|pu| pu.poll_id }.join(",") + ")"
+    @unfinished_poll = Poll.where("polls_type = 'Course' and polls_group_id in #{my_course_ids} and polls_status = 2 and id not in #{finished_poll_ids}").order("updated_at desc")
+    @unfinished_poll_count = @unfinished_poll.count
+    @limit = 20
+    @unfinished_poll_pages = Paginator.new @unfinished_poll_count, @limit, params['page'] || 1
+    @offset ||= @unfinished_poll_pages.offset
+    @unfinished_poll = paginateHelper @unfinished_poll, @limit
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  # 待匿评的作业
+  def anonymous_evaluation_list
+    my_course_ids = StudentsForCourse.includes(:course).where("student_id = #{@user.id} and courses.is_delete = 0").blank? ? "(-1)" : "(" + StudentsForCourse.includes(:course).where("student_id = #{@user.id} and courses.is_delete = 0").map{|sc| sc.course_id}.join(",") + ")"
+    homeworks = HomeworkCommon.includes(:homework_detail_manual).where("homework_commons.course_id in #{my_course_ids} and homework_detail_manuals.comment_status in (1,2)")
+    homework_ids = homeworks.blank? ? "(-1)" : "(" + homeworks.map{|homework| homework.id}.join(",") + ")"
+    student_work_scores = @user.student_works_scores.where("reviewer_role = 3")
+    anonymous_evaluation_ids = student_work_scores.blank? ? "(-1)" : "(" + student_work_scores.map{|st| st.student_work_id}.join(",") + ")"
+    unfinished_evaluations = @user.student_works_evaluation_distributions.where("student_work_id not in #{anonymous_evaluation_ids}")
+    unfinished_evaluations_work_ids = unfinished_evaluations.blank? ? "(-1)" : "(" + unfinished_evaluations.map{|st| st.student_work_id}.join(",") + ")"
+    homework_ids = StudentWork.where("id in #{unfinished_evaluations_work_ids} and homework_common_id in #{homework_ids}").blank? ? "(-1)" : "(" + StudentWork.where("id in #{unfinished_evaluations_work_ids} and homework_common_id in #{homework_ids}").map{|st| st.homework_common_id}.join(",") + ")"
+    @anonymous_evaluation = HomeworkCommon.where("homework_commons.id in #{homework_ids}")
+    @anonymous_evaluation_count = @anonymous_evaluation.count
+    @limit = 20
+    @anonymous_evaluation_pages = Paginator.new @anonymous_evaluation_count, @limit, params['page'] || 1
+    @offset ||= @anonymous_evaluation_pages.offset
+    @anonymous_evaluation = paginateHelper @anonymous_evaluation, @limit
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  # 待审批的申请
+  def unapproval_applied_list
+    @message_alls = []
+    # messages_all = MessageAll.where("(user_id =? and message_type !=?) or message_type =?" ,@user.id, "SystemMessage", "SystemMessage").includes(:message).order("created_at desc")
+    messages_all = MessageAll.where(:user_id => @user.id, :message_type => ["OrgMessage", "AppliedMessage", "CourseMessage"]).includes(:message).order("created_at desc")
+    messages_all.each do |message_all|
+      mess = message_all.message
+      if !mess.nil?
+        if (message_all.message_type == "OrgMessage")
+          if  mess.message_type == "ApplySubdomain" && OrgMessage.where(:organization_id => mess.organization_id, :message_type => "AgreeApplySubdomain").count == 0
+            @message_alls << mess
+          end
+        elsif (message_all.message_type == "AppliedMessage" )
+          if (mess.applied_type == "AppliedProject" &&  mess.status == 1) || (mess.applied_type == "ApplyAddSchools" && mess.status == 0)
+            @message_alls << mess
+          end
+        elsif message_all.message_type == "CourseMessage"
+          if (mess.course_message_type == "JoinCourse" && mess.status == 0)
+            @message_alls << mess
+          end
+        end
+      end
+    end
+    @message_count = @message_alls.count
+    @message_alls = paginateHelper @message_alls, 20
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  # 课程社区
+  def course_community
     if params[:course_id] != nil
       join_course_messages = CourseMessage.where("course_id =? and course_message_type =? and user_id =? and course_message_id =? and viewed =?",
                                                  params[:course_id],  'JoinCourseRequest', User.current.id, @user.id, false)
       join_course_messages.update_all(:viewed => true)
     end
-    shield_project_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{@user.id} and shield_type='Project'").map(&:shield_id)
     shield_course_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{@user.id} and shield_type='Course'").map(&:shield_id)
     @page = params[:page] ? params[:page].to_i + 1 : 0
-    user_project_ids = (@user.favorite_projects.visible.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (@user.favorite_projects.visible.map{|project| project.id}-shield_project_ids).join(",") + ")"
     user_course_ids = (@user.favorite_courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (@user.favorite_courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).join(",") + ")"
     course_types = "('Message','News','HomeworkCommon','Poll','Course','JournalsForMessage')"
-    project_types = "('Message','Issue','Project')"
     principal_types = "JournalsForMessage"
     container_type = ''
     act_type = ''
+
     if params[:type].present?
       case params[:type]
         when "course_homework"
@@ -1847,6 +2128,63 @@ class UsersController < ApplicationController
         when "course_journals"
           container_type = 'Course'
           act_type = 'JournalsForMessage'
+        when "user_journals"
+          container_type = 'Principal'
+          act_type = 'JournalsForMessage'
+        when "current_user"
+          container_type = 'Principal'
+          act_type = 'Principal'
+        when "all"
+          container_type = 'all'
+          act_type = 'all'
+      end
+    end
+    if container_type != '' && container_type != 'all'
+      if container_type == 'Course'
+        sql = "container_type = '#{container_type}' and container_id in #{user_course_ids} and act_type = '#{act_type}'"
+      elsif container_type == 'Principal' && act_type == 'JournalsForMessage'
+        sql = "container_type = '#{container_type}' and act_type= '#{act_type}' and container_id = #{@user.id}"
+      elsif container_type == 'Principal' && act_type == 'Principal'
+        sql = "user_id = #{@user.id} and (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})"
+      end
+      if User.current != @user
+        sql += " and user_id = #{@user.id}"
+      end
+    else
+      if User.current != @user
+        blog_ids = "("+@user.blog.id.to_s+")"
+      else
+        blog_ids = "("+@user.blog.id.to_s+","+((User.watched_by(@user.id).count == 0 )? '0' :User.watched_by(@user.id).map{|u| u.blog.id}.join(','))+")"
+      end
+      sql = "(container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})" +
+          "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id}) " +
+          "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})"
+      if container_type != 'all' && User.current != @user
+        sql = "user_id = #{@user.id} and(" + sql + ")"
+      end
+    end
+    @user_activities_count = UserActivity.where("#{sql}").order('updated_at desc').count
+    @user_activities = UserActivity.where("#{sql}").order('updated_at desc').limit(10).offset(@page * 10)
+    @type = params[:type]
+    respond_to do |format|
+      format.js
+      format.html {render :layout => 'base_course_community'}
+    end
+  end
+
+  # 项目社区
+  def project_community
+    # 看别人的主页显示动态
+    #更新用户申请成为课程老师或教辅消息的状态
+    shield_project_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{@user.id} and shield_type='Project'").map(&:shield_id)
+    @page = params[:page] ? params[:page].to_i + 1 : 0
+    user_project_ids = (@user.favorite_projects.visible.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (@user.favorite_projects.visible.map{|project| project.id}-shield_project_ids).join(",") + ")"
+    project_types = "('Message','Issue','Project')"
+    principal_types = "JournalsForMessage"
+    container_type = ''
+    act_type = ''
+    if params[:type].present?
+      case params[:type]
         when "project_issue"
           container_type = 'Project'
           act_type = 'Issue'
@@ -1865,14 +2203,12 @@ class UsersController < ApplicationController
       end
     end
     if container_type != '' && container_type != 'all'
-      if container_type == 'Course'
-        sql = "container_type = '#{container_type}' and container_id in #{user_course_ids} and act_type = '#{act_type}'"
-      elsif container_type == 'Project'
+      if container_type == 'Project'
         sql = "container_type = '#{container_type}' and container_id in #{user_project_ids} and act_type = '#{act_type}'"
       elsif container_type == 'Principal' && act_type == 'JournalsForMessage'
         sql = "container_type = '#{container_type}' and act_type= '#{act_type}' and container_id = #{@user.id}"
       elsif container_type == 'Principal' && act_type == 'Principal'
-        sql = "user_id = #{@user.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))"
+        sql = "user_id = #{@user.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}))"
       end
       if User.current != @user
         sql += " and user_id = #{@user.id}"
@@ -1884,19 +2220,18 @@ class UsersController < ApplicationController
         blog_ids = "("+@user.blog.id.to_s+","+((User.watched_by(@user.id).count == 0 )? '0' :User.watched_by(@user.id).map{|u| u.blog.id}.join(','))+")"
       end
       sql = "(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +
-          "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+
           "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id}) " +
           "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})"
       if container_type != 'all' && User.current != @user
         sql = "user_id = #{@user.id} and(" + sql + ")"
       end
     end
-    
+    @user_activities_count = UserActivity.where("#{sql}").order('updated_at desc').count
     @user_activities = UserActivity.where("#{sql}").order('updated_at desc').limit(10).offset(@page * 10)
     @type = params[:type]
     respond_to do |format|
       format.js
-      format.html {render :layout => 'new_base_user'}
+      format.html {render :layout => 'base_project_community'}
     end
   end
 
@@ -2520,7 +2855,7 @@ class UsersController < ApplicationController
         end
         @ori = ori
       end
-    # 发送多个资源
+      # 发送多个资源
     elsif params[:send_ids].present?
       send_ids = params[:send_ids].split(",")
       project_ids = params[:projects_ids]
@@ -2796,7 +3131,7 @@ class UsersController < ApplicationController
     project_ids.each do |project_id|
       project = Project.find(project_id)
       if project.news.map(&:id).exclude?(news.id)
-      #  message = Message.create(:board_id => project.boards.first.id, :subject => news.title, :content => news.description, :author_id => User.current.id)
+        #  message = Message.create(:board_id => project.boards.first.id, :subject => news.title, :content => news.description, :author_id => User.current.id)
         message = News.create(:project_id => project.id, :title => news.title, :summary => news.summary, :description => news.description, :author_id => User.current.id, :created_on => Time.now )
         # record forward to table forwards if new record is valid
         if message.valid?
@@ -3547,7 +3882,7 @@ class UsersController < ApplicationController
     # @syllabus = paginateHelper @syllabus,@limit
 
     respond_to do |format|
-      format.html {render :layout => 'new_base_user'}
+      format.html {render :layout => 'base_course_community'}
     end
   end
 
@@ -3682,7 +4017,7 @@ class UsersController < ApplicationController
     #limit = 5
 
     # 用户的所有项目
-   # @my_projects = @user.projects.visible.where("projects.user_id = #{@user.id}").select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS updatetime").order("updatetime DESC")
+    # @my_projects = @user.projects.visible.where("projects.user_id = #{@user.id}").select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS updatetime").order("updatetime DESC")
     @my_projects = @user.projects.where("projects.user_id = #{@user.id}").select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS updatetime").order("updatetime DESC")
     @my_projects_count = @my_projects.count
 
@@ -3691,7 +4026,7 @@ class UsersController < ApplicationController
     @my_joined_projects_count = @my_joined_projects.count
 
     respond_to do |format|
-      format.html {render :layout => 'new_base_user'}
+      format.html {render :layout => 'base_project_community'}
     end
   end
 

app/helpers/application_helper.rb

@@ -37,6 +37,11 @@ module ApplicationHelper
   #   super
   # end
 
+  # 获取多种类型的user用户名
+  def user_message_username user
+    user.try(:show_name)
+  end
+
   # 超出1w后用k+形式显示
   def switch_integer_into_k number
     number > 10000 ? (number.to_f / 1000).round.to_s + "k" : number
@@ -77,10 +82,16 @@ module ApplicationHelper
     user.nil? ? User.find(2) : user
   end
 
-  # 通过邮件查找用户，能查到返回用户，否则返回邮件地址
-  def user_by_mail mail
-    user = User.find_by_mail(mail)
-    user.nil? ? mail : user.try(:show_name)
+  # 通过登录名查找用户，能查到返回用户姓名，否则返回登录名
+  def link_to_user_login login, css_class
+    user = User.find_by_login(login)
+    user = user.nil? ? login : user
+    if user.is_a?(User)
+      name = user.show_name
+      link_to name, {:controller=> 'users', :action => 'show', id: user.id}, :class => css_class, :target => "_blank"
+    else
+      "<a class='#{css_class}'>#{h(user.to_s)}</a>".html_safe
+    end
   end
 
   def link_to_user_mail(mail, css_class)
@@ -90,7 +101,7 @@ module ApplicationHelper
       name = user.show_name
       link_to name, {:controller=> 'users', :action => 'show', id: user.id}, :class => css_class, :target => "_blank"
     else
-      "<a class='#{css_class}'>#{h(user.to_s)}</a>".html_safe
+      "<a class='#{css_class}' title='#{user.to_s}'>#{h(user.to_s)}</a>".html_safe
     end
   end
 
@@ -2815,6 +2826,37 @@ module ApplicationHelper
     end
     technical_title
   end
+  # 用户项目总数
+  def user_project_count
+    @my_projects = @user.projects.select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS updatetime").order("updatetime DESC")
+    @my_project_total = @my_projects.count
+  end
+
+  # 用户的课程总数
+  def user_course_count
+    @my_course_count = @user.syllabuses.count
+
+    sy_courses = @user.courses.visible.not_deleted
+    syllabus_ids = sy_courses.empty? ? '(-1)' : "(" + sy_courses.map{|course| !course.syllabus_id.nil? && course.syllabus_id}.join(",") + ")"
+    syllabus_members = SyllabusMember.where("user_id = #{@user.id}")
+    syllabus_member_ids = syllabus_members.empty? ? "(-1)" : "(" + syllabus_members.map{|syl_mem| syl_mem.syllabus_id}.join(',') + ")"
+    @join_syllabuses = Syllabus.where("(id in #{syllabus_ids} or id in #{syllabus_member_ids}) and user_id != #{@user.id}")
+    @my_joined_course_count = @join_syllabuses.count
+
+    @user_course_total = @my_joined_course_count + @my_course_count
+  end
+
+  # 用户发布的issue数
+  def issues_author_is_self_count
+    @issues = Issue.where( :author_id => @user.id )
+    @issues_author_is_self_count = @issues.count
+  end
+
+  # 用户收到的issue数
+  def issues_assigned_is_self_count
+    @issues = Issue.where( :assigned_to_id => @user.id )
+    @issues_assigned_is_self_count = @issues.count
+  end
 
   def get_user_roll user
     technical_title = ""

app/helpers/users_helper.rb

@@ -29,6 +29,10 @@ module UsersHelper
                         ["#{l(:status_locked)} (#{user_count_by_status[3].to_i})", '3']], selected.to_s)
   end
 
+  def task_count(unsolved_issues_count, unfinished_homework_count, unfinished_test_count, unfinished_poll_count, anonymous_evaluation_count, unapproval_homework)
+    result = unsolved_issues_count + unfinished_homework_count + unfinished_test_count + unfinished_poll_count + anonymous_evaluation_count + unapproval_homework
+  end
+
   def issue_list(issues, &block)
     ancestors = []
     issues.each do |issue|
@@ -78,6 +82,18 @@ module UsersHelper
     end
   end
 
+  # 作业类型提示
+  def homework_type_tip homework_type
+    case homework_type
+      when 1
+        "普通作业"
+      when 2
+        "编程作业"
+      when 3
+        "分组作业"
+    end
+  end
+
   # 获取消息角色
   def applied_project_message_type role
     case role
@@ -94,13 +110,13 @@ module UsersHelper
   def pull_request_message_status ma
     case ma.status
       when 1
-        "创建了PullRequest:"
+        "创建了PullRequest："
       when 2
-        "接受了PullRequest:"
+        "接受了PullRequest："
       when 3
-        "重新打开了PullRequest:"
+        "重新打开了PullRequest："
       when 4
-        "关闭了PullRequest:"
+        "关闭了PullRequest："
     end
 
   end
@@ -135,11 +151,11 @@ module UsersHelper
   def applied_project_tip applied_message
     case applied_message.status
       when 4
-        "拒绝申请加入项目:"
+        "拒绝申请加入："
       when 5,3,2,1,7
-        "申请加入项目:"
+        "申请加入："
       when 6
-        "同意申请加入项目"
+        "同意申请加入："
     end
   end
 
@@ -159,6 +175,10 @@ module UsersHelper
     end
   end
 
+  def is_current_user
+    is_current_user = (User.current == @user)
+  end
+
   def applied_project_tip_header applied_message
     case applied_message.status
       when 4

app/models/data_exception.rb

@@ -0,0 +1,3 @@
+class DataException < ActiveRecord::Base
+  attr_accessible :container_id, :container_type, :message
+end

app/models/homework_common.rb

@@ -1,6 +1,6 @@
 #encoding: utf-8
 #老师布置的作业表
-#homework_type: 0:普通作业;1:匿评作业;2:编程作业
+#homework_type: 0:普通作业;1:匿评作业;2:编程作业;3:分组作业;
 class HomeworkCommon < ActiveRecord::Base
   # attr_accessible :name, :user_id, :description, :publish_time, :end_time, :homework_type, :late_penalty, :course_id,:simi_time
   require 'net/http'

app/models/issue.rb

@@ -135,6 +135,10 @@ class Issue < ActiveRecord::Base
   after_save :after_create_from_copy
   after_destroy :update_parent_attributes
 
+  def user
+    self.author
+  end
+
   #动态的更新
   def update_activity
     update_user_activity(self.class, self.id)

app/models/journals_for_message.rb

@@ -73,13 +73,13 @@ class JournalsForMessage < ActiveRecord::Base
   has_one :praise_tread_cache, as: :object, dependent: :destroy
 
   validates :notes, presence: true, if: :is_homework_jour?
-  after_create :act_as_activity, :act_as_course_activity, :act_as_course_message,
+  after_create :act_as_course_activity, :act_as_course_message,
                act_as_at_message(:notes, :user_id), :act_as_user_feedback_message,
-               :act_as_principal_activity, :act_as_student_score
-  after_create :reset_counters!
+               :act_as_principal_activity
+  # after_create :reset_counters!
   #after_update :update_activity
   # after_destroy :reset_counters!
-  after_save :be_user_score
+  # after_save :be_user_score
   after_destroy :down_user_score, :down_course_score
 
   # default_scope { where('m_parent_id IS NULL') }

app/models/message.rb

@@ -106,6 +106,10 @@ class Message < ActiveRecord::Base
       end
     }
 
+  def description
+    self.content
+  end
+
   def topic?
     parent_id.nil?
   end

app/models/poll.rb

@@ -44,7 +44,9 @@ class Poll < ActiveRecord::Base
   def act_as_course_activity
     if self.polls_type == "Course"
       if self.polls_status == 2 #问卷是发布状态
-        self.course_acts << CourseActivity.new(:user_id => self.user_id,:course_id => self.polls_group_id)
+        if CourseActivity.where(:course_id => self.polls_group_id, :user_id => self.user_id, :course_act_id => self.id, :course_act_type => 'Poll').count == 0
+          self.course_acts << CourseActivity.new(:user_id => self.user_id,:course_id => self.polls_group_id)
+        end
       elsif self.polls_status == 1 #问卷是新建状态
         self.course_acts.destroy_all
       end

app/models/user.rb

@@ -1217,13 +1217,9 @@ class User < Principal
     end
   end
 
-  #为新注册用户发送留言
+  # 为新注册用户发送留言
+  # 只发三条没可以不用delay job，而且这个最好是注册的时候就能看到
   def add_new_jour
-    self.delay.add_new_jour_delay
-  end
-
-  #为新注册用户发送留言
-  def add_new_jour_delay
     Rails.logger.info "add_new_jour_delay!!!!!!!!!"
     if Setting.find_by_name("hidden_non_project") && Setting.find_by_name("hidden_non_project").value != "0"
       if Message.where("id=19504").any? and Message.where("id=19291").any? and Message.where("id=19292").any?
@@ -1239,6 +1235,26 @@ class User < Principal
         self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes3, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
       end
     end
+    # self.delay.add_new_jour_delay
+  end
+
+  #为新注册用户发送留言
+  def add_new_jour_delay
+    # Rails.logger.info "add_new_jour_delay!!!!!!!!!"
+    # if Setting.find_by_name("hidden_non_project") && Setting.find_by_name("hidden_non_project").value != "0"
+    #   if Message.where("id=19504").any? and Message.where("id=19291").any? and Message.where("id=19292").any?
+    #     lead_message1 = Message.find(19292)
+    #     notes1 = lead_message1.content
+    #     lead_message2 = Message.find(19291)
+    #     notes2 = lead_message2.content
+    #     lead_message3 = Message.find(19504)
+    #     notes3 = lead_message3.content
+    #     #user_id 默认为课程使者创建
+    #     self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes1, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
+    #     self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes2, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
+    #     self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes3, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
+    #   end
+    # end
   end
 
   # 更新邮箱的同事，更新invite_lists表中的邮箱信息

app/views/blog_comments/show.html.erb

@@ -92,7 +92,7 @@
       <div class="postDetailDate mb5"><%= format_time( @article.created_on)%></div>
       <div class="cl"></div>
 
-      <div class="homepagePostIntro break_word upload_img table_maxWidth " id="activity_description_<%= @article.id%>">
+      <div class="homepagePostIntro break_word upload_img table_maxWidth ke-block" id="activity_description_<%= @article.id%>">
         <div id="intro_content_<%= @article.id%>">
           <%= @article.content.to_s.html_safe %>
         </div>

app/views/issues/_detail.html.erb

@@ -28,7 +28,7 @@
   <%= render :partial => 'action_menu' %>
   <div class="cl"></div>
   <% if @issue.description? || @issue.attachments.any? -%>
-      <div class="talk_info mb10 issue_desc" id="issue_desc_<%= @issue.id %>" style="word-break:break-all;">
+      <div class="talk_info mb10 issue_desc ke-block" id="issue_desc_<%= @issue.id %>" style="word-break:break-all;">
         <% if @issue.description? %>
             <%#= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %>
             <%= textAreailizable @issue, :description, :attachments => @issue.attachments %>

app/views/issues/_form.html.erb

@@ -27,30 +27,7 @@
               <%#= wikitoolbar_for 'issue_description' %>
           <% end %>
         </li>
-        <li class="fl">
-          <% if @issue.safe_attribute? 'tracker_id' %>
-              <label class="label mt3"><span class="c_red f12">*</span>&nbsp;类型&nbsp;&nbsp;:&nbsp;</label>
-              <%= f.select :tracker_id, @issue.project.trackers.collect { |t| [t.name, t.id] },
-                           {:required => true, :no_label => true},
-                           #:onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')",
-                           :class => "w110" %>
-          <% end %>
-        </li>
-        <li class="fl ml41">
-          <label class="label mt3"><span class="c_red f12">*</span><%= l(:field_status) %>：</label>
-          <%# if @issue.safe_attribute?('status_id') && @allowed_statuses.present? %>
-          <%= f.select :status_id, (@allowed_statuses.collect { |p| [p.name, p.id] }),
-                       {:no_label => true},
-                       :class => "w110" %>
-        </li>
-        <li class="fl ml41">
-          <label class="label mt3"><span class="c_red f12">*</span><%= l(:field_priority) %>：</label>
-          <% if @issue.safe_attribute? 'priority_id' %>
-              <%= f.select :priority_id, (@priorities.collect { |p| [p.name, p.id] }),
-                           {:required => true, :no_label => true}, :disabled => !@issue.leaf?,
-                           :class => "w110" %>
-          <% end %>
-        </li>
+
         <li class="clear">
           <label class="label"><%= l(:label_attachment_plural) %>：</label>
           <%= render :partial => 'attachments/form', :locals => {:container => @issue} %>
@@ -59,7 +36,7 @@
           <% if params[:action] == "new" %>
             <a href="<%= project_issues_path(@project, :remote => true) %>" class="sy_btn_grey mr5 fr"> 取消</a>
           <% else %>
-            <a href="javascript:void(0);" onclick="issueDetailShow();" class="sy_btn_grey mr5 fr" > 取消 </a>
+            <%= link_to "取消", issue_path(@issue), :class => "sy_btn_grey mr5 fr" %>
           <% end %>
           <!--<a href="javascript:void(0);" class="sy_btn_blue mr5 fr"> 保存并继续</a>-->
           <!--<a href="javascript:void(0);" onclick="issue_desc_editor.sync();$('#issue-form').submit();" class="sy_btn_blue mr5 fr" id="issue_confirm"> 保存</a>-->
@@ -75,66 +52,90 @@
           <% end %>
         </li>
         <li class="clear"  id="versions_assigned_id">
+          <span class="fl mt6 mr10">指派给</span>
           <% if @issue.safe_attribute? 'assigned_to_id' %>
               <%= f.select :assigned_to_id, assigned_options_for_select(@issue.assignable_users, @issue.assigned_to),
                         {:required => @issue.required_attribute?('assigned_to_id'), :no_label => true},
-                        {:onchange => "change_assigned_tip();",:class => "w150"}  %>
+                        {:onchange => "change_assigned_tip();",:class => "w160 fl"}  %>
           <% end %>
         </li>
-        <li class="clear" id="assigned_to_tips">
-          <%= @issue.assigned_to.nil? ? "未指派" : "已指派"  %>
+        <li class="clear">
+          <span class="fl mt6 mr12">类&nbsp;&nbsp;&nbsp;型</span>
+          <% if @issue.safe_attribute? 'tracker_id' %>
+              <%= f.select :tracker_id, @issue.project.trackers.collect { |t| [t.name, t.id] },{:required => true, :no_label => true},
+                          #:onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')",
+                          :class => "fl", :style => "width:160px;padding-left:0px;" %>
+          <% end %>
+        </li>
+        <li class="clear">
+          <span class="fl mt6 mr12">状&nbsp;&nbsp;&nbsp;态</span>
+          <%# if @issue.safe_attribute?('status_id') && @allowed_statuses.present? %>
+          <%= f.select :status_id, (@allowed_statuses.collect { |p| [p.name, p.id] }),
+                     {:no_label => true},
+                      :class => "fl", :style => "width:160px;padding-left:0px;" %>
+        </li>
+        <li class="clear">
+          <span class="fl mt6 mr10"><%= l(:field_priority) %></span>
+          <% if @issue.safe_attribute? 'priority_id' %>
+              <%= f.select :priority_id, (@priorities.collect { |p| [p.name, p.id] }),
+                        {:required => true, :no_label => true}, :disabled => !@issue.leaf?,
+                         :class => "w160 fl" %>
+          <% end %>
         </li>
         <li class="clear" >
-        <%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version),
-                   {:include_blank => true, :required => @issue.required_attribute?('fixed_version_id'), :no_label => true},
-                   {:onchange => "change_milestone_tip();", :class => "w150"} %>
-        </li>
-        <li class="clear" id="milestone_option_tips">
-          <%= @issue.fixed_version.nil? ? "未选择里程碑" : "已选择里程碑" %>
-          <% if params[:action] == "new" %>
-              <%= link_to "", new_project_version_path(@project, :is_issue => true, :issue_project_id => @project.id), :class => "pic_add mt5 ml5 fr", :remote => true %>
-          <% end %>
-        </li>
-        <li class="clear" style="border:1px solid #c8c8c8;">
-          <% if @issue.safe_attribute? 'start_date' %>
-              <%= f.text_field :start_date, :size => 22, :disabled => !@issue.leaf?, :no_label => true,
-                               :required => @issue.required_attribute?('start_date'), :onchange => "issue_start_date_change();",
-                               :class => "fl calendar_input", :style => "width:170px;" %>
-              <%= calendar_for('issue_start_date', 'start_date') if @issue.leaf? %>
-          <% end %>
-        </li>
-        <li class="clear" id="option_start_date_tips">
-          <%= @issue.start_date.nil? ? "未选择开始日期" : "已选择开始日期" %>
-        </li>
-        <li class="clear" style="border:1px solid #c8c8c8;">
-          <label class="label02" ></label>
-          <% if @issue.safe_attribute? 'due_date' %>
-              <%= f.text_field :due_date, :size => 22, :disabled => !@issue.leaf?, :no_label => true,
-                              :required => @issue.required_attribute?('due_date'), :onchange => "issue_end_date_change();",
-                              :class => "fl calendar_input",:style => "width: 170px;", :placeholder => "请选择结束日期"  %>
-              <%= calendar_for('issue_due_date', 'start_date') if @issue.leaf? %>
-          <% end %>
-        </li>
-        <li class="clear " id="option_end_date_tips">
-          <%= @issue.due_date.nil? ? "未选择结束日期" : "已选择结束日期" %>
+          <span class="fl mt6 mr10">里程碑</span>
+          <%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version),
+                     {:include_blank => true, :required => @issue.required_attribute?('fixed_version_id'), :no_label => true},
+                     {:onchange => "change_milestone_tip();", :class => "w160 fl"} %>
         </li>
         <li class="clear">
-          <% if @issue.safe_attribute? 'estimated_hours' %>
-              <%= f.text_field :estimated_hours, :size => 22, :disabled => !@issue.leaf?, :no_label => true,
-                              :required => @issue.required_attribute?('estimated_hours'), :placeholder => "请填写预计工时" %>
-          <% end %>
+          <label class="fl mt6 mr12">开&nbsp;&nbsp;&nbsp;始</label>
+          <label class=" fl" style="border:1px solid #c8c8c8;display: inline-block;">
+            <% if @issue.safe_attribute? 'start_date' %>
+                <%= f.text_field :start_date, :size => 22, :disabled => !@issue.leaf?, :no_label => true,
+                                 :required => @issue.required_attribute?('start_date'), :onchange => "issue_start_date_change();",
+                                 :class => "fl issues_calendar_input",
+                                 :style => "height:28px;border-left:none;border-top:none;border-bottom:none;width:124px;",
+                                 :placeholder => "请选择开始日期" %>
+                <%= calendar_for('issue_start_date', 'start_date') if @issue.leaf? %>
+            <% end %>
+          </label>
         </li>
-        <li class="clear"><%= l(:field_estimated_hours) %></li>
 
         <li class="clear">
+          <!--<label class="label02" ></label>-->
+          <label class="fl mt6 mr12">结&nbsp;&nbsp;&nbsp;束</label>
+          <label class=" fl" style="border:1px solid #c8c8c8;display: inline-block;">
+            <% if @issue.safe_attribute? 'due_date' %>
+                <%= f.text_field :due_date, :size => 10, :disabled => !@issue.leaf?, :no_label => true,
+                                :required => @issue.required_attribute?('due_date'), :onchange => "issue_end_date_change();",
+                                :class => "issues_calendar_input fl",
+                                :style => "height:28px;border-left:none;border-top:none;border-bottom:none;width:124px;",
+                                :placeholder => "请选择结束日期" %>
+                <%= calendar_for('issue_due_date', 'start_date') if @issue.leaf? %>
+            <% end %>
+          </label>
+        </li>
+
+        <li class="clear">
+          <span class="fl mt6 mr12">工&nbsp;&nbsp;&nbsp;时</span>
+          <% if @issue.safe_attribute? 'estimated_hours' %>
+              <%= f.text_field :estimated_hours, :disabled => !@issue.leaf?, :no_label => true,
+                              :required => @issue.required_attribute?('estimated_hours'), :placeholder => "请填写预计工时",
+                              :class => "fl", :style => "width:153px;" %>
+          <% end %>
+        </li>
+
+        <li class="clear">
+          <span class="fl mt6 mr10">完成度</span>
           <% if @issue.safe_attribute?('done_ratio') && @issue.leaf? && Issue.use_field_for_done_ratio? %>
               <%= f.select :done_ratio, ((0..10).to_a.collect { |r| ["#{r*10} %", r*10] }),
                          {:required => @issue.required_attribute?('done_ratio'), :no_label => true},
                           :onchange => "PrecentChange(this.value)",
-                          :class => "w150" %>
+                          :class => "w160 fl" %>
           <% end %>
         </li>
-        <li class="clear">完成度</li>
+
         <% if @project.gpid %>
             <%#= hidden_field_tag @issue_commit_ids %>
             <input value="" name="commit_ids" id="commit_ids" type="hidden">
@@ -162,6 +163,28 @@
       </ul>
 <% end %>
 <script>
+
+    function change_assigned_tip() {
+        if( document.getElementById('issue_assigned_to_id').options[document.getElementById('issue_assigned_to_id').selectedIndex].value == 0 ){
+            $('#assigned_to_tips').html("未指派");
+        }
+        else{
+            $('#assigned_to_tips').html("已指派")};
+    }
+    function change_milestone_tip(version_id){
+        if( document.getElementById('issue_fixed_version_id').options[document.getElementById('issue_fixed_version_id').selectedIndex].value == 0 ){
+            $('#milestone_option_tips').html("未选择里程碑")}
+        else{
+            $('#milestone_option_tips').html("已选择里程碑")
+        };
+    }
+    function issue_start_date_change(){
+        $('#option_start_date_tips').html("已选择开始日期");
+    }
+    function issue_end_date_change() {
+        $('#option_end_date_tips').html("已选择结束日期");
+    }
+
     function issue_create(){
         var issue_commit_ids = $("#issue_commit_ids .commit_id_value");
         var str = "";
@@ -195,26 +218,6 @@
         })
     }
 
-    function change_assigned_tip() {
-        if( document.getElementById('issue_assigned_to_id').options[document.getElementById('issue_assigned_to_id').selectedIndex].value == 0 ){
-            $('#assigned_to_tips').html("未指派");
-        }
-        else{
-        $('#assigned_to_tips').html("已指派")};
-    }
-    function change_milestone_tip(version_id){
-        if( document.getElementById('issue_fixed_version_id').options[document.getElementById('issue_fixed_version_id').selectedIndex].value == 0 ){
-            $('#milestone_option_tips').html("未选择里程碑")}
-        else{
-            $('#milestone_option_tips').html("已选择里程碑")
-        };
-    }
-    function issue_start_date_change(){
-        $('#option_start_date_tips').html("已选择开始日期");
-    }
-    function issue_end_date_change() {
-        $('#option_end_date_tips').html("已选择结束日期");
-    }
    // 里程碑添加默认选项
    $("#issue_fixed_version_id option[value='']").remove();
 

app/views/issues/_issue_commit_ids.html.erb

@@ -1,6 +1,6 @@
-<% if @issue_commit_ids %>
+<% unless @issue_commit_ids.blank? %>
     <% @issue_commit_ids.each do |commit_id| %>
-        <div class="btn btn-blue mb5">
+        <div class="btn-commit-issue btn-blue mb5 mr5">
           <%= link_to commit_id[0,8], {:controller => 'repositories', :action => 'commit_diff', :id => @project.id, :changeset => commit_id}, :target => "_blank", :class => "commit_id_value" %>
           <% if @issue %>
               <% if User.current.admin? || is_project_manager?(User.current.id, @project.id) || User.current.id == @issue.author_id %>
@@ -13,6 +13,4 @@
           <% end %>
         </div>
     <% end %>
-<% else %>
-    <div class="c_grey">暂无</div>
 <% end %>

app/views/issues/_issue_commit_ids_show.html.erb

@@ -0,0 +1,20 @@
+<% if !@issue_commit_ids.blank? %>
+    <span class="pro_new_conbox_leftspan mb5">关联Commit</span>
+    <% @issue_commit_ids.each do |commit_id| %>
+        <div class="btn-commit-issue btn-blue mb5 mr5">
+          <%= link_to commit_id[0,8], {:controller => 'repositories', :action => 'commit_diff', :id => @project.id, :changeset => commit_id}, :target => "_blank", :class => "commit_id_value" %>
+          <% if @issue %>
+              <% if User.current.admin? || is_project_manager?(User.current.id, @project.id) || User.current.id == @issue.author_id %>
+                  <%= link_to "×", issue_commit_delete_issues_path(:commit_id => commit_id, :project_id => @project.id, :issue_commit_ids => @issue_commit_ids, :issue_id => @issue.try(:id)), :remote => true, :style => "color:#fff;" %>
+              <% end %>
+          <% else %>
+              <% if User.current.member_of?(@project) %>
+                  <%= link_to "×", issue_commit_delete_issues_path(:commit_id => commit_id, :project_id => @project.id, :issue_commit_ids => @issue_commit_ids, :issue_id => @issue.try(:id)), :remote => true, :style => "color:#fff;" %>
+              <% end %>
+          <% end %>
+        </div>
+    <% end %>
+<% else %>
+    <span class="pro_new_conbox_leftspan mb5 fl">关联Commit</span>
+    <span class="pro_new_conbox_rightspan fl ml10">无</span>
+<% end %>

app/views/issues/_project_issue.html.erb

@@ -73,7 +73,7 @@
               <span class="fl mr5"><%= activity.journals.count %></span>
           <% end %>
           <div class="undis" style="position: absolute; <%= activity.journals.count > 0 ? 'top:25px;' : 'top:7px' %>">
-            <%= link_to "", issue_path(activity.id, :edit => 'true'), :class => 'sy_icons_edit fl mt15', :style => "margin-top:25px;", :accesskey => accesskey(:edit) if activity.editable? && User.current.allowed_to?(:edit_issues, activity.project)  %>
+            <%= link_to "", edit_issue_path(activity.id), :class => 'sy_icons_edit fl mt15', :style => "margin-top:25px;", :accesskey => accesskey(:edit) if activity.editable? && User.current.allowed_to?(:edit_issues, activity.project)  %>
             <% if !defined?(project_id) && !defined?(user_id) %>
                 <%= link_to "", issue_path(activity.id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'sy_icons_del fl mt15', :style => "margin-top:25px;" if User.current.allowed_to?(:delete_issues, activity.project) %>
             <% elsif defined?(project_id) %>

app/views/issues/show.html.erb

@@ -37,7 +37,7 @@
     </div>
   </div>
 
-  <ul class="fr pro_new_conbox_right" id="project_issue_info_show">
+  <ul class="fr pro_new_conbox_right mt10" id="project_issue_info_show">
     <li class="clear">
       <span class="pro_new_conbox_leftspan fl">当前状态</span>
       <span class="pro_new_conbox_rightspan fl ml10"><%= @issue.status.name %></span>
@@ -64,6 +64,11 @@
           <span class="pro_new_conbox_rightspan fl ml10"><%= format_date(@issue.start_date) %></span>
         </li>
     <% end %>
+    <% unless @issue.disabled_core_fields.include?('due_date') %>
+        <li class="clear"><span class="pro_new_conbox_leftspan fl">结束日期</span>
+          <span class="pro_new_conbox_rightspan fl ml10"><%= format_date(@issue.due_date) %></span>
+        </li>
+    <% end %>
     <% unless @issue.disabled_core_fields.include?('estimated_hours') %>
         <li class="clear"><span class="pro_new_conbox_leftspan fl">预计工时(H)</span>
           <span class="pro_new_conbox_rightspan fl ml10"><%= l_hours(@issue.estimated_hours) %></span>
@@ -74,10 +79,8 @@
           <span class="pro_new_conbox_rightspan fl ml10"><%= @issue.done_ratio %>%</span>
         </li>
     <% end %>
-    <li class="clear"><span class="pro_new_conbox_leftspan mb5">关联Commit</span>
-      <div id="issue_commit_ids">
-        <%= render :partial => "issues/issue_commit_ids" %>
-      </div>
+    <li class="clear">
+      <%= render :partial => "issues/issue_commit_ids_show" %>
     </li>
   </ul>
   <div class="cl"></div>

app/views/layouts/_logined_header.html.erb

@@ -7,13 +7,19 @@
       <li class="navHomepageMenu fl">
         <%= link_to "首页",user_activities_path(User.current), :class => "c_white f16 db p10", :title => "回到个人首页"%>
       </li>
+<!--      <li class="navHomepageMenu fl">
+        <%#= link_to "资源库", user_resource_user_path(User.current, :type => 1), :class => "c_white f16 db p10" %>
+      </li>-->
       <li class="navHomepageMenu fl">
-        <%= link_to "资源库", user_resource_user_path(User.current, :type => 1), :class => "c_white f16 db p10" %>
+        <%= link_to "课程", user_course_community_path(User.current), :class => "c_white f16 db p10" %>
+      </li>
+      <li class="navHomepageMenu fl">
+        <%= link_to "项目", user_project_community_path(User.current), :class => "c_white f16 db p10" %>
       </li>
       <% if hidden_unproject_infos %>
-          <li class="navHomepageMenu fl">
-            <%= link_to "题库",  user_homeworks_user_path(User.current), :class => "c_white f16 db p10"%>
-          </li>
+<!--          <li class="navHomepageMenu fl">
+            <%#= link_to "题库",  user_homeworks_user_path(User.current), :class => "c_white f16 db p10"%>
+          </li>-->
           <% memo = Memo.where(:id => 1168).first %>
           <% unless memo.nil? %>
               <li class="navHomepageMenu fl mr30">
@@ -72,10 +78,10 @@
               </li>
           <% end %>
           <li>
-            <%= link_to "我的组织",  user_organizations_user_path(:id => User.current), :class => "menuGrey"%>
+            <%= link_to '我的项目', {:controller => "users", :action => "user_projectlist", :id => @user}, :id => 'user_project_list', :class => "menuGrey" %>
           </li>
           <li>
-            <%= link_to "新建组织", new_organization_path, :class => "menuGrey"%>
+            <%= link_to "我的组织",  user_organizations_user_path(:id => User.current), :class => "menuGrey"%>
           </li>
           <!--<li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>-->
           <li>

app/views/layouts/_user_brief_introduction.html.erb

@@ -1,10 +1,10 @@
 <span>
-    <% if user.user_extensions && user.user_extensions.brief_introduction && !user.user_extensions.brief_introduction.empty? %>
-        <%= user.user_extensions.brief_introduction %>
-    <% else%>
-        这个小伙伴很懒，什么都没留下~
+<div class="user_info_intro">
+    <% if  !user.user_extensions.school_id.blank? %>
+        <%= user.user_extensions.school.name %>
     <% end %>
+</div>
 </span>
-<% 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 %>
+<%# 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_watch_btn.html.erb

@@ -1,18 +1,18 @@
 <ul>
   <% if User.current.logged?%>
       <% if User.current == target%>
-          <li style="width: 119px; float: left; border-right: 1px solid #ddd;"><%= link_to("个人资料", my_account_path, :class => "user_editinfo") %></li>
-          <li style="width: 118px; float: left;"><%= link_to '个人主页', homepage_user_path(@user), :class => "user_editinfo", :target => '_blank' %></li>
+<!--          <li style="width: 119px; float: left; border-right: 1px solid #ddd;"><%#= link_to("个人资料", my_account_path, :class => "user_editinfo") %></li>-->
+          <li><%= link_to '个人主页', homepage_user_path(@user), :class => "user_editinfo", :target => '_blank' %></li>
           <li class="cl"></li>
       <% else%>
-          <li style="width: 119px; float: left; border-right: 1px solid #ddd;">
-            <% if target.base_homepage.nil? %>
+        <!--  <li style="width: 119px; float: left; border-right: 1px solid #ddd;">
+            <%# if target.base_homepage.nil? %>
                 <a href="javascript:void(0)" class ="user_editinfo" style="color: #cccccc" title="该用户暂未设置主页">主页</a>
-            <% else %>
-                <%=link_to "主页", homepage_user_path(@user.login), :class => 'user_editinfo', :target => '_blank' %>
-            <% end %>
-          </li>
-          <li style="width: 118px; float: left;">
+            <%# else %>
+                <%#=link_to "主页", homepage_user_path(@user.login), :class => 'user_editinfo', :target => '_blank' %>
+            <%# end %>
+          </li>-->
+          <li>
             <%if(target.watched_by?(User.current))%>
                 <%= link_to "取消关注",watch_path(:object_type=> 'user',:object_id=>target.id,:target_id=>target.id),:class => "user_editinfo", :method => "delete",:remote => "true", :title => "取消关注"%>
             <% else %>

app/views/layouts/base_course_community.html.erb

@@ -0,0 +1,113 @@
+<!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','css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','syllabus','css/moduel', 'css/user', :media => 'all' %>
+  <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
+  <%= javascript_heads %>
+  <%= javascript_include_tag "bootstrap","avatars","new_user",'attachments','prettify'%>
+  <%= heads_for_theme %>
+  <%= call_hook :view_layouts_base_html_head %>
+  <%= yield :header_tags -%>
+  <!-- MathJax的配置 -->
+  <script type="text/javascript"
+          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+  </script>
+  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+  <script type="text/x-mathjax-config">
+    MathJax.Hub.Config({
+
+    showMathMenu: false,
+    showMathMenuMSIE: false,
+      tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+    });
+  </script>
+</head>
+
+<body onload="prettyPrint();">
+<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="cl"></div>
+<div class="homepageContentContainer">
+  <!--div class="homepageRightBannerImg"></div-->
+  <div class="cl"></div>
+  <div class="homepageContent">
+    <div class="homepageLeft mt10" id="LSide">
+      <div class="user_leftnav ">
+        <% if hidden_unproject_infos %>
+            <ul class="users_accordion mb10">
+              <li id="user_01" class="user_icons_course">
+                <%= link_to '班级',{:controller => "users", :action => "user_courselist", :id => @user}, :id => "user_course_list" %>
+                <font class="show-all-sub"><%= link_to '全部',{:controller => "users", :action => "user_courselist", :id => @user}, :style => "color:#aaa;" %></font>
+                <% courses = @user.favorite_courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(10) %>
+                <div class="<%= courses.empty? ? 'none' : ''%>" id="homepage_left_course_list">
+                  <%=render :partial => 'layouts/homepage_left_course_list', :locals => {:courses => courses} %>
+                </div>
+              </li>
+              <% if is_current_user %>
+                  <li id="user_02"  class="user_icons_new">
+                    <%= link_to "新建课程", new_syllabus_path(:host=> Setting.host_course), :target => "_blank", :style => "font-size:14px;" %>
+                  </li>
+                  <li id="user_03" class="user_icons_new">
+                    <%= link_to "新建班级", new_course_path(:host=> Setting.host_course), :target => "_blank", :style => "font-size:14px;" %>
+                  </li>
+                  <li id="user_04" class="user_icons_addclass">
+                    <%= link_to "加入班级",join_private_courses_courses_path,:remote => true, :method => "post", :style => "font-size:14px;" %>
+                  </li>
+              <% end %>
+            </ul>
+        <% end %>
+        <ul class="users_accordion mb10">
+          <% if @user == User.current %>
+              <li id="user_05" class="user_icons_myhw">
+                <%=link_to '我的作业', my_homeworks_user_path(@user), :target => "_blank", :style => "font-size:14px;" %>
+              </li>
+              <li id="user_06" class="icons-doc clear">
+                <%= link_to "题库",  user_homeworks_user_path(User.current), :target => "_blank", :style => "font-size:14px;" %>
+              </li>
+              <li id="user_07" class="icons-download clear">
+                <%= link_to "资源库", user_resource_user_path(User.current, :type => 1), :target => "_blank",:style => "font-size:14px;" %>
+              </li>
+          <% end %>
+        </ul>
+      </div>
+      <div class="user_leftnav ">
+        <ul class="users_accordion mb10">
+          <li id="user_10" class="user_icons_mes">
+            <%= link_to '留言', feedback_path(@user, :host=> Setting.host_user)%>
+          </li>
+        </ul>
+      </div>
+      <%# 更新访问数,刷新的时候更新访问次数 %>
+      <%  update_visiti_count @user %>
+      <div class="fontGrey5 mt10 ml20">访问计数 <%= @user.visits.to_i %> （自2016年5月）</div>
+    </div>
+    <div class="homepageRight">
+      <%= yield %>
+    </div>
+  </div>
+</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;">
+  <%=render :partial => 'layouts/upload_avatar', :locals => {:source => @user} %>
+</div>
+</body>
+</html>

app/views/layouts/base_project_community.html.erb

@@ -0,0 +1,96 @@
+<!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','css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','syllabus','css/moduel', 'css/user', :media => 'all' %>
+  <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
+  <%= javascript_heads %>
+  <%= javascript_include_tag "bootstrap","avatars","new_user",'attachments','prettify'%>
+  <%= heads_for_theme %>
+  <%= call_hook :view_layouts_base_html_head %>
+  <%= yield :header_tags -%>
+  <!-- MathJax的配置 -->
+  <script type="text/javascript"
+          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+  </script>
+  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+  <script type="text/x-mathjax-config">
+    MathJax.Hub.Config({
+
+    showMathMenu: false,
+    showMathMenuMSIE: false,
+      tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+    });
+  </script>
+</head>
+
+<body onload="prettyPrint();">
+<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="cl"></div>
+<div class="homepageContentContainer">
+  <!--div class="homepageRightBannerImg"></div-->
+  <div class="cl"></div>
+  <div class="homepageContent">
+    <div class="homepageLeft mt10" id="LSide">
+      <div class="user_leftnav ">
+        <ul class="users_accordion mb10">
+          <li id="user_06" class="user_icons_project">
+            <%= link_to '项目',{:controller => "users", :action => "user_projectlist", :id => @user}, :id => 'user_project_list'%>
+            <font class="show-all-sub"><%= link_to '全部',{:controller => "users", :action => "user_projectlist", :id => @user}, :style => "color:#aaa;" %></font>
+            <% projects = @user.favorite_projects.visible.select("projects.*, (SELECT MAX(updated_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(10)%>
+            <div class="<%= projects.empty? ? 'none' : ''%>" id="homepage_left_project_list">
+              <%=render :partial => 'layouts/homepage_left_project_list', :locals => {:projects => projects} %>
+            </div>
+          </li>
+          <% if is_current_user %>
+              <li id="user_07"  class="user_icons_new">
+                <%= link_to "新建项目",  new_project_path(:host=> Setting.host_name), :target => "_blank", :style => "font-size:14px;" %>
+              </li>
+              <li id="user_08" class="user_icons_addproject">
+                <%= link_to "加入项目", applied_join_project_path, :remote => true, :method => "post", :style => "font-size:14px;" %>
+              </li>
+              <li id="user_09" class="user_icons_myissues">
+                <%= link_to "我的Issue", user_issues_user_path(@user), :target => "_blank", :style => "font-size:14px;" %>
+              </li>
+          <% end %>
+        </ul>
+        <ul class="users_accordion mb10">
+          <li id="user_10" class="user_icons_mes">
+            <%= link_to '留言', feedback_path(@user, :host=> Setting.host_user)%>
+          </li>
+        </ul>
+      </div>
+      <%# 更新访问数,刷新的时候更新访问次数 %>
+      <%  update_visiti_count @user %>
+      <div class="fontGrey5 mt10 ml20">访问计数 <%= @user.visits.to_i %> （自2016年5月）</div>
+    </div>
+    <div class="homepageRight">
+      <%= yield %>
+    </div>
+  </div>
+</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;">
+  <%=render :partial => 'layouts/upload_avatar', :locals => {:source => @user} %>
+</div>
+</body>
+</html>

app/views/layouts/new_base_user.html.erb

@@ -7,7 +7,7 @@
   <meta name="keywords" content="issue,bug,tracker" />
   <%= csrf_meta_tag %>
   <%= favicon %>
-  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','syllabus','css/moduel',:media => 'all' %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','syllabus','css/moduel', 'css/user', :media => 'all' %>
   <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
   <%= javascript_heads %>
   <%= javascript_include_tag "bootstrap","avatars","new_user",'attachments','prettify'%>
@@ -88,7 +88,7 @@
 
 <body onload="prettyPrint();">
 <div class="navContainer">
-  <% is_current_user = User.current.logged? && User.current == @user%>
+  <% is_current_user = User.current.logged? && User.current == @user %>
   <% if User.current.logged? %>
       <%= render :partial => 'layouts/logined_header' %>
   <% else%>
@@ -104,7 +104,8 @@
       <div class="user_leftinfo mb10">
         <% if User.current.logged? && User.current == @user%>
             <div class="pr" style="width: 80px; margin:0 auto;">
-                <%=link_to image_tag(url_to_avatar(@user),width:"74", height: "74", :id=>'nh_source_tx'), my_clear_user_avatar_temp_path, :class => "user_leftinfo_img", :remote => true%>
+                <%=link_to image_tag(url_to_avatar(@user),width:"74", height: "74", :id => 'nh_source_tx'),
+                           my_clear_user_avatar_temp_path, :class => "user_leftinfo_img", :remote => true %>
                 <div class="homepageEditProfile undis">
                   <%=link_to '', my_clear_user_avatar_temp_path, :class => 'homepageEditProfileIcon', :remote => true, :title => '点击编辑Logo' %>
                 </div>
@@ -130,23 +131,23 @@
                 <%= render :partial => 'layouts/user_brief_introduction', :locals => {:user => @user} %>
               </div>
             </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>
+          <!--  <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>
           <ul class="user_atten clear">
             <li>
-              <a href="<%=user_blogs_path(:user_id => @user) %>">
+              <a href="<%= user_blogs_path(:user_id => @user) %>">
                 <strong>博客</strong><br />
-                <span class="sy_cgrey"><%=@user.blog.blog_comments.where("#{BlogComment.table_name}.parent_id is null").count %></span>
+                <span class="sy_cgrey"><%= @user.blog.blog_comments.where("#{BlogComment.table_name}.parent_id is null").count %></span>
               </a>
             </li>
             <li>
-              <a href="<%=user_watchlist_user_path(@user) %>">
+              <a href="<%= user_watchlist_user_path(@user) %>">
                 <strong>关注</strong><br />
-                <span class="sy_cgrey"><%=User.watched_by(@user).count %></span>
+                <span class="sy_cgrey"><%= User.watched_by(@user).count %></span>
               </a>
             </li>
             <li>
-              <a href="<%=user_fanslist_user_path(@user) %>">
+              <a href="<%= user_fanslist_user_path(@user) %>">
                 <strong>粉丝</strong><br />
                 <span id="user_fans_number" class="sy_cgrey"><%= @user.watcher_users.count %></span>
               </a>
@@ -157,64 +158,110 @@
           <%= render :partial => 'layouts/user_watch_btn', :locals => {:target => @user} %>
         </div>
       </div>
-
-      <div class="user_leftnav ">
-        <% if hidden_unproject_infos %>
-        <ul class="users_accordion mb10">
-          <li id="user_01" class="user_icons_course">
-            <%= link_to '班级',{:controller => "users", :action => "user_courselist", :id => @user}, :id => "user_course_list" %>
-            <font class="show-all-sub"><%= link_to '全部',{:controller => "users", :action => "user_courselist", :id => @user}, :style => "color:#aaa;" %></font>
-            <% courses = @user.favorite_courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(10) %>
-            <div class="<%= courses.empty? ? 'none' : ''%>" id="homepage_left_course_list">
-              <%=render :partial => 'layouts/homepage_left_course_list', :locals => {:courses => courses} %>
-            </div>
-          </li>
-          <% if is_current_user %>
-              <li id="user_02"  class="user_icons_new">
-                <%= link_to "新建课程", new_syllabus_path(:host=> Setting.host_course), :target => "_blank", :style => "font-size:14px;" %>
-              </li>
-              <li id="user_03" class="user_icons_new">
-                <%= link_to "新建班级", new_course_path(:host=> Setting.host_course), :target => "_blank", :style => "font-size:14px;" %>
-              </li>
-              <li id="user_04" class="user_icons_addclass">
-                <%= link_to "加入班级",join_private_courses_courses_path,:remote => true, :method => "post", :style => "font-size:14px;" %>
-              </li>
-              <% if @user == User.current %>
-                <li id="user_05" class="user_icons_myhw">
-                  <%=link_to '我的作业', my_homeworks_user_path(@user), :target => "_blank", :style => "font-size:14px;" %>
+      <% if is_current_user %>
+          <div class="home-user-leftnav">
+            <h3 >
+          	  <%= link_to "课程社区", user_course_community_path(User.current), :class => "fl" %>
+			</h3>
+            <%# if hidden_unproject_infos %>
+                <ul>
+                  <li class="home-user-leftnav-li icons-class clear">
+                    <%= link_to user_course_count > 0 ? "课程<span class='issues_nav_tag mr10 fr' style='line-height:18px;margin-top: 9px;'>#{user_course_count}</span>".html_safe : "课程",
+                                {:controller => "users", :action => "user_courselist", :id => @user}, :id => "user_course_list" %>
+                    <!--      <div class="user_navmore_box" >
+              <ul>
+                <li class="user_navmore_icons">
+                  <ul class="user_navmore_txt02" >
+                    <%# if is_current_user %>
+                    <li>
+                      <%#= link_to "新建课程", new_syllabus_path(:host=> Setting.host_course), :target => "_blank", :class => "user_navmore_li" %>
+                    </li>
+                    <li>
+                      <%#= link_to "新建班级", new_course_path(:host=> Setting.host_course), :target => "_blank", :class => "user_navmore_li" %>
+                    </li>
+                    <li>
+                      <%#= link_to "加入班级", join_private_courses_courses_path, :remote => true, :method => "post", :class => "user_navmore_li" %>
+                    </li>
+                    <#% end %>
+                  </ul>
                 </li>
-              <% end %>
-          <% end %>
-        </ul>
-        <% end %>
+              </ul>
+            </div>-->
+                  </li>
+                      <li class="home-user-leftnav-li icons-homework clear">
+                        <%=link_to '我的作业', my_homeworks_user_path(@user), :target => "_blank", :class => "fl" %>
+                      </li>
+                  <li class="home-user-leftnav-li icons-doc clear">
+                    <%= link_to "题库",  user_homeworks_user_path(User.current), :target => "_blank", :class => "fl" %>
+                  </li>
+                  <li class="home-user-leftnav-li icons-download clear">
+                    <%= link_to "资源库", user_resource_user_path(User.current, :type => 1), :target => "_blank", :class => "fl" %>
+                  </li>
+                </ul>
+            <%# end %>
+          </div>
 
-        <ul class="users_accordion mb10">
-          <li id="user_06" class="user_icons_project">
-            <%= link_to '项目',{:controller => "users", :action => "user_projectlist", :id => @user}, :id => 'user_project_list'%>
-            <font class="show-all-sub"><%= link_to '全部',{:controller => "users", :action => "user_projectlist", :id => @user}, :style => "color:#aaa;" %></font>
-            <% projects = @user.favorite_projects.visible.select("projects.*, (SELECT MAX(updated_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(10)%>
-            <div class="<%= projects.empty? ? 'none' : ''%>" id="homepage_left_project_list">
-              <%=render :partial => 'layouts/homepage_left_project_list', :locals => {:projects => projects} %>
-            </div>
-          </li>
-          <% if is_current_user %>
-              <li id="user_07"  class="user_icons_new">
-                <%= link_to "新建项目",  new_project_path(:host=> Setting.host_name), :target => "_blank", :style => "font-size:14px;" %>
+          <div class="home-user-leftnav">
+            <h3 >
+          	  <%= link_to "项目社区", user_project_community_path(User.current), :class => "fl" %>
+			</h3>
+            <ul>
+              <li class="home-user-leftnav-li icons-project clear">
+                <%= link_to  user_project_count > 0 ? "项目<span class='issues_nav_tag mr10 fr' style='line-height:18px;margin-top: 9px;'>#{user_project_count}</span>".html_safe : "项目",
+                             {:controller => "users", :action => "user_projectlist", :id => @user}, :id => 'user_project_list' %>
+                <!--    <div class="user_navmore_box" >
+              <ul>
+                <li class="user_navmore_icons">
+                  <ul class="user_navmore_txt02">
+                    <li>
+                      <%#= link_to "新建项目",  new_project_path(:host => Setting.host_name), :target => "_blank", :class => "user_navmore_li" %>
+                    </li>
+                    <li>
+                      <%#= link_to "加入项目", applied_join_project_path, :remote => true, :method => "post", :class => "user_navmore_li" %>
+                    </li>
+                    <li>
+                        <%#= link_to "我的关注", user_watchlist_user_path(@user), :remote => true, :method => "post", :class => "user_navmore_li" %>
+                    </li>
+                    &lt;!&ndash;<li><a href="javascript:void(0);" class="user_navmore_li">发现更多</a></li>&ndash;&gt;
+                  </ul>
+                </li>
+              </ul>
+            </div>-->
               </li>
-              <li id="user_08" class="user_icons_addproject">
-                <%= link_to "加入项目", applied_join_project_path, :remote => true, :method => "post", :style => "font-size:14px;" %>
+              <li class="home-user-leftnav-li icons-issue clear">
+                <%= link_to issues_author_is_self_count > 0 ? "我发布的issue<span class='issues_nav_tag mr10 fr'style='line-height:18px;margin-top: 9px;'>#{issues_author_is_self_count}</span>".html_safe : "我发布的issue",
+                            user_issues_user_path(@user, :type => "author" ) %>
               </li>
-              <li id="user_09" class="user_icons_myissues">
-                <%= link_to "我的Issue", user_issues_user_path(@user), :style => "font-size:14px;" %>
+              <li class="home-user-leftnav-li icons-issue clear">
+                <%= link_to issues_assigned_is_self_count > 0 ? "我收到的issue<span class='issues_nav_tag mr10 fr' style='line-height:18px;margin-top: 9px;'>#{issues_assigned_is_self_count}</span>".html_safe : "我收到的issue",
+                            user_issues_user_path(@user, :type => "assigned") %>
               </li>
-          <% end %>
-        </ul>
+            </ul>
+          </div>
+      <% else %>
+          <div class="home-user-leftnav">
+            <h3 >Ta在确实
+                <span class="fr mr5" style="font-size:12px;color: #7f7f7f;"><%= time_tag(@user.created_on).html_safe %></span>
+            </h3>
+            <ul>
+              <li class="home-user-leftnav-li icons-class clear">
+                <%= link_to user_course_count > 0 ? "课程<span class='issues_nav_tag ml140'>#{user_course_count}</span>".html_safe : "课程",
+                            {:controller => "users", :action => "user_courselist", :id => @user}, :id => "user_course_list", :class => "fl" %>
+              </li>
+              <li class="home-user-leftnav-li icons-project clear">
+                <%= link_to  user_project_count > 0 ? "项目<span class='issues_nav_tag ml140'>#{user_project_count}</span>".html_safe : "项目",
+                             {:controller => "users", :action => "user_projectlist", :id => @user}, :id => 'user_project_list', :class => "fl" %>
+              </li>
+            </ul>
+          </div>
+      <% end %>
+      <div class="user_leftnav ">
         <ul class="users_accordion mb10">
           <li id="user_10" class="user_icons_mes">
-            <%= link_to '留言', feedback_path(@user, :host=> Setting.host_user)%>
+            <%= link_to "留言", feedback_path(@user, :host=> Setting.host_user)%>
           </li>
         </ul>
-      </div><!--sy_class_leftnav end-->
+      </div>
 
       <%# 更新访问数,刷新的时候更新访问次数 %>
       <%  update_visiti_count @user %>
@@ -281,4 +328,4 @@
     }
 </script>
 </body>
-</html>
+</html>

app/views/memos/show.html.erb

@@ -45,7 +45,7 @@
         <%= link_to @memo.author.show_name, user_path(@memo.author), :class => "linkBlue2", :target=> "_blank"%></div>
       <div class="postDetailDate mb5"><%= format_date( @memo.created_at)%></div>
       <div class="cl"></div>
-      <div class="homepagePostIntro memo-content" id="activity_description_<%= @memo.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
+      <div class="homepagePostIntro memo-content ke-block" id="activity_description_<%= @memo.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
         <%= @memo.content.html_safe%>
       </div>
       <div class="cl"></div>

app/views/messages/_course_show.html.erb

@@ -73,7 +73,7 @@
       </div>
       <div class="postDetailDate mb5"><%= format_time( @topic.created_on)%></div>
       <div class="cl"></div>
-      <div class="homepagePostIntro memo-content upload_img break_word" id="message_description_<%= @topic.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
+      <div class="homepagePostIntro memo-content upload_img break_word ke-block" id="message_description_<%= @topic.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
         <%= @topic.content.html_safe%>
       </div>
       <div class="cl"></div>

app/views/messages/_org_subfield_show.html.erb

@@ -104,7 +104,7 @@
       </div>
       <div class="postDetailDate mb5"><%= format_time(@topic.created_on) %></div>
       <div class="cl"></div>
-      <div class="homepagePostIntro memo-content upload_img break_word" id="message_description_<%= @topic.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;">
+      <div class="homepagePostIntro memo-content upload_img break_word ke-block" id="message_description_<%= @topic.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;">
         <%= @topic.content.html_safe %>
       </div>
       <div class="cl"></div>

app/views/messages/_project_show.html.erb

@@ -136,7 +136,7 @@
     </div>
     <div class="postDetailDate mb5"><%= format_time( @topic.created_on)%></div>
     <div class="cl"></div>
-    <div class="homepagePostIntro memo-content upload_img break_word" id="message_description_<%= @topic.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
+    <div class="homepagePostIntro memo-content upload_img break_word ke-block" id="message_description_<%= @topic.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
       <%= @topic.content.html_safe%>
     </div>
     <div class="cl"></div>

app/views/my/clear_user_avatar_temp.js.erb

@@ -1,8 +1,8 @@
-    $("img[nhname='avatar_image']").attr('src',$("#nh_source_tx").attr('src'));
-    $('#ajax-modal').html($("#nh_tx_dialog_html").html());
-    showModal('ajax-modal','460px');
-    $('#ajax-modal').siblings().hide();
-    $('#ajax-modal').parent().removeClass("alert_praise").removeClass("copyCoursePopup");
-    $('#ajax-modal').parent().css("top","30%").css("left","40%");
-    $('#ajax-modal').parent().addClass("alert_box");
-    $('#ajax-modal').parent().css("border", "3px solid #269ac9").css("border-radius", "0").css(" -webkit-border-radius", "0").css(" -moz-border-radius", "0");
+$("img[nhname='avatar_image']").attr('src',$("#nh_source_tx").attr('src'));
+$('#ajax-modal').html($("#nh_tx_dialog_html").html());
+showModal('ajax-modal','460px');
+$('#ajax-modal').siblings().hide();
+$('#ajax-modal').parent().removeClass("alert_praise").removeClass("copyCoursePopup");
+$('#ajax-modal').parent().css("top","30%").css("left","40%");
+$('#ajax-modal').parent().addClass("alert_box");
+$('#ajax-modal').parent().css("border", "3px solid #269ac9").css("border-radius", "0").css(" -webkit-border-radius", "0").css(" -moz-border-radius", "0");

app/views/news/_course_show.html.erb

@@ -70,7 +70,7 @@
       </div>
       <div class="postDetailDate mb5"><%= format_time( @news.created_on)%></div>
       <div class="cl"></div>
-      <div class="homepagePostIntro memo-content upload_img break_word" id="message_description_<%= @news.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
+      <div class="homepagePostIntro memo-content upload_img break_word ke-block" id="message_description_<%= @news.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
         <%= @news.description.html_safe%>
       </div>
       <div class="cl"></div>

app/views/news/_organization_show.html.erb

@@ -60,7 +60,7 @@
       </div>
       <div class="postDetailDate mb5"><%= format_time( @news.created_on)%></div>
       <div class="cl"></div>
-      <div class="homepagePostIntro memo-content upload_img break_word" id="message_description_<%= @news.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
+      <div class="homepagePostIntro memo-content upload_img break_word ke-block" id="message_description_<%= @news.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
         <%= @news.description.html_safe%>
       </div>
       <div class="cl"></div>

app/views/news/_project_show.html.erb

@@ -74,7 +74,7 @@
       </div>
       <div class="postDetailDate mb5"><%= format_time( @news.created_on)%></div>
       <div class="cl"></div>
-      <div class="homepagePostIntro memo-content upload_img break_word" id="message_description_<%= @news.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
+      <div class="homepagePostIntro memo-content upload_img break_word ke-block" id="message_description_<%= @news.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
         <%= @news.description.html_safe%>
       </div>
       <div class="cl"></div>

app/views/projects/_act_issues.html.erb

@@ -17,7 +17,7 @@
                   <li class="homepagePostSettingIcon">
                     <ul class="homepagePostSettiongText">
                       <li>
-                        <%= link_to l(:button_edit), issue_path(activity.id, :edit => 'true'), :class => 'postOptionLink', :accesskey => accesskey(:edit) if activity.editable? && User.current.allowed_to?(:edit_issues, activity.project)  %>
+                        <%= link_to l(:button_edit), edit_issue_path(activity.id), :class => 'postOptionLink', :accesskey => accesskey(:edit) if activity.editable? && User.current.allowed_to?(:edit_issues, activity.project)  %>
                       </li>
                       <li>
                         <% if !defined?(project_id) && !defined?(user_id) %>

app/views/projects/_applied_status.html.erb

@@ -26,33 +26,18 @@
         </li>
         <li class="mr5 fl">
           <a class="pro_new_topbtn_left fl " style="cursor:default;"> 已加入</a>
-<!--          <a href="<%= project_member_path(@project) %>" class=" pro_new_topbtn fl"><%= Member.where(:project_id => @project.id).count %></a>-->
+<!--          <a href="<%#= project_member_path(@project) %>" class=" pro_new_topbtn fl"><%#= Member.where(:project_id => @project.id).count %></a>-->
           <%= link_to "#{Member.where(:project_id => @project.id).count}", project_member_path(@project), :class => 'pro_new_topbtn fl', :title => "项目成员列表" %>
         </li>
         <%#= link_to "#{Member.where(:project_id => @project.id).count}", project_member_path(@project), :class => 'pro_new_topbtn fl', :title => "项目成员" %>
     <% end %>
 <% end %>
+
 <!--项目fork-->
-<% if @project.gpid && User.current.id != @project.user_id %>
-<!--    <div class="fr mt5"><%#= link_to "<span class='vl_fork'></span>".html_safe+"Fork", {:controller => 'repositories', :action => 'forked'},
-                                    :class=>"vl_btn", :target => "_blank", :confirm=>"平台将为您创建一个新的同名项目和版本库，请问是否继续？" %>
-      <span href="javascript:void(0);" class="vl_btn_2 fb"><%#= link_to @project.forked_count.to_i, member_forked_project_path(@project) %></span>
-    </div>-->
-    <li class="mr5 fl">
-<!--      <a href="<%#= {:controller => 'repositories', :action => 'forked'} %>" class="pro_new_topbtn_left fl" target="_blank">Fork</a>-->
-      <%= link_to "<span class='vl_fork'></span>".html_safe+"Fork", forked_pop_project_path(@project),
-                                    :class=>"pro_new_topbtn_left fl",  :remote => true %>
-      <a href="<%= member_forked_project_path(@project) %>" class=" pro_new_topbtn fl" title="fork成员列表"><%= project_fork_count %></a>
-
-    </li>
-<% else%>
-    <li class="mr5 fl">
-      <%#= link_to "<span class='vl_fork '></span>".html_safe+"Fork","#",
-                  :class=>"pro_new_grey_topbtn_left fl"%>
-      <a href="javascript:void(0)" class="pro_new_grey_topbtn_left fl" >
-        <span class='vl_fork'>Fork</span>
-      </a>
-      <a href="<%= member_forked_project_path(@project) %>" class=" pro_new_topbtn fl"  title="fork成员列表"><%= project_fork_count %></a>
-<% end %>
+<li class="mr5 fl">
+  <%= link_to "<span class='vl_fork'></span>".html_safe+"Fork", forked_pop_project_path(@project),
+              :class=>"pro_new_topbtn_left fl",  :remote => true %>
+  <a href="<%= member_forked_project_path(@project) %>" class=" pro_new_topbtn fl" title="fork成员列表"><%= project_fork_count %></a>
+</li>
 
 

app/views/projects/_project_attachment.html.erb

@@ -9,10 +9,10 @@
           <div class="homepagePostTo break_word">
             <%= link_to activity.try(:author).show_name, user_path(activity.author_id), :class => "newsBlue mr15" %>
             TO
-            <%= link_to activity.project.name.to_s+" | 项目资源", project_files_path(activity.project), :class => "newsBlue ml15" %>
+            <%= link_to activity.project.name.to_s+" | 项目资源", project_files_path(activity.course), :class => "newsBlue ml15" %>
           </div>
           <div class="homepagePostTitle break_word" >
-            <%= link_to activity.filename, project_files_path(activity.project), :class => "postGrey" %>
+            <%= link_to activity.filename, project_files_path(activity.course), :class => "postGrey" %>
           </div>
           <div class="homepagePostSubmitContainer">
             <div class="homepagePostDeadline mr15">

app/views/pull_requests/_pull_request_comments.html.erb

@@ -3,7 +3,11 @@
     <%= form_tag(url_for(:controller => 'pull_requests', :action => 'create_pull_request_comment', :project_id => @project.id), :id => 'pull_request_comment_form', :method => "post", :remote => true) do %>
         <textarea id="pull_request_comment" name="pull_request_comment" class="pullreques_reply_textarea" style="padding-left: 0px;"></textarea>
         <span id ="pr_comment_tip" class="fontGrey2 c_red" style="display: none">内容不能为空</span>
-        <a href="javascript:void(0);" class="btn btn-blue fr" onclick="pull_request_commit()">留言</a>
+        <% if User.current.member_of?(@project) %>
+            <a href="javascript:void(0);" class="btn btn-blue fr" onclick="pull_request_commit()">留言</a>
+        <% else %>
+            <a class="btn btn-grey fr" >留言</a>
+        <% end %>
     <% end %>
   </div>
   <ul class="pullreques_reply_list">
@@ -12,7 +16,7 @@
           <%= link_to image_tag(url_to_avatar(get_user_by_login_and(comment.author.try(:username))), :width => "43", :height => "43", :class => "pullreques_reply_user_img fl mr15"), user_path(get_user_by_login_and(comment.author.try(:username))), :alt => "用户头像", :target => "_blank", :class => "fl" %>
           <div class="sy_teachers_txt fl ">
             <p class="clear mb5">
-              <%= link_to comment.author.try(:username), user_path(get_user_by_login_and(comment.author.try(:username))), :class => "pullreques_reply_name fl", :target => "_blank" %>
+              <%= link_to_user_login(comment.author.try(:username), "pullreques_reply_name fl") %>
               <span class="fl ml15 c_grey"><%= time_tag(comment.created_at) %>前</span>
             </p>
             <p class="pullreques_reply_txt"><%= comment.note %></p>

app/views/pull_requests/_pull_request_commits.html.erb

@@ -8,7 +8,7 @@
         <% commits.each do |commit| %>
             <li  class="clear">
               <span class="fl c_grey ml15 "><%= time_tag(commit.created_at) %>前</span>
-              <%= link_to get_user_by_mail(commit.author_email).show_name, user_path(get_user_by_mail(commit.author_email)), :target => "_blank", :class => "pullreques_pull_name fl ml10" %>
+              <%= link_to_user_mail(commit.author_email, "pullreques_pull_name fl ml10") %>
               <p class="pullreques_pull_txt ml10 fl"><%= commit.title %></p>
               <%= link_to truncate(commit.short_id, :length => 20), {:controller => 'repositories', :action => 'commit_diff', :id => @project.id, :changeset => commit.id}, :target => "_blank", :class => "fr mr15 c_grey" %>
             </li>

app/views/pull_requests/_pull_requests_list.html.erb

@@ -12,7 +12,7 @@
             <%= link_to "", project_pull_request_path(request.id, :project_id => @project.id), :class => "issues_icons_mes fr mr5 ml5" %>
           </div>
           <div class="c_grey clear mt5">
-            <p class="fl">由 <%= link_to get_user_by_login_and(request.author.try(:username)).try(:show_name), user_path(get_user_by_login_and(request.author.try(:username))), :class => "linkBlue2" %> 创建于<%= time_tag(request.created_at) %>前</p>
+            <p class="fl">由 <%= link_to_user_login(request.author.try(:username), "linkBlue2") %> 创建于<%= time_tag(request.created_at) %>前</p>
             <span class="fl ml10"><%= time_tag(request.updated_at) %>前更新</span>
             <p class="fr"><%#= find_gitlab_project(request.source_project_id)+"/"+request.source_branch %><span class="c_grey02 ml10 mr10">合并到</span><%#= find_gitlab_project(request.target_project_id)+"/"+request.target_branch %></p>
           </div>

app/views/pull_requests/_show.html.erb

@@ -19,7 +19,7 @@
       <p><%= @request.description %></p>
     </div>
     <div class="c_grey clear mt5">
-      <p class="fl">由 <%= link_to @request.author.try(:username), user_path(get_user_by_login_and(@request.author.try(:username))), :class => "linkBlue2" %>于 <%= format_time(@request.created_at) %> 创建</p>
+      <p class="fl">由 <%= link_to_user_login(@request.author.try(:username), "linkBlue2") %>于 <%= format_time(@request.created_at) %> 创建</p>
       <span class="fl ml10">最近更新：<%= format_time(@request.updated_at) %></span>
       <p class="fr">
         <%= find_gitlab_project(@request.source_project_id)+"/"+@request.source_branch %><span class="c_grey02 ml10 mr10">合并到</span><%= find_gitlab_project(@request.target_project_id)+"/"+@request.target_branch %>
@@ -34,7 +34,9 @@
       改动已合并至 <%= @request.target_branch %> 分支
     </div>
 <% else %>
-    <%= render "show_container" %>
+    <div id="unmerged_tip">
+      <%= render "show_container" %>
+    </div>
 <% end %>
 
 

app/views/pull_requests/_show_container.html.erb

@@ -6,10 +6,15 @@
     <div class="alert alert-orange mb15 ">
       项目分支 <%= @request.source_branch %> 和 <%= @request.target_branch %> 似乎没有差异，请将新改动提交至源分支或者切换到其它目标分支
     </div>
+<% elsif @request.try(:merge_status) == "cannot_be_merged" %>
+    <div class="alert alert-orange mb15 ">
+      Pull Request中存在冲突，请先解决冲突或者手动进行合并。
+    </div>
 <% else %>
     <% if is_project_manager?(User.current.id, @project.id) %>
         <div class="alert alert-orange mb15 ">
-          在管理员接受后，将由系统自动合并。<%= link_to "接受", accept_pull_request_project_pull_request_path(@request.id, :project_id => @project.id), :class => "linkBlue2", :remote => true %></a>
+          在管理员接受后，将由系统自动合并。
+          <%= link_to "接受", accept_pull_request_project_pull_request_path(@request.id, :project_id => @project.id), :class => "linkBlue2", :remote => true %></a>
         </div>
     <% end %>
 <% end %>

app/views/pull_requests/accept_pull_request.js.erb

@@ -1,2 +1,4 @@
 $("#create_pull_request_error").html('<%= escape_javascript(render :partial => "pull_requests/error_message") %>');
 
+
+

app/views/repositories/_forked_popbox.html.erb

@@ -6,20 +6,31 @@
   </div>
   <div class="sy_popup_con" style="width:380px;">
     <ul class="sy_popup_add" >
-    <li class="center mb5" style="line-height:20px">
-      <% if has_forked_cur_project(@project) %>
-          您已经Fork过该项目，点击“确定”将会跳入您Fork的项目主页，请问是否继续？
+      <% if User.current.id == @project.user_id %>
+          <li class="center mb30" style="line-height:20px">
+            自己不能Fork自己创建的项目
+          </li>
       <% else %>
-          Fork将在后台执行<br>平台将为您创建一个新的同名项目和版本库，请问是否继续？
+        <% if @project.gpid.blank? %>
+              <li class="center mb30" style="line-height:20px">
+                该项目还没有创建版本库，暂时不能Fork
+              </li>
+        <% else %>
+              <li class="center mb5" style="line-height:20px">
+                <% if has_forked_cur_project(@project) %>
+                    您已经Fork过该项目，点击“确定”将会跳入您Fork的项目主页，请问是否继续？
+                <% else %>
+                    Fork将在后台执行<br>平台将为您创建一个新的同名项目和版本库，请问是否继续？
+                <% end %>
+              </li>
+              <li class="mt10">
+                <label class="mr27">&nbsp;</label>
+                <a href="javascript:void(0);" class="sy_btn_grey fl " onclick="hideModal()">取&nbsp;&nbsp;消</a>
+                <%= link_to "确   定", {:controller => 'repositories', :action => 'forked'}, :class => "sy_btn_blue fl ml20", :onclick => "hideModal();", :target => "_blank" %>
+                <div class="cl"></div>
+              </li>
+        <% end %>
       <% end %>
-    </li>
-    <li class="mt10">
-      <label class="mr27">&nbsp;</label>
-      <a href="javascript:void(0);" class="sy_btn_grey fl " onclick="hideModal()">取&nbsp;&nbsp;消</a>
-     <!-- <a href="<%#= {:controller => 'repositories', :action => 'forked'} %>" class="sy_btn_blue fl ml20" onclick="hideModal();">确&nbsp;&nbsp;定</a>-->
-      <%= link_to "确   定", {:controller => 'repositories', :action => 'forked'}, :class => "sy_btn_blue fl ml20", :onclick => "hideModal();", :target => "_blank" %>
-      <div class="cl"></div>
-    </li>
   </ul>
   </div>
 </div>

app/views/student_work/_upload_attachment.html.erb

@@ -48,6 +48,7 @@
       <div class="cl"></div>
       <p id="hint_message"></p>
       <div class="cl"></div>
+      <div class="_notice_box text_c none mt5" style="height: 20px; width: 397px; padding: 4px 4px; line-height: 20px;" id="_notice_box">注意：暂不支持IE浏览器的上传，请更换浏览器</div>
       <div style="margin-top: 10px">
         <a href="javascript:void(0);" id="upload_files_cancle_btn" class="fl sy_btn_grey mr10" onclick="closeModal();">取消</a>
         <a href="javascript:void(0);" id="upload_files_submit_btn" class="fl sy_btn_blue" onclick="submit_revise_files();">确定</a>
@@ -55,4 +56,14 @@
   <% end %>
 </div>
   <div class="cl"></div>
-</div>
+</div>
+<script>
+  $(function(){
+      if(is_IE()){
+          $("#_notice_box").show();
+          $("#uploadReviseBox").addClass('disable_link');
+          $("#uploadReviseBox").attr("title","IE无法上传");
+          $("#choose_revise_attach").attr("onclick","return false;");
+      }
+  });
+</script>

app/views/student_work/new.html.erb

@@ -5,6 +5,16 @@
 <% end %>
 
 <script type="text/javascript">
+  $(function(){
+      if(is_IE()){
+          $("#_notice_box").show();
+          $("#uploadReviseBox").addClass('disable_link');
+          $("#upload_file_local").attr("title","IE无法上传");
+          $("#upload_file_local").attr("onclick","return false;");
+          $("#resource_repo_upload").attr("title","IE无法上传");
+          $("#resource_repo_upload").attr("href","javascript:void(0)");
+      }
+  });
   <%if @homework.anonymous_comment == 0 && @homework.homework_detail_manual.comment_status != 1%>
     $(function(){
         $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/new_student_work_alert') %>');
@@ -203,8 +213,9 @@
 </div>
 <div class="cl"></div>
 
-<div class="HomeWork" id="users_setting">
+<div class="_notice_box text_c none mb10" style="height: 20px; padding: 4px 4px; line-height: 20px;" id="_notice_box">注意：暂不支持IE浏览器的上传，请更换浏览器</div>
 
+<div class="HomeWork" id="users_setting">
   <div class="HomeWorkBox">
     <div class="">
       <div class="homepagePostTitle fl m_w530 hidden">

app/views/syllabuses/show.html.erb

@@ -39,7 +39,7 @@
       <p class="sy_tab_con_p">该课程尚未填写课程大纲，敬请期待！</p>
   <% else %>
       <div class="sy_tab_con">
-        <div class="syllabuscon upload_img" id="syllabus_description_<%= @syllabus.id %>">
+        <div class="syllabuscon upload_img ke-block" id="syllabus_description_<%= @syllabus.id %>">
           <%=@syllabus.description.html_safe %>
         </div>
         <div class="mt10" style="font-weight:normal; font-size: 12px;">

app/views/users/_anonymous_evaluation_list.html.erb

@@ -0,0 +1,50 @@
+<div class="resources" >
+  <div class="clear" >
+    <table class="sy_new_table clear"  cellpadding="0" cellspacing="0">
+      <thead>
+      <tr>
+        <th>作业标题</th>
+        <th style="width:160px">来源</th>
+        <th style="width:80px">类型</th>
+        <th style="width:160px">截止剩余时间</th>
+      </tr>
+      </thead>
+      <tbody>
+      <% @anonymous_evaluation.each do |ae| %>
+          <tr>
+            <th>
+              <li class="homepageTabTitle">
+               <%= link_to ae.name.to_s, student_work_index_url(:homework => ae.id, :tab => 2), :target => "_blank", :class => "homepageTabTitle fl ml5" %>
+              </li>
+            </th>
+            <th>
+              <li class="homepageTabProjectName ml5">
+               <%= link_to ae.course.try(:name),"", :target => "_blank", :class => "homepageTabTitle ml5"%>
+              <li>
+            </th>
+            <th>
+              <li class="homepageTabAuthor ml5" >
+                <%= homework_type_tip(ae.homework_type) %>
+              </li>
+            </th>
+            <th>
+              <li class="homepageTabTime ml5" >
+                <% end_time = ae.end_time.to_time.to_i + 24*60*60 - 1 %>
+                <% if end_time >  Time.now.to_i %>
+                    <span class="c_red"><%= (end_time - Time.now.to_i) / (24*60*60) %></span> 天
+                    <span class="c_red"><%= ((end_time - Time.now.to_i) % (24*60*60)) / (60*60)%></span> 小时
+                    <span class="c_red"><%= (((end_time - Time.now.to_i) % (24*60*60)) % (60*60)) / 60%></span> 分
+                <% else %>
+                    <span class="c_red">已截止</span>
+                <% end %>
+              </li>
+            </th>
+          </tr>
+      <% end %>
+      </tbody>
+    </table>
+    <ul class="pages" style="width: auto;display: table;margin-left: auto;margin-right: auto; padding-top: 10px">
+      <%= pagination_links_full @anonymous_evaluation_pages, @anonymous_evaluation_count, :per_page_links => false, :remote => true,  :flag => true, :is_new => true %>
+    </ul>
+  </div>
+</div>

app/views/users/_applied_project_content.html.erb

@@ -1,15 +1,16 @@
-<li class="homepageNewsPortrait fl">
-  <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(applied_project_users(ma)), :width => "30", :height => "30"), user_path(applied_project_users(ma)), :target => '_blank' %></a>
-</li>
-<li class="homepageNewsPubType fl">
-  <%= render :partial => "users/user_message_applide_users", :locals =>{:ma => ma} %>
-</li>
-<li class="homepageNewsContent fl" style="width:283px;"><a href="javascript:void(0);" class="newsGrey">
-  以“<%= applied_project_message_type(ma.role) %>”身份加入<% project = Project.find(ma.project_id) %>
-  <%= link_to project.name, project_path(ma.project_id), :class => "link-blue", :target => '_blank', :title => "#{project.name}" %>
-</a>
-</li>
-<li class="fl" style="width:71px; height:49px;">
+<div class="shortMessageWidth">
+  <li class="homepageNewsPortrait fl">
+    <%=link_to image_tag(url_to_avatar(applied_project_users(ma)), :width => "30", :height => "30"), user_path(applied_project_users(ma)), :target => '_blank' %>
+  </li>
+  <li class="homepageNewsPubType fl">
+    <%= render :partial => "users/user_message_applide_users", :locals =>{:ma => ma} %>
+  </li>
+  <li class="messageInformationContents">
+    <% project = Project.find(ma.project_id) %>
+    <%= link_to project.name, project_path(ma.project_id), :class => "link-blue", :target => '_blank', :title => "#{project.name}" %>
+  </li>
+</div>
+<li class="messageOperateContents fl">
   <span><%= render :partial => "users/user_message_applide_action", :locals =>{:ma => ma} %></span>
 </li>
-<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>

app/views/users/_apply_homework_course_message.html.erb

@@ -1,27 +1,35 @@
-<li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= link_to image_tag(url_to_avatar(User.find(ma.apply_user_id)), :width => "30", :height => "30"), user_path(User.find(ma.apply_user_id)), :target => '_blank' %></div></a></li>
-<li class="homepageNewsPubType fl">
-  <%= link_to User.find(ma.apply_user_id).show_name,
-              user_path(User.find(ma.apply_user_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-  <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">申请引用作业：</span>
-</li>
-<li class="<%=(ma.apply_result == 0 || ma.apply_result.nil?) ? 'homepageHomeworkContent2' : 'homepageHomeworkContent' %> fl">
-  <% content = ma.content.nil? ? '' : '：'+ ma.content.to_s %>
-  <%= link_to User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}", student_work_index_path(:homework => ma.course_message.id), :title => User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}",:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}", :target => '_blank' %>
-  <!--:onmouseover => "message_titile_show($(this),event)",-->
-  <!--:onmouseout => "message_titile_hide($(this))" %>-->
-</li>
-
-<li class="<%=(ma.apply_result == 0 || ma.apply_result.nil?) ? 'homepageHomeworkContentWarn2' : 'homepageHomeworkContentWarn' %> fl">
-            <span id="deal_info_<%=ma.id%>">
-              <% if ma.apply_result == 0 || ma.apply_result.nil?%>
-                <%= link_to '同意',dealwith_apply_homework_user_path(User.current,:agree=>'Y',:msg_id=>ma.id),:remote=>'true'%>
+<div class="shortMessageWidth">
+  <li class="homepageNewsPortrait fl">
+    <div class="navHomepageLogo fl">
+      <%= link_to image_tag(url_to_avatar(User.find(ma.apply_user_id)), :width => "30", :height => "30"), user_path(User.find(ma.apply_user_id)), :target => '_blank' %>
+    </div>
+  </li>
+  <li class="homepageNewsPubType fl">
+    <%= link_to User.find(ma.apply_user_id).show_name, user_path(User.find(ma.apply_user_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+    <span class="homepageNewsType fl">申请引用作业：</span>
+  </li>
+  <li class="messageInformationContents">
+    <% content = ma.content.nil? ? '' : '：'+ ma.content.to_s %>
+    <%= link_to User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}",
+                student_work_index_path(:homework => ma.course_message.id),
+                :title => User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}",
+                :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}",
+                :target => '_blank' %>
+    <!--:onmouseover => "message_titile_show($(this),event)",-->
+    <!--:onmouseout => "message_titile_hide($(this))" %>-->
+  </li>
+</div>
+<li class="messageApplyContents fl">
+            <span id="deal_info_<%= ma.id %>">
+              <% if ma.apply_result == 0 || ma.apply_result.nil? %>
+                <%= link_to '同意', dealwith_apply_homework_user_path(User.current, :agree=>'Y', :msg_id=>ma.id), :remote=>'true'%>
                   |
-                  <%= link_to '拒绝',dealwith_apply_homework_user_path(User.current,:agree=>'N',:msg_id=>ma.id),:remote=>'true'%>
-             <% elsif ma.apply_result == 1%> <!-- 同意 -->
-                 您已经同意了该申请
-             <% elsif ma.apply_result == 2%> <!-- 拒绝 -->
-                 您已经拒绝了该申请
-             <%end %>
+                  <%= link_to '拒绝', dealwith_apply_homework_user_path(User.current, :agree=>'N', :msg_id=>ma.id), :remote=>'true'%>
+             <% elsif ma.apply_result == 1 %> <!-- 同意 -->
+                 您已同意申请
+             <% elsif ma.apply_result == 2 %> <!-- 拒绝 -->
+                 您已拒绝申请
+             <% end %>
              </span>
 </li>
-<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>

app/views/users/_apply_resource_course_message.html.erb

@@ -1,3 +1,4 @@
+<div class="shortMessageWidth">
 <li class="homepageNewsPortrait fl">
   <div class="navHomepageLogo fl">
     <%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %>
@@ -5,9 +6,9 @@
 </li>
 <li class="homepageNewsPubType fl">
   <%= link_to ma.course_message.user.show_name, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
-  <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">申请引用资源：</span>
+  <span class="homepageNewsType fl">申请引用资源：</span>
 </li>
-<li class="<%=(ma.apply_result == 0 || ma.apply_result.nil?) ? 'homepageHomeworkContent2' : 'homepageHomeworkContent' %> fl">
+<li class="messageInformationContents">
   <% content = ma.course_message.content.nil? ? '' : '：'+ ma.course_message.content.to_s %>
   <% show_content = ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)}"+"\"#{content}" %>
   <% if ma.course_message.container_type == "Course" %>
@@ -22,17 +23,17 @@
       </a>
   <% end %>
 </li>
-
-<li class="<%=(ma.apply_result == 0 || ma.apply_result.nil?) ? 'homepageHomeworkContentWarn2' : 'homepageHomeworkContentWarn' %> fl">
+</div>
+<li class="messageApplyContents fl">
    <span id="deal_info_<%= ma.id %>">
      <% if ma.apply_result == 0 || ma.apply_result.nil? %>
          <%= link_to '同意', deal_with_apply_resource_user_path(User.current, :agree => 'Y', :msg_id => ma.id, :apply_user_id => ma.course_message.apply_user_id), :remote => 'true' %> |
          <%= link_to '拒绝', deal_with_apply_resource_user_path(User.current, :agree => 'N', :msg_id => ma.id, :apply_user_id => ma.course_message.apply_user_id), :remote => 'true' %>
      <% elsif ma.apply_result == 1 %>
-         您已经同意了该申请
+         您已同意申请
      <% elsif ma.apply_result == 2 %>
-         您已经拒绝了该申请
+         您已拒绝申请
      <%end %>
    </span>
 </li>
-<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>

app/views/users/_apply_resource_course_message_reply.html.erb

@@ -1,4 +1,4 @@
-<ul class="homepageNewsList fl">
+<div class="longMessageWidth">
   <li class="homepageNewsPortrait fl">
     <% owner = User.find(ma.course_message.apply_user_id) %>
     <div class="navHomepageLogo fl">
@@ -7,9 +7,9 @@
   </li>
   <li class="homepageNewsPubType fl">
     <%= link_to owner.show_name, user_path(owner), :class => "newsBlue homepageNewsPublisher" %>
-    <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.apply_result == 2 ? '同意' : '拒绝'%>引用资源：</span>
+    <span class="homepageNewsType fl"><%= ma.apply_result == 2 ? '同意' : '拒绝'%>引用资源：</span>
   </li>
-  <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+  <li class="messageInformationContents">
     <% link_str = ma.apply_result == 2 ?
             '您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename) + '"的申请已通过'
     :
@@ -25,10 +25,7 @@
           <%= link_str %>
         </a>
     <% end %>
-
-
     <%= link_to link_str, user_resource_user_path(User.current, :type => 2), :title => link_str,:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
-  </a>
   </li>
-  <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-</ul>
+</div>
+<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>

app/views/users/_join_course_course_message.html.erb

@@ -1,38 +1,49 @@
-<li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div></a></li>
-<li class="homepageNewsPubType fl">
-  <span class="newsBlue homepageNewsPublisher">系统提示</span>
-  <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">您有了新的班级成员申请：</span>
-</li>
-<li class="<%=(ma.status == 0 || ma.status.nil?) ? 'homepageHomeworkContent2' : 'homepageHomeworkContent' %> fl">
-  <a href="javascript:void(0);" class="newsGrey">
+<div class="shortMessageWidth">
+  <% message_user = User.find(ma.course_message_id) %>
+  <li class="homepageNewsPortrait fl">
+    <div class="navHomepageLogo fl">
+      <%= link_to image_tag(url_to_avatar(message_user), :width => "30", :height => "30"), user_path(message_user), :target => '_blank' %>
+    </div>
+  </li>
+  <li class="homepageNewsPubType fl">
+  <span class="newsBlue homepageNewsPublisher">
+     <%=link_to message_user.show_name, user_path(ma.course_message_id),
+                :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+  </span>
+  <span class="homepageNewsType fl">
+    申请以<%= ma.content && ma.content.include?('9') ? "“教师”" : "“助教”" %>的身份加入班级：
+  </span>
+  </li>
+  <li class="messageInformationContents">
     <% content = User.find(ma.course_message_id).name+"申请成为班级\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content && ma.content.include?('9') ? "教师" : "助教"}" %>
-    <%= link_to content, user_path(User.find(ma.course_message_id), :course_id => ma.course_id),
+    <%= link_to Course.find(ma.course_id).name, course_path(Course.find(ma.course_id)),
                 :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank', :title => "#{content}" %>
     <!--:onmouseover => "message_titile_show($(this),event)",-->
     <!--:onmouseout => "message_titile_hide($(this))" %>-->
-  </a>
-</li>
-<div style="display: none" class="message_title_red system_message_style">
-  <p>
-    <%= User.current.lastname + User.current.firstname %>老师您好！您有了新的班级成员申请，信息如下：
-  </p>
-  <p>真实姓名：<%= User.find(ma.course_message_id).realname %></p>
-  <p>申请班级：<%= Course.find(ma.course_id).name%></p>
-  <div class="fl">班级描述：</div>
-  <div class="ml60"><%= Course.find(ma.course_id).description.html_safe if Course.find(ma.course_id).description %></div>
-  <p>申请职位：<%=ma.content && ma.content.include?('9')  ? "教师" : "助教"%></p>
+  </li>
+  <div style="display: none" class="message_title_red system_message_style">
+    <p>
+      <%= User.current.lastname + User.current.firstname %>老师您好！您有了新的班级成员申请，信息如下：
+    </p>
+    <p>真实姓名：<%= User.find(ma.course_message_id).realname %></p>
+    <p>申请班级：<%= Course.find(ma.course_id).name%></p>
+    <div class="fl">班级描述：</div>
+    <div class="ml60"><%= Course.find(ma.course_id).description.html_safe if Course.find(ma.course_id).description %></div>
+    <p>申请职位：<%=ma.content && ma.content.include?('9')  ? "教师" : "助教"%></p>
+  </div>
 </div>
-<li class="<%=(ma.status == 0 || ma.status.nil?) ? 'homepageHomeworkContentWarn2' : 'homepageHomeworkContentWarn' %> fl">
+<li class="messageOperateContents fl">
             <span id="deal_info_<%=ma.id%>">
               <% if ma.status == 0 || ma.status.nil?%>
                 <%= link_to '同意',dealwith_apply_request_user_path(User.current,:agree=>'Y',:msg_id=>ma.id),:remote=>'true',:class=>'linkBlue'%>
                   |
                   <%= link_to '拒绝',dealwith_apply_request_user_path(User.current,:agree=>'N',:msg_id=>ma.id),:remote=>'true',:class=>'linkBlue'%>
              <% elsif ma.status == 1%> <!-- 同意 -->
-                 您已经同意了该申请
+                 您已同意申请
              <% elsif ma.status == 2%> <!-- 拒绝 -->
-                 您已经拒绝了该申请
+                 您已拒绝申请
              <%end %>
              </span>
 </li>
-<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+

app/views/users/_new_user_message.html.erb

@@ -0,0 +1,27 @@
+<% message_alls.each do |ma| %>
+    <%# 系统消息 %>
+    <%= render :partial => 'users/user_message_system', :locals => {:ma => ma}  %>
+
+    <%= render :partial => 'users/user_at_message', :locals => {:ma => ma}  %>
+
+    <%# 课程消息 %>
+    <%= render :partial => 'users/user_message_course', :locals => {:ma => ma}  %>
+
+    <!--项目消息-->
+    <%= render :partial => 'users/user_message_forge', :locals => {:ma => ma}  %>
+
+    <!--公共贴吧-->
+    <%= render :partial => 'users/user_message_forum', :locals => {:ma => ma}  %>
+
+    <!--用户留言-->
+    <%= render :partial => 'users/user_message_userfeedaback', :locals => {:ma => ma}  %>
+
+    <%= render :partial => 'users/user_message_org', :locals => {:ma => ma} %>
+
+    <%# 申请类消息 %>
+    <%= render :partial => 'users/user_message_applied', :locals => {:ma => ma} %>
+<% end %>
+
+<ul class="pages" style="width: auto;display: table;margin-left: auto;margin-right: auto; padding-top: 10px">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => true,  :flag => true, :is_new => true %>
+</ul>

app/views/users/_no_data.html.erb

@@ -0,0 +1,4 @@
+<div class="pro_new_info mt50" style="width:748px;height:405px;">
+  <div class="icons_tishi"><img src="/images/new_project/icons_smile.png" width="110" height="110" alt=""></div>
+  <p class="sy_tab_con_p ">该用户无公开动态~</p>
+</div>

app/views/users/_no_data.html.erb.LOCAL.erb

@@ -0,0 +1,4 @@
+<div class="pro_new_info mt50" style="width:748px;height:405px;">
+  <div class="icons_tishi"><img src="/images/new_project/icons_smile.png" width="110" height="110" alt=""></div>
+  <p class="sy_tab_con_p ">该用户无公开动态~</p>
+</div>

app/views/users/_no_data.html.erb.REMOTE.erb

@@ -0,0 +1,4 @@
+<div class="pro_new_info mt50" style="width:748px;height:405px;">
+  <div class="icons_tishi"><img src="/images/new_project/icons_smile.png" width="110" height="110" alt=""></div>
+  <p class="sy_tab_con_p ">该用户无公开动态~</p>
+</div>

app/views/users/_project_issue.html.erb

@@ -20,7 +20,7 @@
                   <li class="homepagePostSettingIcon">
                     <ul class="homepagePostSettiongText">
                       <li>
-                        <%= link_to l(:button_edit), issue_path(activity.id, :edit => 'true'), :class => 'postOptionLink', :accesskey => accesskey(:edit) if activity.editable? && User.current.allowed_to?(:edit_issues, activity.project)  %>
+                        <%= link_to l(:button_edit), edit_issue_path(activity.id), :class => 'postOptionLink', :accesskey => accesskey(:edit) if activity.editable? && User.current.allowed_to?(:edit_issues, activity.project)  %>
                       </li>
                       <li>
                         <% if !defined?(project_id) && !defined?(user_id) %>

app/views/users/_task_tip.html.erb

@@ -0,0 +1,84 @@
+<% if @unsolved_issues_count > 0 %>
+    <div class="flex-cell_homepage"  id="user_homepage_tab_1" onclick="HoverLi(1);">
+      <a href="<%= unsolved_issues_list_user_path(@user)%>" data-remote = "true" >
+        <div class="homepage_tab_div" style="">
+            <span style="margin: 5px auto; vertical-align: middle; display: inline-block;">
+              <li class="homepage_issue_tab mb5 fl"></li>
+              <span class="ml5 fl" style="font-size: 20px;"><%= @unsolved_issues_count %></span>
+              <div class="cl"></div>
+            </span>
+          <br />待解决Issue
+        </div>
+      </a>
+    </div>
+<% end %>
+<% if @unfinished_homework_count > 0 %>
+    <div class="flex-cell_homepage" id="user_homepage_tab_2" onclick="HoverLi(2);">
+      <a href="<%= unfinished_homework_list_user_path(@user) %>" data-remote = "true">
+        <div class="homepage_tab_div" style="">
+            <span style="margin: 5px auto; vertical-align: middle; display: inline-block;">
+              <li class="homepage_work_tab mb5 fl"></li>
+              <span class="ml5 fl" style="font-size: 20px;"><%= @unfinished_homework_count %></span>
+              <div class="cl"></div>
+            </span>
+          <br />待完成作业
+        </div>
+      </a>
+    </div>
+<% end %>
+<% if @unfinished_test_count > 0 %>
+    <div class="flex-cell_homepage"  id="user_homepage_tab_3" onclick="HoverLi(3);">
+      <a href="<%= unfinished_test_list_user_path(@user) %>"  data-remote = "true">
+        <div class="homepage_tab_div" style="">
+            <span style="margin: 5px auto; vertical-align: middle; display: inline-block;">
+              <li class="homepage_test_tab mb5 fl"></li>
+              <span class="ml5 fl" style="font-size: 20px;"><%= @unfinished_test_count %></span>
+              <div class="cl"></div>
+            </span>
+          <br />待完成测验
+        </div>
+      </a>
+    </div>
+<% end %>
+<% if @unfinished_poll_count > 0 %>
+    <div class="flex-cell_homepage"  id="user_homepage_tab_4" onclick="HoverLi(4);">
+      <a href="<%= unfinished_poll_list_user_path(@user) %>" data-remote = "true">
+        <div class="homepage_tab_div" style="">
+            <span style="margin: 5px auto; vertical-align: middle; display: inline-block;">
+              <li class="homepage_poll_tab mb5 fl"></li>
+              <span class="ml5 fl" style="font-size: 20px;"><%= @unfinished_poll_count %></span>
+              <div class="cl"></div>
+            </span>
+          <br />待完成问卷
+        </div>
+      </a>
+    </div>
+<% end %>
+<% if @anonymous_evaluation_count > 0 %>
+    <div class="flex-cell_homepage" id="user_homepage_tab_5" onclick="HoverLi(5);">
+      <a href="<%= anonymous_evaluation_list_user_path(@user) %>"  data-remote = "true">
+        <div class="homepage_tab_div" id="user_homepage_tab_05" style="">
+            <span style="margin: 5px auto; vertical-align: middle; display: inline-block;">
+              <li class="homepage_anonymity_tab mb5 fl"></li>
+              <span class="ml5 fl" style="font-size: 20px;"><%= @anonymous_evaluation_count %></span>
+              <div class="cl"></div>
+            </span>
+          <br />待匿评作品
+        </div>
+      </a>
+    </div>
+<% end %>
+<% if @applied_message_alls_count > 0 %>
+    <div class="flex-cell_homepage" id="user_homepage_tab_6" onclick="HoverLi(6);">
+      <a href="<%= unapproval_applied_list_user_path(@user) %>"  data-remote="true">
+        <div class="homepage_tab_div" style="">
+            <span style="margin: 5px auto; vertical-align: middle; display: inline-block;">
+              <li class="homepage_apply_tab mb5 fl"></li>
+              <span class="ml5 fl" style="font-size: 20px;"><%= @applied_message_alls_count %></span>
+              <div class="cl"></div>
+            </span>
+          <br />待审批申请
+        </div>
+      </a>
+    </div>
+<% end %>

app/views/users/_unapproval_applied_list.html.erb

@@ -0,0 +1,8 @@
+<div class="homepageRightBanner">
+  <div class="NewsBannerName">
+    申请内容
+  </div>
+</div>
+<div class="resources">
+  <%= render :partial => 'users/new_user_message', :locals => { :message_alls => @message_alls } %>
+</div>

app/views/users/_unfinished_homework_list.html.erb

@@ -0,0 +1,50 @@
+<div class="resources" >
+  <div class="clear" >
+    <table class="sy_new_table clear"  cellpadding="0" cellspacing="0">
+      <thead>
+      <tr>
+        <th>作业标题</th>
+        <th style="width:160px">来源</th>
+        <th style="width:80px">类型</th>
+        <th style="width:160px">截止剩余时间</th>
+      </tr>
+      </thead>
+      <tbody>
+      <% @unfinished_homeworks.each do |uh| %>
+          <tr>
+            <th>
+              <li class="homepageTabTitle">
+                <%= link_to uh.name.to_s, student_work_index_path( :homework => uh.id, :tab => 1), :target => "_blank", :class => "homepageTabTitle fl ml5" %>
+              </li>
+            </th>
+            <th>
+              <li class="homepageTabProjectName ml5">
+                <%=  link_to uh.course.try(:name), course_path(uh.course_id), :target => "_blank", :class => "homepageTabTitle ml5"%>
+              <li>
+            </th>
+            <th>
+              <li class="homepageTabAuthor ml5" >
+               <%= homework_type_tip(uh.homework_type) %>
+              </li>
+            </th>
+            <th>
+              <li class="homepageTabTime ml5" >
+                <% end_time = uh.end_time.to_time.to_i + 24*60*60 - 1 %>
+                <% if end_time >  Time.now.to_i %>
+                    <span class="c_red"><%= (end_time - Time.now.to_i) / (24*60*60) %></span> 天
+                    <span class="c_red"><%= ((end_time - Time.now.to_i) % (24*60*60)) / (60*60)%></span> 小时
+                    <span class="c_red"><%= (((end_time - Time.now.to_i) % (24*60*60)) % (60*60)) / 60%></span> 分
+                <% else %>
+                    <span class="c_red">已截止</span>
+                <% end %>
+              </li>
+            </th>
+          </tr>
+      <% end %>
+      </tbody>
+    </table>
+    <ul class="pages" style="width: auto;display: table;margin-left: auto;margin-right: auto; padding-top: 10px">
+      <%= pagination_links_full @unfinished_homework_pages, @unfinished_homeworks_count, :per_page_links => false, :remote => true,  :flag => true, :is_new => true %>
+    </ul>
+  </div>
+</div>

app/views/users/_unfinished_poll_list.html.erb

@@ -0,0 +1,33 @@
+<div class="resources" >
+  <div class="clear" >
+    <table class="sy_new_table clear"  cellpadding="0" cellspacing="0">
+      <thead>
+      <tr>
+        <th><li class="fl ml5">问卷标题</li></th>
+        <th style="width:160px">来源</th>
+      </tr>
+      </thead>
+      <tbody>
+      <% @unfinished_poll.each do |up| %>
+          <tr>
+            <th>
+              <li class="homepageTabPollTitle">
+                <%= link_to up.polls_name.to_s, poll_path(up.id), :target => "_blank", :class => "homepageTabPollTitle fl ml5" %>
+              </li>
+            </th>
+            <th>
+              <li class="homepageTabProjectName ml5">
+                <% if up.polls_type == "Course" %>
+                    <%= link_to Course.find(up.polls_group_id).name, course_path(Course.find(up.polls_group_id)) %>
+                <% end %>
+              <li>
+            </th>
+          </tr>
+      <% end %>
+      </tbody>
+    </table>
+    <ul class="pages" style="width: auto;display: table;margin-left: auto;margin-right: auto; padding-top: 10px">
+      <%= pagination_links_full @unfinished_poll_pages, @unfinished_poll_count, :per_page_links => false, :remote => true,  :flag => true, :is_new => true %>
+    </ul>
+  </div>
+</div>

app/views/users/_unfinished_test_list.html.erb

@@ -0,0 +1,53 @@
+<div class="resources" >
+  <div class="clear" >
+    <table class="sy_new_table clear"  cellpadding="0" cellspacing="0">
+      <thead>
+      <tr>
+        <th>测验标题</th>
+        <th style="width:160px">来源</th>
+        <th style="width:80px">测验时长</th>
+        <th style="width:160px">截止剩余时间</th>
+      </tr>
+      </thead>
+      <tbody>
+      <% @unfinished_test.each do |ut| %>
+          <tr>
+            <th>
+              <li class="homepageTabTitle">
+                <%= link_to ut.exercise_name.to_s, exercise_index_path(:course_id => ut.course_id), :target => "_blank", :class => "homepageTabTitle fl ml5" %>
+              </li>
+            </th>
+            <th>
+              <li class="homepageTabProjectName ml5">
+                <%=  link_to ut.course.try(:name), course_path(ut.course_id), :target => "_blank", :class => "homepageTabTitle ml5"%>
+              <li>
+            </th>
+            <th>
+              <li class="homepageTabAuthor ml5" >
+                <% if ut.time.to_i == -1 %>
+                    不限时
+                <% else %>
+                    <%= ut.time %>
+                <% end %>
+              </li>
+            </th>
+            <th>
+              <li class="homepageTabTime ml5" >
+                <% if ut.end_time > Time.now %>
+                    <span class="c_red"><%= (ut.end_time.to_i - Time.now.to_i) / (24*60*60) %></span> 天
+                    <span class="c_red"><%= ((ut.end_time.to_i - Time.now.to_i) % (24*60*60)) / (60*60)%></span> 小时
+                    <span class="c_red"><%= (((ut.end_time.to_i - Time.now.to_i) % (24*60*60)) % (60*60)) / 60%></span> 分
+                <% else %>
+                    <span class="c_red">已截止</span>
+                <% end %>
+              </li>
+            </th>
+          </tr>
+      <% end %>
+      </tbody>
+    </table>
+    <ul class="pages" style="width: auto;display: table;margin-left: auto;margin-right: auto; padding-top: 10px">
+      <%= pagination_links_full @unfinished_test_pages, @unfinished_test_count, :per_page_links => false, :remote => true,  :flag => true, :is_new => true %>
+    </ul>
+  </div>
+</div>

app/views/users/_unsolved_issues_list.html.erb

@@ -0,0 +1,53 @@
+<div class="resources" >
+  <div class="clear" >
+    <table class="sy_new_table clear"  cellpadding="0" cellspacing="0">
+      <thead>
+      <tr>
+        <th>标题</th>
+        <th style="width:160px">来源</th>
+        <th style="width:80px">发布人</th>
+        <th style="width:80px">优先度</th>
+        <th style="width:80px">状态</th>
+      </tr>
+      </thead>
+      <tbody>
+      <% @unsolved_issues.each do |ui| %>
+          <tr>
+            <th>
+              <li class="homepageTabTitle">
+                <%= link_to ui.subject.to_s, issue_path(ui), :target => "_blank", :class => "homepageTabTitle fl ml5" %>
+              </li>
+            </th>
+            <th>
+              <li class="homepageTabProjectName ml5">
+                <%= link_to ui.project.try(:name), project_path(ui.project_id) %>
+              <li>
+            </th>
+            <th>
+              <li class="homepageTabAuthor ml5" >
+                <% if ui.author.show_name == ' ' %>
+                    <%= link_to ui.try(:author), user_path(ui.author_id) %>
+                <% else %>
+                    <%= link_to ui.author.show_name, user_path(ui.author_id) %>
+                <% end %>
+              </li>
+            </th>
+            <th>
+              <li class="homepageTabAuthor ml5" >
+                <%= ui.priority.name %>
+              </li>
+            </th>
+            <th>
+              <li class="homepageTabAuthor ml5" >
+                <%= ui.status.name %>
+              </li>
+            </th>
+          </tr>
+      <% end %>
+      </tbody>
+    </table>
+    <ul class="pages" style="width: auto;display: table;margin-left: auto;margin-right: auto; padding-top: 10px">
+      <%= pagination_links_full @unsolved_issues_pages, @unsolved_issues_count, :per_page_links => false, :remote => true,  :flag => true, :is_new => true %>
+    </ul>
+  </div>
+</div>

app/views/users/_user_activities.html.erb

@@ -109,7 +109,7 @@
 <!--
     <div id="show_more_activities" class="loadMore mt10 f_grey">点击展开更多<%#=link_to "", user_activities_path(@user.id,:type => type,:page => page),:id => "more_activities_link",:remote => "true",:class => "none" %></div>
 -->
-    <%= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
+    <%= link_to "点击展开更多", user_activities_path(@user.id,:type => type,:page => page), :id => "show_more_activities", :remote => "true", :class => "loadMore mt10 f_grey"%>
 <% end%>
 
 <!--

app/views/users/_user_at_message.html.erb

@@ -1,28 +1,34 @@
 <% if ma.class == AtMessage && ma.at_valid? && ma.at_message %>
-        <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.author), :width => "30", :height => "30"),user_path(ma.author) %></a></li>
-          <li class="homepageNewsPubType fl">
+    <ul class="homepageNewsList fl">
+      <div class="longMessageContents">
+        <li class="homepageNewsPortrait fl">
+          <%= link_to image_tag(url_to_avatar(ma.author), :width => "30", :height => "30"), user_path(ma.author) %>
+        </li>
+        <li class="homepageNewsPubType fl">
             <span class="newsBlue homepageNewsPublisher">
               <%= link_to  ma.author.show_name,  user_path(ma.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             </span><span class="homepageNewsType fl">提到了你：</span>
-          </li>
-          <li class="homepageNewsContent fl">
-            <% if ma.at_message_type == "Message" && !ma.at_message.course.nil? %>
-                <%= link_to ma.subject.html_safe, course_boards_path(ma.at_message.course,
-                            :parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id),
-                            :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}" %>
-                            <!--# :onmouseover =>"message_titile_show($(this),event)",-->
-                            <!--:onmouseout => "message_titile_hide($(this))" %>-->
-            <% elsif ma.at_message_type == "Message" && !ma.at_message.project.nil? %>
-                <%= link_to ma.subject.html_safe, project_boards_path(ma.at_message.project,
-                            :parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id),
-                             :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}" %>
-                            <!--# :onmouseover =>"message_titile_show($(this),event)",-->
-                            <!--:onmouseout => "message_titile_hide($(this))" %>-->
-            <% else %>
-                <%= link_to ma.subject.html_safe, ma.url, :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}", :onmouseover =>"message_titile_show($(this),event)", :onmouseout => "message_titile_hide($(this))" %>
-            <% end %>
-            </li>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
+        </li>
+        <li class="messageInformationContents">
+          <% if ma.at_message_type == "Message" && !ma.at_message.course.nil? %>
+              <%= link_to ma.subject.html_safe, course_boards_path(ma.at_message.course,
+                                                                   :parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id,
+                                                                   :topic_id => ma.at_message.id),
+                          :title => "#{ma.subject.html_safe}",
+                          :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}" %>
+          <% elsif ma.at_message_type == "Message" && !ma.at_message.project.nil? %>
+              <%= link_to ma.subject.html_safe, project_boards_path(ma.at_message.project,
+                                                                    :parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id,
+                                                                    :topic_id => ma.at_message.id),
+                          :title => "#{ma.subject.html_safe}",
+                          :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}" %>
+          <% else %>
+              <%= link_to ma.subject.html_safe, ma.url,
+                          :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}",
+                          :title => "#{ma.subject.html_safe}" %>
+          <% end %>
+        </li>
+      </div>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
 <% end %>

app/views/users/_user_homework_attachment.html.erb

@@ -69,8 +69,8 @@
 
 <div class="mt5 fl">
    <!-- , user_import_resource_user_path(User.current.id,:homework_id=>container.id) -->
-  <a href="javascript:void(0);" class="AnnexBtn fl mt3 mr15" onclick="$('#_file').click();" title="请选择文件上传">上传附件</a>
-  <%= link_to "资源库", user_ref_resource_search_user_path(User.current.id, :homework_id => container.id), :class => "FilesBtn fl mt3 mr15", :title => "请从资源库中选择文件作为作业的附件", :remote => true %>
+  <a href="javascript:void(0);" id="upload_file_local" class="AnnexBtn fl mt3 mr15" onclick="$('#_file').click();" title="请选择文件上传">上传附件</a>
+  <%= link_to "资源库", user_ref_resource_search_user_path(User.current.id, :homework_id => container.id), :class => "FilesBtn fl mt3 mr15", :title => "请从资源库中选择文件作为作业的附件", :remote => true, :id => "resource_repo_upload" %>
 </div>
 
 <% content_for :header_tags do %>

app/views/users/_user_message_applide_action.html.erb

@@ -1,13 +1,15 @@
 <% ma = ma.nil? ? @applied_message : ma %>
 <% if allow_to_show(ma) %>
-    <%= link_to "同意", allow_to_join_project_project_memberships_path(:project_id => ma.project_id,  :applied_message_id => ma.id), :remote => true, :method => :post, :class => "link-blue"%> |
-    <%= link_to "拒绝", refused_allow_to_join_project_project_memberships_path(:project_id => ma.project_id, :applied_message_id => ma.id), :remote => true, :method => :get, :class => "link-blue" %>
+    <%= link_to "同意", allow_to_join_project_project_memberships_path(:project_id => ma.project_id,  :applied_message_id => ma.id),
+                :remote => true, :method => :post, :class => "link-blue", :style => "font-size: 14px;" %> |
+    <%= link_to "拒绝", refused_allow_to_join_project_project_memberships_path(:project_id => ma.project_id, :applied_message_id => ma.id),
+                :remote => true, :method => :get, :class => "link-blue",:style => "font-size: 14px;"  %>
 <% elsif ma.status == 4 %>
-    <span class="fontGrey3">被拒绝</span>
+    <span class="fontGrey3" style="font-size:14px">被拒绝</span>
 <% elsif ma.status == 5 %>
-    <span class="fontGrey3">您已拒绝</span>
+    <span class="fontGrey3" style="font-size:14px">您已拒绝</span>
 <% elsif ma.status == 6 %>
-    <span class="fontGrey3">已通过</span>
+    <span class="fontGrey3" style="font-size:14px">已通过</span>
 <% elsif ma.status == 7 %>
-    <span class="fontGrey3">您已同意</span>
+    <span class="fontGrey3" style="font-size:14px">您已同意</span>
 <% end %>

app/views/users/_user_message_applide_users.html.erb

@@ -1,2 +1,4 @@
 <%=link_to applied_project_users(ma), user_path(applied_project_users(ma)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-<span class="homepageNewsType fl"><%= applied_project_tip(ma) %></span>
+<span class="homepageNewsType fl">
+  申请以“<%= applied_project_message_type(ma.role) %>”身份加入：
+</span>

app/views/users/_user_message_applied.html.erb

@@ -2,25 +2,26 @@
     <!-- 申请添加单位 -->
     <% if ma.applied_type == "ApplyAddSchools" %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);">
+          <div class="longMessageWidth">
+            <li class="homepageNewsPortrait fl">
               <% if ma.status == 0 %>
                   <% applied_user = User.find(ma.applied_user_id) %>
                   <%= link_to image_tag(url_to_avatar(applied_user), :width => "30", :height => "30"), user_path(applied_user), :target => '_blank' %>
               <% else %>
                   <%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %>
               <% end %>
-            </a>
-          </li>
-          <li class="homepageNewsPubType fl">
+            </li>
+            <li class="homepageNewsPubType fl">
               <%= render :partial => "users/user_message_applied_schools", :locals =>{:ma => ma} %>
-              <li class = "homepageNewsContent fl">
-                <%= render :partial => "users/user_message_applied_school_action", :locals =>{:ma => ma} %>
-              </li>
-              <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-          </li>
+            </li>
+            <li class = "messageInformationContents">
+              <%= render :partial => "users/user_message_applied_school_action", :locals =>{:ma => ma} %>
+            </li>
+
+          </div>
+          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
-    <!-- 申请加入项目 -->
+        <!-- 申请加入项目 -->
     <% elsif ma && ma.applied_type == "AppliedProject" %>
         <ul class="homepageNewsList fl" id="applied_project_<%= ma.id %>">
           <%= render :partial => "users/applied_project_content", :locals =>{:ma => ma} %>

app/views/users/_user_message_applied_schools.html.erb

@@ -1,7 +1,6 @@
-
 <% if ma.status != 0 %>
     <span class="newsBlue homepageNewsPublisher">系统提示</span>
 <% else %>
     <%=link_to User.where("id=?", ma.applied_user_id).first.show_name, user_path(ma.applied_user_id), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
 <% end %>
-<span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>"><%= applied_school_tip(ma) %></span>
+<span class="homepageNewsType fl"><%= applied_school_tip(ma) %></span>

app/views/users/_user_message_forge.html.erb

@@ -2,221 +2,239 @@
     <!--申请加入项目-->
     <% if ma.forge_message_type == "AppliedProject" %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl">
-            <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), :target => '_blank' %></a>
-          </li>
-          <li class="homepageNewsPubType fl">
-            <%=link_to ma.forge_message.user, user_path(ma.forge_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">申请加入项目：</span>
-          </li>
-          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to ma.project, settings_project_path(:id => ma.project, :tab => "members"), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-                        <!--:onmouseover => "message_titile_show($(this),event)",-->
-                        <!--:onmouseout => "message_titile_hide($(this))" %>-->
-            </a>
-          </li>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+          <div class="longMessageWidth">
+            <li class="homepageNewsPortrait fl">
+              <%= link_to image_tag(url_to_avatar(ma.forge_message.user), :width => "30", :height => "30"), user_path(ma.forge_message.user), :target => '_blank' %>
+            </li>
+            <li class="homepageNewsPubType fl">
+              <%=link_to ma.forge_message.user, user_path(ma.forge_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+              <span class="homepageNewsType fl">申请加入：</span>
+            </li>
+            <li class="messageInformationContents">
+              <%= link_to ma.project, settings_project_path(:id => ma.project, :tab => "members"), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+              <!--:onmouseover => "message_titile_show($(this),event)",-->
+              <!--:onmouseout => "message_titile_hide($(this))" %>-->
+            </li>
+          </div>
+          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
     <% end %>
     <!--被管理员拉入项目-->
     <% if ma.forge_message_type == "JoinProject" %>
-      <% unless ma.project.nil? %>
-        <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.forge_message_id)), :width => "30", :height => "30"), user_path(ma.forge_message_id), :target => '_blank' %></a>
-          </li>
-          <li class="homepageNewsPubType fl">
-            <%=link_to User.find(ma.forge_message_id).show_name, user_path(User.find(ma.forge_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">将您加入了项目：</span>
-          </li>
-          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to ma.project, project_member_path(ma.project), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-                        <!--:onmouseover => "message_titile_show($(this),event)",-->
-                        <!--:onmouseout => "message_titile_hide($(this))" %>-->
-            </a>
-          </li>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-      <% end %>
+        <% unless ma.project.nil? %>
+            <ul class="homepageNewsList fl">
+              <div class="longMessageWidth">
+                <li class="homepageNewsPortrait fl">
+                  <%=link_to image_tag(url_to_avatar(User.find(ma.forge_message_id)), :width => "30", :height => "30"), user_path(ma.forge_message_id), :target => '_blank' %>
+                </li>
+                <li class="homepageNewsPubType fl">
+                  <%=link_to User.find(ma.forge_message_id).show_name, user_path(User.find(ma.forge_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+                  <span class="homepageNewsType fl">将您加入了项目：</span>
+                </li>
+                <li class="messageInformationContents">
+                  <%= link_to ma.project, project_member_path(ma.project), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+                  <!--:onmouseover => "message_titile_show($(this),event)",-->
+                  <!--:onmouseout => "message_titile_hide($(this))" %>-->
+                </li>
+              </div>
+              <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+            </ul>
+        <% end %>
     <% end %>
     <!--被管理员移出项目-->
     <% if ma.forge_message_type == "RemoveFromProject" %>
-      <% unless ma.project.nil? %>
-        <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.forge_message_id)), :width => "30", :height => "30"), user_path(ma.forge_message_id), :target => '_blank' %></a>
-          </li>
-          <li class="homepageNewsPubType fl">
-            <%=link_to User.find(ma.forge_message_id).show_name, user_path(User.find(ma.forge_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">将您移出了项目：</span>
-          </li>
-          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to ma.project, member_project_path(ma.project), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-                        <!--:onmouseover => "message_titile_show($(this),event)",-->
-                        <!--:onmouseout => "message_titile_hide($(this))" %>-->
-            </a>
-          </li>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-      <% end %>
+        <% unless ma.project.nil? %>
+            <ul class="homepageNewsList fl">
+              <div class="longMessageWidth">
+                <li class="homepageNewsPortrait fl">
+                  <%=link_to image_tag(url_to_avatar(User.find(ma.forge_message_id)), :width => "30", :height => "30"), user_path(ma.forge_message_id), :target => '_blank' %>
+                </li>
+                <li class="homepageNewsPubType fl">
+                  <%=link_to User.find(ma.forge_message_id).show_name, user_path(User.find(ma.forge_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+                  <span class="homepageNewsType fl">将您移出了项目：</span>
+                </li>
+                <li class="messageInformationContents">
+                  <%= link_to ma.project, member_project_path(ma.project), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+                  <!--:onmouseover => "message_titile_show($(this),event)",-->
+                  <!--:onmouseout => "message_titile_hide($(this))" %>-->
+                </li>
+              </div>
+              <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+            </ul>
+        <% end %>
     <% end %>
     <!--邀请加入项目-->
     <% if ma.forge_message_type == "ProjectInvite" %>
         <% inviter = User.find(ma.forge_message_id) %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(inviter), :width => "30", :height => "30"), user_path(inviter), :target => '_blank' %></a>
-          </li>
-          <li class="homepageNewsPubType fl">
-            <%=link_to inviter, user_path(inviter), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-            <span class='<%= ma.viewed == 0 ? 'homepageNewsTypeNotRead fl' : 'homepageNewsType fl' %>'>邀请你加入项目：</span>
-          </li>
-          <% if ma.user.member_of?(ma.project) %>
-              <li class="homepageNewsContent fl">
-          <% else %>
-              <li class="homepageHomeworkContent fl">
-          <% end %>
-          <%= link_to ma.project, project_path(ma.project),
-                      :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-                      <!--:onmouseover => "message_titile_show($(this),event)",-->
-                      <!--:onmouseout => "message_titile_hide($(this))" %>-->
-          </li>
+          <div class="shortMessageWidth">
+            <li class="homepageNewsPortrait fl">
+              <%=link_to image_tag(url_to_avatar(inviter), :width => "30", :height => "30"), user_path(inviter), :target => '_blank' %>
+            </li>
+            <li class="homepageNewsPubType fl">
+              <%=link_to inviter, user_path(inviter), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+              <span class='<%= ma.viewed == 0 ? 'homepageNewsTypeNotRead fl' : 'homepageNewsType fl' %>'>邀请你加入项目：</span>
+            </li>
+            <li class="messageInformationContents">
+              <%= link_to ma.project, project_path(ma.project),
+                          :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                          :target => '_blank',
+                          :title => "ma.project"
+              %>
+              <!--:onmouseover => "message_titile_show($(this),event)",-->
+              <!--:onmouseout => "message_titile_hide($(this))" %>-->
+            </li>
+          </div>
           <% unless User.current.member_of?(ma.project) %>
-              <li  class="homepageHomeworkContentWarn fl">
+              <li class="messageOperateContents fl">
                 <%=link_to "同意加入", {:controller => 'projects', :action => 'member', :id => ma.project_id, :message_id =>ma.id,  :key => ma.secret_key},
                            :value => ma.secret_key,
-                           :class => "green_btn_cir ml10",
-                           :style => "color:#fff", :target => '_blank' %>
+                           :class => "green_btn_cir",
+                           :style => "color:#fff",
+                           :target => '_blank' %>
               </li>
           <% end %>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
     <% end %>
     <% if ma.forge_message_type == "Issue" %>
         <% if ma.status == 1%>
             <ul class="homepageNewsList fl">
-              <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), :target => '_blank' %></a>
-              </li>
-              <li class="homepageNewsPubType fl">
-                <%=link_to User.find(ma.forge_message.author_id).show_name, user_path(ma.forge_message.author),
-                           :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-                <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">
-                  <%= ma.forge_message.tracker_id == 5 ? "发布的周报：":"指派给你的问题："%>
+              <div class="shortMessageWidth">
+                <li class="homepageNewsPortrait fl">
+                  <%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author), :target => '_blank' %>
+                </li>
+                <li class="homepageNewsPubType fl">
+                  <%=link_to User.find(ma.forge_message.author_id).show_name, user_path(ma.forge_message.author),
+                             :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+                  <span class="homepageNewsType fl">
+                  <%= ma.forge_message.tracker_id == 5 ? "发布的周报：" : "指派给你的问题："%>
                 </span>
-              </li>
-              <li class="homepageHomeworkContent fl"><a href="javascript:void(0);" class="newsGrey">
-                <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id),
-                            :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-                            <!--:onmouseover => "message_titile_show($(this),event)",-->
-                            <!--:onmouseout => "message_titile_hide($(this))" %>-->
-                </a>
-              </li>
-              <li class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp; 截止时间快到了！</li>
-              <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+                </li>
+                <li class="messageInformationContents">
+                  <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id),
+                              :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                              :target => '_blank',
+                              :title => "#{ma.forge_message.subject}"
+                  %>
+                  <!--:onmouseover => "message_titile_show($(this),event)",-->
+                  <!--:onmouseout => "message_titile_hide($(this))" %>-->
+                </li>
+              </div>
+              <li class="messageOperateContents fl" title="截止时间快到了！">截止时间快到啦</li>
+              <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
             </ul>
         <% else %>
             <ul class="homepageNewsList fl">
-              <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), :target => '_blank' %></a>
-              </li>
-              <li class="homepageNewsPubType fl">
-                <%=link_to User.find(ma.forge_message.author_id).show_name, user_path(ma.forge_message.author),
-                           :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-                <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">
-                  <%= ma.forge_message.tracker_id == 5 ? "发布了周报：":"指派了问题给你："%>
+              <div class="longMessageWidth">
+                <li class="homepageNewsPortrait fl">
+                  <%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author), :target => '_blank' %>
+                </li>
+                <li class="homepageNewsPubType fl">
+                  <%=link_to User.find(ma.forge_message.author_id).show_name, user_path(ma.forge_message.author),
+                             :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+                  <span class="homepageNewsType fl">
+                  <%= ma.forge_message.tracker_id == 5 ? "发布了周报：" : "指派了问题给你："%>
                 </span>
-              </li>
-              <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-                            <!--:onmouseover => "message_titile_show($(this),event)",-->
-                            <!--:onmouseout => "message_titile_hide($(this))" %>-->
-                </a>
-              </li>
-              <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+                </li>
+                <li class="messageInformationContents">
+                  <%= link_to ma.forge_message.subject,
+                              issue_path(:id => ma.forge_message.id),
+                              :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                              :target => '_blank',
+                              :title => "#{ma.forge_message.subject}"
+                  %>
+                  <!--:onmouseover => "message_titile_show($(this),event)",-->
+                  <!--:onmouseout => "message_titile_hide($(this))" %>-->
+                </li>
+              </div>
+              <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
             </ul>
         <% end %>
     <% end %>
     <% if ma.forge_message_type == "Journal" && ma.forge_message %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);">
+          <div class="longMessageWidth">
+            <li class="homepageNewsPortrait fl">
               <%=link_to image_tag(url_to_avatar(ma.forge_message.user), :width => "30", :height => "30"), user_path(ma.forge_message.user), :target => '_blank' %>
-            </a>
-          </li>
-          <li class="homepageNewsPubType fl">
-            <%= link_to User.find(ma.forge_message.user_id).show_name, user_path(ma.forge_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">
-                            更新了问题状态：</span>
-          </li>
-          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to ma.forge_message.journalized.subject,
-                        issue_path(:id => ma.forge_message.journalized_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-                        <!--:onmouseover =>"message_titile_show($(this),event)",-->
-                        <!--:onmouseout => "message_titile_hide($(this))" %>-->
-            </a>
-          </li>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+            </li>
+            <li class="homepageNewsPubType fl">
+              <%= link_to User.find(ma.forge_message.user_id).show_name, user_path(ma.forge_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+              <span class="homepageNewsType fl">更新了问题状态：</span>
+            </li>
+            <li class="messageInformationContents">
+              <%= link_to ma.forge_message.journalized.subject,
+                          issue_path(:id => ma.forge_message.journalized_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+              <!--:onmouseover =>"message_titile_show($(this),event)",-->
+              <!--:onmouseout => "message_titile_hide($(this))" %>-->
+            </li>
+          </div>
+          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
     <% end %>
     <% if ma.forge_message_type == "Message" %>
         <ul class="homepageNewsList fl">
-          <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), :target => '_blank' %></a></li>
-          <li class="homepageNewsPubType fl"><%=link_to ma.forge_message.author.try(:show_name), user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %></span></li>
-          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to ma.forge_message.subject, board_message_path(ma.forge_message.board_id, ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id), :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-            <!--:onmouseover => "message_titile_show($(this),event)",-->
-            <!--:onmouseout => "message_titile_hide($(this))" %>-->
-          </a>
-          </li>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+          <div class="longMessageWidth">
+            <li class="homepageNewsPortrait fl">
+              <%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author), :target => '_blank' %>
+            </li>
+            <li class="homepageNewsPubType fl">
+              <%=link_to ma.forge_message.author.try(:show_name), user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+              <span class="homepageNewsType fl"><%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %></span>
+            </li>
+            <li class="messageInformationContents">
+              <%= link_to ma.forge_message.subject, board_message_path(ma.forge_message.board_id, ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id), :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+              <!--:onmouseover => "message_titile_show($(this),event)",-->
+              <!--:onmouseout => "message_titile_hide($(this))" %>-->
+            </li>
+          </div>
+          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
     <% end %>
     <% if ma.forge_message_type == "Comment" %>
         <ul class="homepageNewsList fl">
-          <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), :target => '_blank' %>
-          </a>
-          </li>
-          <li class="homepageNewsPubType fl">
-            <%=link_to ma.forge_message.author.try(:show_name), user_path(ma.forge_message.author),
-                                                        :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">评论了新闻：</span>
-          </li>
-          <li class="homepageNewsContent fl">
-            <%= link_to "#{ma.forge_message.commented.title}",
-                        {:controller => 'news', :action => 'show', :id => ma.forge_message.commented.id },:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-                        <!--:onmouseover => "message_titile_show($(this),event)",-->
-                        <!--:onmouseout => "message_titile_hide($(this))" %>-->
-          </li>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+          <div class="longMessageWidth">
+            <li class="homepageNewsPortrait fl">
+              <%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author), :target => '_blank' %>
+            </li>
+            <li class="homepageNewsPubType fl">
+              <%=link_to ma.forge_message.author.try(:show_name), user_path(ma.forge_message.author),
+                         :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+              <span class="homepageNewsType fl">评论了新闻：</span>
+            </li>
+            <li class="messageInformationContents">
+              <%= link_to "#{ma.forge_message.commented.title}",
+                          {:controller => 'news', :action => 'show', :id => ma.forge_message.commented.id },:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+              <!--:onmouseover => "message_titile_show($(this),event)",-->
+              <!--:onmouseout => "message_titile_hide($(this))" %>-->
+            </li>
+          </div>
+          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
     <% end %>
 
     <% if ma.forge_message_type == "PullRequest" %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);">
+          <div class="longMessageWidth">
+            <li class="homepageNewsPortrait fl">
               <% send_message_user =  PullRequest.where(:pull_request_id => ma.forge_message_id) %>
               <% author = User.find(ma.operate_user_id.nil? ? 2 : ma.operate_user_id) %>
               <%= link_to image_tag(url_to_avatar(author), :width => "30", :height => "30"), user_path(author), :target => '_blank' %>
-            </a>
-          </li>
-          <li class="homepageNewsPubType fl">
-            <%= link_to User.find(author.id).show_name, user_path(author),
-                        :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">
+            </li>
+            <li class="homepageNewsPubType fl">
+              <%= link_to User.find(author.id).show_name, user_path(author),
+                          :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+              <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">
               <%= pull_request_message_status(ma) %>
             </span>
-          </li>
-          <li class="homepageNewsContent fl">
-            <%= link_to "#{send_message_user[0].title}", project_pull_requests_path(ma.project_id),
-                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+            </li>
+            <li class="messageInformationContents">
+              <%= link_to "#{send_message_user[0].title}", project_pull_requests_path(ma.project_id),
+                          :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
 
-          </li>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+            </li>
+          </div>
+          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
     <% end %>
 <% end %>

app/views/users/_user_message_forum.html.erb

@@ -1,29 +1,29 @@
 <% if ma.class == MemoMessage %>
     <% if ma.memo_type == "Memo" && !ma.memo.nil? && !ma.memo.author.nil? %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.memo.author), :width => "30", :height => "30"), user_path(ma.memo.author), :target => '_blank' %></a>
-          </li>
-          <li class="homepageNewsPubType fl">
-            <%=link_to User.find(ma.memo.author_id).show_name, user_path(ma.memo.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>" ><%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %></span>
-          </li>
-          <% if ma.memo.parent_id.nil? %>
-              <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                <%= link_to ma.memo.subject, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-                            <!--:onmouseover =>"message_titile_show($(this),event)",-->
-                            <!--:onmouseout => "message_titile_hide($(this))" %>-->
-                </a>
-              </li>
-          <% else %>
-              <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                <%= link_to message_content(ma.memo.content), forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-                            <!--:onmouseover =>"message_titile_show($(this),event)",-->
-                            <!--:onmouseout => "message_titile_hide($(this))" %>-->
-                </a>
-              </li>
-          <% end %>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.memo.created_at).html_safe %> </li>
+          <div class="longMessageWidth">
+            <li class="homepageNewsPortrait fl">
+              <%=link_to image_tag(url_to_avatar(ma.memo.author), :width => "30", :height => "30"), user_path(ma.memo.author), :target => '_blank' %>
+            </li>
+            <li class="homepageNewsPubType fl">
+              <%=link_to User.find(ma.memo.author_id).show_name, user_path(ma.memo.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+              <span class="homepageNewsType fl" ><%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %></span>
+            </li>
+            <% if ma.memo.parent_id.nil? %>
+                <li class="messageInformationContents">
+                  <%= link_to ma.memo.subject, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+                  <!--:onmouseover =>"message_titile_show($(this),event)",-->
+                  <!--:onmouseout => "message_titile_hide($(this))" %>-->
+                </li>
+            <% else %>
+                <li class="messageInformationContents">
+                  <%= link_to message_content(ma.memo.content), forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+                  <!--:onmouseover =>"message_titile_show($(this),event)",-->
+                  <!--:onmouseout => "message_titile_hide($(this))" %>-->
+                </li>
+            <% end %>
+          </div>
+          <li class="homepageNewsTime fr"><%= time_tag(ma.memo.created_at).html_safe %> </li>
         </ul>
     <% end %>
 <% end %>

app/views/users/_user_message_list.html.erb

@@ -0,0 +1,24 @@
+<div class="homepageRightBanner">
+  <div class="NewsBannerName">
+    消息动态
+  </div>
+      <span class="fr" style="margin-top:5px;">
+        共 <span style="color: red;"><%= @message_count %></span> 个消息
+      </span>
+</div>
+<div class="resources">
+  <%= render :partial => 'users/new_user_message', :locals => { :message_alls => @message_alls } %>
+</div>
+
+<script>
+  $(function(){
+      $(".messageInformationContents").each(function(){
+          var parentWidth = $(this).parent().width();
+          var eq0Width = $(this).parent().children().eq(0).width();
+          var eq1Width = $(this).parent().children().eq(1).width();
+          var classWidth = parentWidth - eq0Width - eq1Width;
+          $(this).css("max-width",classWidth + "px");
+      });
+      //$(".messageInformationContents").width()
+  });
+</script>

app/views/users/_user_message_org.html.erb

@@ -1,40 +1,44 @@
 <% if ma.class == OrgMessage %>
     <% if ma.message_type == 'ApplySubdomain'%>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.organization), :width => "30", :height => "30"), organization_path(ma.organization_id), :target => '_blank' %></a>
-          </li>
-          <li class="homepageNewsPubType fl">
-            <%=link_to ma.organization.name, organization_path(ma.organization_id), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-            <span class='<%= ma.viewed == 0 ? 'homepageNewsTypeNotRead fl' : 'homepageNewsType fl' %>'>申请子域名：</span>
-          </li>
-          <li class="homepageHomeworkContent fl">
-            <%= ma.content %>
-          </li>
-          <li class="homepageHomeworkContentWarn fl">
+          <div class="shortMessageWidth">
+            <li class="homepageNewsPortrait fl">
+              <%=link_to image_tag(url_to_avatar(ma.organization), :width => "30", :height => "30"), organization_path(ma.organization_id), :target => '_blank' %>
+            </li>
+            <li class="homepageNewsPubType fl">
+              <%=link_to ma.organization.name, organization_path(ma.organization_id), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+              <span class='homepageNewsType fl'>申请子域名：</span>
+            </li>
+            <li class="messageInformationContents">
+              <%= ma.content %>
+            </li>
+          </div>
+          <li class="messageOperateContents fl">
             <%=link_to (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count == 0 || (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count > 0 && Secdomain.where("sub_type=2 and pid=?", ma.organization.id).first.subname != ma.content)) ? "同意申请":"申请已批准",
                        agree_apply_subdomain_organizations_path( :organization_id => ma.organization_id, :org_domain => ma.content, :user_id => ma.sender_id, :act_id => ma.id ),
                        :id => "agree_apply_subdomain_#{ma.id}",
                        :method => 'post',
                        :remote => true,
-                       :class => "green_btn_cir ml10",
-                       :style => "color:#fff" %>
+                       :class => 'link-blue'
+            %>
           </li>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
     <% end %>
     <% if ma.message_type == 'AgreeApplySubdomain'%>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div></a>
-          </li>
-          <li class="homepageNewsPubType fl">
-            <span class='<%= ma.viewed == 0 ? 'homepageNewsTypeNotRead fl' : 'homepageNewsType fl' %>'>管理员同意了您的子域名申请：</span>
-          </li>
-          <li class="homepageNewsContent fl">
-            <%= ma.content %>
-          </li>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+          <div class="longMessageWidth">
+            <li class="homepageNewsPortrait fl">
+              <div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div>
+            </li>
+            <li class="homepageNewsPubType fl">
+              <span class='homepageNewsType fl'>管理员同意了您的子域名申请：</span>
+            </li>
+            <li class="messageInformationContents">
+              <%= ma.content %>
+            </li>
+          </div>
+          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
     <% end %>
 <% end %>

app/views/users/_user_message_system.html.erb

@@ -1,21 +1,22 @@
 <% if ma.class == SystemMessage %>
     <%# @user_system_messages.each do |usm| %>
-        <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div></a>
-          </li>
-          <li class="homepageNewsPubType fl">
-            <span class="newsBlue homepageNewsPublisher">Trustie平台</span><span class="homepageNewsType fl">发布新消息：</span>
-          </li>
-          <span style="color: red;float: left">【系统消息】</span>
-          <li class="homepageSystenMessageContent fl">
-
-            <%= link_to ma.subject.blank? ? (ma.content.nil? ? ma.description.html_safe : ma.content.html_safe) : ma.subject, user_system_messages_path(User.current, :anchor => "position_#{ma.id}"),
-                        :id => "content_link_#{ma.id}", :target => '_blank' %>
-                        <!--:onmouseover =>"message_titile_show($(this),event);",-->
-                        <!--:onmouseout => "message_titile_hide($(this));"-->
-          </li>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
+    <ul class="homepageNewsList fl">
+      <div class="longMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div></a>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <span style="color: red;float: left">系统消息：</span>
+          <!--            <span class="homepageNewsType fl">发布新消息：</span>-->
+        </li>
+        <li class="messageInformationContents">
+          <%= link_to ma.subject.blank? ? (ma.content.nil? ? ma.description.html_safe : ma.content.html_safe) : ma.subject, user_system_messages_path(User.current, :anchor => "position_#{ma.id}"),
+                      :id => "content_link_#{ma.id}", :target => '_blank' %>
+          <!--:onmouseover =>"message_titile_show($(this),event);",-->
+          <!--:onmouseout => "message_titile_hide($(this));"-->
+        </li>
+      </div>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
     <%# end %>
 <% end %>

app/views/users/_user_message_userfeedaback.html.erb

@@ -1,21 +1,25 @@
 <% if ma.class == UserFeedbackMessage %>
     <% if ma.journals_for_message_type == "JournalsForMessage" %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);">
+          <div class="longMessageWidth">
+            <li class="homepageNewsPortrait fl">
               <%=link_to image_tag(url_to_avatar(ma.journals_for_message.user), :width => "30", :height => "30"),
                          user_path(ma.journals_for_message.user), :target => '_blank' %>
-            </a>
-          </li>
-          <li class="homepageNewsPubType fl">
-            <%=link_to User.find(ma.journals_for_message.user_id).show_name, user_path(ma.journals_for_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">
+            </li>
+            <li class="homepageNewsPubType fl">
+              <%=link_to User.find(ma.journals_for_message.user_id).show_name, user_path(ma.journals_for_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+              <span class="homepageNewsType fl">
               <%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %>
             </span>
-          </li>
-          <li class="homepageNewsContent fl">
-            <%= link_to message_content(ma.journals_for_message.notes), feedback_path(ma.journals_for_message.jour_id, :anchor => "user_activity_#{ma.journals_for_message.id}"), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank'%>
-          </li>
+            </li>
+            <li class="messageInformationContents">
+              <%= link_to message_content(ma.journals_for_message.notes),
+                          feedback_path(ma.journals_for_message.jour_id,
+                                        :anchor => "user_activity_#{ma.journals_for_message.id}"),
+                          :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                          :target => '_blank'%>
+            </li>
+          </div>
           <div  style="display: none" class="message_title_red system_message_style" >
             <% if ma.journals_for_message.reply_id == 0 %>
                 <%= ma.journals_for_message.notes.html_safe %>
@@ -26,7 +30,7 @@
                 <div class="ml60"><%= ma.journals_for_message.notes.html_safe %></div>
             <% end %>
           </div>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.journals_for_message.created_on).html_safe %> </li>
+          <li class="homepageNewsTime fr"><%= time_tag(ma.journals_for_message.created_on).html_safe %> </li>
         </ul>
     <% end %>
 <% end %>

app/views/users/anonymous_evaluation_list.js.erb

@@ -0,0 +1 @@
+$("#user_homepage_message_list").html("<%= escape_javascript( render :partial =>  'users/anonymous_evaluation_list') %>");

app/views/users/course_community.html.erb

@@ -0,0 +1,39 @@
+<script src="/javascripts/i18n/jquery.ui.datepicker-zh-CN.js" type="text/javascript"></script>
+<input type="hidden" value="<%= @type%>" name="type" id="user_activities_type">
+    <div class="homepageRightBanner">
+      <div class="NewsBannerName">消息动态</div>
+      <ul class="resourcesSelect">
+        <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
+          <ul class="homepagePostType" style="margin-left:95px; width:80px" >
+            <li>
+              <ul class="homepagePostTypeHomework fl">
+                <% if hidden_unproject_infos %>
+                    <li><%= link_to "全部动态", {:controller => "users", :action => "course_community", :type => "all"}, :class => "homepagePostTypeAll postTypeGrey" %></li>
+                    <li><%= link_to @user == User.current ? "我的动态" : "他的动态", {:controller => "users", :action => "course_community", :type => "current_user"}, :class => "homepagePostTypeMine postTypeGrey" %></li>
+                    <li><%= link_to "作业动态", {:controller => "users", :action => "course_community", :type => "course_homework"}, :class => "homepagePostTypeAssignment postTypeGrey" %></li>
+                    <li><%= link_to "通知动态", {:controller => "users", :action => "course_community", :type => "course_news"}, :class => "homepagePostTypeNotice postTypeGrey" %></li>
+                    <li><%= link_to "论坛动态", {:controller => "users", :action => "course_community", :type => "course_message"}, :class => "homepagePostTypeForum postTypeGrey" %></li>
+                    <li><%= link_to "问卷动态", {:controller => "users", :action => "course_community", :type => "course_poll"}, :class => "homepagePostTypeQuiz postTypeGrey" %></li>
+                    <li><%= link_to "班级留言", {:controller => "users", :action => "course_community", :type => "course_journals"}, :class => "homepagePostTypeMessage postTypeGrey" %></li>
+                    <li><%= link_to "个人留言", {:controller => "users", :action => "course_community", :type => "user_journals"}, :class => "homepagePostTypeMessage postTypeGrey" %></li>
+                <% end %>
+              </ul>
+            </li>
+          </ul>
+        </li>
+      </ul>
+    </div>
+
+    <!--显示个人主页-->
+<%# if @user.blog.homepage_id and BlogComment.where("id=?", @user.blog.homepage_id).count > 0 %>
+    <%# homepage = BlogComment.find(@user.blog.homepage_id) %>
+    <%#= render :partial => 'blogs/homepage', :locals => {:activity => homepage, :user_activity_id => homepage.id} %>
+<%# end %>
+    <% if @user_activities_count > 0 %>
+        <%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities, :page => 0, :type => @type,
+                                                                    :user_id => (@user.type == "AnonymousUser" ? User.current.id : @user.id), :action => params[:action] } %>
+    <% else %>
+        <div class="mb10">
+          <%= render :partial => 'users/no_data' %>
+        </div>
+    <% end %>

app/views/users/course_community.js.erb

@@ -0,0 +1,6 @@
+$("#show_more_activities").replaceWith("<%= escape_javascript( render :partial =>  'users/user_activities',
+                                                                      :locals => {:user_activities => @user_activities,
+                                                                                  :page => @page,
+                                                                                  :type => @type,
+                                                                                  :user_id => (@user.type == "AnonymousUser" ? User.current.id : @user.id),
+                                                                                  :action => "course_community"} )%>");

app/views/users/project_community.html.erb

@@ -0,0 +1,37 @@
+<script src="/javascripts/i18n/jquery.ui.datepicker-zh-CN.js" type="text/javascript"></script>
+<input type="hidden" value="<%= @type%>" name="type" id="user_activities_type">
+<div class="homepageRightBanner">
+  <div class="NewsBannerName">消息动态</div>
+  <ul class="resourcesSelect">
+    <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
+      <ul class="homepagePostType" style="margin-left:95px; width:80px" >
+        <li>
+          <ul class="homepagePostTypeHomework fl">
+            <% if hidden_unproject_infos %>
+                <li><%= link_to "全部动态", {:controller => "users", :action => "project_community", :type => "all"}, :class => "homepagePostTypeAll postTypeGrey" %></li>
+                <li><%= link_to @user == User.current ? "我的动态" : "他的动态", {:controller => "users", :action => "project_community", :type => "current_user"},
+                                :class => "homepagePostTypeMine postTypeGrey" %></li>
+                <li><%= link_to "问题动态", {:controller => "users", :action => "project_community", :type => "project_issue"}, :class => "homepagePostTypeQuestion postTypeGrey"%></li>
+                <li><%= link_to "论坛动态", {:controller => "users", :action => "project_community", :type => "project_message"}, :class => "homepagePostTypeForum postTypeGrey"%></li>
+                <li><%= link_to "个人留言", {:controller => "users", :action => "project_community", :type => "user_journals"}, :class => "homepagePostTypeMessage postTypeGrey" %></li>
+            <% end %>
+          </ul>
+        </li>
+      </ul>
+    </li>
+  </ul>
+</div>
+
+<!--显示个人主页-->
+<%# if @user.blog.homepage_id and BlogComment.where("id=?", @user.blog.homepage_id).count > 0 %>
+<%# homepage = BlogComment.find(@user.blog.homepage_id) %>
+<%#= render :partial => 'blogs/homepage', :locals => {:activity => homepage, :user_activity_id => homepage.id} %>
+<%# end %>
+<% if @user_activities_count > 0 %>
+    <%= render :partial => 'users/user_activities', :locals => { :user_activities => @user_activities, :page => 0, :type => @type,
+                                                                :user_id => (@user.type == "AnonymousUser" ? User.current.id : @user.id), :action => params[:action] } %>
+<% else %>
+    <div class="mb10">
+      <%= render :partial => 'users/no_data' %>
+    </div>
+<% end %>

app/views/users/project_community.js.erb

@@ -0,0 +1,6 @@
+$("#show_more_activities").replaceWith("<%= escape_javascript( render :partial =>  'users/user_activities',
+                                                                      :locals => {:user_activities => @user_activities,
+                                                                                  :page => @page,
+                                                                                  :type => @type,
+                                                                                  :user_id => (@user.type == "AnonymousUser" ? User.current.id : @user.id),
+                                                                                  :action => "project_community"} )%>");

app/views/users/project_community.js.erb.LOCAL.erb

@@ -0,0 +1,6 @@
+$("#show_more_activities").replaceWith("<%= escape_javascript( render :partial =>  'users/user_activities',
+                                                                      :locals => {:user_activities => @user_activities,
+                                                                                  :page => @page,
+                                                                                  :type => @type,
+                                                                                  :user_id => (@user.type == "AnonymousUser" ? User.current.id : @user.id),
+                                                                                  :action => "project_community"} )%>");

app/views/users/project_community.js.erb.REMOTE.erb

@@ -0,0 +1,6 @@
+$("#show_more_activities").replaceWith("<%= escape_javascript( render :partial =>  'users/user_activities',
+                                                                      :locals => {:user_activities => @user_activities,
+                                                                                  :page => @page,
+                                                                                  :type => @type,
+                                                                                  :user_id => (@user.type == "AnonymousUser" ? User.current.id : @user.id),
+                                                                                  :action => "project_community"} )%>");

app/views/users/show.html.erb

@@ -1,51 +1,48 @@
 <script src="/javascripts/i18n/jquery.ui.datepicker-zh-CN.js" type="text/javascript"></script>
-<input type="hidden" value="<%= @type%>" name="type" id="user_activities_type">
-<div class="homepageRightBanner">
-    <div class="NewsBannerName">最新动态</div>
-    <ul class="resourcesSelect">
-  <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
-    <ul class="homepagePostType">
-          <li>
-            <ul class="homepagePostTypeHomework fl">
-              <% if hidden_unproject_infos %>
-                  <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><%= link_to "班级留言", {:controller => "users", :action => "show", :type => "course_journals"}, :class =>"homepagePostTypeMessage postTypeGrey"%>
-                    <!--<li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
-                  <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuiz postTypeGrey">问卷动态</a></li>-->
-              <% end %>
-            </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 class="mt-4"><%= link_to "个人留言", {:controller => "users", :action => "show", :type => "user_journals"}, :class =>"homepagePostTypeMessage postTypeGrey"%>
-          <li class="mt-4"><%= link_to @user == User.current ? "我的动态" : "他的动态", {:controller => "users", :action => "show", :type => "current_user"}, :class =>"homepagePostTypeMine postTypeGrey"%>
-          <li class="mt-4"><%= link_to "全部动态", {:controller => "users", :action => "show", :type => "all"}, :class =>"homepagePostTypeAll postTypeGrey"%>
-        </ul>
-      </li>
-    </ul>
-  </li>
-</ul>
-</div>
+<input type="hidden" value="<%= @type %>" name="type" id="user_activities_type">
+<script>
+    $(function(){
+        $($(".homepage_tab_div")[$(".homepage_tab_div").length - 1]).css("border", "none");
+    });
+    // 个人主页的tab
+    function g(o){
+        return document.getElementById(o);
+    }
+    function HoverLi(n){
+        // g('message_all_list').className='undis';
+        //如果有N个标签,就将i<=N;
+        for(var i = 1; i <= 6; i++){
+            if (g('user_homepage_tab_'+i) != null)
+                g('user_homepage_tab_'+i).className='flex-cell_homepage';
+            //    if(g('message_list_content_'+i) != null)
+            //        g('message_list_content_'+i).className='undis';
+        }
+//        g('message_list_content_'+n).className='dis';
+        g('user_homepage_tab_'+n).className='homepageClickBackground';
+    }
+</script>
+<% if is_current_user %>
+    <% if task_count(@unsolved_issues_count, @unfinished_homework_count, @unfinished_test_count, @unfinished_poll_count, @anonymous_evaluation_count, @applied_message_alls_count) > 0 %>
+        <div class="homepagetopBanner mb10"  style="width:748px;">
+          <div class="flex-container_homepage">
+            <%= render :partial => "users/task_tip" %>
+          </div>
+        </div>
+    <% end %>
 
-<!--显示个人主页-->
-<%# if @user.blog.homepage_id and BlogComment.where("id=?", @user.blog.homepage_id).count > 0 %>
-    <%# homepage = BlogComment.find(@user.blog.homepage_id) %>
-    <%#= render :partial => 'blogs/homepage', :locals => {:activity => homepage, :user_activity_id => homepage.id} %>
-<%# end %>
-<%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => 0,:type => @type, :user_id => (@user.type == "AnonymousUser" ? User.current.id : @user.id)} %>
+    <div id="user_homepage_message_list">
+      <%= render :partial => 'users/user_message_list'%>
+    </div>
+<% else %>
+    <div class="homepageRightBanner">
+      <div class="NewsBannerName">Ta的动态</div>
+    </div>
+    <!--显示个人主页-->
+    <% if @user_activities_count > 0 %>
+        <%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities, :page => 0, :type => @type, :user_id => (@user.type == "AnonymousUser" ? User.current.id : @user.id)} %>
+    <% else %>
+        <div class="mb10">
+          <%= render :partial => 'users/no_data' %>
+        </div>
+    <% end %>
+<% end %>

app/views/users/show.js.erb

@@ -1,2 +1,5 @@
-$("#show_more_activities").replaceWith("<%= escape_javascript( render :partial =>  'users/user_activities',:locals => {:user_activities => @user_activities, :page => @page,:type => @type, :user_id => (@user.type == "AnonymousUser" ? User.current.id : @user.id)} )%>");
-
+<% if is_current_user %>
+    $("#user_homepage_message_list").html("<%= escape_javascript( render :partial =>  'users/user_message_list') %>");
+<% else %>
+    $("#show_more_activities").replaceWith("<%= escape_javascript( render :partial =>  'users/user_activities',:locals => {:user_activities => @user_activities, :page => @page,:type => @type, :user_id => (@user.type == "AnonymousUser" ? User.current.id : @user.id)} )%>");
+<% end %>

app/views/users/unapproval_applied_list.js.erb

@@ -0,0 +1 @@
+$("#user_homepage_message_list").html("<%= escape_javascript( render :partial =>  'users/unapproval_applied_list') %>");

app/views/users/unfinished_homework_list.js.erb

@@ -0,0 +1 @@
+$("#user_homepage_message_list").html("<%= escape_javascript( render :partial =>  'users/unfinished_homework_list') %>");

app/views/users/unfinished_poll_list.js.erb

@@ -0,0 +1 @@
+$("#user_homepage_message_list").html("<%= escape_javascript( render :partial =>  'users/unfinished_poll_list') %>");

app/views/users/unfinished_test_list.js.erb

@@ -0,0 +1 @@
+$("#user_homepage_message_list").html("<%= escape_javascript( render :partial =>  'users/unfinished_test_list') %>");

app/views/users/unsolved_issues_list.js.erb

@@ -0,0 +1 @@
+$("#user_homepage_message_list").html("<%= escape_javascript( render :partial =>  'users/unsolved_issues_list') %>");

app/views/users/user_issues.html.erb

@@ -4,7 +4,7 @@
 
 <script xmlns="http://www.w3.org/1999/html">
     function add_style(){
-       // $("#proeject_id").val("来源");
+        // $("#proeject_id").val("来源");
         if($("select[id='tracker_id']").val() != 0){
             $("#tracker_id").addClass('issues_filter_active');
         }
@@ -83,7 +83,7 @@
 
     function remote_function_export(user) {
         var project_id = $("#project_id").attr("value");
-       var tracker_id = $("#tracker_id").attr("value");
+        var tracker_id = $("#tracker_id").attr("value");
         var subject = $("#v_subject").attr("value");
         var assigned_to_id = $("#assigned_to_id").attr("value");
         var fixed_version_id = $("#fixed_version_id").attr("value");
@@ -171,102 +171,111 @@
         $("#test").removeClass('issues_filter_active');
         remote_function();
     }
+    $(function(){
+        <% if @type %>
+          <% if @type == "assigned" %>
+            HoverLi(2);
+          <% else %>
+            HoverLi(3);
+          <% end %>
+        <% end %>
+    });
 </script>
 
 <!--缺陷列表开始-->
 <div id="myissues_con" class="myissues_con mb10">
-<div class="myissues_head mb5">
-  <h2 class="ml15">我的Issue</h2>
-</div>
-<div class="clear mb5">
-  <div class="issues_statistics fl">
-    <ul>
-      <li>所有<a href="javascript:void(0);" class="issues_greycirbg_btn "><%= @issues_filter.count %></a></li>
-      <li>开启<a href="javascript:void(0);" class="issues_greycirbg_btn "><%= @issue_open_count %></a></li>
-      <li>关闭<a href="javascript:void(0);" class="issues_greycirbg_btn "><%= @issue_close_count %></a></li>
-    </ul>
-  </div><!--issues_statistics end-->
-
-</div>
- <%= form_tag( user_issues_user_path(@user), :remote=>'xls', :method => "post", :id=>"issue_query_form", :class => 'query_form') do %>
-<div class="clear mb10">
-  <div class="hw_search_box fl ">
-    <input class="hw_search-input" placeholder="输入Issue名称进行搜索" type="text" id="v_subject"  name="subject" onkeypress="EnterPress(event)" onkeydown="EnterPress()">
-    <a href="javascript:void(0);" class="hw_btn_search" onclick="remote_function();" ></a>
+  <div class="myissues_head mb5">
+    <h2 class="ml15">我的Issue</h2>
   </div>
-  <a href="javascript:void(0);" class="sy_btn_grey fl ml5" onclick="all_reset_form();">清除</a>
-<!--  <div class="issues_filter_data fr">
-    <input type="text"  placeholder="开始日期" class="issues_calendar_input fl " ><a href="" class="issues_data_img fl" style="border-right:none;"></a>
-    <input type="text"  placeholder="结束日期" class="issues_calendar_input fl " ><a href="" class="issues_data_img fl"></a>
-  </div>-->
-</div>
+  <div class="clear mb5">
+    <div class="issues_statistics fl">
+      <ul>
+        <li>所有<a href="javascript:void(0);" class="issues_greycirbg_btn "><%= @issues_filter.count %></a></li>
+        <li>开启<a href="javascript:void(0);" class="issues_greycirbg_btn "><%= @issue_open_count %></a></li>
+        <li>关闭<a href="javascript:void(0);" class="issues_greycirbg_btn "><%= @issue_close_count %></a></li>
+      </ul>
+    </div><!--issues_statistics end-->
 
-<div class="issues_con_list" style="position: relative;">
-  <ul id="issues_list_nav" >
-    <li id="issues_list_nav_1" class="issues_nav_hover" onclick="HoverLi(1);all_reset_form();">
-      <a href="javascript:void(0);" id="issues_type_1" onclick="all_reset_form();" >搜索结果</a>
-      <span id="issue_filter_all"><%= render :partial => "users/my_issue_filter_all" %></span>
-    </li>
-    <li id="issues_list_nav_2" onclick="HoverLi(2);">
-      <a href="javascript:void(0);" id="issues_type_2" onclick="switch_assign_to(<%= User.current.id %>)">指派给我
-        <span id="issue_assigned_count"><%= render :partial => "users/my_issue_assigned_filter" %></span>
-      </a>
-    </li>
-    <li id="issues_list_nav_3" onclick="HoverLi(3);">
-      <a href="javascript:void(0);" id="issues_type_3" onclick="createByMe(<%= User.current.id %>)">我的发布<span class="issues_nav_tag ml5">
+  </div>
+  <%= form_tag( user_issues_user_path(@user), :remote=>'xls', :method => "post", :id=>"issue_query_form", :class => 'query_form') do %>
+      <div class="clear mb10">
+        <div class="hw_search_box fl ">
+          <input class="hw_search-input" placeholder="输入Issue名称进行搜索" type="text" id="v_subject"  name="subject" onkeypress="EnterPress(event)" onkeydown="EnterPress()">
+          <a href="javascript:void(0);" class="hw_btn_search" onclick="remote_function();" ></a>
+        </div>
+        <a href="javascript:void(0);" class="sy_btn_grey fl ml5" onclick="all_reset_form();">清除</a>
+        <!--  <div class="issues_filter_data fr">
+            <input type="text"  placeholder="开始日期" class="issues_calendar_input fl " ><a href="" class="issues_data_img fl" style="border-right:none;"></a>
+            <input type="text"  placeholder="结束日期" class="issues_calendar_input fl " ><a href="" class="issues_data_img fl"></a>
+          </div>-->
+      </div>
+
+      <div class="issues_con_list" style="position: relative;">
+        <ul id="issues_list_nav" >
+          <li id="issues_list_nav_1" class="issues_nav_hover" onclick="HoverLi(1);all_reset_form();">
+            <a href="javascript:void(0);" id="issues_type_1" onclick="all_reset_form();" >搜索结果</a>
+            <span id="issue_filter_all"><%= render :partial => "users/my_issue_filter_all" %></span>
+          </li>
+          <li id="issues_list_nav_2" onclick="HoverLi(2);">
+            <a href="javascript:void(0);" id="issues_type_2" onclick="switch_assign_to(<%= User.current.id %>)">指派给我
+              <span id="issue_assigned_count"><%= render :partial => "users/my_issue_assigned_filter" %></span>
+            </a>
+          </li>
+          <li id="issues_list_nav_3" onclick="HoverLi(3);">
+            <a href="javascript:void(0);" id="issues_type_3" onclick="createByMe(<%= User.current.id %>)">我的发布<span class="issues_nav_tag ml5">
         <%= @issues_author_count %>
       </span></a>
-    </li>
-    <div class="cl"></div>
-  </ul>
-  <div class="issues_filter">
-    <div class="issues_form_filter mt5 mr5">
-<!--     <select  placeholder=" 来源" class="fl mr10"  >
-        <option value="0" selected="selected">来源</option>
-        <option value="8166">123</option>
-        <option value="8166">123s</option>
-      </select>-->
-      <%= select( :project, :project_id, options_for_issue_project_list(@issues_filter),
-                  { :include_blank => false,:selected => @project_id ? @project_id : 0 },
-                  { :onchange => "remote_function();add_style();",:id => "project_id", :name => "project_id", :class => "fl", :style=>"width: 80px; margin-right:20px;"}
-      )%>
-     <select  placeholder=" 发布人" class="fl my_issues_filter" disabled="disabled" style="padding:0px;width: 50px;margin-right: 15px;">
-        <option value="0" selected="selected">发布人</option>
-      </select>
-      <%= select( :issue, :user_id, [[@user.show_name, @user.id]].unshift(["发布人",0]),
-                  { :include_blank => false,:selected => @author_id ? @author_id : 0},
-                  {:onchange => "remote_function();add_style();",:id => "author_id", :name => "author_id", :class => "fl", :style => "visibility:hidden;width: 0px;margin:0px;padding:0px;"}
-          )
-      %>
+          </li>
+          <div class="cl"></div>
+        </ul>
+        <div class="issues_filter">
+          <div class="issues_form_filter mt5 mr5">
+            <!--     <select  placeholder=" 来源" class="fl mr10"  >
+                    <option value="0" selected="selected">来源</option>
+                    <option value="8166">123</option>
+                    <option value="8166">123s</option>
+                  </select>-->
+            <%= select( :project, :project_id, options_for_issue_project_list(@issues_filter),
+                        { :include_blank => false,:selected => @project_id ? @project_id : 0 },
+                        { :onchange => "remote_function();add_style();",:id => "project_id", :name => "project_id", :class => "fl", :style=>"width: 80px; margin-right:20px;"}
+                )%>
+            <select  placeholder=" 发布人" class="fl my_issues_filter" disabled="disabled" style="padding:0px;width: 50px;margin-right: 15px;">
+              <option value="0" selected="selected">发布人</option>
+            </select>
+            <%= select( :issue, :user_id, [[@user.show_name, @user.id]].unshift(["发布人",0]),
+                        { :include_blank => false,:selected => @author_id ? @author_id : 0},
+                        {:onchange => "remote_function();add_style();",:id => "author_id", :name => "author_id", :class => "fl", :style => "visibility:hidden;width: 0px;margin:0px;padding:0px;"}
+                )
+            %>
 
-      <select  placeholder=" 类型" class="fl my_issues_filter" disabled="disabled" style="padding:0px; margin:0px;width:35px; margin-right:10px;">
-        <option value="0" selected="selected">类型</option>
-      </select>
-     <select  placeholder=" 指派给" class="fl my_issues_filter" disabled="disabled" style="padding:0px; margin-right: 15px;">
-        <option value="0" selected="selected">指派给</option>
-      </select>
-      <%= select( :issue, :user_id, [[@user.show_name, @user.id]].unshift(["指派给",0]),
-                  { :include_blank => false, :selected => @assigned_to ? @assigned_to : 0},
-                  {:onchange=>"remote_function();add_style();",:id=>"assigned_to_id",:name=>"assigned_to_id",:class=>"fl", :style => "visibility:hidden; width:0px;margin:0px;padding:0px;"} )
-      %>
-      <select  placeholder=" 优先度" class="fl my_issues_filter"  disabled="disabled" style="padding:0px; margin:0px">
-        <option value="0" selected="selected">优先度</option>
-      </select>
-      <select  placeholder=" 里程碑" class="fl my_issues_filter" disabled="disabled" style="padding:0px;margin-left: 20px; margin-right: 10px">
-        <option value="0" selected="selected">里程碑</option>
-      </select>
-      <select  placeholder=" 状态" class="fl my_issues_filter" disabled="disabled" style="padding:0px; margin-right:10px;width:35px;">
-        <option value="0" selected="selected">状态</option>
-      </select>
-      <select  placeholder=" 完成度" class="fl my_issues_filter" disabled="disabled" style="padding:0px; margin:0px">
-        <option value="0" selected="selected">完成度</option>
-      </select>
-      <select  placeholder=" 排序" class="fl my_issues_filter" disabled="disabled" style="width:50px;visibility:hidden;margin-left: 0px;margin-right: 0px;">
-        <option value="0" selected="selected">排序</option>
-      </select>
-    </div>
-    <div class="cl"></div>
-  </div>
+            <select  placeholder=" 类型" class="fl my_issues_filter" disabled="disabled" style="padding:0px; margin:0px;width:35px; margin-right:10px;">
+              <option value="0" selected="selected">类型</option>
+            </select>
+            <select  placeholder=" 指派给" class="fl my_issues_filter" disabled="disabled" style="padding:0px; margin-right: 15px;">
+              <option value="0" selected="selected">指派给</option>
+            </select>
+            <%= select( :issue, :user_id, [[@user.show_name, @user.id]].unshift(["指派给",0]),
+                        { :include_blank => false, :selected => @assigned_to ? @assigned_to : 0},
+                        {:onchange=>"remote_function();add_style();",:id=>"assigned_to_id",:name=>"assigned_to_id",:class=>"fl", :style => "visibility:hidden; width:0px;margin:0px;padding:0px;"} )
+            %>
+            <select  placeholder=" 优先度" class="fl my_issues_filter"  disabled="disabled" style="padding:0px; margin:0px">
+              <option value="0" selected="selected">优先度</option>
+            </select>
+            <select  placeholder=" 里程碑" class="fl my_issues_filter" disabled="disabled" style="padding:0px;margin-left: 20px; margin-right: 10px">
+              <option value="0" selected="selected">里程碑</option>
+            </select>
+            <select  placeholder=" 状态" class="fl my_issues_filter" disabled="disabled" style="padding:0px; margin-right:10px;width:35px;">
+              <option value="0" selected="selected">状态</option>
+            </select>
+            <select  placeholder=" 完成度" class="fl my_issues_filter" disabled="disabled" style="padding:0px; margin:0px">
+              <option value="0" selected="selected">完成度</option>
+            </select>
+            <select  placeholder=" 排序" class="fl my_issues_filter" disabled="disabled" style="width:50px;visibility:hidden;margin-left: 0px;margin-right: 0px;">
+              <option value="0" selected="selected">排序</option>
+            </select>
+          </div>
+          <div class="cl"></div>
+        </div>
   <% end %>
   <% if @issues.empty? %>
       <p class="nodata mt10"><%= l(:label_no_data) %></p>
@@ -275,15 +284,15 @@
         <%= render :partial => 'users/all_issue_list', :locals => {:issues => @issues, :issue_pages => @issue_pages,:issue_count => @issue_count, :subject => @subject } %>
       </div>
   <% end %>
-</div>
-<div class="cl"></div>
+  </div>
+  <div class="cl"></div>
 </div><!--issues_filter end-->
-  <div id="issues_list_content_1">
-  </div><!--issues_list_content_1 end-->
-  <div id="issues_list_content_2" class="undis">
-  </div><!--issues_list_content_2 end-->
-  <div id="issues_list_content_3" class="undis">
-  </div><!--issues_list_content_3 end-->
+<div id="issues_list_content_1">
+</div><!--issues_list_content_1 end-->
+<div id="issues_list_content_2" class="undis">
+</div><!--issues_list_content_2 end-->
+<div id="issues_list_content_3" class="undis">
+</div><!--issues_list_content_3 end-->
 <!--issues_con_list end-->
 
 

app/views/users/user_messages.html.erb

@@ -14,32 +14,7 @@
 
         <!--总消息列表-->
         <% unless @message_alls.nil? %>
-            <% @message_alls.each do |ma| %>
-                <%# 系统消息 %>
-                <%= render :partial => 'users/user_message_system', :locals => {:ma => ma}  %>
-
-                <%= render :partial => 'users/user_at_message', :locals => {:ma => ma}  %>
-
-                <%# 课程消息 %>
-                <%= render :partial => 'users/user_message_course', :locals => {:ma => ma}  %>
-
-                <!--项目消息-->
-                <%= render :partial => 'users/user_message_forge', :locals => {:ma => ma}  %>
-
-                <!--公共贴吧-->
-                <%= render :partial => 'users/user_message_forum', :locals => {:ma => ma}  %>
-
-                <!--用户留言-->
-                <%= render :partial => 'users/user_message_userfeedaback', :locals => {:ma => ma}  %>
-
-                <%= render :partial => 'users/user_message_org', :locals => {:ma => ma} %>
-
-                <%# 申请类消息 %>
-                <%= render :partial => 'users/user_message_applied', :locals => {:ma => ma} %>
-            <% end %>
-            <ul class="wlist" style=" border:none; padding-top: 15px;">
-              <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
-            </ul>
+            <%= render :partial => 'users/new_user_message', :locals => { :message_alls => @message_alls } %>
         <% end %>
         <!--项目消息-->
     <% else %>

config/locales/projects/zh.yml

@@ -510,4 +510,5 @@ zh:
 
   label_pull_request_conflic: 您创建的Pull Request尚未被管理员接受或者关闭，不能重新创建
   label_pull_request_forbidden: 您没有权限进行该操作
-  label_pull_request_notfound: 您操作的页面不存在或者已被删除
+  label_pull_request_notfound: 您操作的页面不存在或者已被删除
+  label_pull_request_datanotaccepted: Pull Request中存在冲突，请先解决冲突或者手动进行合并

config/routes.rb

@@ -568,6 +568,9 @@ RedmineApp::Application.routes.draw do
   match 'courses/:course_id/news/new', :to => 'news#new', :via => [:get, :post]
   match 'users/:user_id/homepage/articles/:id', :to => 'article_homepages#show', :as => "user_homepage_show"
 
+  match 'users/:id/courses', :to => 'users#course_community', :as => "user_course_community"
+  match 'users/:id/projects', :to => 'users#project_community', :as => "user_project_community"
+
   scope ":username" do
     resources :posts
   end
@@ -691,6 +694,12 @@ RedmineApp::Application.routes.draw do
       get 'expand_courses'
       get 'cancel_or_collect'
       get 'homepage'
+      get 'unsolved_issues_list'
+      get 'unfinished_homework_list'
+      get 'unfinished_poll_list'
+      get 'unfinished_test_list'
+      get 'anonymous_evaluation_list'
+      get 'unapproval_applied_list'
       # end
     end
     #resources :blogs