Merge branch 'develop' into cxt_course

2016-01-25 10:18:54 +08:00 · 2016-01-25 10:18:54 +08:00 · 3d05a4b82f
parent 3de8687440 12f55f039c
commit 3d05a4b82f
85 changed files with 751 additions and 186 deletions
--- a/app/api/mobile/apis/courses.rb
+++ b/app/api/mobile/apis/courses.rb
@ -272,7 +272,7 @@ module Mobile
        params do
          requires :token,type:String
          requires :course_id,type:Integer,desc: '课程id'
-          optional :name,type:String,desc:'学生的姓名或者昵称或者学号可能包含的字符'
+          optional :name,type:String,desc:'学生的姓名或者登录名或者学号可能包含的字符'
        end
        get ":course_id/members" do
          cs = CoursesService.new
--- a/app/api/mobile/apis/users.rb
+++ b/app/api/mobile/apis/users.rb
@ -82,7 +82,7 @@ module Mobile
        desc "用户搜索"
        params do
          requires :name, type: String, desc: '用户名关键字'
-          requires :search_by, type: String,desc: '搜索依据：0 昵称，1 用户名，2 邮箱,3 昵称和姓名'
+          requires :search_by, type: String,desc: '搜索依据：0 登录名，1 用户名，2 邮箱,3 登录名和姓名'
          optional :is_search_assitant,type:Integer,desc:'是否搜索注册用户来作为助教'
          optional :course_id,type:Integer,desc: '课程id，搜索注册用户不为该课程教师的其他用户'
          optional :user_id,type:Integer,desc:'用户id'
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@ -461,8 +461,8 @@ class AdminController < ApplicationController
    scope = User.order('last_login_on desc')
    scope = scope.where("last_login_on>= '#{params[:startdate]} 00:00:00'") if params[:startdate].present?
    scope =scope.where("last_login_on <= '#{params[:enddate]} 23:59:59'") if params[:enddate].present?
-    @user = scope
-    @user = paginateHelper @user,30
+    @users = scope
+    @users = paginateHelper @users,30
    @page = (params['page'] || 1).to_i - 1
    respond_to do |format|
      format.html
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -312,7 +312,8 @@ class ApplicationController < ActionController::Base
    elsif @course
      allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @course || @courses, :global => global)
    else
-      allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project || @projects, :global => global)
+      # allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project || @projects, :global => global)
+      allowed = true
    end
    allowed
  end
--- a/app/controllers/blog_comments_controller.rb
+++ b/app/controllers/blog_comments_controller.rb
@ -52,10 +52,14 @@ class BlogCommentsController < ApplicationController
      render_attachment_warning_if_needed(@article)
    else
    end
-    if params[:is_homepage]
-      redirect_to user_blogs_path(params[:user_id])
+    if params[:in_act]
+      redirect_to user_path(params[:user_id])
    else
-      redirect_to user_blog_blog_comment_path(:user_id=>params[:user_id],:blog_id=>params[:blog_id],:id=>params[:id])
+      if params[:is_homepage]
+        redirect_to user_blogs_path(params[:user_id])
+      else
+        redirect_to user_blog_blog_comment_path(:user_id=>params[:user_id],:blog_id=>params[:blog_id],:id=>params[:id])
+      end
    end
  end
  def destroy
@ -123,6 +127,7 @@ class BlogCommentsController < ApplicationController
    @blogComment.title = "RE: #{@article.title}" unless params[:blog_comment][:title]
    @article.children << @blogComment
    @article.save
+    # @article.update_attribute(:updated_on, @blogComment.updated_on)
    @user_activity_id = params[:user_activity_id]
    user_activity = UserActivity.where("act_type='BlogComment' and act_id =#{@article.id}").first
    if user_activity
--- a/app/controllers/blogs_controller.rb
+++ b/app/controllers/blogs_controller.rb
@ -2,7 +2,6 @@ class BlogsController < ApplicationController
  before_filter :find_blog,:except => [:index,:create,:new,:set_homepage, :cancel_homepage]
  before_filter :find_user
  def index
-    @articls = @user.blog.articles
    @article = BlogComment.new
    respond_to do |format|
      format.html {render :layout=>'new_base_user'}
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@ -509,7 +509,7 @@ class CoursesController < ApplicationController
    if @course
      respond_to do |format|
        flash[:notice] = l(:notice_successful_create)
-        format.html {redirect_to settings_course_url(@course, :course_type => 1)}
+        format.html {redirect_to course_url(@course)}
        format.api { render :action => 'show', :status => :created, :location => url_for(:controller => 'courses', :action => 'show', :id => @course.id) }
      end
    else
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@ -81,6 +81,7 @@ class IssuesController < ApplicationController
      @priority_id = params[:priority_id]
      @status_id = params[:status_id]
      @subject = params[:subject]
+      @done_ratio = params[:done_ratio]
      @issue_count = @query.issue_count
      @issue_pages = Paginator.new @issue_count, @limit, params['page']
      params[:page] = (params[:page] || 1).to_i + 1 #页码需要加1
@ -220,19 +221,27 @@ class IssuesController < ApplicationController
  end

  def update
-    return unless update_issue_from_params
-    @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads]))
-    saved = false
-    begin
-      @saved = @issue.save_issue_with_child_records(params, @time_entry)
-    rescue ActiveRecord::StaleObjectError
-      @conflict = true
-      if params[:last_journal_id]
-        @conflict_journals = @issue.journals_after(params[:last_journal_id]).all
-        @conflict_journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
+    if params[:issue_detail]
+      issue = Issue.find(params[:id])
+      issue = update_user_issue_detail(issue, params)
+      @saved = update_user_issue_detail(issue, params)
+      return
+    else
+      return unless update_issue_from_params
+      @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads]))
+      saved = false
+      begin
+        @saved = @issue.save_issue_with_child_records(params, @time_entry)
+      rescue ActiveRecord::StaleObjectError
+        @conflict = true
+        if params[:last_journal_id]
+          @conflict_journals = @issue.journals_after(params[:last_journal_id]).all
+          @conflict_journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
+        end
      end
    end

+
    if @saved
      #修改界面增加跟踪者
      watcherlist = @issue.watcher_users
@ -278,6 +287,19 @@ class IssuesController < ApplicationController
    end
  end

+  def update_user_issue_detail(issue, params)
+    case params[:type]
+    when "status"
+      issue.update_attribute(:status_id, params[:status_id])
+    when "assigned"
+      issue.update_attribute(:assigned_to_id, params[:assigned_to_id])
+    when "ratio"
+      issue.update_attribute(:done_ratio, params[:done_ratio])
+    when "prior"
+      issue.update_attribute(:priority_id, params[:priority_id])
+    end
+  end
+
  # Updates the issue form when changing the project, status or tracker
  # on issue creation/update
  def update_form
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@ -55,6 +55,7 @@ class OrganizationsController < ApplicationController
    @organization.name = params[:organization][:name]
    @organization.description = params[:organization][:description]
    @organization.is_public = params[:organization][:is_public]
+    @organization.allow_guest_download = params[:organization][:allow_guest_download] == '1' ? 1 : 0
    @organization.creator_id = User.current.id
    member = OrgMember.new(:user_id => User.current.id)

--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@ -360,6 +360,9 @@ update
      end
      # end
      @changesets_latest_coimmit = @changesets[0]
+      unless @changesets[0].blank?
+        update_commits_date(@project, @changesets_latest_coimmit)
+      end
      @properties = @repository.properties(@path, @rev)
      @repositories = @project.repositories
      @course_tag = params[:course]
@ -589,6 +592,11 @@ update
    project.project_score.update_attribute(:changeset_num, count)
  end

+  # 更新项目提交次数时间
+  def update_commits_date project, date
+    project.project_score.update_attribute(:commit_time, date.created_at)
+  end
+
  def find_repository
    @repository = Repository.find(params[:id])
    @project = @repository.project
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@ -93,6 +93,11 @@ class UsersController < ApplicationController
    end
  end

+  # 更新issue状态
+  def user_act_issue_assign_to
+
+  end
+
  # 用户消息
  # 说明： homework 发布作业；message：讨论区； news：新闻； poll：问卷；works_reviewers：作品评阅；works_reply:作品回复,exercise:课程测验
  # issue：问题；journal：缺陷状态更新； forum：公共贴吧: user_feedback: 用户留言; new_reply:新闻回复（comment）
@ -1791,13 +1796,24 @@ class UsersController < ApplicationController
  def share_news_to_project
    news = News.find(params[:send_id])
    project_ids = params[:project_ids]
+    # project_ids.each do |project_id|
+    #   if Project.find(project_id).news.map(&:id).exclude?(news.id)
+    #     project_news = News.create(:project_id => project_id.to_i, :title => news.title, :summary => news.summary, :description => news.description,:author_id => User.current.id, :created_on => Time.now)
+    #     news.attachments.each do |attach|
+    #       project_news.attachments << Attachment.new(:filename => attach.filename, :disk_filename => attach.disk_filename, :filesize => attach.filesize, :content_type => attach.content_type, :digest => attach.digest,
+    #                                              :downloads => 0, :author_id => User.current.id, :created_on => Time.now, :description => attach.description, :disk_directory => attach.disk_directory, :attachtype => attach.attachtype,
+    #                                              :is_public => attach.is_public,  :quotes => 0)
+    #     end
+    #   end
+    # end
    project_ids.each do |project_id|
-      if Project.find(project_id).news.map(&:id).exclude?(news.id)
-        project_news = News.create(:project_id => project_id.to_i, :title => news.title, :summary => news.summary, :description => news.description,:author_id => User.current.id, :created_on => Time.now)
+      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)
        news.attachments.each do |attach|
-          project_news.attachments << Attachment.new(:filename => attach.filename, :disk_filename => attach.disk_filename, :filesize => attach.filesize, :content_type => attach.content_type, :digest => attach.digest,
-                                                 :downloads => 0, :author_id => User.current.id, :created_on => Time.now, :description => attach.description, :disk_directory => attach.disk_directory, :attachtype => attach.attachtype,
-                                                 :is_public => attach.is_public,  :quotes => 0)
+          message.attachments << Attachment.new(:filename => attach.filename, :disk_filename => attach.disk_filename, :filesize => attach.filesize, :content_type => attach.content_type, :digest => attach.digest,
+                                                     :downloads => 0, :author_id => User.current.id, :created_on => Time.now, :description => attach.description, :disk_directory => attach.disk_directory, :attachtype => attach.attachtype,
+                                                     :is_public => attach.is_public,  :quotes => 0)
        end
      end
    end
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -49,6 +49,21 @@ module ApplicationHelper
    end
  end

+  def link_to_user_version(version, options = {})
+    return '' unless version && version.is_a?(Version)
+    link_to_if version.visible?, format_version_name(version), { :controller => 'versions', :action => 'show', :id => version }, :class => " f16 fb c_dblue "
+  end
+
+  # 判断课程是否为精品课程
+  def is_excellent_course course
+    (course.is_excellent? or course.excellent_option?) ? true : false
+  end
+
+  # 判断课程对成员是否可见
+  def visible_course?(course)
+    (course.is_delete? or (!course.is_public? && !User.current.member_of_course?(course))) ? false : true
+  end
+
  # 获取项目/课程总分
  # 发布缺陷 4分 回复缺陷 1分 提交一次 4分 讨论帖子 2分 回复帖子 1分 发布新闻 1分
  def static_project_score obj
@ -959,7 +974,17 @@ module ApplicationHelper
    first_page = FirstPage.find_by_page_type('project')
    if args.empty?
      title = @html_title || []
-      title << @project.name if @project
+      if @project
+        title << @project.name
+      elsif @course
+        title << @course.name
+      elsif @organization
+        title << @organization.name
+      elsif @user
+        title << @user.login
+      else
+        title << User.current.login
+      end
      if first_page.nil? || first_page.web_title.nil?
        title << Setting.app_title unless Setting.app_title == title.last
      else
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@ -11,6 +11,59 @@ module CoursesHelper
  #StudentRoles = [5, 10]
  #AllPeople = StudentRoles+TeacherRoles
  ## return people count
+
+
+  # 推荐的精品课程
+  def excellent_course_recommend new_course
+    q = "%#{new_course.name.strip}%"
+    result = find_excelletn_course(q, new_course)
+  end
+
+  # 查询符合条件的精品课程
+  # 用新课程名去匹配精品课程中按课程名和Tag名
+  def find_excelletn_course keywords, current_course
+    # 获取tag匹配结果ID
+    a_tags = []
+    # kc = keywords.to_a
+    Course.visible.where("is_excellent =?", 1).each do |ec|
+      if ec.tags.any?{|value| current_course.name.include?(value.to_s)}
+        a_tags << ec.id
+      end
+    end
+    # sql = "SELECT distinct c.* FROM `courses` c, tags t, taggings ts where t.id = ts.tag_id and ts.taggable_id = c.id  and c.is_excellent = 1 and is_delete = 0 and
+    #       ts.taggable_type = 'Course' and t.name like '%#{keywords}%'"
+    # a_tags = Course.find_by_sql(sql).select{|course| course.is_public ==1 unless User.current.member_of_course?(course)}
+    # 通过elastic结果获取精品课程
+    a_courses = []
+    #courses = Course.search(keywords)
+    #courses.each do |c|
+    #  a_courses << c.id
+    #end
+    a_courses << a_tags unless a_tags.length == 0
+    # 课程本身不能搜索显示自己
+    excellent_ids = a_courses.flatten.uniq.delete_if{|i| i == current_course.id}
+    limit = 5 - excellent_ids.length.to_i
+    sql = "SELECT distinct c.id FROM course_activities cs, courses c where cs.course_id = c.id
+         and c.is_excellent =1 and c.id != #{current_course.id} order by cs.updated_at desc;"
+    default_ecourse_ids = Course.find_by_sql(sql).flatten
+    # REDO:时间紧，待优化
+    default_ids =[]
+    default_ecourse_ids.each do |de|
+      default_ids << de.id
+    end
+    default_ids = default_ids - excellent_ids
+    #default_ecourse = Course.where("id is not in (?)", ids).find_by_sql(sql).flatten.delete_if{|i| i == current_course.id}.flatten
+    arr_result = excellent_ids << default_ids
+    arr_result = arr_result.flatten.first(5)
+    return arr_result
+    # 过滤条件：精品课程、本身不在搜索范围
+    #e_courses = Course.where("is_excellent =? and id in (?)",1, arr_result).where("id !=?", current_course.id)
+  end
+
+  # 判断精品课程是否可见，非课程成员无法查看私有课程
+  def visible_excellent_course obj
+    # if course.is_pu
+  end
  
  # 返回x项目成员数量，即roles表中定义的所有成员
  def projectCount project    
--- a/app/models/blog_comment.rb
+++ b/app/models/blog_comment.rb
@ -18,6 +18,7 @@ class BlogComment < ActiveRecord::Base

  after_save :add_user_activity
  after_update :update_activity
+  after_create :update_parent_time
  before_destroy :destroy_user_activity

  scope :like, lambda {|arg|
@ -64,6 +65,11 @@ class BlogComment < ActiveRecord::Base
    (user && user.logged? && (self.author == user) ) || user.admin?
  end

+  def update_parent_time
+    if !self.parent.nil?
+      self.root.update_attribute(:updated_on, self.updated_on)
+    end
+  end
  def project
  end
 end
--- a/app/models/course.rb
+++ b/app/models/course.rb
@ -144,6 +144,26 @@ class Course < ActiveRecord::Base
    )
  end

+  def self.e_search(query)
+    __elasticsearch__.search(
+        {
+            query: {
+                multi_match: {
+                    query: query,
+                    type:"most_fields",
+                    operator: "or",
+                    fields: ['name', 'description^0.5']
+                }
+            },
+            sort: {
+                _score:{order: "desc" },
+                updated_at:{order:"desc"}
+
+            }
+        }
+    )
+  end
+
  def visible?(user=User.current)
    user.allowed_to?(:view_course, self)
  end
@ -383,6 +403,7 @@ class Course < ActiveRecord::Base
  def act_as_course_message
    self.course_messages << CourseMessage.new(:user_id => self.tea_id, :course_id => self.id, :viewed => false)
  end
+
  #项目与课程分离后，很多课程的名称等信息为空，这些数据信息存储在项目表中！！就是数据兼容的问题
  #def name
  #  read_attribute('name') || Project.find_by_identifier(self.extra).try(:name)
@ -404,6 +425,7 @@ class Course < ActiveRecord::Base
      self.__elasticsearch__.index_document
    end
  end
+
  def update_course_ealasticsearch_index
    if self.is_public == 1 and self.is_delete == 0 #如果是初次更新成为公开或者恢复被删除的情况，会报错，那么这条记录尚未被索引过。没有报错就是更新的其他属性
      begin
@ -427,8 +449,12 @@ class Course < ActiveRecord::Base

    end
  end
+
+
 end

+
+
 # Delete the previous articles index in Elasticsearch
 # Course.__elasticsearch__.client.indices.delete index: Course.index_name rescue nil
 #
--- a/app/models/course_activity.rb
+++ b/app/models/course_activity.rb
@ -6,6 +6,7 @@ class CourseActivity < ActiveRecord::Base
  belongs_to :user
  has_many :user_acts, :class_name => 'UserAcivity',:as =>:act
  after_save :add_user_activity, :add_course_activity
+  after_create :add_course_lead
  before_destroy :destroy_user_activity, :destroy_org_activity

  #在个人动态里面增加当前动态
@ -60,4 +61,18 @@ class CourseActivity < ActiveRecord::Base
    org_activity = OrgActivity.where("org_act_type = '#{self.course_act_type.to_s}' and org_act_id = '#{self.course_act_id}'")
    org_activity.destroy_all
  end
+
+  # 发布新课导语
+  # 导语要放置在课程创建信息之后
+  # 导语
+  def add_course_lead
+    if self.course_act_type == "Course"
+      name = Redmine::Configuration['course_message_lead_subject']
+      content = Redmine::Configuration['course_message_lead_content']
+      # message的status状态为0为正常，为1表示创建课程时发送的message
+      message = Message.create(:subject => name, :content => content, :board_id => self.course.boards.first.id, :author_id => self.course.tea_id , :sticky => true, :status => true )
+      # 更新的目的是为了排序，因为该条动态的时间可能与课程创建的动态创建时间一直
+      message.course_acts.first.update_attribute(:updated_at, message.course_acts.first.updated_at + 1)
+    end
+  end
 end
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@ -380,8 +380,16 @@ class Mailer < ActionMailer::Base
  end

  # issue截止时间提醒
-  def issue_due_date(issue, recipients)
-    @author = issue.author.login
+  def issue_due_date(issue)
+    recipients ||= []
+    if issue.author.id != issue.assigned_to_id
+      recipients << issue.author.mail
+    end
+
+    # 被指派人邮箱地址加入数组
+    recipients << issue.assigned_to.mail
+    # cc = wiki_content.page.wiki.watcher_recipients - recipients
+    @author = issue.author
    @issue_name = issue.subject
    @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id)
    @subject = "#{l(:mail_issue)}#{issue.subject} #{l(:mail_issue_due_date)} "
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -825,6 +825,9 @@ class User < Principal
  end

  def admin_of_org?(org)
+    if self.admin?
+      return true
+    end
    if  OrgMember.where("user_id =? and organization_id =?", self.id, org.id).count == 0
      return false
    end
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@ -224,7 +224,7 @@
          <%= back_url_hidden_field_tag %>
          <div class="mb20">
            <%= text_field_tag 'username', params[:username], :tabindex => '1' ,
-                               :class=>'loginSignBox',:placeholder=>'请输入邮箱地址或昵称', :onkeypress => "user_name_keypress(event);"%>
+                               :class=>'loginSignBox',:placeholder=>'请输入邮箱地址或登录名', :onkeypress => "user_name_keypress(event);"%>
            <!--<input type="text" placeholder="请输入邮箱地址或昵称" class="loginSignBox" />-->
          </div>
          <% if Setting.openid? %>
@ -283,8 +283,8 @@
          </div>
          <div  class="loginSignRow">
            <!--<input type="text" placeholder="请输入用户昵称" class="loginSignBox" />-->
-            <%= f.text_field :login, :size => 25,:placeholder=>"请输入用户昵称",:class=>'loginSignBox'%>
-            <div class="loginSignAlert" id="login_req" style="display: none">用户昵称为2-18个中英文，数字或下划线</div>
+            <%= f.text_field :login, :size => 25,:placeholder=>"请输入用户登录名",:class=>'loginSignBox'%>
+            <div class="loginSignAlert" id="login_req" style="display: none">用户登录名为2-18个中英文，数字或下划线</div>
          </div>
              <div class="loginSignOption">
                <div class="fl mt3 mr5">
--- a/app/views/admin/latest_login_users.html.erb
+++ b/app/views/admin/latest_login_users.html.erb
@ -38,7 +38,7 @@
        用户姓名
      </th>
      <th style="width: 50px;">
-        用户昵称
+        用户登录名
      </th>
      <th style="width: 50px;">
        用户身份
@ -47,7 +47,7 @@
    </thead>
    <tbody>
        <% @count=@page * 30 %>
-        <% for user in @user do %>
+        <% for user in @users do %>
            <tr>
              <% @count +=1 %>
              <td align="center">
--- a/app/views/attachments/_form.html.erb
+++ b/app/views/attachments/_form.html.erb
@ -31,7 +31,7 @@
  <span class="add_attachment" style="font-weight:normal;">
    <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
    <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
-    <%= button_tag "文件浏览", :type=>"button", :onclick=>"$('#_file').click();",:onmouseover => 'this.focus()',:class => 'sub_btn' %>
+    <%= button_tag "上传附件", :type=>"button", :onclick=>"$('#_file').click();",:onmouseover => 'this.focus()',:class => 'sub_btn' %>
    <%= file_field_tag 'attachments[dummy][file]',
                       :id => '_file',
                       :class => 'file_selector',
--- a/app/views/attachments/_form_project.html.erb
+++ b/app/views/attachments/_form_project.html.erb
@ -109,7 +109,7 @@
    <span class="add_attachment">
 <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
      <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
-      <%= button_tag "文件浏览", :type=>"button", :onclick=>"_file.click()", :class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
+      <%= button_tag "上传附件", :type=>"button", :onclick=>"_file.click()", :class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
      <%= file_field_tag 'attachments[dummy][file]',
                         :id => '_file',
                         :class => 'file_selector',
--- a/app/views/blog_comments/edit.html.erb
+++ b/app/views/blog_comments/edit.html.erb
@ -1,5 +1,5 @@
 <% if User.current.logged? && User.current.id == @user.id %>
-    <%= form_for @article, :url =>{:controller=>'blog_comments',:action => 'update',:user_id=>@user.id , :blog_id => @article.id, :is_homepage => params[:is_homepage]},:method=>'PUT',
+    <%= form_for @article, :url =>{:controller=>'blog_comments',:action => 'update',:user_id=>@user.id , :blog_id => @article.id, :is_homepage => params[:is_homepage],:in_act => params[:in_act]},:method=>'PUT',
                          :html => {:nhname=>'form',:multipart => true, :id => 'message-form'} do |f| %>
        <%= render :partial => 'blog_comments/edit', :locals => {:f => f, :article => @article, :edit_mode => true, :user => @user} %>
    <% end %>
--- a/app/views/blog_comments/show.html.erb
+++ b/app/views/blog_comments/show.html.erb
@ -45,7 +45,7 @@
                  <li>
                    <%= link_to(
                                l(:button_edit),
-                                {:action => 'edit', :id => @article.id},
+                                {:action => 'edit', :id => @article.id,:in_act => params[:in_act]},
                                :class => 'postOptionLink'
                        ) if User.current && User.current.id == @article.author.id %>
                  </li>
@ -215,4 +215,4 @@
      postContent = postContent.replace(/&nbsp;/g," ");
      $("#message_description_<%= @article.id %>").html(postContent);
  });
-</script>
+</script>
--- a/app/views/blogs/index.html.erb
+++ b/app/views/blogs/index.html.erb
@ -30,7 +30,7 @@
 <%= import_ke(enable_at: false, prettify: false) %>


-<%= render :partial => 'blogs/article_list', :locals => {:blog=>@user.blog,:topics => @user.blog.articles.reorder("#{BlogComment.table_name}.sticky desc,#{BlogComment.table_name}.created_on desc"), :page => 0, :user => @user} %>
+<%= render :partial => 'blogs/article_list', :locals => {:blog=>@user.blog,:topics => @user.blog.articles.reorder("#{BlogComment.table_name}.sticky desc,#{BlogComment.table_name}.updated_on desc"), :page => 0, :user => @user} %>


 <script type="text/javascript">//侧导航
--- a/app/views/courses/_recommendation.html.erb
+++ b/app/views/courses/_recommendation.html.erb
@ -0,0 +1,20 @@
+<% unless excellent_course_recommend(course).length == 0 %>
+    <ul class="courseR mb10">
+      <h4 class="mb5" ><%= l(:label_homework_recommendation) %>：</h4>
+      <% excellent_course_recommend(course).each do |e_course| %>
+          <% e_course = Course.find(e_course) %>
+
+          <li class="mt15"> <%= image_tag(url_to_avatar(e_course), :width => "40", :height => "40", :class => "fl mr10 rankPortrait", :alt => "logo") %>
+            <div class="fl">
+              <p class="f12 mb5"><%=link_to e_course.name, course_path(e_course.id), :class => "hidden fl w170" %></p>
+              <p class="f12">
+                <span class="fl mr15 fontGrey4"><%= l(:project_module_attachments) %>(<%= link_to e_course.attachments.count, course_files_path(e_course), :class => "linkBlue2" %>)</span>
+                <span class="fl fontGrey4"><%= l(:label_homework_commont) %>(<%= link_to e_course.homework_commons.count, homework_common_index_path(:course=>e_course.id), :class => "linkBlue2" %>)</span></p>
+            </div>
+            <div class="cl"></div>
+          </li>
+      <% end %>
+      <div class="cl"></div>
+    </ul>
+<% end %>
+
--- a/app/views/courses/_searchmembers.html.erb
+++ b/app/views/courses/_searchmembers.html.erb
@ -1,5 +1,5 @@
 <%= form_tag( searchmembers_course_path(@course), method: 'get',:class => "f_l",:remote=>true,:id => "search_student") do %>
-    <%= text_field_tag 'name', params[:name], name: "name", :class => 'st_search_input', :placeholder => '输入学生昵称、姓名、学号进行搜索'%>
+    <%= text_field_tag 'name', params[:name], name: "name", :class => 'st_search_input', :placeholder => '输入学生登录名、姓名、学号进行搜索'%>
    <% if @group %>
        <%= hidden_field "search_group_id", params[:search_group_id],:value => "#{@group.id}", name: 'search_group_id' %>
        <input type="hidden" name="ingroup">
--- a/app/views/courses/settings.html.erb
+++ b/app/views/courses/settings.html.erb
@ -110,7 +110,7 @@
    <div class="search_course fl">
      <%= form_tag(search_member_course_path,:id => "course_member_search_form", :method => :get, :class => "search_form_course",:remote => true) do %>
          <!-- , :onkeyup => "regexQ('#{l(:label_search_conditions_not_null)}');" -->
-          <%= text_field_tag 'name', params[:name], :placeholder => "昵称、学号、姓名搜索", :class => "search_text fl" %>
+          <%= text_field_tag 'name', params[:name], :placeholder => "登录名、学号、姓名搜索", :class => "search_text fl" %>
          <a href="javascript:void(0)" onclick="submitMemberSerch('<%= l(:label_search_conditions_not_null) %>');" class="search_btn fl f14 c_white ml10" >
            <%= l(:label_search)%>
          </a>
--- a/app/views/files/_course_file.html.erb
+++ b/app/views/files/_course_file.html.erb
@ -126,4 +126,4 @@
   <%= render :partial => 'course_list',:locals => {course: @course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments}  %>
  </div>
 </div>
-<% html_title(l(:label_attachment_plural)) -%>
+<%# html_title(l(:label_attachment_plural)) -%>
--- a/app/views/files/_project_file.html.erb
+++ b/app/views/files/_project_file.html.erb
@ -95,4 +95,4 @@
    <%= render :partial => 'project_list',:locals => {project: @project, all_attachments: @all_attachments, sort:@sort, order:@order, project_attachments:@obj_attachments}  %>
  </div>
 </div>
-<% html_title(l(:label_attachment_plural)) -%>
+<%# html_title(l(:label_attachment_plural)) -%>
--- a/app/views/files/_subfield_files.html.erb
+++ b/app/views/files/_subfield_files.html.erb
@ -74,7 +74,7 @@
  </div><!---re_con end-->

 </div>
-<% html_title(l(:label_attachment_plural)) -%>
+<%# html_title(l(:label_attachment_plural)) -%>
 <script>
  function org_upload_files(org_subfield_id){
      $.ajax({
--- a/app/views/homework_attach/_homeworks_list.html.erb
+++ b/app/views/homework_attach/_homeworks_list.html.erb
@ -20,7 +20,7 @@
        <%= link_to l(:label_export_excel), get_batch_homeworks_homework_attach_index_path(:bid_id => @bid.id,:format => 'xls'),:class=>'xls' if is_batch_homeworks%>
        <%= link_to l(:label_export_excel), get_not_batch_homework_homework_attach_index_path(:bid_id => @bid.id,:format => 'xls'),:class=>'xls' if not_batch_homework%>
        <%= link_to l(:label_export_excel), get_homeworks_homework_attach_index_path(:bid_id => @bid.id,:format => 'xls'),:class=>'xls' if is_all_homeworks%>
-        <input type="text" id="homework_member_search" placeholder="昵称、学号、姓名搜索" class="min_search ml10" value="<%= @search_name%>" >
+        <input type="text" id="homework_member_search" placeholder="登录名、学号、姓名搜索" class="min_search ml10" value="<%= @search_name%>" >
        <a href="javascript:void(0)" class="member_search" onclick="search_homework_member('<%= url%>');">搜索</a>
      </span>
      <span class="fr">
--- a/app/views/issues/add_journal.js.erb
+++ b/app/views/issues/add_journal.js.erb
@ -20,7 +20,7 @@
    $(".homepagePostReplyBannerCount").html('回复(<%= Issue.find( @issue_id).journals.count %>)')
    sd_create_editor_from_data(<%= @issue.id %>, null, "100%");
 <%else%>
-    $("#user_activity_<%= @user_activity_id %>").replaceWith("<%= escape_javascript(render :partial => 'users/project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id}) %>");
+    $("#div_user_issue_reply_<%=@user_activity_id %>").html("<%= escape_javascript(render :partial => 'users/project_issue_reply', :locals => {:activity => @issue, :user_activity_id => @user_activity_id}) %>");
   init_activity_KindEditor_data(<%= @user_activity_id %>,"","87%", 'UserActivity');
   // sd_create_editor_from_data(<%#= @issue.id%>, null, "100%");
 <%end %>
--- a/app/views/layouts/_project_info.html.erb
+++ b/app/views/layouts/_project_info.html.erb
@ -3,14 +3,14 @@
 <% student_num = studentCount(@course) %>
 <% course_file_num = visable_attachemnts_incourse(@course).count%>
 <div class="pr_info_logo fl mr10 mb5">
-  <% if @course.id == 370 %>
+  <% if is_excellent_course(@course) %>
    <img src="/images/course/boutique.png" width="50" height="auto" alt="精品" class="boutiqueP" />
  <% end %>
 <!--<a href="#"><img src="images/courses/pic_courses.jpg" width="60" height="60" alt="logo" /></a>-->
 <%= image_tag(url_to_avatar(@course), :width => "60", :height => "60") %>
 </div>
 <div class="pr_info_id fl mb5 f14"><%= @course.is_public == 0 ? "私有课程" : "公开课程" %>
-  <% if @course.id == 370 %>
+  <% if is_excellent_course(@course) %>
    <img src="/images/course/medal.png" alt="精品课程" style="vertical-align:bottom;" class="ml5" />
  <% end %>
 </div>
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@ -199,12 +199,14 @@
        </div>
      </div><!--项目简介 end-->
      <div class="project_Label">
-        <h4 class="mb5" ><%= l(:label_tag)%>:</h4>
+        <h4 class="mb5" ><%= l(:label_tag)%>：</h4>
        <div class="tag_h" >
          <%= render :partial => 'tags/new_tag', :locals => {:obj => @course, :object_flag => "9"} %>
        </div>
        <div class="cl"></div>
      </div><!--项目标签 end-->
+      <!--课程推荐-->
+      <%= render :partial => 'courses/recommendation', :locals => {:course => @course} %>
    </div><!--LSide end-->

    <div id="RSide" class="fl">
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@ -150,7 +150,7 @@

      <!-- tag模块 -->
      <div class="project_Label">
-        <h4 class="mb5"><%= l(:label_tag)%>:</h4>
+        <h4 class="mb5"><%= l(:label_tag)%>：</h4>
        <div class="tag_h">
          <div id="tags">
            <%= render :partial => 'tags/project_tag', :locals => {:obj => @project,:object_flag => "2"}%>
--- a/app/views/mailer/issue_due_date.html.erb
+++ b/app/views/mailer/issue_due_date.html.erb
@ -2,7 +2,7 @@
  <ul style="list-style-type:none; margin:0; padding:0;">
    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
 		<span style="float: left; width: 526px">
-          <p><%=link_to @author, user_url(@author) %> 发布的问题跟踪：<%=link_to @issue_name, @issue_url %> <span style="color: red">截止时间快到了，请您关注！</span></p>
+          <p><%=link_to @author.login, user_url(@author) %> 发布的问题跟踪：<%=link_to @issue_name, @issue_url %> <span style="color: red">截止时间快到了，请您关注！</span></p>
        </span>
    </li>
  </ul>
--- a/app/views/mailer/issue_due_date.text.erb
+++ b/app/views/mailer/issue_due_date.text.erb
--- a/app/views/news/_project_news.html.erb
+++ b/app/views/news/_project_news.html.erb
@ -23,7 +23,7 @@
 <div class="homepageRight mt0 ml10">
  <div class="homepageRightBanner">
    <div class="NewsBannerName">
-      项目通知
+      新闻
    </div>
  </div>
  <% if @project && User.current.allowed_to?(:manage_news, @project) %>
--- a/app/views/news/_project_news_new.html.erb
+++ b/app/views/news/_project_news_new.html.erb
@ -6,7 +6,7 @@
  <div id="new_course_news">
    <div class="homepagePostBrief c_grey">
      <div>
-        <input  type="text" name="news[title]" id="news_title" class="InputBox  w713" maxlength="60" onfocus="$('#news_editor').show()" onkeyup="regexTitle();" placeholder="发布通知，请先输入通知标题" value="<%= news.title%>" >
+        <input  type="text" name="news[title]" id="news_title" class="InputBox  w713" maxlength="60" onfocus="$('#news_editor').show()" onkeyup="regexTitle();" placeholder="发布新闻，请先输入新闻标题" value="<%= news.title%>" >
        <p id="title_notice_span"></p>
      </div>
      <div id="news_editor" style="display: none;">
--- a/app/views/news/_project_show.html.erb
+++ b/app/views/news/_project_show.html.erb
@ -72,7 +72,7 @@
          </div>
      <%end%>
      <div class="postDetailTitle fl">
-        <a href="javascript:void(0);" class="f14 linkGrey4 fb" style="overflow:hidden;">通知: <%= @news.title%></a>
+        <a href="javascript:void(0);" class="f14 linkGrey4 fb" style="overflow:hidden;">新闻: <%= @news.title%></a>
      </div>
      <div class="cl"></div>

--- a/app/views/news/edit.html.erb
+++ b/app/views/news/edit.html.erb
@ -11,7 +11,7 @@
 <div class="homepageRight mt0 ml10">
  <div class="homepageRightBanner">
    <div class="NewsBannerName">
-      编辑通知
+      编辑<%= @news.project_id != -1 ? '新闻':'通知' %>
    </div>
  </div>
  <%= labelled_form_for :news, @news, :url => news_path(@news),
--- a/app/views/organizations/_org_course_homework.html.erb
+++ b/app/views/organizations/_org_course_homework.html.erb
@ -194,7 +194,7 @@
                    <% time=project.updated_on %>
                    <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
                    <p class="mh18"><span class="captainName" title="<%=(User.find project.user_id).show_name %>"><%=(User.find project.user_id).show_name %></span><span style="vertical-align: top;">(组长)</span></p>
-                    <p class="mh18"><%=time_from_now !com_time.nil? && format_time(com_time) > format_timetime ? com_time : time %>&nbsp;&nbsp;<%= project.project_score.changeset_num %>提交</p>
+                    <p class="mh18"><%=time_from_now !com_time.nil? && format_time(com_time) > format_time(time) ? com_time : time %>&nbsp;&nbsp;<%= project.project_score.changeset_num %>提交</p>
                    <div class="relatePInfo" id="relatePInfo_<%=project.id %>_<%=activity.id %>">
                      项目名称：<%=project.name %><br />
                      创建者：<%=(User.find project.user_id).show_name %>(组长)<br />
--- a/app/views/organizations/_org_subfield_message.html.erb
+++ b/app/views/organizations/_org_subfield_message.html.erb
@ -12,7 +12,7 @@
            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
        <% end %>
        TO
-        <%= link_to activity.board.org_subfield.name.to_s+" | 帖子栏目讨论区",org_subfield_boards_path(activity.board.org_subfield), :class => "newsBlue ml15 mr5"%>
+        <%= link_to activity.board.org_subfield.name.to_s+" | 帖子栏目讨论区",organization_path(activity.board.org_subfield.organization, :org_subfield_id => activity.board.org_subfield.id), :class => "newsBlue ml15 mr5"%>
        <!--<a href="javascript:void(0);" class="newsBlue ml15 mr5"><%= activity.board.org_subfield.name %>(项目讨论区)</a>-->
      </div>
      <div class="homepagePostTitle break_word">
--- a/app/views/organizations/_org_subfield_news.html.erb
+++ b/app/views/organizations/_org_subfield_news.html.erb
@ -35,7 +35,21 @@
          <li class="homepagePostSettingIcon">
            <% if User.current.logged? %>
                <ul class="homepagePostSettiongText">
-                  <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}','#{User.current.id}','news')")  %></li>
+                  <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}',#{User.current.id},'news')")  %></li>
+                  <li>
+                    <%= link_to(
+                                l(:button_edit),
+                                {:controller => 'news', :action => 'edit', :id => activity},
+                                :class => 'postOptionLink'
+                        ) if activity.author == User.current %>
+                  </li>
+                  <li>
+                    <%= delete_link(
+                                news_path(activity),
+                                :data => {:confirm => l(:text_are_you_sure)},
+                                :class => 'postOptionLink'
+                        ) if activity.author == User.current %>
+                  </li>
                </ul>
            <% end %>
          </li>
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@ -65,8 +65,9 @@
        <div class="orgRow mb10 mt5"><span style="margin-left:38px;" >公开&nbsp;: </span>
          <input type="checkbox" name="organization[is_public]" <%= @organization.is_public ? 'checked': ''%> class="ml3" />
        </div>
-        <div class="orgRow mb10 mt5"><span>允许游客下载: </span>
-          <input type="checkbox" name="organization[allow_guest_download]" <%= @organization.allow_guest_download ? 'checked': ''%> class="ml3" />
+        <div class="orgRow mb10 mt5"><span style="margin-left:10px;">下载支持&nbsp;: </span>
+          <input type="checkbox" style="margin-top:5px;" name="organization[allow_guest_download]" <%= @organization.allow_guest_download ? 'checked': ''%> class="ml3" />
+          &nbsp;<span>允许游客下载</span>
        </div>
        <a href="javascript:void(0);" class="saveBtn ml80 db fl" onclick="update_org(<%=@organization.id %>);">保存</a>
        <% end %>
@ -86,7 +87,7 @@
          <div class="orgMemberAdd">
            <p class="fontBlue fb mb5">添加成员</p>
            <%= form_tag url_for(:controller => 'org_member',:action => 'create',:org=>@organization),:id=>'org_member_add_form',:remote=>true do |f|%>
-                <input type="text" id="not_org_member_search" name="orgAddSearch" placeholder="支持姓名、邮箱、昵称搜索" class="orgAddSearch mb20" />
+                <input type="text" id="not_org_member_search" name="orgAddSearch" placeholder="支持姓名、邮箱、登录名搜索" class="orgAddSearch mb20" />
                <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript org_member_autocomplete_org_member_index_path(:org=>@organization, :format => 'js') }')" %>
                <div id="principals_for_new_member">
                  <%= find_user_not_in_current_org_by_name(@project) %>
--- a/app/views/projects/_project_news.html.erb
+++ b/app/views/projects/_project_news.html.erb
@ -108,7 +108,7 @@
        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
          <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment[comments]"></textarea>
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
              <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px; margin-left: 5px;"></div>
              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
              <div class="cl"></div>
--- a/app/views/student_work/_student_work_attachment_form.html.erb
+++ b/app/views/student_work/_student_work_attachment_form.html.erb
@ -3,7 +3,7 @@
  </span>
  <div class="cl"></div>
  <span class="add_attachment" style="font-weight:normal;">
-    <%= button_tag "文件浏览", :type=>"button", :onclick=>"$('#_file#{work.id}').click();",:onmouseover => 'this.focus()',:class => 'sub_btn mb0' %>
+    <%= button_tag "上传附件", :type=>"button", :onclick=>"$('#_file#{work.id}').click();",:onmouseover => 'this.focus()',:class => 'sub_btn mb0' %>
    <%= file_field_tag 'attachments[dummy][file]',
                       :id => "_file#{work.id}",
                       :class => 'file_selector',
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@ -193,7 +193,7 @@
                <% time=project.updated_on %>
                <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
                <p class="mh18"><span class="captainName" title="<%=(User.find project.user_id).show_name %>"><%=(User.find project.user_id).show_name %></span><span style="vertical-align: top;">(组长)</span></p>
-                <p class="mh18"><%=time_from_now !com_time.nil? && format_time(com_time) > format_timetime ? com_time : time %>&nbsp;&nbsp;<%= project.project_score.changeset_num %>提交</p>
+                <p class="mh18"><%=time_from_now !com_time.nil? && format_time(com_time) > format_time(time) ? com_time : time %>&nbsp;&nbsp;<%= project.project_score.changeset_num %>提交</p>
                <div class="relatePInfo" id="relatePInfo_<%=project.id %>_<%=activity.id %>">
                  项目名称：<%=project.name %><br />
                  创建者：<%=(User.find project.user_id).show_name %>(组长)<br />
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@ -41,6 +41,14 @@
          <% content = activity.parent.content%>
      <% end %>
      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
+        <% if activity.status == 1 %>
+            <span style="font-family:Calibri;font-size:10.5000pt;"><%= activity.created_on.year %></span>
+            <span style="font-size:10.5000pt;">年</span>
+            <span style="font-family:Calibri;font-size:10.5000pt;"><%= activity.created_on.month %></span>
+            <span style="font-size:10.5000pt;">月</span>
+            <span style="font-family:Calibri;font-size:10.5000pt;"><%= activity.created_on.day %></span>
+            <span style="font-size:10.5000pt;">日</span>
+        <% end %>
      <div class="cl"></div>
      <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
      <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@ -40,7 +40,21 @@
          <li class="homepagePostSettingIcon">
            <% if User.current.logged? %>
                <ul class="homepagePostSettiongText">
-                  <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}',#{User.current.id},'news')")  %></li>
+                  <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}',#{User.current.id},'news')")  %></li>
+                  <li>
+                    <%= link_to(
+                                l(:button_edit),
+                                {controller:'news', :action => 'edit', :id => activity.id},
+                                :class => 'postOptionLink'
+                        ) if User.current.allowed_to?(:manage_news, activity.course) %>
+                  </li>
+                  <li>
+                    <%= delete_link(
+                                news_path(activity),
+                                :data => {:confirm => l(:text_are_you_sure)},
+                                :class => 'postOptionLink'
+                        ) if User.current.allowed_to?(:manage_news, activity.course) %>
+                  </li>
                </ul>
            <% end %>
          </li>
--- a/app/views/users/_jour_form.html.erb
+++ b/app/views/users/_jour_form.html.erb
@ -8,8 +8,8 @@
  <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
  <%= f.kindeditor :content, :editor_id => 'jour_content_editor',
                   :width => '99.7%',
-                   :height => 40,
-                   :minHeight=>40,
+                   :height => 100,
+                   :minHeight=>100,
                   :input_html => { :id => 'jour_content',
                                    :class => 'talk_text fl',
                                    :maxlength => 5000 }%>
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@ -51,6 +51,14 @@
        <div class="cl"></div>
      </div>
      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.description} %>
+      <%# 局部刷新：修改xissue属性 %>
+      <% if is_project_manager?(User.current, activity.project) %>
+          <% unless params[:action] == "index" %>
+              <div id="div_user_issue_detail_<%=activity.id %>">
+                <%= render :partial => 'users/project_issue_detail', :locals => {:activity => activity} %>
+              </div>
+          <% end %>
+      <% end %>
      <div class="cl"></div>
      <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
      <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
@ -61,93 +69,7 @@
    </div>
    <div class="cl"></div>
  </div>
-  <% count = activity.journals.count %>
-  <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-          <% if activity.author == User.current %>
-            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
-          <% else %>
-            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-          <% end %>
-        </span>
-      </div>
-      <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
-      <% if count > 3 %>
-          <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%= user_activity_id %>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
-              展开更多
-            </a>
-          </div>
-      <% end %>
-    </div>
-
-    <% replies_all_i = 0 %>
-    <% if count > 0 %>
-        <div class="" id="reply_div_<%= user_activity_id %>">
-          <ul>
-            <% activity.journals.reorder("created_on desc").each do |reply| %>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= reply.id %>');
-                    });
-                </script>
-                <% replies_all_i=replies_all_i + 1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>3 ? 'none' : '' %>">
-                  <div class="homepagePostReplyPortrait">
-                    <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_path(reply.user_id), :alt => "用户头像" %>
-                  </div>
-                  <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher mt-4">
-                      <% if reply.try(:user).try(:realname) == ' ' %>
-                          <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
-                      <% else %>
-                          <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= format_time(reply.created_on) %>
-                      <span id="reply_praise_count_<%=reply.id %>">
-                          <% if reply.user == User.current %>
-                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %></span></span>
-                          <% else %>
-                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
-                          <% end %>
-                      </span>
-                    </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
-                      <% if reply.details.any? %>
-                          <% details_to_strings(reply.details).each do |string| %>
-                              <p><%= string %></p>
-                          <% end %>
-                      <% end %>
-                      <P><%= reply.notes.html_safe %></P>
-                    </div>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-            <% end %>
-          </ul>
-        </div>
-    <% end %>
-
-    <div class="homepagePostReplyContainer borderBottomNone minHeight48">
-      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
-      <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  add_journal_issue_path(activity.id),:method => "post", :remote => true) do |f|%>
-              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="notes"></textarea>
-              <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px; margin-left: 5px;"></div>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-              <div class="cl"></div>
-              <p nhname='contentmsg_<%= user_activity_id%>'></p>
-          <% end%>
-        </div>
-        <div class="cl"></div>
-      </div>
-      <div class="cl"></div>
-    </div>
-
+  <div id="div_user_issue_reply_<%=user_activity_id%>">
+    <%= render :partial => 'users/project_issue_reply', :locals => {:activity => activity, :user_activity_id => user_activity_id} %>
  </div>
 </div>
--- a/app/views/users/_project_issue_detail.html.erb
+++ b/app/views/users/_project_issue_detail.html.erb
@ -0,0 +1,115 @@
+<script>
+    $(document).ready(function(){
+        $(".pro_info_p,.proInfoP").mouseover(function(){
+            $(this).children(".pic_edit2").css("display","inline-block");
+        });
+        $(".pro_info_p,.proInfoP").mouseout(function(){
+            $(this).children(".pic_edit2").css("display","none");
+        });
+        $(".pic_edit2").click(function(){
+            $(this).parent().hide();
+            $(this).parent().next().show();
+        });
+        $(".issueEdit").blur(function(){
+            $(this).hide();
+            $(this).prev().show();
+            var editValue = $(this).children("option:selected").text();
+            $(this).prev().children(":first").text(editValue);
+        });
+        function stopPropagation(e) {
+            if (e.stopPropagation)
+                e.stopPropagation();
+            else
+                e.cancelBubble = true;
+        };
+        $(document).bind('click',function(){
+            $('.issueEdit').css('display','none');
+            $('.proInfoP,.pro_info_p').show();
+        });
+        $('.issueEdit,.pic_edit2').bind('click',function(e){
+            stopPropagation(e);
+        });
+    });
+    function remote_function(id) {
+        $(id).submit();
+    }
+</script>
+<div class="cl"></div>
+<div class="proInfoBox2 mb10 mt10">
+  <ul class="fl">
+    <%#= labelled_fields_for :issue, @issue do |f| %>
+        <%#= f.select :status_id, ([["新增",1],["正在解决",2],["已解决",3],["反馈",4],["关闭",5],["拒绝",6]].unshift(["状态",0])),
+                     {:include_blank => false, :selected => @status_id ? @status_id : 0 },
+                     {:onchange=>"remote_function('#issue_query_form_#{activity.id}');",:id=>"status_id",:name=>"status_id",:class=>"w70 undis issueEdit"} %>
+    <%# end %>
+    <%= form_tag({:controller => 'issues', :action => 'update', :id => activity.id, :issue_detail => true, :type => "status"},:remote=>'true', :method => :put, :id=>"issue_query_form_#{activity.id}", :class => 'query_form') do %>
+    <li>
+      <p class="label03">&nbsp;状态&nbsp;&nbsp;:&nbsp;</p>
+      <p class="proInfoP"><span><%= activity.status.name %></span> <a href="javascript:void(0)" class="pic_edit2 ml5"></a></p>
+      <%= select( :issue,:status, [["新增",1],["正在解决",2],["已解决",3],["反馈",4],["关闭",5],["拒绝",6]].unshift(["状态",0]),
+                  {:include_blank => false, :selected => @status_id ? @status_id : 0 },
+                  {:onchange=>"remote_function('#issue_query_form_#{activity.id}');",:id=>"status_id",:name=>"status_id",:class=>"w70 undis issueEdit"}
+          )
+      %>
+    </li>
+    <% end %>
+    <div class="cl"></div>
+    <%= form_tag({:controller => 'issues', :action => 'update', :id => activity.id, :issue_detail => true, :type => "assigned"},:remote=>'true', :method => :put, :id=>"issue_query_assign_form_#{activity.id}", :class => 'query_form') do %>
+    <li>
+      <p class="label03">&nbsp;指派&nbsp;&nbsp;:&nbsp;</p>
+      <span class="pro_info_p">
+        <%= link_to activity.try(:assigned_to), user_path(activity.assigned_to_id), :class => "linkBlue hidden", :style => "max-width:50px; display:inline-block;" %>
+        <a href="javascript:void(0)" class="pic_edit2 ml5" style="vertical-align:top;"></a></span>
+      <%= select( :issue, :user_id, principals_options_for_isuue_list(activity.project),
+               { :include_blank => false,:selected => @assign_to_id ? @assign_to_id : 0},
+               {:onchange=>"remote_function('#issue_query_assign_form_#{activity.id}');", :id =>"assigned_to_id", :name => "assigned_to_id",:class=>"w70 undis issueEdit"}) %>
+    </li>
+    <% end %>
+    <div class="cl"></div>
+  </ul>
+  <ul class="fl">
+    <%= form_tag({:controller => 'issues', :action => 'update', :id => activity.id, :issue_detail => true, :type => "prior"},:remote=>'true', :method => :put, :id=>"issue_query_prior_form_#{activity.id}", :class => 'query_form') do %>
+    <li>
+      <p class="label03">&nbsp;优先级&nbsp;&nbsp;:&nbsp;</p>
+      <span class="proInfoP" style="width:70px;"><span><%= activity.priority.name %></span> <a href="javascript:void(0)" class="pic_edit2 ml5"></a> </span>
+      <%= select( :issue,:prior, [["低",1],["正常",2],["高",3],["紧急",4],["立刻",5]].unshift(["优先级",0]),
+                {:include_blank => false,:selected=>@priority_id ?  @priority_id : 0},
+                {:onchange=>"remote_function('#issue_query_prior_form_#{activity.id}');",:id=>"priority_id",:name=>"priority_id",:class=>"w70 undis issueEdit"}) %>
+    </li>
+    <% end %>
+    <div class="cl"></div>
+    <%= form_tag({:controller => 'issues', :action => 'update', :id => activity.id, :issue_detail => true, :type => "ratio"},:remote=>'true', :method => :put, :id=>"issue_query_done_form_#{activity.id}", :class => 'query_form') do %>
+    <li>
+      <p class="label03">&nbsp;完成度&nbsp;&nbsp;:&nbsp;</p>
+      <span class="proInfoP" style="width:70px;"><span><%= activity.done_ratio %>%</span> <a href="javascript:void(0)" class="pic_edit2 ml5"></a> </span>
+      <%= select( :issue,:done_ratio, ((0..10).to_a.collect { |r| ["#{r*10} %", r*10] }),
+                {:include_blank => false, :selected => @done_ratio ? @done_ratio : 0},
+                {:onchange=>"remote_function('#issue_query_done_form_#{activity.id}');",:id=>"done_ratio",:name=>"done_ratio",:class=>"w70 undis issueEdit"}) %>
+    <% end %>
+    </li>
+
+    <div class="cl"></div>
+  </ul>
+  <ul class="fl ">
+    <li>
+      <p class="label03" style="width:50px;">&nbsp;开始&nbsp;&nbsp;:&nbsp;</p>
+      <p class="proInfoP" style="width:100px;"><span><%= format_date(activity.start_date) %></span></p>
+    </li>
+    <div class="cl"></div>
+    <li>
+      <p class="label03" style="width:50px;">&nbsp;周期&nbsp;&nbsp;:&nbsp;</p>
+      <span class="proInfoP" style="width:100px;"><%= l_hours(activity.estimated_hours) %></span> </li>
+    <div class="cl"></div>
+  </ul>
+  <ul class="fl ml20">
+    <li>
+      <p class="label03">&nbsp;计划完成&nbsp;&nbsp;:&nbsp;</p>
+      <span class="proInfoP" style="width:120px;"><span><%= format_date(activity.due_date)? format_date(activity.due_date) : "--" %></span></span> </li>
+    <div class="cl"></div>
+    <li>
+      <p class="label03">&nbsp;目标版本&nbsp;&nbsp;:&nbsp;</p>
+      <span class="proInfoP" style="width:120px;"><%= (activity.fixed_version ? link_to_user_version(activity.fixed_version) : "--") %> </span> </li>
+    <div class="cl"></div>
+  </ul>
+  <!--pro_info_box end-->
+</div>
--- a/app/views/users/_project_issue_reply.html.erb
+++ b/app/views/users/_project_issue_reply.html.erb
@ -0,0 +1,89 @@
+<% count = activity.journals.count %>
+<div class="homepagePostReply">
+  <div class="homepagePostReplyBanner">
+    <div class="homepagePostReplyBannerCount">回复
+      <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
+        <span id="praise_count_<%=user_activity_id %>">
+          <% if activity.author == User.current %>
+            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
+          <% else %>
+            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
+          <% end %>
+        </span>
+    </div>
+    <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
+    <% if count > 3 %>
+        <div class="homepagePostReplyBannerMore">
+          <a id="reply_btn_<%= user_activity_id %>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
+            展开更多
+          </a>
+        </div>
+    <% end %>
+  </div>
+
+  <% replies_all_i = 0 %>
+  <% if count > 0 %>
+      <div class="" id="reply_div_<%= user_activity_id %>">
+        <ul>
+          <% activity.journals.reorder("created_on desc").each do |reply| %>
+              <script type="text/javascript">
+                  $(function(){
+                      showNormalImage('reply_content_<%= reply.id %>');
+                  });
+              </script>
+              <% replies_all_i=replies_all_i + 1 %>
+              <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>3 ? 'none' : '' %>">
+                <div class="homepagePostReplyPortrait">
+                  <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_path(reply.user_id), :alt => "用户头像" %>
+                </div>
+                <div class="homepagePostReplyDes">
+                  <div class="homepagePostReplyPublisher mt-4">
+                    <% if reply.try(:user).try(:realname) == ' ' %>
+                        <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
+                    <% else %>
+                        <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
+                    <% end %>
+                    <%= format_time(reply.created_on) %>
+                    <span id="reply_praise_count_<%=reply.id %>">
+                          <% if reply.user == User.current %>
+                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %></span></span>
+                          <% else %>
+                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
+                          <% end %>
+                      </span>
+                  </div>
+                  <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
+                    <% if reply.details.any? %>
+                        <% details_to_strings(reply.details).each do |string| %>
+                            <p><%= string %></p>
+                        <% end %>
+                    <% end %>
+                    <P><%= reply.notes.html_safe %></P>
+                  </div>
+                </div>
+                <div class="cl"></div>
+              </li>
+          <% end %>
+        </ul>
+      </div>
+  <% end %>
+
+  <div class="homepagePostReplyContainer borderBottomNone minHeight48">
+    <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
+    <div class="homepagePostReplyInputContainer mb10">
+      <div nhname='new_message_<%= user_activity_id %>' style="display:none;">
+        <%= form_for('new_form',:url =>  add_journal_issue_path(activity.id, :user_activity_id => user_activity_id),:method => "post", :remote => true) do |f| %>
+            <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+            <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="notes"></textarea>
+            <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px; margin-left: 5px;"></div>
+            <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+            <div class="cl"></div>
+            <p nhname='contentmsg_<%= user_activity_id%>'></p>
+        <% end%>
+      </div>
+      <div class="cl"></div>
+    </div>
+    <div class="cl"></div>
+  </div>
+
+</div>
--- a/app/views/users/_project_news.html.erb
+++ b/app/views/users/_project_news.html.erb
@ -10,8 +10,8 @@
            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
        <% else %>
            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
-        <% end %> TO  <!--+"(课程名称)"-->
-        <%= link_to activity.project.name.to_s+" | 项目通知", project_news_index_path(activity.project), :class => "newsBlue ml15" %>
+        <% end %> TO  <!--+"(名称)"-->
+        <%= link_to activity.project.name.to_s+" | 新闻", project_news_index_path(activity.project), :class => "newsBlue ml15" %>
      </div>
      <div class="homepagePostTitle break_word hidden fl m_w600"> <!--+"(通知标题)"-->
        <%= link_to activity.title.to_s, news_path(activity), :class => "postGrey" %>
@ -37,7 +37,21 @@
          <li class="homepagePostSettingIcon">
            <% if User.current.logged? %>
                <ul class="homepagePostSettiongText">
-                  <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}','#{User.current.id}','news')")  %></li>
+                  <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}',#{User.current.id},'news')")  %></li>
+                  <li>
+                    <%= link_to(
+                                l(:button_edit),
+                                {:action => 'edit', :id => activity},
+                                :class => 'postOptionLink'
+                        ) if activity.author == User.current %>
+                  </li>
+                  <li>
+                    <%= delete_link(
+                                news_path(activity),
+                                :data => {:confirm => l(:text_are_you_sure)},
+                                :class => 'postOptionLink'
+                        ) if activity.author == User.current %>
+                  </li>
                </ul>
            <% end %>
          </li>
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@ -111,7 +111,7 @@
                <% case user_activity.act_type.to_s %>
                <% when 'JournalsForMessage' %>
                    <% unless act.private == 1 && (!User.current || (User.current && act.jour_id != User.current.id && act.user_id != User.current.id)) %>
-                        <%= render :partial => 'user_journalsformessage', :locals => {:activity => act,:user_activity_id =>user_activity.id,:is_activity=>true} %>
+                        <%= render :partial => 'user_journalsformessage', :locals => {:activity => act,:user_activity_id =>user_activity.id,:is_activity=>1} %>
                    <% end %>
                <% end %>
            <% end %>
--- a/app/views/users/_user_blog.html.erb
+++ b/app/views/users/_user_blog.html.erb
@ -15,7 +15,7 @@
      </div>
      <div class="homepagePostTitle break_word"> <!--+"(通知标题)"-->
        <div class="fl">
-        <%= link_to activity.title.to_s, user_blog_blog_comment_path(:user_id=>activity.author_id,:blog_id=>activity.blog_id,:id=>activity.id), :class => "postGrey" %>
+        <%= link_to activity.title.to_s, user_blog_blog_comment_path(:user_id=>activity.author_id,:blog_id=>activity.blog_id,:id=>activity.id,:in_act => true), :class => "postGrey" %>
        </div>
        <% if activity.sticky == 1%>
            <span class="sticky_btn_cir ml10">置顶</span>
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@ -195,7 +195,7 @@
                    <% time=project.updated_on %>
                    <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
                    <p class="mh18"><span class="captainName" title="<%=(User.find project.user_id).show_name %>"><%=(User.find project.user_id).show_name %></span><span style="vertical-align: top;">(组长)</span></p>
-                    <p class="mh18"><%=time_from_now !com_time.nil? && format_time(com_time) > format_timetime ? com_time : time %>&nbsp;&nbsp;<%= project.project_score.changeset_num %>提交</p>
+                    <p class="mh18"><%=time_from_now !com_time.nil? && format_time(com_time) > format_time(time) ? com_time : time %>&nbsp;&nbsp;<%= project.project_score.changeset_num %>提交</p>
                    <div class="relatePInfo" id="relatePInfo_<%=project.id %>_<%=homework_common.id %>">
                      项目名称：<%=project.name %><br />
                      创建者：<%=(User.find project.user_id).show_name %>(组长)<br />
--- a/app/views/users/_user_journalsformessage.html.erb
+++ b/app/views/users/_user_journalsformessage.html.erb
@ -16,7 +16,7 @@
            <% end %>
        <% end %>
      </div>
-      <% if is_activity %>
+      <% if is_activity.to_i == 1 %>
          <div class="homepagePostTitle break_word list_style upload_img">
            <% if activity.parent %>
                <%= link_to activity.parent.notes.html_safe, feedback_path(activity.jour, :host=> Setting.host_user), :class => "postGrey" %>
--- a/app/views/users/_user_jours_list.html.erb
+++ b/app/views/users/_user_jours_list.html.erb
@ -18,11 +18,27 @@
    <% jours.each do |jour|%>
        <% unless jour.private == 1 && (!User.current || (User.current && jour.jour_id != User.current.id && jour.user_id != User.current.id)) %>
            <script type="text/javascript">
+                function expand_reply(container,btnid){
+                    var target = $(container);
+                    var btn = $(btnid);
+                    if(btn.data('init')=='0'){
+                        btn.data('init',1);
+                        btn.html('收起回复');
+                        target.show();
+                    }else{
+                        btn.data('init',0);
+                        btn.html('展开更多');
+                        target.hide();
+                        target.eq(0).show();
+                        target.eq(1).show();
+                        target.eq(2).show();
+                    }
+                }
                $(function(){
                    init_activity_KindEditor_data(<%= jour.id%>, null, "87%", "<%=jour.class.to_s%>");
                });
            </script>
-            <%= render :partial => 'user_journalsformessage', :locals => {:activity => jour,:user_activity_id =>jour.id,:is_activity=>false} %>
+            <%= render :partial => 'user_journalsformessage', :locals => {:activity => jour,:user_activity_id =>jour.id,:is_activity=>0} %>
            <%#= render :partial => 'user_jours_new', :locals => {:jour => jour} %>
        <% end %>
    <%end%>
--- a/app/views/welcome/_search_project.html.erb
+++ b/app/views/welcome/_search_project.html.erb
@ -91,7 +91,7 @@ form #search_by
  {
      if($("#search_type").val() == "users")
      {
-          $("#q").attr('placeholder','昵称/姓名/邮箱');
+          $("#q").attr('placeholder','登录名/姓名/邮箱');
 //          $("#search_by").show();
      }
      else
--- a/app/views/words/create_reply.js.erb
+++ b/app/views/words/create_reply.js.erb
@ -3,7 +3,7 @@
        <% if @reply_type == 'user' %>
            $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id,:is_activity=>@is_activity}) %>");
        <% else %>
-            $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id,:is_activity=>@is_activity}) %>");
+            $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id}) %>");
        <% end %>
        init_activity_KindEditor_data('<%= @user_activity_id%>', "", "87%", "UserActivity");
    <% else %>
--- a/config/locales/navigatiors/zh.yml
+++ b/config/locales/navigatiors/zh.yml
@ -63,7 +63,7 @@ zh:
        course: 课程
        user: 用户
        userinfo:
-          nickname: 昵称
+          nickname: 登录名
          showname: 姓名
          email: 邮箱  

--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@ -369,7 +369,7 @@ zh:
  label_input_email: 请输入邮箱地址
  
  label_invite_trustie_user: "邀请Trustie注册用户" 
-  label_invite_trustie_user_tips: "支持姓名、邮箱、昵称搜索！"
+  label_invite_trustie_user_tips: "支持姓名、邮箱、登录名搜索！"
  label_user_role_null: 用户和角色不能留空！
  label_invite_project: 邀请您加入项目
  label_mail_invite_success: 您已成功加入项目！
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@ -674,7 +674,7 @@ zh:
  label_day_plural: 天
  label_repository: 版本库
  label_course_repository: 代码库
-  label_browse: 浏览
+  label_browse: 上传文件
  label_branch: 分支
  label_tag: 标签
  label_revision: 修订
@ -1855,7 +1855,7 @@ zh:

  excel_user_id: 学生id
  excel_user_name: 用户名
-  excel_nickname: 昵称
+  excel_nickname: 登录名
  excel_student_id: 学号
  excel_mail: 电子邮箱
  excel_homework_name: 作品名
@ -2106,4 +2106,6 @@ zh:
  label_org_name: 组织名称：
  label_blank_user_lists_for_org: 用户不能为空

-
+  # 课程推荐
+  label_homework_commont: 作业
+  label_homework_recommendation: 课程推荐
--- a/config/routes.rb
+++ b/config/routes.rb
@ -82,6 +82,10 @@ RedmineApp::Application.routes.draw do
  get '/', to: 'organizations#show', defaults: { id: 23 }, constraints: {subdomain: 'nubot'}
  get '/', to: 'organizations#show', defaults: { id: 1 }, constraints: {subdomain: 'team'}

+  get '/', to: 'users#show', defaults: {id: 7}, constraints: {subdomain: 'whm'}
+  get '/', to: 'users#show', defaults: {id: 5}, constraints: {subdomain: 'yg'}
+  get '/', to: 'users#show', defaults: {id:11}, constraints: {subdomain: 'wt'}
+
  resources :org_member do
    member do

@ -525,6 +529,7 @@ RedmineApp::Application.routes.draw do
      match 'file_score_index', :to => 'projects#file_score_index', :via => [:get, :post]
      match 'code_submit_score_index', :to => 'projects#code_submit_score_index', :via => [:get, :post]
      match 'projects_topic_score_index', :to => 'projects#projects_topic_score_index', :via => [:get, :post]
+      match 'user_act_issue_assign_to', :to => 'users#user_act_issue_assign_to', :via => [:get, :post]
      get 'edit_brief_introduction'
      get "user_resource"
      get "resource_search"
--- a/db/migrate/20160115021923_add_is_excellent_to_course.rb
+++ b/db/migrate/20160115021923_add_is_excellent_to_course.rb
@ -0,0 +1,5 @@
+class AddIsExcellentToCourse < ActiveRecord::Migration
+  def change
+    add_column :courses, :is_excellent, :integer, :default => false
+  end
+end
--- a/db/migrate/20160115022341_add_excellent_course.rb
+++ b/db/migrate/20160115022341_add_excellent_course.rb
@ -0,0 +1,7 @@
+class AddExcellentCourse < ActiveRecord::Migration
+  def up
+  end
+
+  def down
+  end
+end
--- a/db/migrate/20160118014219_define_excellent_course.rb
+++ b/db/migrate/20160118014219_define_excellent_course.rb
@ -0,0 +1,17 @@
+class DefineExcellentCourse < ActiveRecord::Migration
+  def up
+    arr = [302,192,370,394,183,361,117,218,379,178,418,203,342,403,225]
+    for i in 0..arr.length-1
+      begin
+      puts arr[i]
+      course = Course.find(arr[i])
+      course.update_attribute(:is_excellent, true)
+      rescue
+        logger.error("Course is not found!")
+      end
+    end
+  end
+
+  def down
+  end
+end
--- a/db/migrate/20160118083751_add_status_to_message.rb
+++ b/db/migrate/20160118083751_add_status_to_message.rb
@ -0,0 +1,5 @@
+class AddStatusToMessage < ActiveRecord::Migration
+  def change
+    add_column :messages, :status, :integer, :default => false
+  end
+end
--- a/db/migrate/20160122083400_add_excellent_option_to_course.rb
+++ b/db/migrate/20160122083400_add_excellent_option_to_course.rb
@ -0,0 +1,6 @@
+class AddExcellentOptionToCourse < ActiveRecord::Migration
+  def change
+    add_column :courses, :excellent_option, :integer, :default => false
+  end
+end
+
--- a/db/migrate/20160122083507_define_excellent_option_course.rb
+++ b/db/migrate/20160122083507_define_excellent_option_course.rb
@ -0,0 +1,19 @@
+class DefineExcellentOptionCourse < ActiveRecord::Migration
+  def up
+    arr = [151,122,15,227,139,410,291,224,55,137,414,43,417,52,205,44,216,132,204,258,411,50,
+           419,390,420,133,91,112,202,95,194,34,172,403,177,252,138,352,225,46,279,382,397,286,344,27,175,
+           124,265,88,59,110,72,92,392,413,26,201,94,57,156,393,154,12,262]
+    for i in 0..arr.length-1
+      begin
+        puts arr[i]
+        course = Course.find(arr[i])
+        course.update_attribute(:excellent_option, true)
+      rescue
+        logger.error("Course is not found!")
+      end
+    end
+  end
+
+  def down
+  end
+end
--- a/db/migrate/20160122094805_excellent_course.rb
+++ b/db/migrate/20160122094805_excellent_course.rb
@ -0,0 +1,17 @@
+class ExcellentCourse < ActiveRecord::Migration
+  def up
+    arr = [302,192,370,394,183,361,117,218,379,178,418,203,342,403,225]
+    for i in 0..arr.length-1
+      begin
+        puts arr[i]
+        course = Course.find(arr[i])
+        course.update_attribute(:is_excellent, true)
+      rescue
+        logger.error("Course is not found!")
+      end
+    end
+  end
+
+  def down
+  end
+end
--- a/db/migrate/20160122094829_excellent_option_course.rb
+++ b/db/migrate/20160122094829_excellent_option_course.rb
@ -0,0 +1,19 @@
+class ExcellentOptionCourse < ActiveRecord::Migration
+  def up
+    arr = [151,122,15,227,139,410,291,224,55,137,414,43,417,52,205,44,216,132,204,258,411,50,
+           419,390,420,133,91,112,202,95,194,34,172,403,177,252,138,352,225,46,279,382,397,286,344,27,175,
+           124,265,88,59,110,72,92,392,413,26,201,94,57,156,393,154,12,262]
+    for i in 0..arr.length-1
+      begin
+        puts arr[i]
+        course = Course.find(arr[i])
+        course.update_attribute(:excellent_option, true)
+      rescue
+        logger.error("Course is not found!")
+      end
+    end
+  end
+
+  def down
+  end
+end
--- a/db/migrate/20160122142844_excellent_course_se.rb
+++ b/db/migrate/20160122142844_excellent_course_se.rb
@ -0,0 +1,17 @@
+class ExcellentCourseSe < ActiveRecord::Migration
+  def up
+    arr = [302,192,370,394,183,361,117,218,379,178,418,203,342,403,225]
+    for i in 0..arr.length-1
+      begin
+        puts arr[i]
+        course = Course.find(arr[i])
+        course.update_attribute(:is_excellent, true)
+      rescue
+        logger.error("Course is not found!")
+      end
+    end
+  end
+
+  def down
+  end
+end
--- a/db/migrate/20160122143138_excellent_option_se.rb
+++ b/db/migrate/20160122143138_excellent_option_se.rb
@ -0,0 +1,19 @@
+class ExcellentOptionSe < ActiveRecord::Migration
+  def up
+    arr = [151,122,15,227,139,410,291,224,55,137,414,43,417,52,205,44,216,132,204,258,411,50,
+           419,390,420,133,91,112,202,95,194,34,172,403,177,252,138,352,225,46,279,382,397,286,344,27,175,
+           124,265,88,59,110,72,92,392,413,26,201,94,57,156,393,154,12,262]
+    for i in 0..arr.length-1
+      begin
+        puts arr[i]
+        course = Course.find(arr[i])
+        course.update_attribute(:excellent_option, true)
+      rescue
+        logger.error("Course is not found!")
+      end
+    end
+  end
+
+  def down
+  end
+end
--- a/db/schema.rb
+++ b/db/schema.rb
@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.

-ActiveRecord::Schema.define(:version => 20160121070232) do
+ActiveRecord::Schema.define(:version => 20160122143138) do

  create_table "activities", :force => true do |t|
    t.integer  "act_id",                                  :null => false
@ -499,6 +499,8 @@ ActiveRecord::Schema.define(:version => 20160121070232) do
    t.integer  "is_delete",                     :default => 0
    t.integer  "end_time"
    t.string   "end_term"
+    t.integer  "is_excellent",                  :default => 0
+    t.integer  "excellent_option",              :default => 0
  end

  create_table "custom_fields", :force => true do |t|
@ -1072,6 +1074,7 @@ ActiveRecord::Schema.define(:version => 20160121070232) do
    t.integer  "sticky",        :default => 0
    t.integer  "reply_id"
    t.integer  "quotes"
+    t.integer  "status",        :default => 0
  end

  add_index "messages", ["author_id"], :name => "index_messages_on_author_id"
@ -1214,7 +1217,6 @@ ActiveRecord::Schema.define(:version => 20160121070232) do
  create_table "org_members", :force => true do |t|
    t.integer  "user_id"
    t.integer  "organization_id"
-    t.string   "role"
    t.datetime "created_at",      :null => false
    t.datetime "updated_at",      :null => false
  end
@ -1370,6 +1372,7 @@ ActiveRecord::Schema.define(:version => 20160121070232) do
    t.integer  "board_message_num", :default => 0
    t.integer  "board_num",         :default => 0
    t.integer  "attach_num",        :default => 0
+    t.datetime "commit_time"
  end

  create_table "project_statuses", :force => true do |t|
@ -1712,10 +1715,6 @@ ActiveRecord::Schema.define(:version => 20160121070232) do
    t.string   "extra"
  end

-  create_table "temp", :id => false, :force => true do |t|
-    t.integer "id", :default => 0, :null => false
-  end
-
  create_table "time_entries", :force => true do |t|
    t.integer  "project_id",  :null => false
    t.integer  "user_id",     :null => false
--- a/lib/tasks/issue_due_date.rake
+++ b/lib/tasks/issue_due_date.rake
@ -8,14 +8,16 @@ namespace :issue_due_date do
      if ForgeMessage.where("forge_message_type =? and forge_message_id =? and status =?", "Issue", issue.id, 1).first.nil?
        recipients = []
        assigner = User.find(issue.assigned_to_id)
-        recipients << issue.author
+        unless assigner.id == issue.author.id
+          recipients << issue.author
+        end
        recipients << assigner
        recipients.each do |r|
          issue.forge_messages << ForgeMessage.new(:user_id => r.id, :project_id => issue.project_id, :viewed => false, :status => 1)
-          # issue截止时间邮件提醒
-          Mailer.issue_due_date(issue, recipients).deliver
        end
      end
+      # issue截止时间邮件提醒
+      Mailer.issue_due_date(issue).deliver
    end
  end
 end
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@ -117,6 +117,7 @@ $(function(){
    $('#BluePopupBox').parent().resizable("disable");
    $('#BluePopupBox').parent().removeClass("ui-state-disabled");
    $('#BluePopupBox').parent().css("border","3px solid #269ac9").css("padding","10px");
+    $('#BluePopupBox').parent().css("position","fixed");

    $('a.ProBtn').live('click', function(){
        $("#BluePopupBox").dialog("open");
@ -194,7 +195,7 @@ $(function(){
                autoTextarea2(outputs[i], inputs[i]);
            }
        }
-
+        $(inputs[inputs.length - 1]).focus();
    });
    $("#BluePopupBox").on('click', 'a.icon_remove', function(){
        $(this).parent('.mt10').remove();
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@ -75,7 +75,7 @@ function private_jour_submit(){
 function jourReplyVerify() {
    var content = jour_content_editor.html();//$.trim($("#message_content").val());
    if (jour_content_editor.isEmpty()) {
-        $("#jour_content_span").text("回复不能为空");
+        $("#jour_content_span").text("留言不能为空");
        $("#jour_content_span").css('color', '#ff0000');
        $("#submit_feedback_user").one('click',function() {
            jour_submit();
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@ -513,7 +513,7 @@ a.exit { height:24px; display:block; width:80px; color:#000000; background:#c3c3
 .st_list{ width:670px;}
 .st_search{ }
 .st_search span{ font-size:14px; font-weight:bold; color:#606060; margin-right:35px;}
-.st_search_input{ border:1px solid #1c9ec7; background:#fff; height:20px; color:#c4c4c4; width:200px; padding-left:5px; margin-bottom:5px;}
+.st_search_input{ border:1px solid #1c9ec7; background:#fff; height:20px; color:#c4c4c4; width:220px; padding-left:5px; margin-bottom:5px;}
 .st_search a{ background:#1c9ec7; color:#fff;border:1px solid #1c9ec7; text-align:center; display:block; width:60px; height:20px; float:left; font-size:12px; }
 .st_search a:hover{ background:#048fbb; text-decoration:none;}
 .classbox{ border:1px solid #f8df8c; background:#fffce6; color:#0d90c3; padding:0 3px; float:left; margin-left:15px;}
@ -1260,4 +1260,5 @@ div.disable_link {background-color: #c1c1c1 !important;}
 .boutiqueP {position:absolute; left:0px; top:0px;}

 .mh18 {max-height: 18px;}
-.relatePWrap{max-height: 210px;overflow:hidden;}
+.relatePWrap{max-height: 210px;overflow:hidden;}/*160114课程推荐*/
+.courseR {width:220px; padding:10px; background-color:#ffffff; margin-top:10px;}
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@ -693,7 +693,7 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostSettingIcon {background:url(../images/homepage_icon.png) -93px -5px no-repeat; width:20px; height:20px;}
 .homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;}
 .homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}
-a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;}
+a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;text-align:center;}
 a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyPortrait {float:left; width:33px;}
 .imageFuzzy {filter:alpha(opacity=50); -moz-opacity:0.5; -khtml-opacity:0.5;opacity: 0.5;}
@ -1422,3 +1422,14 @@ span.at a{color:#269ac9;text-decoration: none;}
 .orgSendSearch {border:1px solid #dddddd; outline:none; width:262px; height:22px; padding-left:10px; float:left;}

 .relatePWrap{max-height: 210px;overflow:hidden;}
+
+/*20160115问题跟踪*/
+.proInfoBox2{ border:1px solid #dddddd; height:45px; padding:10px 0; background-color:#f1f1f1;}
+.proInfoBox2 ul li{ height:24px; position:relative;}
+.pic_edit2{display:inline-block; background:url(../images/public_icon.png) 0px -32px no-repeat; width:20px; height:15px; vertical-align:middle; display:none;}
+.pic_edit2:hover{display:inline-block; background:url(../images/public_icon.png) -32px -32px no-repeat; width:20px; height:15px;}
+.w70{ width:70px;}
+.w80{ width:80px;}
+.label03{ width:70px; text-align:right;    display:block; float:left;}
+.pro_info_p{color:#0781b4 !important; float:left;  width:80px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
+.proInfoP{color:#000000 !important; float:left;  width:80px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@ -414,7 +414,7 @@ a.link_file_board{ background:url(../images/pic_file.png) 0 3px no-repeat !impor
 .st_list{ width:670px;}
 .st_search{ }
 .st_search span{ font-size:14px; font-weight:bold; color:#606060; margin-right:35px;}
-.st_search_input{ border:1px solid #1c9ec7; background:#fff; height:20px; color:#c4c4c4; width:200px; padding-left:5px; margin-bottom:5px;}
+.st_search_input{ border:1px solid #1c9ec7; background:#fff; height:20px; color:#c4c4c4; width:220px; padding-left:5px; margin-bottom:5px;}
 .st_search a{ background:#1c9ec7; color:#fff;border:1px solid #1c9ec7; text-align:center; display:block; width:60px; height:20px; float:left; font-size:12px; }
 .st_search a:hover{ background:#048fbb; text-decoration:none;}
 .classbox{ border:1px solid #f8df8c; background:#fffce6; color:#0d90c3; padding:0 3px; float:left; margin-left:15px;}
@ -1163,4 +1163,8 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat;
 .mb10 {margin-bottom: 10px}
 .mb15 {margin-bottom: 15px}
 div.disable_link {background-color: #c1c1c1 !important;}
-.reUploadDetail{border:1px solid #dddddd; float:left; resize:none; width:400px; height:80px; overflow-y:auto;outline: none;}
+.reUploadDetail{border:1px solid #dddddd; float:left; resize:none; width:400px; height:80px; overflow-y:auto;outline: none;}
+
+/*问题跟踪局部修改属性*/
+.proInfoBox2{ border:1px solid #dddddd; height:45px; padding:10px 0; background-color:#f1f1f1;}
+.proInfoBox2 ul li{ height:24px; position:relative;}
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@ -140,10 +140,12 @@ h4{ font-size:14px; color:#3b3b3b;}
 .w50 {width:50px;}
 .w60{ width:60px;}
 .w70{ width:70px;}
+.w80{ width:80px;}
 .w90{ width:90px;}
 .w100{width: 100px;}
 .w210{ width:210px;}
 .w150{ width:150px;}
+.w170{width:170px;}
 .w230{width:230px !important;}
 .w235{ width:235px !important;}
 .w280{ width:280px;}
@ -221,6 +223,7 @@ a.c_green{ color:#28be6c;}
 .fontGrey {color:#cecece;}
 .fontGrey2 {color:#888888;}
 .fontGrey3 {color:#484848;}
+.fontGrey4{color:#999999;}
 .fontBlue {color:#3498db;}
 a.underline {text-decoration:underline;}
 a.fontBlue {color:#297fb8;}
@ -322,6 +325,9 @@ a:hover.bgreen_n_btn{background:#08a384;}
 .pic_text02{display:block; background:url(../images/new_project/public_icon.png) 0px -642px no-repeat; width:20px; height:19px;}
 .pic_edit{display:block; background:url(../images/new_project/public_icon.png) 0px -32px no-repeat; width:20px; height:15px;}
 .pic_edit:hover{display:block; background:url(../images/new_project/public_icon.png) -32px -32px no-repeat; width:20px; height:15px;}
+.pic_edit2{display:inline-block; background:url(../images/public_icon.png) 0px -32px no-repeat; width:20px; height:15px; vertical-align:middle; display:none;}
+.pic_edit2:hover{display:inline-block; background:url(../images/public_icon.png) -32px -32px no-repeat; width:20px; height:15px;}
+