Merge branch 'szzh' into dev_zanle

Conflicts:
	app/controllers/organizations_controller.rb
	db/schema.rb
	public/stylesheets/courses.css
	public/stylesheets/public.css

app/controllers/attachments_controller.rb

@@ -268,6 +268,8 @@ class AttachmentsController < ApplicationController
         format.html { redirect_to_referer_or mobile_version_path }
       elsif !@attachment.container.nil? && @attachment.container.is_a?(OrgSubfield)
         format.html {redirect_to_referer_or org_subfield_files_path(@attachment.container)}
+      elsif !@attachment.container.nil? && @attachment.container.is_a?(OrgDocumentComment)
+        format.html {redirect_to_referer_or org_document_comment_path(@attachment.container)}
       else
          if @project.nil?
            format.html { redirect_to_referer_or forum_memo_path(@attachment.container.forum, @attachment.container) }

app/controllers/boards_controller.rb

@@ -18,8 +18,8 @@
 class BoardsController < ApplicationController
   layout 'base_projects'#by young
   default_search_scope :messages
-  before_filter :find_project_by_project_id, :find_board_if_available
-  before_filter :authorize, :except => [:new, :show, :create, :index]
+  before_filter :find_project_by_project_id, :find_board_if_available, :except => [:join_to_org_subfields]
+  before_filter :authorize, :except => [:new, :show, :create, :index, :join_to_org_subfields]
   accept_rss_auth :index, :show
   
 
@@ -79,13 +79,12 @@ class BoardsController < ApplicationController
           end
         end
       end
-
+      # 更新@消息为已读
       @project.boards.each do |board|
         board.messages.each do |m|
           User.current.at_messages.unviewed('Message', m.id).each {|x| x.viewed!}
         end
       end
-
     elsif @course
       query_course_messages = @board.messages
       query_course_messages.each do |query_course_message|
@@ -106,43 +105,19 @@ class BoardsController < ApplicationController
     @is_new = params[:is_new]
     @topic_count = @board ? @board.topics.count : 0
     if @project
-      @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
-      #现在发布帖子的时候置顶功能已经没有了。所以取消这个置顶排序 #{Message.table_name}.sticky DESC,
-      @topics = @board.topics.
-          reorder("#{Message.table_name}.created_on desc").
-          includes(:last_reply).
-          limit(@topic_pages.per_page).
-          offset(@topic_pages.offset).
-
-          preload(:author, {:last_reply => :author}).
-          all
+      if @board
+        limit = 10;
+        @topic_count = @board.topics.count();
+        @topic_pages = (params[:page] ? params[:page].to_i + 1 : 0) *10
+        @topics = @board.topics.reorder("#{Message.table_name}.sticky DESC, COALESCE(last_replies_messages.created_on, #{Message.table_name}.created_on) desc").
+            limit(limit).offset(@topic_pages).includes(:last_reply).
+            preload(:author, {:last_reply => :author}).all();
+      else
+        @topics = [];
+      end
     elsif @course
-      #
-      # board_topics =  @board ? @board.topics.reorder("#{Message.table_name}.sticky DESC, #{Message.table_name}.created_on desc").
-      #     includes(:last_reply).
-      #     # limit(@topic_pages.per_page).
-      #     # offset(@topic_pages.offset).
-      #
-      #     preload(:author, {:last_reply => :author}).
-      #     all : []
-      # @topics = paginateHelper board_topics,10
       if (@board)
         limit = 10;
-        #pageno = params[:page];
-        #if(pageno == nil || pageno=='')
-        #   dw_topic = nil;
-        #  if( params[:parent_id]!=nil && params[:parent_id]!='' )
-        #    dw_topic = @board.topics.where(id:params[:parent_id]).first();
-        #  end
-        #  if( dw_topic != nil )
-        #    dw_count = @board.topics.where('(sticky>?) or (sticky=? and created_on>?)',dw_topic.sticky,dw_topic.sticky,dw_topic.created_on).count();
-        #    dw_count = dw_count+1;
-        #    pageno = dw_count%10==0 ? (dw_count/limit) : (dw_count/limit+1)
-        #  end
-        #end
-        #if(pageno == nil || pageno=='')
-        #  pageno=1;
-        #end
         @topic_count = @board.topics.count();
         @topic_pages = (params[:page] ? params[:page].to_i + 1 : 0) *10
         @topics = @board.topics.reorder("#{Message.table_name}.sticky DESC, COALESCE(last_replies_messages.created_on, #{Message.table_name}.created_on) desc").
@@ -225,6 +200,16 @@ class BoardsController < ApplicationController
     redirect_to_settings_in_projects
   end
 
+  def join_to_org_subfields
+    if params[:id]
+      @board = Board.find(params[:id])
+      @org_subfield_ids = params[:org_subfield_ids]
+      @org_subfield_ids.each do |id|
+        OrgSubfieldBoard.create(:org_subfield_id => id.to_i, :board_id => params[:id].to_i)
+      end
+    end
+  end
+
 private
   def redirect_to_settings_in_projects
     redirect_to settings_project_url(@project, :tab => 'boards')

app/controllers/comments_controller.rb

@@ -27,7 +27,12 @@ class CommentsController < ApplicationController
     raise Unauthorized unless @news.commentable?
 
     @comment = Comment.new
-    @project ? @comment.comments = params[:comment][:comments] : @comment.comments = params[:comment]
+    #@project ? @comment.comments = params[:comment][:comments] : @comment.comments = params[:comment]
+    if params[:user_activity_id]
+      @comment.comments = params[:comment]
+    else
+      @comment.comments = params[:comment][:comments]
+    end
     @comment.author = User.current
     if @news.comments << @comment
       if params[:asset_id]
@@ -48,7 +53,7 @@ class CommentsController < ApplicationController
       #   end
       # end
       # # <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ض<EFBFBD>̬<EFBFBD>ļ<EFBFBD>¼add end
-      flash[:notice] = l(:label_comment_added)
+      #flash[:notice] = l(:label_comment_added)
       course_activity = CourseActivity.where("course_act_type='News' and course_act_id =#{@news.id}").first
       if course_activity
         course_activity.updated_at = Time.now

app/controllers/courses_controller.rb

@@ -293,10 +293,15 @@ class CoursesController < ApplicationController
           @all_members = searchTeacherAndAssistant(@course)
           @members =  @all_members
         when '2'
-          @subPage_title = l :label_student_list
-          page = params[:page].nil? ? 0 : (params['page'].to_i - 1)
-          @all_members = student_homework_score(0,page, 10,"desc")
-          @members =  @all_members
+          if @course.open_student == 1 || User.current.member_of_course?(@course)
+            @subPage_title = l :label_student_list
+            page = params[:page].nil? ? 0 : (params['page'].to_i - 1)
+            @all_members = student_homework_score(0,page, 10,"desc")
+            @members =  @all_members
+          else
+            render_403
+            return
+          end
       end
       respond_to do |format|
         if params[:page]
@@ -394,6 +399,25 @@ class CoursesController < ApplicationController
 
   end
 
+  def private_or_public
+    if @course.is_public == 0
+      @course.update_attributes(:is_public => 1)
+    else
+      @course.update_attributes(:is_public => 0)
+    end
+    if @course.is_public == 0
+      course_status = CourseStatus.find_by_course_id(@course.id)
+      course_status.destroy if course_status
+    elsif @course.is_public == 1
+      course_status = CourseStatus.find_by_course_id(@course.id)
+      course_status.destroy if course_status
+      course_status = CourseStatus.create(:course_id => @course.id,  :grade => 0)
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
   def search_member
     if User.current.allowed_to?(:as_teacher,@course) || User.current.admin
       q = "#{params[:name].strip}"

app/controllers/exercise_controller.rb

@@ -450,7 +450,7 @@ class ExerciseController < ApplicationController
         if params[:answer_text].nil? || params[:answer_text].blank?
           #用户提交空答案，视作不作答
           @percent = get_percent(@exercise,User.current)
-          render :json => {:text => ea.answer_text,:percent => format("%.2f", @percent)}
+          render :json => {:text => "",:percent => format("%.2f", @percent)}
         else
           #添加答案
           ea = ExerciseAnswer.new
@@ -476,7 +476,7 @@ class ExerciseController < ApplicationController
           # 用户提交空答案，视为删除答案
           if ea.delete
             @percent = get_percent(@exercise,User.current)
-            render :json => {:text => ea.answer_text,:percent => format("%.2f", @percent)}
+            render :json => {:text => "",:percent => format("%.2f", @percent)}
           else
             render :json => {:text => "failure"}
           end
@@ -485,7 +485,7 @@ class ExerciseController < ApplicationController
           ea.answer_text = params[:answer_text]
           if ea.save
             @percent = get_percent(@exercise,User.current)
-            render :json => {:text => pv.vote_text,:percent => format("%.2f", @percent)}
+            render :json => {:text => ea.answer_text,:percent => format("%.2f", @percent)}
           else
             render :json => {:text => "failure"}
           end

app/controllers/homework_common_controller.rb

@@ -63,6 +63,7 @@ class HomeworkCommonController < ApplicationController
       end
       @homework.end_time = params[:homework_common][:end_time] || Time.now
       @homework.course_id = params[:course_id]
+      @homework.anonymous_comment = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment] : 1
 
       homework_detail_manual = @homework.homework_detail_manual || HomeworkDetailManual.new
       if @homework.publish_time <= Date.today && homework_detail_manual.comment_status == 0

app/controllers/issues_controller.rb

@@ -81,7 +81,8 @@ class IssuesController < ApplicationController
       @status_id = params[:status_id]
       @subject = params[:subject]
       @issue_count = @query.issue_count
-      @issue_pages = Paginator.new @issue_count, @limit, params['page'].to_i + 1
+      @issue_pages = Paginator.new @issue_count, @limit, params['page']
+      params[:page] = (params[:page] || 1).to_i + 1 #页码需要加1
       @offset ||= @issue_pages.offset
       @issues = @query.issues(:include => [:assigned_to, :tracker, :priority, :category, :fixed_version],
                               :order => sort_clause,

app/controllers/messages_controller.rb

@@ -22,8 +22,8 @@ class MessagesController < ApplicationController
   default_search_scope :messages
   before_filter :find_board, :only => [:new, :preview,:edit]
   before_filter :find_attachments, :only => [:preview]
-  before_filter :find_message, :except => [:new, :preview]
-  before_filter :authorize, :except => [:preview, :edit, :destroy, :new]
+  before_filter :find_message, :except => [:new, :preview, :join_org_subfield, :get_subfield_on_click_org, :join_org_subfields]
+  before_filter :authorize, :except => [:preview, :edit, :destroy, :new,:join_org_subfield, :get_subfield_on_click_org, :join_org_subfields]
 
   helper :boards
   helper :watchers
@@ -75,7 +75,7 @@ class MessagesController < ApplicationController
       @replies = paginateHelper messages_replies,10
       @reply = Message.new(:subject => "RE: #{@message.subject}")
       render :action => "show", :layout => "base_courses"#by young
-    else
+    elsif @project
       @reply_pages = Paginator.new @reply_count, REPLIES_PER_PAGE, page
       @replies =  @topic.children.
           includes(:author, :attachments, {:board => :project}).
@@ -86,6 +86,18 @@ class MessagesController < ApplicationController
 
       @reply = Message.new(:subject => "RE: #{@message.subject}")
       render :action => "show", :layout => "base_projects"#by young
+    else
+      @reply_pages = Paginator.new @reply_count, REPLIES_PER_PAGE, page
+      @replies =  @topic.children.
+          includes(:author, :attachments, {:board => :project}).
+          reorder("#{Message.table_name}.created_on DESC").
+          limit(@reply_pages.per_page).
+          offset(@reply_pages.offset).
+          all
+
+      @reply = Message.new(:subject => "RE: #{@message.subject}")
+      @organization = @org_subfield.organization
+      render :action => "show", :layout => "base_org"#by young
     end
   end
 
@@ -248,7 +260,14 @@ class MessagesController < ApplicationController
       else
         respond_to do |format|
           format.html {
-            layout_file = @project ? 'base_projects' : 'base_courses'
+            if @project
+              layout_file = 'base_projects'
+            elsif @course
+              layout_file = 'base_courses'
+            elsif @org_subfield
+              @organization = @org_subfield.organization
+              layout_file = 'base_org'
+            end
             render :layout => layout_file
           }
         end
@@ -270,7 +289,12 @@ class MessagesController < ApplicationController
       if params[:is_board]
         redirect_to project_boards_url(@project)
       else
-        redirect_to board_message_url(@board, @topic, :r => @reply)
+        if @message.parent
+          redirect_to board_message_url(@board, @message.parent, :r => r)
+        else
+          redirect_to project_board_url(@project, @board)
+        end
+        # redirect_to board_message_url(@board, @topic, :r => @reply)
       end
     elsif @course
       if params[:is_board]
@@ -282,6 +306,16 @@ class MessagesController < ApplicationController
           redirect_to course_board_url(@course, @board)
         end
       end
+    elsif @org_subfield
+      if params[:is_board]
+        redirect_to organization_path(:id => @org_subfield.organization_id, :org_subfield_id => @org_subfield.id)
+      else
+        if @message.parent
+          redirect_to board_message_url(@board, @message.parent, :r => r)
+        else
+          redirect_to organization_path(:id => @org_subfield.organization_id, :org_subfield_id => @org_subfield.id)
+        end
+      end
     end
   end
 
@@ -301,6 +335,41 @@ class MessagesController < ApplicationController
     render :partial => 'common/preview'
   end
 
+  def join_org_subfield
+    @message = Message.find(params[:message_id])
+    @organizations = User.current.organizations
+  end
+
+  def get_subfield_on_click_org
+    @org = Organization.find(params[:organization_id])
+  end
+
+  def join_org_subfields
+    org_subfield_ids = params[:org_subfields]
+    @message = Message.find(params[:id])
+    # @message.update_attribute(:updated_on, Time.now)
+    # type = @message.board.course_id.nil? ? "Project":"Course"
+    org_subfield_ids.each do |field_id|
+      @message.quotes = @message.quotes.nil? ? 1 : (@message.quotes + 1)
+      @message.save
+      board = OrgSubfield.find(field_id).boards.first
+      mes = Message.create(:board_id => board.id, :subject => @message.subject, :content => @message.content, :author_id => User.current.id,
+                           :created_on => Time.now, :updated_on => Time.now, :locked => @message.locked, :sticky => @message.sticky)
+      @message.attachments.each do |attach|
+        mes.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
+      # OrgSubfieldMessage.create(:org_subfield_id => field_id.to_i, :message_id => mes.id, :message_type => type)
+      # org_acts = OrgActivity.where("container_type='OrgSubfield' and container_id=? and org_act_type='Message' and org_act_id=?", field_id.to_i, @message.id)
+      # if org_acts.all.size() > 0
+      #   org_acts.first.update_attribute(:updated_at, Time.now)
+      # else
+      OrgActivity.create(:container_type => 'OrgSubfield', :container_id => field_id.to_i, :org_act_type=>'Message', :org_act_id => mes.id, :user_id => User.current.id)
+      # end
+    end
+  end
+
   private
   def find_message
     return unless find_board
@@ -317,6 +386,9 @@ class MessagesController < ApplicationController
       @project = @board.project
     elsif  @board.course_id
       @course = @board.course
+    else
+      @org_subfield = @board.org_subfield
+      @organization = @org_subfield
     end
 
   rescue ActiveRecord::RecordNotFound

app/controllers/news_controller.rb

@@ -69,20 +69,25 @@ class NewsController < ApplicationController
     elsif @course
       if (User.current.admin? || @course.is_public == 1 || (@course.is_public == 0 && User.current.member_of_course?(@course)))
         scope = @course ? @course.news.course_visible : News.course_visible
+        news_arr = scope.map{|news| news.id}
 
+
+        @page = params[:page] ? params[:page].to_i + 1 : 0
+        news_page = @page *10
         @news_count = scope.count
+        @is_new = params[:is_new]
         @q = params[:subject]
         if params[:subject].nil? || params[:subject].blank?
-          scope_order = scope.all(:include => [:author, :course],
-                                  :order => "#{News.table_name}.sticky DESC, #{News.table_name}.created_on DESC")
+          scope_order = scope.reorder("#{News.table_name}.sticky DESC, #{News.table_name}.created_on DESC").limit(10).offset(news_page).includes(:author,:course).all()
+              #all(:include => [:author, :course],
+                                  #:order => "#{News.table_name}.sticky DESC, #{News.table_name}.created_on DESC").limit(10).offset(news_page)
         else
-          scope_order = scope.where("#{News.table_name}.title like '#{'%' << params[:subject].to_s << '%'}'").all(:include => [:author, :course],
-                                                                                    :order => "#{News.table_name}.sticky DESC, #{News.table_name}.created_on DESC")
+          scope_order = scope.where("#{News.table_name}.title like '#{'%' << params[:subject].to_s << '%'}'").reorder("#{News.table_name}.sticky DESC, #{News.table_name}.created_on DESC").limit(10).offset(news_page).includes(:author,:course).all()
+          #.all(:include => [:author, :course],:order => "#{News.table_name}.sticky DESC, #{News.table_name}.created_on DESC")
         end
 
-                           # :offset => @offset,
-                           # :limit => @limit)
-        @newss = paginateHelper scope_order,10
+        @newss = scope_order
+        #@newss = paginateHelper scope_order,10
         respond_to do |format|
           format.html {
             @news = News.new
@@ -130,6 +135,7 @@ class NewsController < ApplicationController
     result = cs.show_course_news params,User.current
     @news = result[:news]
     @comments =  result[:comments]
+    @comment = Comment.new
     #@comments = @news.comments
     #@comments.reverse! if User.current.wants_comments_in_reverse_order?
     #modify by nwb
@@ -147,7 +153,22 @@ class NewsController < ApplicationController
       @news = News.new(:project => @project, :author => User.current)
     elsif @course
       @news = News.new(:course => @course, :author => User.current)
-      render :layout => 'base_courses'
+      #render :layout => 'base_courses'
+      @news.safe_attributes = params[:news]
+      @news.save_attachments(params[:attachments])
+      if @news.save
+        if params[:asset_id]
+          ids = params[:asset_id].split(',')
+          update_kindeditor_assets_owner ids,@news.id,OwnerTypeHelper::NEWS
+        end
+        render_attachment_warning_if_needed(@news)
+        #flash[:notice] = l(:notice_successful_create)
+        redirect_to course_news_index_url(@course)
+      else
+        redirect_to course_news_index_url(@course)
+        #layout_file =  'base_courses'
+        #render :action => 'new', :layout => layout_file
+      end
     end
   end
 
@@ -210,7 +231,7 @@ class NewsController < ApplicationController
     @news.save_attachments(params[:attachments])
     if @news.save
       render_attachment_warning_if_needed(@news)
-      flash[:notice] = l(:notice_successful_update)
+      #flash[:notice] = l(:notice_successful_update)
       redirect_to news_url(@news)
     else
       #flash[:error] = l(:notice_successful_update)

app/controllers/org_document_comments_controller.rb

@@ -1,16 +1,18 @@
 class OrgDocumentCommentsController < ApplicationController
   before_filter :find_organization, :only => [:new, :create, :show, :index]
-
+  helper :attachments
   layout 'base_org'
 
   def new
      @org_document_comment = OrgDocumentComment.new
   end
 
+
   def create
     @org_document_comment = OrgDocumentComment.new(:organization_id => @organization.id, :creator_id => User.current.id)
     @org_document_comment.title = params[:org_document_comment][:title]
     @org_document_comment.content = params[:org_document_comment][:content]
+    @org_document_comment.save_attachments(params[:attachments])
     if params[:field_id]
       @org_document_comment.org_subfield_id = params[:field_id].to_i
     end
@@ -26,6 +28,7 @@ class OrgDocumentCommentsController < ApplicationController
       redirect_to new_org_document_comment_path(:organization_id => @organization.id)
     end
   end
+
   def show
     @document = OrgDocumentComment.find(params[:id])
   end
@@ -37,9 +40,12 @@ class OrgDocumentCommentsController < ApplicationController
       render_403
     end
   end
+
   def update
     @org_document =  OrgDocumentComment.find(params[:id])
     @org_document.update_attributes(:title => params[:org_document_comment][:title], :content => params[:org_document_comment][:content])
+    Attachment.attach_files(@org_document, params[:attachments])
+    # @org_document.save_attachments(params[:attachments])
     if @org_document.parent.nil?
       act  = OrgActivity.where("org_act_type='OrgDocumentComment' and org_act_id =?", @org_document.id).first
       act.update_attributes(:updated_at => @org_document.updated_at)

app/controllers/org_subfields_controller.rb

@@ -1,24 +1,32 @@
-class OrgSubfieldsController < ApplicationController
-  def create
-    @subfield = OrgSubfield.create(:name => params[:name])
-    @organization = Organization.find(params[:organization_id])
-    @organization.org_subfields << @subfield
-    @subfield.update_attributes(:priority => @subfield.id, :field_type => params[:field_type])
-  end
-
-  def destroy
-    @subfield = OrgSubfield.find(params[:id])
-    @organization = Organization.find(@subfield.organization_id)
-    @subfield.destroy
-  end
-
-  def update
-    @subfield = OrgSubfield.find(params[:id])
-    @organization = Organization.find(@subfield.organization_id)
-    @subfield.update_attributes(:name => params[:name])
-  end
-
-  def show
-    
-  end
-end
+class OrgSubfieldsController < ApplicationController
+  def create
+    @subfield = OrgSubfield.create(:name => params[:name])
+    @organization = Organization.find(params[:organization_id])
+    @organization.org_subfields << @subfield
+    @subfield.update_attributes(:priority => @subfield.id, :field_type => params[:field_type])
+  end
+
+  def show
+    @org_subfield = OrgSubfield.find(params[:id])
+    @organization = @org_subfield.organization.id
+    @messages = []
+    @messages << @org_subfield.org_document_comments
+    @messages << @org_subfield.messages
+    @messages.sort{|a, b| b.updated_at <=> a.updated_at}
+    respond_to do |format|
+      format.html{render :layout => 'base_org'}
+    end
+  end
+  def destroy
+    @subfield = OrgSubfield.find(params[:id])
+    @organization = Organization.find(@subfield.organization_id)
+    @subfield.destroy
+  end
+
+  def update
+    @subfield = OrgSubfield.find(params[:id])
+    @organization = Organization.find(@subfield.organization_id)
+    @subfield.update_attributes(:name => params[:name])
+  end
+
+end

app/controllers/organizations_controller.rb

@@ -14,7 +14,7 @@ class OrganizationsController < ApplicationController
   include PollHelper
   helper :user_score
   helper :journals
-
+  helper :attachments
   # added by liuping 关注
 
   helper :watchers
@@ -71,7 +71,7 @@ class OrganizationsController < ApplicationController
       if params[:org_subfield_id]
         @org_subfield = OrgSubfield.find(params[:org_subfield_id])
         @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0
-        @org_activities = OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id in (#{@org_subfield_ids.join(",")})").order('updated_at desc').page(params[:page] || 1).per(10)
+        @org_activities = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{@org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{@org_subfield.id})").order('updated_at desc').page(params[:page] || 1).per(10)
       else
         project_ids = @organization.projects.map(&:id) << 0
         course_ids = @organization.courses.map(&:id) << 0

app/controllers/repositories_controller.rb

@@ -31,8 +31,8 @@ class RepositoriesController < ApplicationController
   default_search_scope :changesets
 
   before_filter :find_project_by_project_id, :only => [:new, :create, :newrepo]
-  before_filter :find_repository, :only => [:edit, :update, :destroy, :committers, :forked]
-  before_filter :find_project_repository, :except => [:new, :create, :newcreate, :edit, :update, :destroy, :committers, :newrepo,:to_gitlab]
+  before_filter :find_repository, :only => [:edit, :update, :destroy, :committers]
+  before_filter :find_project_repository, :except => [:new, :create, :newcreate, :edit, :update, :destroy, :committers, :newrepo, :to_gitlab, :forked]
   before_filter :find_changeset, :only => [:revision, :add_related_issue, :remove_related_issue]
   before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked]
   accept_rss_auth :revisions
@@ -64,6 +64,8 @@ class RepositoriesController < ApplicationController
   end
 
   def forked
+    @project = Project.find(params[:id])
+    @repository = Repository.where("project_id =? and type =?", @project.id, "Repository::Gitlab")
     # 如果当前用户已经fork过该项目，不会新fork项目，则跳至已fork的项
     unless has_forked?(@project, User.current)
       project = project_from_current_project(@project.id, User.current.id)
@@ -76,7 +78,11 @@ class RepositoriesController < ApplicationController
       else
         g = Gitlab.client
         if User.current.gid.nil?
-          g.sync_user(User.current)
+          begin
+            g.sync_user(User.current)
+          ensure
+            logger.error "Synv user failed ==>#{User.current.id}"
+          end
         end
         gproject = g.fork(@project.gpid, User.current.gid)
         if gproject
@@ -351,7 +357,7 @@ update
       @changesets = g.commits(@project.gpid, :ref_name => @rev)
       # @changesets = @repository.latest_changesets(@path, @rev)
       # @changesets_count = @repository.latest_changesets(@path, @rev).count
-      @changesets_all_count = 0
+      @changesets_all_count = @project.gpid.nil? ? 0 : g.commits_total_count(@project.gpid).count
       @changesets_latest_coimmit = @changesets[0]
       @properties = @repository.properties(@path, @rev)
       @repositories = @project.repositories
@@ -383,10 +389,10 @@ update
     @commits = g.commits(@project.gpid, page:(params[:page].to_i - 1).to_s)
 
     #add by hx
-    rep_count = commit_count(@project)
+    #rep_count = commit_count(@project)
 
     #页面传递必须要str类型,但是Paginator的初始化必须要num类型,需要类型转化
-    @commits_count = rep_count
+    @commits_count = params[:commit_count].to_i
     @commits_pages = Redmine::Pagination::Paginator.new @commits_count,limit,params[:page]
 
     @commit = g.commit(@project.gpid,@rev)

app/controllers/student_work_controller.rb

@@ -649,7 +649,8 @@ class StudentWorkController < ApplicationController
     if revise_attachments.count == 2
       revise_attachments.last.destroy
     end
-    #@attachment = @work.attachments.where("attachtype = 7").order("created_on desc").first
+    attachment = @work.attachments.where("attachtype = 7").first
+    attachment.update_attributes(:description => params[:description])
     respond_to do |format|
       format.js
     end

app/controllers/users_controller.rb

@@ -497,7 +497,7 @@ class UsersController < ApplicationController
 
       #提交作品时，计算是否迟交
       if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d")
-        student_work.late_penalty = 1
+        student_work.late_penalty = homework.late_penalty
       else
         student_work.late_penalty = 0
       end
@@ -522,6 +522,7 @@ class UsersController < ApplicationController
         else
           homework.publish_time = params[:homework_common][:publish_time]
         end
+        homework.anonymous_comment = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment] : 1
         homework.homework_type = params[:homework_type].to_i || 1
         homework.late_penalty = 10
         homework.teacher_priority = 1

app/controllers/zipdown_controller.rb

@@ -17,6 +17,7 @@ class ZipdownController < ApplicationController
       begin
         if params[:base64file]
           file = Base64.decode64(params[:base64file])
+          file = file.sub('*', '+')
           send_file "#{OUTPUT_FOLDER}/#{file}", :filename => filename_for_content_disposition(file), :type => detect_content_type(file)
         else
           send_file "#{OUTPUT_FOLDER}/#{params[:file]}", :filename => filename_for_content_disposition(params[:filename]), :type => detect_content_type(params[:file])
@@ -118,11 +119,15 @@ class ZipdownController < ApplicationController
     [{files:[out_file.file_path], count: 1, index: 1,
       real_file: out_file.file_path,
       file: File.basename(out_file.file_path),
-      base64file: Base64.encode64(File.basename(out_file.file_path)),
+      base64file: encode64(File.basename(out_file.file_path)),
       size:(out_file.pack_size / 1024.0 / 1024.0).round(2)
      }]
   end
 
+  def encode64(str)
+    Base64.encode64(str).sub('+', '*')
+  end
+
   def zip_homework_common homework_common
     bid_homework_path = []
     digests = []
@@ -142,7 +147,7 @@ class ZipdownController < ApplicationController
     [{files:[out_file.file_path], count: 1, index: 1,
       real_file: out_file.file_path,
       file: File.basename(out_file.file_path),
-      base64file: Base64.encode64(File.basename(out_file.file_path)),
+      base64file: encode64(File.basename(out_file.file_path)),
       size:(out_file.pack_size / 1024.0 / 1024.0).round(2)
      }]
   end

app/helpers/application_helper.rb

@@ -253,8 +253,10 @@ module ApplicationHelper
         subject = truncate(subject, :length => 60)
       end
     end
-    if issue.status_id == 5
+    if issue.status_id == 3
       s = link_to text, issue_path(issue), :class => "text_line_s", :title => title
+    elsif issue.status_id == 5
+      s = link_to text, issue_path(issue), :class => "text_line_s del_line", :title => title
     else
       s = link_to text, issue_path(issue), :class => "c_blue", :title => title
     end

app/models/board.rb

@@ -19,6 +19,7 @@ class Board < ActiveRecord::Base
   include Redmine::SafeAttributes
   belongs_to :project,:touch => true
   belongs_to :course,:touch=>true
+  belongs_to :org_subfield, :touch => true
   has_many :topics, :class_name => 'Message', :conditions => "#{Message.table_name}.parent_id IS NULL", :order => "#{Message.table_name}.created_on DESC"
   has_many :messages, :dependent => :destroy, :order => "#{Message.table_name}.created_on DESC"
   belongs_to :last_message, :class_name => 'Message', :foreign_key => :last_message_id

app/models/mailer.rb

@@ -156,7 +156,6 @@ class Mailer < ActionMailer::Base
   def send_for_user_activities(user, date_to, days)
     date_from = date_to - days.days
     subject = "[ #{user.show_name}#{l(:label_day_mail)}]"
-    @subject = " #{user.show_name}#{l(:label_day_mail)}"
     date_from = "#{date_from} 17:59:59"
     date_to = "#{date_to} 17:59:59"
     # 生成token用于直接点击登录
@@ -268,7 +267,10 @@ class Mailer < ActionMailer::Base
 
     has_content = [@issues,@issues_journals,@course_messages,@project_messages,@course_news,@course_news_comments,@project_news,@project_news_comments,@project_attachments,
                    @course_journal_messages,@user_journal_messages,@project_journal_messages,@forums,@memos,@attachments,@bids,@wiki_contents].any? {|o| !o.empty?}
-
+    total_count = @issues.count + @issues_journals.count + @course_messages.count + @project_messages.count + @course_news.count + @course_news_comments.count + @project_news.count + @project_news_comments.count +
+                  @project_attachments.count + @course_journal_messages.count + @user_journal_messages.count + @project_journal_messages.count + @forums.count + @memos.count + @attachments.count +
+                  @bids.count + @wiki_contents.count
+    @subject = " #{user.show_name}#{l(:label_day_mail_first)}#{total_count}#{l(:label_day_mail_last)}"
     mylogger.debug "Sent activity mail : #{user.mail} - #{has_content}"
     #有内容才发，没有不发
     mail :to => user.mail,:subject => subject if has_content
@@ -394,7 +396,7 @@ class Mailer < ActionMailer::Base
     @issue = issue
     user = User.find_by_mail(recipients)
     @user = user
-    @token = Token.get_token_from_user(user, 'autologin')
+    # @token = Token.get_token_from_user(user, 'autologin')
     @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id)
 
     # edit
@@ -436,15 +438,15 @@ class Mailer < ActionMailer::Base
 
     user = User.find_by_mail(recipients)
     @user = user
-    @token = Token.get_token_from_user(user, 'autologin')
+    # @token = Token.get_token_from_user(user, 'autologin')
 
 
     # edit
-    @issue_author_url = url_for(:controller  => 'users', :action => 'show', :id => issue.author_id,  :token => @token.value)
-    @project_url = url_for(:controller  => 'projects', :action => 'show', :id => issue.project_id,  :token => @token.value)
-    @user_url = url_for(my_account_url(user,:token => @token.value))
+    @issue_author_url = url_for(:controller  => 'users', :action => 'show', :id => issue.author_id)
+    @project_url = url_for(:controller  => 'projects', :action => 'show', :id => issue.project_id)
+    @user_url = url_for(my_account_url(user))
 
-    @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id, :anchor => "change-#{journal.id}", :token => @token.value)
+    @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id, :anchor => "change-#{journal.id}")
     s = "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] "
     s << "(#{issue.status.name}) " if journal.new_value_for('status_id')
     s << issue.subject

app/models/message.rb

@@ -23,6 +23,8 @@ class Message < ActiveRecord::Base
   belongs_to :board,:touch => true
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
   has_many :praise_tread, as: :praise_tread_object, dependent: :destroy
+  # has_many :org_subfield_messages, :dependent => :destroy
+  # has_many :org_subfields, :through => :org_subfield_messages
 
   acts_as_tree :counter_cache => :replies_count, :order => "#{Message.table_name}.created_on ASC"
   acts_as_attachable
@@ -148,6 +150,10 @@ class Message < ActiveRecord::Base
     usr && usr.logged? && (usr.allowed_to?(:edit_messages, course) || (self.author == usr && usr.allowed_to?(:edit_own_messages, course)))
   end
 
+  def org_subfield_editable_by?(usr)
+    usr && usr.logged? && (usr.admin?  || self.author == usr ||usr.admin_of_org?(self.board.org_subfield.organization))
+  end
+
   def course_destroyable_by?(usr)
     usr && usr.logged? && (usr.allowed_to?(:delete_messages, course) || (self.author == usr && usr.allowed_to?(:delete_own_messages, course)))
   end
@@ -190,7 +196,7 @@ class Message < ActiveRecord::Base
   # Description 
   def act_as_forge_activity
     # 如果project为空，那么就是课程相关的消息
-    if !self.board.project.nil? && self.parent_id.nil?
+    if self.board.project_id != -1 && self.parent_id.nil?
       self.forge_acts << ForgeActivity.new(:user_id => self.author_id,
                                              :project_id => self.board.project.id)
     end
@@ -225,7 +231,7 @@ class Message < ActiveRecord::Base
           end
         end
       end
-    else  # 项目相关
+    elsif self.project  # 项目相关
       if self.parent_id.nil?   # 主贴
         self.project.members.each do |m|
           if  m.user_id != self.author_id

app/models/org_document_comment.rb

@@ -1,20 +1,26 @@
-class OrgDocumentComment < ActiveRecord::Base
-  attr_accessible :content, :creator_id, :organization_id, :parent_id, :reply_id, :title,:sticky,:locked
-  include Redmine::SafeAttributes
-  belongs_to :organization
-  belongs_to :creator, :class_name => 'User', :foreign_key => 'creator_id'
-  has_many :editor_of_documents, :dependent => :destroy
-  acts_as_tree :order => "#{OrgDocumentComment.table_name}.sticky asc, #{OrgDocumentComment.table_name}.created_at desc"
-  has_many :org_acts, :class_name => 'OrgActivity',:as =>:org_act ,:dependent => :destroy
-  after_create :document_save_as_org_activity
-
-  def document_save_as_org_activity
-    if(self.parent().nil?)
-      self.org_acts << OrgActivity.new(:user_id => User.current.id, :container_id => self.organization.id, :container_type => 'Organization')
-    else
-      act = OrgActivity.where("org_act_type='OrgDocumentComment' and org_act_id =?", self.root.id).first
-      act.update_attributes(:updated_at => self.updated_at)
-    end
-  end
-
-end
+class OrgDocumentComment < ActiveRecord::Base
+  attr_accessible :content, :creator_id, :organization_id, :parent_id, :reply_id, :title,:sticky,:locked
+  include Redmine::SafeAttributes
+  belongs_to :organization
+  belongs_to :creator, :class_name => 'User', :foreign_key => 'creator_id'
+  has_many :editor_of_documents, :dependent => :destroy
+  acts_as_tree :order => "#{OrgDocumentComment.table_name}.sticky asc, #{OrgDocumentComment.table_name}.created_at desc"
+  acts_as_attachable
+  has_many :org_acts, :class_name => 'OrgActivity',:as =>:org_act ,:dependent => :destroy
+  after_create :document_save_as_org_activity
+
+  def document_save_as_org_activity
+    if(self.parent().nil?)
+      self.org_acts << OrgActivity.new(:user_id => User.current.id, :container_id => self.organization.id, :container_type => 'Organization')
+    else
+      act = OrgActivity.where("org_act_type='OrgDocumentComment' and org_act_id =?", self.root.id).first
+      act.update_attributes(:updated_at => self.updated_at)
+    end
+  end
+
+
+  def project
+
+  end
+
+end

app/models/org_subfield.rb

@@ -1,9 +1,26 @@
-class OrgSubfield < ActiveRecord::Base
-  belongs_to :organization, :foreign_key => :organization_id
-  has_many :org_document_comments, :dependent => :destroy
-  has_many :files
-  acts_as_attachable
-
-  def project
-  end
+class OrgSubfield < ActiveRecord::Base
+  belongs_to :organization, :foreign_key => :organization_id
+  has_many :org_document_comments, :dependent => :destroy
+  has_many :files
+  has_many :org_subfield_messages, :dependent => :destroy
+  has_many :messages, :through => :org_subfield_messages
+  has_many :boards, :dependent => :destroy
+  acts_as_attachable
+  after_create :create_board_sync
+  # 创建资源栏目讨论区
+  def create_board_sync
+    @board = self.boards.build
+    #self.name=" #{l(:label_borad_course) }"
+    @board.name = " #{l(:label_borad_org_subfield) }"#self.name
+    @board.description = self.name.to_s
+    @board.project_id = -1
+    if @board.save
+      logger.debug "[OrgSubfield Model] ===> #{@board.to_json}"
+    else
+      logger.error "[OrgSubfield Model] ===> Auto create board when org_subfield saved, because #{@board.full_messages}"
+    end
+  end
+
+  def project
+  end
 end

app/models/org_subfield_message.rb

@@ -0,0 +1,3 @@
+class OrgSubfieldMessage < ActiveRecord::Base
+  # attr_accessible :title, :body
+end

app/views/attachments/_form_course.html.erb

@@ -4,10 +4,10 @@
   <% container.saved_attachments.each_with_index do |attachment, i| %>
     <span id="attachments_p<%= i %>" class="sub_btn">
 
-      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
-      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
-      <span class="ispublic-label"><%= l(:field_is_public)%>:</span>
-      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public_checkbox')%>
+      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'upload_filename readonly', :readonly=>'readonly')%>
+      <%#= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
+      <!--<span class="ispublic-label"><%#= l(:field_is_public)%>:</span>-->
+      <%#= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public_checkbox')%>
 
       <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
       <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
@@ -17,10 +17,10 @@
   <% container.attachments.each_with_index do |attachment, i| %>
      <span id="attachments_p<%= i %>" class="attachment">
 
-      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
-       <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
-       <span class="ispublic-label"><%= l(:field_is_public)%>:</span>
-       <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public_checkbox')%>
+      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'upload_filename readonly', :readonly=>'readonly')%>
+       <%#= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
+       <!--<span class="ispublic-label"><%#= l(:field_is_public)%>:</span>-->
+       <%#= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public_checkbox')%>
 
        <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
        <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
@@ -61,8 +61,7 @@
         :are_you_sure => l(:text_are_you_sure),
         :file_count => l(:label_file_count),
         :delete_all_files => l(:text_are_you_sure_all),
-        :lebel_file_uploding => l(:lebel_file_uploding),
-        :containerid => "#{container.id}"
+        :lebel_file_uploding => l(:lebel_file_uploding)
       } %>
   <% if container.nil? %>
     <span id="upload_file_count" :class="c_grey"><%= l(:label_no_file_uploaded)%></span>

app/views/attachments/_form_project_new.html.erb

@@ -0,0 +1,77 @@
+<span id="attachments_fields<%= container.id %>" class="attachments_fields" xmlns="http://www.w3.org/1999/html">
+<% if defined?(container) && container && container.saved_attachments %>
+  <% if isReply  %>
+  <% container.saved_attachments.each_with_index do |attachment, i| %>
+    <span id="attachments_p<%= i %>" class="sub_btn">
+
+      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
+      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
+      <span class="ispublic-label"><%= l(:field_is_public)%>:</span>
+      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public_checkbox')%>
+
+      <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
+      <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
+    </span>
+  <% end %>
+  <% else %>
+  <% container.attachments.each_with_index do |attachment, i| %>
+     <span id="attachments_p<%= i %>" class="attachment">
+
+      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
+       <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
+       <span class="ispublic-label"><%= l(:field_is_public)%>:</span>
+       <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public_checkbox')%>
+
+       <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
+       <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
+
+       <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
+    </span>
+  <% end %>
+  <% end %>
+<% end %>
+</span>
+<script type='text/javascript'>
+    //    function CompatibleSend()
+    //    {
+    //        var obj=document.getElementById("_file");
+    //        var file= $(obj).clone();
+    //        file.click();
+    //    }
+</script>
+<span class="add_attachment">
+<%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
+  <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
+<%#= button_tag "#{l(:button_browse)}", :type=>"button", :onclick=>"file#{container.id}.click()",:class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
+  <% id ="file#{container.id}"%>
+  <a href="javascript:void(0);" class="AnnexBtn fl" style= "<%= ie8? ? 'display:none' : ''%>" onclick="$('#'+'<%= id %>').click();">上传附件</a>
+  <%= file_field_tag 'attachments[dummy][file]',
+                     :id => "file#{container.id}",
+                     :class => 'file_selector',
+                     :multiple => true,
+                     :onchange => "addInputFiles_board(this, '#{container.id}');",
+                     :style => 'display:none',
+                     :data => {
+                             :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
+                             :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
+                             :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+                             :upload_path => uploads_path(:format => 'js'),
+                             :description_placeholder => l(:label_optional_description),
+                             :field_is_public => l(:field_is_public),
+                             :are_you_sure => l(:text_are_you_sure),
+                             :file_count => l(:label_file_count),
+                             :delete_all_files => l(:text_are_you_sure_all),
+                             :lebel_file_uploding => l(:lebel_file_uploding),
+                             :containerid => "#{container.id}"
+                     } %>
+  <% if container.nil? %>
+    <span id="upload_file_count" :class="c_grey"><%= l(:label_no_file_uploaded)%></span>
+ <% end %>
+  <!--(<%#= l(:label_max_size) %>: <%#= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)-->
+</span>
+
+<% content_for :header_tags do %>
+    <%= javascript_include_tag 'attachments' %>
+<% end %>
+
+

app/views/boards/_course_show_detail.html.erb

@@ -59,12 +59,14 @@
     <% end %>
 
     <% if topics.count == 10 %>
-        <div id="show_more_course_topic" class="loadMore mt10 f_grey">展开更多<%= link_to "", boards_topic_path(@board, :course_id => @board.course.id ,:page => page), :id => "more_topic_link", :remote => "true", :class => "none" %></div>
+        <!--<div id="show_more_course_topic" class="loadMore mt10 f_grey">展开更多<%#= link_to "", boards_topic_path(@board, :course_id => @board.course.id ,:page => page), :id => "more_topic_link", :remote => "true", :class => "none" %></div>-->
+        <%= link_to "点击展开更多",boards_topic_path(@board, :course_id => @board.course.id ,:page => page),:id => "show_more_course_topic",:remote => "true",:class => "loadMore mt10 f_grey"%>
     <% end %>
 <% end%>
 
+<!--
 <script type="text/javascript">
     $("#show_more_course_topic").mouseover(function () {
         $("#more_topic_link").click();
     });
-</script>
+</script>-->

app/views/boards/_org_subfield_message_edit.html.erb

@@ -0,0 +1,16 @@
+<script type="text/javascript">
+    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#Container").css("width","1000px");
+        $("#message_subject").focus();
+    });
+</script>
+<div class="homepageRight mt0 ml10">
+  <div class="homepageRightBanner">
+    <div class="NewsBannerName">
+      编辑帖子
+    </div>
+  </div>
+  <%= render :partial => 'boards/org_subfield_new',
+             :locals => {:f => f, :edit_mode => edit_mode, :topic => topic, :org_subfield => org_subfield} %>
+</div>

app/views/boards/_org_subfield_new.html.erb

@@ -0,0 +1,74 @@
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: true, prettify: false) %>
+<% end %>
+
+<%= error_messages_for 'message' %>
+<div class="resources mt10">
+  <div id="new_course_topic">
+    <div class="homepagePostBrief c_grey">
+      <div>
+        <input  type="text" name="message[subject]" id="message_subject" class="InputBox  w713" maxlength="255" onfocus="$('#topic_editor').show()" onkeyup="regexTopicSubject();" placeholder="发布帖子，请先输入帖子标题" value="<%= topic.subject%>" >
+        <p id="subjectmsg"></p>
+      </div>
+      <div id="topic_editor" style="display: none;">
+        <%if User.current.member_of_org?(org_subfield.organization)%>
+            <div class="mt10">
+              <%= f.check_box :sticky, :value => topic.sticky%>
+              <%= label_tag 'message_sticky', l(:label_board_sticky) %>
+              <%= f.check_box :locked, :value => topic.locked%>
+              <%= label_tag 'message_locked', l(:label_board_locked) %>
+              <div class="cl"></div>
+            </div>
+        <% end %>
+        <div class="mt10">
+          <div id="message_quote" class="wiki" style="width: 92%;word-break: break-all;word-wrap: break-word;margin-left: 40px;"></div>
+          <%= text_area :quote,:quote,:style => 'display:none' %>
+          <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+
+          <%= f.kindeditor :content, :editor_id => 'message_content_editor',
+                           :owner_id => topic.nil? ? 0: topic.id,
+                           :owner_type => OwnerTypeHelper::MESSAGE,
+                           :width => '100%',
+                           :height => 300,
+                           :minHeight=>300,
+                           :class => 'talk_text fl',
+                           :input_html => { :id => 'message_content',
+                                            :class => 'talk_text fl',
+                                            :maxlength => 5000 },
+                           at_id: topic.id, at_type: topic.class.to_s
+          %>
+          <div class="cl"></div>
+          <p id="message_content_span"></p>
+        </div>
+        <div class="cl"></div>
+        <div class="mt10">
+          <div class="fl" id="topic_attachments">
+            <%= render :partial => 'attachments/form_course', :locals => {:container => topic, :isReply => @isReply} %>
+          </div>
+        </div>
+        <div class="cl"></div>
+        <div class="mt5">
+          <%if !edit_mode %>
+              <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_topic();">确定</a>
+              <span class="fr mr10 mt3">或</span>
+              <a href="javascript:void(0);" class="fr mr10 mt3" onclick="reset_topic();">取消</a>
+          <% else %>
+              <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_topic();">确定</a>
+              <span class="fr mr10 mt3">或</span>
+              <%= link_to "取消",board_message_url(topic.board, topic.root, :r => (topic.parent_id && topic.id)), :class => "fr mr10 mt3"%>
+          <% end %>
+        </div>
+        <div class="cl"></div>
+      </div>
+    </div>
+    <%#= render :partial => 'course_new_topic', :locals => {:f => f,  :topic => @message} %>
+    <!--<li>
+      <div class="ml55 fl" nhname="toolbar_container"></div>
+      <a href="javascript:void(0);"  nhname="cancelbtn" class="grey_btn fr ml10"><%#= l(:button_cancel) %></a>
+      <a href="javascript:void(0);" nhname="submitbtn" class="blue_btn fr " style="margin-left: 55px">
+        <%#= l(:button_submit)%>
+      </a>
+      <div class="cl"></div>
+    </li>-->
+  </div>
+</div>

app/views/boards/_project_message_edit.html.erb

@@ -0,0 +1,16 @@
+<script type="text/javascript">
+    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#Container").css("width","1000px");
+        $("#message_subject").focus();
+    });
+</script>
+<div class="homepageRight mt0 ml10">
+  <div class="homepageRightBanner">
+    <div class="NewsBannerName">
+      编辑帖子
+    </div>
+  </div>
+  <%= render :partial => 'boards/project_new_topic',
+             :locals => {:f => f, :edit_mode => edit_mode, :topic => topic, :project => project} %>
+</div>

app/views/boards/_project_new.html.erb

@@ -0,0 +1,65 @@
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: true, prettify: false) %>
+<% end %>
+
+<%= error_messages_for 'message' %>
+<div class="resources mt10">
+  <div id="new_course_topic">
+    <div class="homepagePostBrief c_grey">
+      <div>
+        <input  type="text" name="message[subject]" id="message_subject" class="InputBox  w713" maxlength="255" onfocus="$('#topic_editor').show()" onkeyup="regexTopicSubject();" placeholder="发布帖子，请先输入帖子标题" value="<%= topic.subject%>" >
+        <p id="subjectmsg"></p>
+      </div>
+      <div id="topic_editor" style="display: none;">
+        <%if User.current.member_of?(project)%>
+            <div class="mt10">
+              <%= f.check_box :sticky, :value => topic.sticky%>
+              <%= label_tag 'message_sticky', l(:label_board_sticky) %>
+              <%= f.check_box :locked, :value => topic.locked%>
+              <%= label_tag 'message_locked', l(:label_board_locked) %>
+              <div class="cl"></div>
+            </div>
+        <% end %>
+        <div class="mt10">
+          <div id="message_quote" class="wiki" style="width: 92%;word-break: break-all;word-wrap: break-word;margin-left: 40px;"></div>
+          <%= text_area :quote,:quote,:style => 'display:none' %>
+          <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+
+          <%= f.kindeditor :content, :editor_id => 'message_content_editor',
+                           :owner_id => topic.nil? ? 0: topic.id,
+                           :owner_type => OwnerTypeHelper::MESSAGE,
+                           :width => '100%',
+                           :height => 300,
+                           :minHeight=>300,
+                           :class => 'talk_text fl',
+                           :input_html => { :id => 'message_content',
+                                            :class => 'talk_text fl',
+                                            :maxlength => 5000 },
+                           at_id: topic.id, at_type: topic.class.to_s
+          %>
+          <div class="cl"></div>
+          <p id="message_content_span"></p>
+        </div>
+        <div class="cl"></div>
+        <div class="mt10">
+          <div class="fl" id="topic_attachments">
+            <%= render :partial => 'attachments/form_project_new', :locals => {:container => topic, :isReply => @isReply} %>
+          </div>
+        </div>
+        <div class="cl"></div>
+        <div class="mt5">
+          <%if !edit_mode %>
+              <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_topic_project();">确定</a>
+              <span class="fr mr10 mt3">或</span>
+              <a href="javascript:void(0);" class="fr mr10 mt3" onclick="reset_topic();">取消</a>
+          <% else %>
+              <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_topic_project();">确定</a>
+              <span class="fr mr10 mt3">或</span>
+              <%= link_to "取消",board_message_url(topic.board, topic.root, :r => (topic.parent_id && topic.id)), :class => "fr mr10 mt3"%>
+          <% end %>
+        </div>
+        <div class="cl"></div>
+      </div>
+    </div>
+  </div>
+</div>

app/views/boards/_project_new_topic.html.erb

@@ -1,11 +1,65 @@
-<%= form_for @message, :url =>{:controller=>'messages',:action => 'new',  :board_id => @board.id, :is_board => 'true'},:html => {:nhname=>'form', :multipart => true, :id => 'message-form', :name=>'message-form'} do |f| %>
-
-    <%= render :partial => 'form_project', :locals => {:f => f,  :topic => @message} %>
-    <li>
-      <div class="ml55 fl" nhname="toolbar_container"></div>
-      <a href="javascript:void(0)"  nhname="cancelbtn" class="grey_btn fr ml10"><%= l(:button_cancel) %></a>
-
-      <a href="javascript:void(0)" nhname="submitbtn" class="blue_btn fr " style="margin-left: 55px"><%= l(:button_submit)%></a>
-      <div class="cl"></div>
-    </li>
-<% end %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: true, prettify: false) %>
+<% end %>
+
+<%= error_messages_for 'message' %>
+<div class="resources mt10">
+  <div id="new_course_topic">
+    <div class="homepagePostBrief c_grey">
+      <div>
+        <input  type="text" name="message[subject]" id="message_subject" class="InputBox  w713" maxlength="255" onfocus="$('#topic_editor').show()" onkeyup="regexTopicSubject();" placeholder="发布帖子，请先输入帖子标题" value="<%= topic.subject%>" >
+        <p id="subjectmsg"></p>
+      </div>
+      <div id="topic_editor" style="display: none;">
+        <%if User.current.member_of?(project)%>
+            <div class="mt10">
+              <%= f.check_box :sticky, :value => topic.sticky%>
+              <%= label_tag 'message_sticky', l(:label_board_sticky) %>
+              <%= f.check_box :locked, :value => topic.locked%>
+              <%= label_tag 'message_locked', l(:label_board_locked) %>
+              <div class="cl"></div>
+            </div>
+        <% end %>
+        <div class="mt10">
+          <div id="message_quote" class="wiki" style="width: 92%;word-break: break-all;word-wrap: break-word;margin-left: 40px;"></div>
+          <%= text_area :quote,:quote,:style => 'display:none' %>
+          <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+
+          <%= f.kindeditor :content, :editor_id => 'message_content_editor',
+                           :owner_id => topic.nil? ? 0: topic.id,
+                           :owner_type => OwnerTypeHelper::MESSAGE,
+                           :width => '100%',
+                           :height => 300,
+                           :minHeight=>300,
+                           :class => 'talk_text fl',
+                           :input_html => { :id => 'message_content',
+                                            :class => 'talk_text fl',
+                                            :maxlength => 5000 },
+                           at_id: topic.id, at_type: topic.class.to_s
+          %>
+          <div class="cl"></div>
+          <p id="message_content_span"></p>
+        </div>
+        <div class="cl"></div>
+        <div class="mt10">
+          <div class="fl" id="topic_attachments">
+            <%= render :partial => 'attachments/form_course', :locals => {:container => topic, :isReply => @isReply} %>
+          </div>
+        </div>
+        <div class="cl"></div>
+        <div class="mt5">
+          <%if !edit_mode %>
+              <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="message_content_editor.sync();$('#message-form').submit();">确定</a>
+              <span class="fr mr10 mt3">或</span>
+              <a href="javascript:void(0);" class="fr mr10 mt3" onclick="reset_topic();">取消</a>
+          <% else %>
+              <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="message_content_editor.sync();$('#message-form').submit();">确定</a>
+              <span class="fr mr10 mt3">或</span>
+              <%= link_to "取消",board_message_url(topic.board, topic.root, :r => (topic.parent_id && topic.id)), :class => "fr mr10 mt3"%>
+          <% end %>
+        </div>
+        <div class="cl"></div>
+      </div>
+    </div>
+  </div>
+</div>

app/views/boards/_project_show.html.erb

@@ -1,278 +1,33 @@
-<div nhname="container_board">
-  <div class="project_r_h" xmlns="http://www.w3.org/1999/html">
-    <h2 class="project_h2 fl">
-      <% if User.current.language == "zh"%>
-          <%= h @board.name %>
-      <% else %>
-          <%= l(:project_module_boards) %>
-      <% end %>
-    </h2>
-    <% if User.current.logged? %>
-        <a href="javascript:void(0)" class="green_btn fr newtalk " id="new_topic_btn" nhname="showbtn"><%= l(:label_message_new) %></a>
-    <% end %>
-    <div class="cl"></div>
-  </div>
-  <% if !User.current.logged? %>
-    <div class="c_grey f14">
-      <%= l(:label_user_login_project_board) %>
-      <%= link_to l(:label_user_login_new), signin_path, :class => "c_blue ml5" %>
-    </div>
-  <% end %>
-  <div class="cl"></div>
-  <div class=" talklist_box" >
-    <div class="talk_new ml15 mb10" nhname="about_talk" data-at-id="<%= project.id %>" data-at-type="Project" style="display:none;">
-      <ul>
-        <%= render :partial => 'project_new_topic' %>
-      </ul>
-    </div><!--talknew end-->
-  </div>
-</div>
-<div class=" talklist_box" >
-  <p class="c_dark mb5 f14">讨论区共有<span class="c_orange"><%= @topic_count %></span>个帖子</p>
-  <% if @topics.any? %>
-      <% @topics.each do |topic| %>
-          <div class="talkmain_box" id="topic<%= topic.id %>" nhname="container_board" mhname="container_board_reply" style="border:none; margin-bottom:0; border-bottom: 1px dashed #d9d9d9;">
-            <%= link_to image_tag(url_to_avatar(topic.author), :width=>"42",:height=>"42"), user_path(topic.author),:class =>'talkmain_pic fl' %>
-            <div class="talkmain_txt fl mt5 f14">
-              <% author = topic.author.to_s %>
-              <div style="max-width:80px;white-space:nowrap;overflow:hidden;float:left;text-overflow:ellipsis;">
-                <%= link_to author, user_path(topic.author), :class =>"talkmain_name fl f14",:title=>author,
-                            :style=>'max-width:80px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;' %>
-              </div>
-              <p style="float:left;color:#ff5722;">&nbsp;&nbsp;:</p>
-
-              <p class="talkmain_tit fl fb break_word f14" title="<%=  h(topic.subject) %>" style="width:auto;float:left;max-width:390px;white-space:nowrap;overflow:hidden;float:left;text-overflow:ellipsis;">&nbsp;&nbsp;<%=  h(topic.subject) %></p>
-
-                <% if topic.editable_by?(User.current) %>
-                  <a href="javascript:void(0)" nhname="showbtn" style="color: #426e9a;float: right;margin-right: 10px;"><%= l(:button_edit) %></a>
-                <% end %>
-                <%= link_to(l(:button_delete), {:controller =>'messages',:action => 'destroy',  :id => topic.id, :board_id => topic.board_id,  :is_board=>'true'},
-                           :method => :post,
-                           :data => {:confirm => l(:text_are_you_sure)},
-                           :class => 'talk_edit fr',
-                           :style => ' margin-right: 10px;') if topic.destroyable_by?(User.current) %>
-                <% if topic.sticky? %>
-                  <a href="javascript:void(0)" class="talk_up fr c_red" style="margin-right: 10px;"><%= l(:label_board_sticky)%></a>
-                <% end %>
-                <script>
-                    //$(function(){if($("#contentmessage<%#=topic.id %>").height()>182){$("#project_show_<%#= topic.id%>").show();}});
-                    //解决由于图片加载慢造成div高度不够 以至于展开按钮不显示的bug
-                    $(function(){
-                        function nh_show_btn(){
-                            if($("#project_show_<%= topic.id%>").is(':hidden')){
-                                if($("#contentmessage<%=topic.id %>").height()>182){
-                                    $("#project_show_<%= topic.id%>").show();
-                                }
-                            }
-                        }
-                        var div = $("#contentmessage<%=topic.id %>");
-                        var imgs = $('img',div);
-                        var lens = imgs.length;
-                        function nh_load_img_end(){
-                            nh_show_btn();
-//                    lens--;
-//                    if(lens <= 0){
-//                      nh_show_btn();
-//                    }
-                        }
-                        if(lens > 0){
-                            $('img',div).load(function(){
-                                nh_load_img_end();
-                            });
-                        }
-                        nh_show_btn();
-//                  if(lens <= 0){
-//                    nh_show_btn();
-//                  }else{
-//                    $('img',div).load(function(){
-//                      nh_load_img_end();
-//                    });
-//                  }
-                    });
-                </script>
-
-              <div class="cl"></div>
-              <div  class="project_board_content break_word f14 list_style" id="content_<%=topic.id%>">
-                <div id="contentmessage<%=topic.id %>" class="upload_img">
-                  <%= topic.content.html_safe %>
-                  <!-- -->
-                </div>
-              </div>
-              <p style="display: none;" id="project_show_<%= topic.id%>">
-                <a  id="expend_more_information<%= topic.id%>" style="color: #0781b4;"   href="javascript:void(0)"  onclick="show_more_reply('#content_<%=topic.id%>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');"  value="show_more">[展开]</a>
-                <span class="g-arr-down">
-                  <img id="arrow<%=topic.id%>" src="/images/jiantou.jpg" width="12" height="6" />
-                </span>
-              </p>
-              <%= link_to_attachments_course topic, :author => false %>
-              <%= l(:label_activity_time)%>：&nbsp;&nbsp;<%= format_time topic.created_on %>
-            </div>
-            <% if User.current.logged? %>
-              <a href="javascript:void(0)" nhname="showbtn_reply" class="c_dblue fr f14" style="margin-right:10px;"><%= l(:button_reply) %></a>
-            <% end %>
-            <div class="cl"></div>
-            <div class="talk_new ml15 mb10" nhname='about_talk' id="about_newtalk<%=topic.id%>" data-at-id="<%= topic.id %>" data-at-type="<%= topic.class.name %>" style="display: none;border-top: 1px dashed #d9d9d9;padding-top:5px;margin-left:0px;padding-left:15px;">
-              <ul>
-                <%= render :partial => 'edit',locals:  {:topic => topic} %>
-              </ul>
-            </div>
-            <div class="cl"></div>
-            <div class="talkWrapBox">
-              <% reply = Message.new(:subject => "RE: #{topic.subject}")%>
-              <% if !topic.locked? && authorize_for('messages', 'reply') %>
-                  <div class="talkWrapMsg" nhname="about_talk_reply" data-at-id="<%= topic.id %>" data-at-type="<%= topic.class.name %>" style="display: none;">
-                    <em class="talkWrapArrow"></em>
-                    <div class="cl"></div>
-                    <div class="talkConIpt ml15 mb10" style="margin-left:30px;" id="reply<%= topic.id %>">
-                      <%= form_for reply, :as => :reply, :url => {:controller=>'messages',:action => 'reply', :id => topic.id, :board_id => topic.board_id, :is_board => 'true'},
-                                     :html => {:nhname=>"form",:multipart => true, :id => 'message_form' + topic.id.to_s, :name=>'message-form'} do |f| %>
-                        <%= render :partial => 'form_project', :locals => {:f => f, :replying => true} %>
-                        <div class="fl" style="padding-top:5px;" nhname="toolbar_container"></div>
-                        <div style="padding-top:5px;" class="fr">
-                            <a href="javascript:void(0)" nhname="cancelbtn" class="grey_btn fr ml10" style=""><%= l(:button_cancel)%></a>
-                            <a href="javascript:void(0)" nhname="submitbtn" class="blue_btn fr " style=""><%= l(:button_submit)%></a>
-                        </div>
-                      <% end %>
-                      <div class="cl"></div>
-                    </div>
-                  </div>
-              <% end %>
-              <div class="cl"></div>
-              <% replies_all = topic.children.includes(:author, :attachments, {:board => :project}).reorder("#{Message.table_name}.id desc").all %>
-              <% unless replies_all.empty? %>
-                  <div class="talkWrapMsg" nhname="nh_reply_div" id="nh_reply_div_<%= topic.id %>">
-                    <ul>
-                      <% replies_all_i = 0 %>
-                      <% replies_all.each do |message| %>
-                          <% replies_all_i=replies_all_i+1 %>
-                          <li nhname="reply_rec" style="display:<%= replies_all_i>2?'none':'' %>">
-                            <%= link_to image_tag(url_to_avatar(message.author), :width => '34',:height => '34'), user_path(message.author), :class =>'Msg_pic' %>
-                            <div class="Msg_txt">
-                              <%= link_to_user_header message.author,false,:class => 'fl c_orange f14 ' %>
-                              <br/>
-                              <div class="fl break_word f14 list_style">
-                                <%= textAreailizable message,:content,:attachments => message.attachments %>
-                                <!-- -->
-                              </div>
-                              <input nhname="nh_content_val" type="hidden" value="<%= message.content %>"/>
-                              <br/><div class="cl"></div>
-                              <span class=" c_grey fl f14"><%= format_time(message.created_on) %></span>
-                              <%= link_to(l(:button_delete),{:controller => 'messages', :action => 'destroy',  :id => message.id, :board_id => message.board_id, :is_board => 'true'},
-                                       :method => :post,
-                                       :data => {:confirm => l(:text_are_you_sure)},
-                                       :title => l(:button_delete),
-                                       :class => ' c_dblue fr f14') if message.course_destroyable_by?(User.current) %>
-                              <%= link_to(l(:button_reply), 'javascript:;',
-                                       :nhname =>'showbtn_child_reply',
-                                       :class => ' c_dblue fr f14',
-                                       :style => 'margin-right: 10px;',
-                                       :title => l(:button_reply)) if !topic.locked? && authorize_for('messages', 'reply') %>
-                            </div>
-                            <div class="cl"></div>
-                          </li>
-                      <% end %>
-                    </ul>
-                  </div>
-                  <%if topic.replies_count>2 %>
-                      <div class="talkWrapMsg">
-                        <a nhname="reply_ex_btn" data-count="<%= topic.replies_count %>" data-init="0" href="javascript:void(0)" class="ml258 c_dblue lh23">展开回复(<%= topic.replies_count.to_s%>)</a>
-                      </div>
-                  <% end %>
-              <% end %>
-            </div>
-          </div>
-      <% end %>
-  <% else %>
-      <p class="nodata"><%= l(:label_no_data) %></p>
-  <% end %>
-  <ul class="wlist">
-    <%= pagination_links_full @topic_pages, @topic_count, :per_page_links => false, :remote => false, :flag => true %>
-  </ul>
-  <!--讨论主类容 end-->
-
-<%# other_formats_links do |f| %>
-  <%#= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
-<%# end %>
-  <% html_title @board.name %>
-  <% content_for :header_tags do %>
-      <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@project}: #{@board}") %>
-  <% end %>
-</div>
-<div style="display:none;"><a href="#" id="nhjump"></a></div>
-
 <script type="text/javascript">
     $(function(){
-        $(".talkmain_box").each(function(){
-            var target = $("li[nhname='reply_rec']",$(this));
-            var btn = $("a[nhname='reply_ex_btn']",$(this));
-            var jumpobj = $("div[nhname='nh_reply_div']",$(this));
-            btn.click(function(){
-                if($(this).data('init')=='0'){
-                    $(this).data('init',1);
-                    $(this).html('收起回复');
-                    target.show();
-                }else{
-                    $(this).data('init',0);
-                    $(this).html('展开回复'+$(this).data('count')+')');
-                    target.hide();
-                    target.eq(0).show();
-                    target.eq(1).show();
-                    $("#nhjump").attr('href','#'+jumpobj.attr('id'));
-                    $("#nhjump")[0].click();
-                }
-            });
-        });
-        KindEditor.ready(function(K){
-            $("div[nhname='container_board']").each(function(){
-                var container = $(this);
-                var about_talk = $("div[nhname='about_talk']",container);
-                var params = ({
-                    kindutil:K,
-                    showbtn:$("a[nhname='showbtn']",container),
-                    about_talk:about_talk,
-                    inputsubject:$("input[nhname='inputsubject']",about_talk),
-                    subjectmsg:$("p[nhname='subjectmsg']",about_talk),
-                    textarea:$("textarea[nhname='textarea']",about_talk),
-                    contentmsg:$("p[nhname='contentmsg']",about_talk),
-                    submitbtn:$("a[nhname='submitbtn']",about_talk),
-                    cancelbtn:$("a[nhname='cancelbtn']",about_talk),
-                    form:$("form[nhname='form']",about_talk),
-                    toolbar_container:$("div[nhname='toolbar_container']",about_talk),
-                    init_content_val:$("input[nhname='init_content_val']",about_talk)
-                });
-                nh_init_board(params);
-            });
-            $("div[mhname='container_board_reply']").each(function(){
-                var container = $(this);
-                var about_talk = $("div[nhname='about_talk_reply']",container);
-                var params = {
-                    type:'reply',
-                    kindutil:K,
-                    showbtn:$("a[nhname='showbtn_reply']",container),
-                    showbtn_child:$("a[nhname='showbtn_child_reply']",container),
-                    about_talk:about_talk,
-                    inputsubject:$("input[nhname='inputsubject']",about_talk),
-                    subjectmsg:$("p[nhname='subjectmsg']",about_talk),
-                    textarea:$("textarea[nhname='textarea']",about_talk),
-                    contentmsg:$("p[nhname='contentmsg']",about_talk),
-                    submitbtn:$("a[nhname='submitbtn']",about_talk),
-                    cancelbtn:$("a[nhname='cancelbtn']",about_talk),
-                    form:$("form[nhname='form']",about_talk),
-                    quote_show:$("div[nhname='quote_show']",about_talk),
-                    quote_input:$("textarea[nhname='quote_input']",about_talk),
-                    toolbar_container:$("div[nhname='toolbar_container']",about_talk),
-                    jumphref:$("#nhjump")
-                };
-                params.get_ref_str_call=function(btn){
-                    var div = btn.parent('div');
-                    var str = '<blockquote>'+$('a',div).filter(':first').html()+' 写到： <br/>'+$("input[nhname='nh_content_val']",div).val()+'<div class="cl"></div></blockquote>';
-                    return str;
-                }
-                nh_init_board(params);
-            });
-            <% if(!@flag.nil? && @flag=='true') %>
-            if($("#new_topic_btn")!=undefined)$("#new_topic_btn").click();
-            <% end %>
-        });
+        $("#RSide").removeAttr("id");
+        $("#Container").css("width","1000px");
     });
-</script>
+    function reset_topic(){
+        $("#message_subject").val("");
+        $("#subjectmsg").text("");
+        document.getElementById("message_sticky").checked=false;
+        document.getElementById("message_locked").checked=false;
+        $("#topic_attachments").html("<%= escape_javascript(render :partial => 'attachments/form_project_new', :locals => {:container => Message.new, :isReply => @isReply})%>");
+        message_content_editor.html("");
+        $("#topic_editor").toggle();
+    }
+    <% if @is_new%>
+    $(function(){
+        $("#message_subject").focus();
+    });
+    <%end%>
+</script>
+
+<div class="homepageRight mt0 ml10">
+  <div class="homepageRightBanner">
+    <div class="NewsBannerName"><%= l(:label_borad_project) %></div>
+  </div>
+  <% if User.current.logged? %>
+      <%= labelled_form_for @message, :url =>{:controller=>'messages',:action => 'new',  :board_id => @board.id, :is_board => 'true'},
+                                     :html => {:nhname=>'form',:multipart => true, :id => 'message-form-project'} do |f| %>
+        <%= render :partial => 'project_new', :locals => {:f => f, :topic => @message, :edit_mode => false, :project => @board.project} %>
+      <% end %>
+  <% end %>
+  <%= render :partial=> 'project_show_detail',:locals =>{:topics => @topics, :page => 0} %>
+</div>

app/views/boards/_project_show_detail.html.erb

@@ -0,0 +1,71 @@
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= javascript_include_tag "init_activity_KindEditor" %>
+<% end %>
+<style type="text/css">
+    /*回复框*/
+    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
+    .homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}
+    .homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}
+    .homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}
+    .homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}
+    .homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}
+    .homepagePostReplyInputContainer .ke-outline {border: none;}
+    .homepagePostReplyInputContainer .ke-inline-block {display: none;}
+    .homepagePostReplyInputContainer .ke-container {float: left;}
+</style>
+<% if topics%>
+    <% topics.each do |topic| %>
+        <script>
+            function expand_reply(container, btnid) {
+                var target = $(container);
+                var btn = $(btnid);
+                if (btn.data('init') == '0') {
+                    btn.data('init', 1);
+                    btn.html('收起回复');
+                    target.show();
+                } else {
+                    btn.data('init', 0);
+                    btn.html('展开更多');
+                    target.hide();
+                    target.eq(0).show();
+                    target.eq(1).show();
+                    target.eq(2).show();
+                }
+            }
+
+            function expand_reply_input(id) {
+                $(id).toggle();
+            }
+
+            $(function () {
+                init_activity_KindEditor_data(<%= topic.id%>, null, "87%");
+                showNormalImage('activity_description_<%= topic.id %>');
+                /*var description_images=$("div#activity_description_<%#= topic.id %>").find("img");
+                 if (description_images.length>0) {
+                 for (var i=0; i<description_images.length; i++){
+                 var image=$(description_images[i]);
+                 var element=$("<a></a>").attr("href",image.attr('src'));
+                 image.wrap(element);
+                 }
+                 }
+                 $('#activity_description_<%#= topic.id %> a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false});*/
+            });
+        </script>
+        <% if topic %>
+            <%= render :partial => 'users/project_message', :locals => {:activity => topic, :user_activity_id => topic.id} %>
+        <% end %>
+    <% end %>
+
+    <% if topics.count == 10 %>
+        <!--<div id="show_more_course_topic" class="loadMore mt10 f_grey">展开更多<%#= link_to "", boards_topic_path(@board, :course_id => @board.course.id ,:page => page), :id => "more_topic_link", :remote => "true", :class => "none" %></div>-->
+        <%= link_to "点击展开更多", boards_topic_path(@board, :project_id => @board.project.id ,:page => page), :id => "show_more_project_topic",:remote => "true",:class => "loadMore mt10 f_grey"%>
+    <% end %>
+<% end%>
+
+<!--
+<script type="text/javascript">
+    $("#show_more_course_topic").mouseover(function () {
+        $("#more_topic_link").click();
+    });
+</script>-->

app/views/boards/show.html.erb

@@ -32,12 +32,11 @@
 <% end %>
 
 
-
-  <% if @project %>
-    <%= render :partial => 'project_show', locals: {project: @project} %>
-  <% elsif @course %>
-      <%= render :partial => 'course_show', :locals => {:topics => @topics, :page => 0, :course => @course} %>
-    <% end %>
+<% if @project %>
+    <%= render :partial => 'project_show', locals: {:topics => @topics, :page => 0, project: @project} %>
+<% elsif @course %>
+    <%= render :partial => 'course_show', :locals => {:topics => @topics, :page => 0, :course => @course} %>
+<% end %>
 
 
 <script type="text/javascript">//侧导航

app/views/boards/show.js.erb

@@ -1 +1,5 @@
-$("#show_more_course_topic").replaceWith("<%= escape_javascript( render :partial =>  'boards/course_show_detail',:locals => {:topics => @topics, :page => @page} )%>");
+<% if @course %>
+    $("#show_more_course_topic").replaceWith("<%= escape_javascript( render :partial =>  'boards/course_show_detail',:locals => {:topics => @topics, :page => @page} )%>");
+<% else %>
+    $("#show_more_project_topic").replaceWith("<%= escape_javascript( render :partial =>  'boards/project_show_detail',:locals => {:topics => @topics, :page => @page} )%>");
+<% end %>

app/views/courses/_course_activity.html.erb

@@ -114,11 +114,13 @@
 <% end %>
 
 <% if course_activities.count == 10 %>
-    <div id="show_more_course_activities" class="loadMore mt10 f_grey">展开更多<%= link_to "", course_activity_path(@course.id, :type => type, :page => page), :id => "more_course_activities_link", :remote => "true", :class => "none" %></div>
+    <!--<div id="show_more_course_activities" class="loadMore mt10 f_grey">点击展开更多<%#= link_to "", course_activity_path(@course.id, :type => type, :page => page), :id => "more_course_activities_link", :remote => "true", :class => "none" %></div>-->
+    <%= link_to "点击展开更多",course_activity_path(@course.id, :type => type, :page => page),:id => "show_more_course_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
 <% end %>
 
+<!--
 <script type="text/javascript">
     $("#show_more_course_activities").mouseover(function () {
         $("#more_course_activities_link").click();
     });
-</script>
+</script>-->

app/views/courses/private_or_public.js.erb

@@ -0,0 +1,8 @@
+$("#project_info_<%=@course.id %>").html('<%=escape_javascript(render :partial=>'layouts/project_info') %>');
+if(document.getElementById("course_is_public")) {
+    <% if @course.is_public == 0%>
+        $("#course_is_public").attr("checked",false);
+    <% elsif @course.is_public == 1 %>
+        $("#course_is_public").attr("checked",true);
+    <% end %>
+}

app/views/courses/settings.html.erb

@@ -66,19 +66,19 @@
           <li class=" mb5 ml80">
             <label >公开&nbsp;&nbsp;：</label>
             <input <%= @course.is_public == 1 ? 'checked' : ''%> id="course_is_public" name="course[is_public]"  type="checkbox">
-            <span class="c_grey">（打钩为公开，不打钩则不公开，若不公开，仅课程成员可见该课程。）</span>
+            <span class="c_grey">（选中后课外用户可见该课程，否则仅对课内成员可见）</span>
             <div class="cl"></div>
           </li>
           <li class=" mb5 ml30">
             <label >学生列表公开&nbsp;&nbsp;：</label>
             <input <%= @course.open_student == 1 ? 'checked' : ''%> id="course_open_student" name="course[open_student]"  type="checkbox" style="margin-left: 1px;"/>
-            <span class="c_grey">（打钩为"学生列表公开"，不打钩为不公开，若不公开，则课程外部人员看不到学生列表）</span>
+            <span class="c_grey">（选中后课外用户可见学生列表，否则仅对课内成员可见）</span>
             <div class="cl"></div>
           </li>
           <li class=" mb5 ml30">
             <label >学生上传资源&nbsp;&nbsp;：</label>
             <input <%= @course.publish_resource == 1 ? 'checked' : ''%> id="course_publish_resource" name="course[publish_resource]"  type="checkbox" style="margin-left: 1px;"/>
-            <span class="c_grey">（打钩为"允许学生上传资源"，不打钩为"不允许学生上传资源"）</span>
+            <span class="c_grey">（选中后允许学生上传课程资源，否则不允许）</span>
             <div class="cl"></div>
           </li>
           <li class=" ml90" >

app/views/exercise/_exercise_student.html.erb

@@ -100,6 +100,9 @@
                                               {
                                                   obj.checked = false;
                                               }
+                                          },
+                                          error: function () {
+                                              alert("网络异常，答题失败，请确认网络正常连接后再答题。");
                                           }
                                       });
                                   }
@@ -154,6 +157,9 @@
                                               {
                                                   obj.checked = false;
                                               }
+                                          },
+                                          error: function () {
+                                              alert("网络异常，答题失败，请确认网络正常连接后再答题。");
                                           }
                                       });
                                   }
@@ -196,6 +202,9 @@
                               success: function (data) {
                                   var dataObj = eval(data);
                                   obj.value = dataObj.text;
+                              },
+                              error: function () {
+                                  alert("网络异常，答题失败，请确认网络正常连接后再答题。");
                               }
                           });
 

app/views/exercise/_exercise_student_result.html.erb

@@ -116,8 +116,7 @@
                         √
                     <% else %>
                         ×
-                    <% end %></span><br />
-                  标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) if exercise_question.exercise_standard_answers.first %>
+                    <% end %></span>
                 </div>
                 <div class="cl"></div>
                 <div>

app/views/exercise/_exercise_teacher.html.erb

@@ -95,8 +95,6 @@
             <div id="show_poll_questions_<%= exercise_question.id %>">
               <div>
                 <div class="testEditTitle"> 第<%= list_index+1%>题：<%= exercise_question.question_title %>&nbsp;&nbsp;(<%= exercise_question.question_score %>分)
-                  <br />
-                  标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) if exercise_question.exercise_standard_answers.first%>
                 </div>
                 <div class="cl"></div>
                 <div>

app/views/files/_org_subfield_list.html.erb

@@ -30,7 +30,7 @@
               <% if User.current.logged? %>
                   <% if !@org_subfield.attachments.all.include?file %>
                     <%= link_to("选入栏目",quote_resource_show_org_subfield_org_subfield_file_path(:org_subfield_id => @org_subfield.id, :id => file.id),:class => "f_l re_select c_lorange",:remote => true) %>
-                  <% else %>
+                  <% elsif @org_subfield.organization.org_subfields.where("field_type='Resource'").count > 1 %>
                     <%= link_to("选入组织其他栏目",quote_resource_show_org_subfield_org_subfield_file_path(:org_subfield_id => @org_subfield.id, :id => file.id),:class => "f_l re_select c_lorange",:remote => true) %>
                   <% end %>
                   <%= file_preview_tag(file, class: 'f_l re_open', style:'text-align: center;') %>

app/views/homework_common/index.html.erb

@@ -3,6 +3,7 @@
         $("#homework_name").val("");
         $("#homework_publish_time").val("");
         $("#homework_end_time").val("");
+        document.getElementById("anonymous_comment").checked = true;
         $("#course_id").val($("#option_select").val());
         $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new,:has_program => true,:has_group => true})%>");
         homework_description_editor.html("");

app/views/issues/_attributes.html.erb

@@ -46,7 +46,7 @@
                               :method => 'get',
                               :title => l(:label_version_new),
                               :tabindex => 200) if User.current.allowed_to?(:manage_versions, @issue.project) %>
-                <%= link_to "", new_project_version_path(@issue.project), :class => "pic_add mt5 ml5 " %>
+                <%= link_to "", new_project_version_path(@issue.project), :class => "pic_add mt5 ml5 ", :target => "_blank" %>
                 <!--<a href="javascript:viod(0)" class="pic_add mt5 ml5"></a>-->
             <% end %>
           </li>

app/views/issues/_edit.html.erb

@@ -3,13 +3,12 @@
     <%= import_ke(enable_at: true, prettify: false, init_activity: false) %>
 <% end %>
 
-<%= labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true,:remote=>true} do |f| %>
+<%= labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true, :remote => true} do |f| %>
     <%= error_messages_for 'issue', 'time_entry' %>
     <%= render :partial => 'conflict' if @conflict %>
     <!--编辑的整个属性-->
         <div id="all_attributes" >
           <%= render :partial => 'issues/form', :locals => {:f => f} %>
-
         </div>
     <%# if @journals.present? %>
         <!--<div id="history">-->

app/views/issues/_form.html.erb

@@ -49,7 +49,7 @@
               <%= f.label_for_field :description, :required => @issue.required_attribute?('description'), :no_label => true, :class => "label" %>
               <%#= link_to_function image_tag('edit.png'), '$(this).hide(); $("#issue_description_and_toolbar").show()' unless @issue.new_record? %>
               <%#= content_tag 'span', :id => "issue_description_and_toolbar" do %>
-              <%= f.kindeditor :description,:editor_id => "issue_desc_editor",  :width=>'85%', :resizeType => 0, :no_label => true,at_id: @project.id, at_type: @project.class.to_s %>
+              <%= f.kindeditor :description,:editor_id => "issue_desc_editor",  :width=>'85%', :height =>170, :resizeType => 0, :no_label => true,at_id: @project.id, at_type: @project.class.to_s %>
               <%# end %>
               <%#= wikitoolbar_for 'issue_description' %>
           <% end %>

app/views/issues/_list.html.erb

@@ -40,7 +40,7 @@
      <%= render :partial => 'users/project_issue', :locals => {:activity => issue, :user_activity_id => issue.id} %>
  <% end %>
  <% if issues.count == 10%>
-     <div id="show_more_issues" class="loadMore mt10 f_grey">展开更多<%=link_to "",  project_issues_path({:project_id => project.id,:page => issue_pages.page}.merge(params)),:id => "more_issues_link",:remote => "true",:class => "none" %></div>
+     <div id="show_more_issues" class="loadMore mt10 f_grey">展开更多<%=link_to "",  project_issues_path({:project_id => project.id}.merge(params)),:id => "more_issues_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"%>
  <% end%>
  <!--<ul class="wlist">-->

app/views/issues/show.html.erb

@@ -26,20 +26,15 @@
       <!--problem_main end-->
       <div style="clear: both;"></div>
       <div class="homepagePostReply">
-            <div class="topBorder" style="display: <%= @issue.journals.count>0 ? 'none': '' %>"></div>
-            <div class="homepagePostReplyBanner" >
-              <div class="homepagePostReplyBannerCount" >回复（<%= @issue.journals.count %>）</div>
-              <div class="homepagePostReplyBannerTime"></div>
-            </div>
-
-            <div class="" id="reply_div_<%= @issue.id %>" >
-                       <%= render :partial => 'issue_replies',:locals => {:issue=>@issue,:replies_all_i=>0} %>
-            </div>
-
-
-
-         </div>
-     </div>
+        <div class="topBorder" style="display: <%= @issue.journals.count>0 ? 'none': '' %>"></div>
+        <div class="homepagePostReplyBanner" >
+          <div class="homepagePostReplyBannerCount" >回复（<%= @issue.journals.count %>）</div>
+          <div class="homepagePostReplyBannerTime"></div>
+        </div>
+        <div class="" id="reply_div_<%= @issue.id %>" >
+          <%= render :partial => 'issue_replies',:locals => {:issue => @issue, :replies_all_i => 0} %>
+        </div>
+      </div>
+    </div>
   </div>
-</div>
-    </div>
+</div>

app/views/layouts/_footer.html.erb

@@ -1,39 +1,43 @@
-<div id="Footer" class="f12">
-  <div class="footerAboutContainer">
-    <ul class="footerAbout">
-      <li class="fl"><a href="<%= about_us_path %>" class="f_grey mw20" target="_blank"><%= l(:label_about_us)%></a>|</li>
-      <li class="fl"><a href="<%= agreement_path %>" class="f_grey mw20" target="_blank">服务协议</a>|</li>
-      <li class="fl" style="display: none"><span class="f_grey mw20" title="暂未开放"><%= l(:label_recruitment_information)%></span>|</li>
-      <li class="fl"><%= link_to l(:label_surpport_group), "https://#{Setting.host_name}/forums/1/memos/1168", :class => "f_grey mw20", :target=>"_blank" %>|</li>
-      <li class="fl"><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="f_grey mw20" target="_blank" ><%= l(:label_forums)%></a></li>
-
-    </ul>
-  </div>
-
-  <div class="cl"></div>
-  <ul class="departments">
-    <li class="fl mr10">
-      <strong><%= l(:label_hosted_organization)%></strong><a href="http://www.nudt.edu.cn/ArticleShow.asp?ID=47" class=" ml10 f_grey" target="_blank"><%= l(:label_hosted_by)%></a>
-    </li>
-    <li class="fl">
-      <a href="http://www.nudt.edu.cn/ArticleShow.asp?ID=41" class="mr45 f_grey" target="_blank"><%= l(:label_sponsor)%></a>
-    </li>
-    <li class="fl mr10">
-      <strong><%= l(:label_partners)%></strong><a href="http://eecs.pku.edu.cn" class="ml10 f_grey" target="_blank"><%= l(:label_co_organizer_EECS)%></a>
-    </li>
-    <li class="fl">
-      <a href="http://scse.buaa.edu.cn/" class="mr10 f_grey" target="_blank"><%= l(:label_co_organizer_BHU)%></a>
-    </li>
-    <li class="fl">
-      <a href="http://www.iscas.ac.cn/" class="mr10 f_grey" target="_blank"><%= l(:label_co_organizer_CAS)%></a>
-    </li>
-    <li class="fl">
-      <a href="http://www.inforbus.com/" class="f_grey" target="_blank"><%= l(:label_co_organizer_InforS)%></a>
-    </li>
-  </ul>
-  <div class="cl"></div>
-  <ul class="copyright">
-    <li class="fl mr30"><%= l(:label_rights_reserved)%></li>
-    <li class="fl"><a href="http://www.miibeian.gov.cn/" class="fl f_grey" target="_blank"><%= l(:label_license)%></a></li>
-  </ul>
+<div id="Footer" class="f12">
+  <div class="footerAboutContainer">
+    <ul class="footerAbout">
+      <li class="fl"><a href="<%= about_us_path %>" class="f_grey mw20" target="_blank"><%= l(:label_about_us)%></a>|</li>
+      <li class="fl"><a href="<%= agreement_path %>" class="f_grey mw20" target="_blank">服务协议</a>|</li>
+      <li class="fl" style="display: none"><span class="f_grey mw20" title="暂未开放"><%= l(:label_recruitment_information)%></span>|</li>
+      <li class="fl"><%= link_to l(:label_surpport_group), "https://#{Setting.host_name}/forums/1/memos/1168", :class => "f_grey mw20", :target=>"_blank" %>|</li>
+      <li class="fl"><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="f_grey mw20" target="_blank" ><%= l(:label_forums)%></a></li>
+
+    </ul>
+  </div>
+
+  <div class="cl"></div>
+  <ul class="departments">
+    <!--li class="fl mr10">
+      <strong><%#= l(:label_hosted_organization)%></strong><a href="http://www.nudt.edu.cn/ArticleShow.asp?ID=47" class=" ml10 f_grey" target="_blank"><%#= l(:label_hosted_by)%></a>
+    </li>
+    <li class="fl">
+      <a href="http://www.nudt.edu.cn/ArticleShow.asp?ID=41" class="mr45 f_grey" target="_blank"><%#= l(:label_sponsor)%></a>
+    </li-->
+    <li class="fl mr10">
+      <strong><%= l(:label_partners)%></strong>
+    </li>
+    <li class="fl mr20">
+      <a href="http://eecs.pku.edu.cn" class="f_grey" target="_blank"><%#= l(:label_co_organizer_EECS)%><img src="/images/footer_logo/PekingUniversity.png" width="121" height="40" style="display: inline-block;" alt="北京大学" /></a>
+    </li>
+    <li class="fl mr20">
+      <a href="http://scse.buaa.edu.cn/" class="f_grey" target="_blank"><%#= l(:label_co_organizer_BHU)%><img src="/images/footer_logo/BeiHang_university.png" width="173" height="40" style="display: inline-block;" alt="北京航空航天大学" /></a>
+    </li>
+    <li class="fl mr20">
+      <a href="http://www.iscas.ac.cn/" class="f_grey" target="_blank"><%#= l(:label_co_organizer_CAS)%><img src="/images/footer_logo/ISCAS_logo.png" width="91" height="40" style="display: inline-block;" alt="ISCAS" /></a>
+    </li>
+    <li class="fl mr20">
+      <a href="http://www.inforbus.com/" class="f_grey" target="_blank"><%#= l(:label_co_organizer_InforS)%><img src="/images/footer_logo/CVICSE.png" width="165" height="40" style="display: inline-block;" alt="中创软件" /></a>
+    </li>
+    <li class="fl"><a href="http://www.webxmf.com/" target="_blank"><img src="/images/footer_logo/bee_logo.png" width="167" height="40" style="display: inline-block;" alt="web小蜜蜂" /></a></li>
+  </ul>
+  <div class="cl"></div>
+  <ul class="copyright">
+    <li class="fl mr30"><%= l(:label_rights_reserved)%></li>
+    <li class="fl"><a href="http://www.miibeian.gov.cn/" class="fl f_grey" target="_blank"><%= l(:label_license)%></a></li>
+  </ul>
 </div><!--Footer end-->

app/views/layouts/_project_info.html.erb

@@ -0,0 +1,92 @@
+<% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
+<% teacher_num = searchTeacherAndAssistant(@course).count %>
+<% student_num = studentCount(@course) %>
+<% course_file_num = visable_attachemnts_incourse(@course).count%>
+<div class="pr_info_logo fl mr10 mb5">
+<!--<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 ? "私有课程" : "公开课程" %></div>
+<div class="pr_info_id fl f14">
+ID:<%= @course.id%>
+</div>
+<!--<div class="pr_info_id fl mb5 f14">
+      ID:<%#= @course.id%>
+    </div>
+    <div class="pr_info_join fl">
+      <%# if is_teacher%>
+          <%#= link_to "<span class='pr_setting'></span>#{l(:button_configure)}".html_safe, {:controller => 'courses', :action => 'settings', :id => @course}, :class => "pr_join_a" %>
+          <%#= set_course_time @course%>
+          <%#= link_to "<span class='pr_copy'></span>#{l(:button_copy)}".html_safe, copy_course_course_path(@course.id), :class => "pr_join_a" %>
+      <%# else%>
+          <div id="join_in_course_header"><%#= join_in_course_header(@course, User.current) %></div>
+      <%# end%>
+    </div>-->
+<div class="cl"></div>
+
+<!--<div >-->
+<!--<a class="pr_info_name fl c_dark fb break_word" href="http://<%#= Setting.host_course%>/courses/<%#= @course.id%>" target="_blank">-->
+<!--<%#= @course.name %>-->
+<!--</a>-->
+<!--<%# if @course.is_public == 0%>-->
+<!--<span class="img_private ">-->
+<!--<%#= l(:field_is_private)%>-->
+<!--</span>-->
+<!--<%# end %>-->
+<!--<%#if @course.tea_id == User.current.id && @course.outline == 0 %>-->
+<!--<span>-->
+<!--<a href="javascript:void(0)" onclick="course_outline('<%#= @course.id%>');">设置大纲</a>-->
+<!--</span>-->
+<!--<%# else%>-->
+<!--<span>-->
+<!--<a href="javascript:void(0)" onclick="course_outline('<%#= @course.id%>');">设置大纲</a>-->
+<!--</span>-->
+<!--<%# end %>-->
+<!--</div>-->
+<div >
+<a class="pr_info_name fl c_dark fb break_word" href="http://<%= Setting.host_course%>/courses/<%= @course.id%>" target="_blank"></a>
+<div>
+  <a class="pr_info_name c_dark fb break_word fl" href="http://<%= Setting.host_course%>/courses/<%= @course.id%>" target="_blank">
+    <%= @course.name %>
+  </a>
+  <%# if @course.is_public == 0%>
+  <!--<span class="img_private "></span>-->
+  <!--<span class="img_private mr5 fl">
+              <%#= l(:field_is_private)%>
+            </span>-->
+  <%# end %>
+  <span id="course_outline_bar">
+      <%if User.current && @course.tea_id == User.current.id && (@course.outline == 0 ||  BlogComment.where(:id=>@course.outline).count == 0) %>
+          <a href="javascript:void(0);" title="设置课程大纲" onclick="course_outline('<%= @course.id%>')" class="mr5 syllabusSetting fl"> </a>
+       <% elsif User.current && @course.tea_id == User.current.id && @course.outline != 0 && BlogComment.where(:id=>@course.outline).count != 0%>
+          <a href="<%=syllabus_course_path(@course) %>" title="课程大纲" class="mr5 syllabusIcon fl"> </a>
+        <% elsif User.current && @course.tea_id != User.current.id && !@course.is_public? && User.current.member_of_course?(@course)  && @course.outline != 0%>
+          <a href="<%=syllabus_course_path(@course) %>" title="课程大纲" class="mr5 syllabusIcon fl"> </a>
+        <% elsif User.current && @course.tea_id != User.current.id && @course.is_public? && @course.outline != 0%>
+          <a href="<%=syllabus_course_path(@course) %>" title="课程大纲" class="mr5 syllabusIcon fl"> </a>
+        <%else%>
+        <%end %>
+  </span>
+</div>
+</div>
+<div class="cl"></div>
+<div class="pr_info_foot ">
+<%= l(:label_account_identity_teacher)%>（<%= course_teacher_link teacher_num %>）
+<span>|&nbsp;</span>
+<%= l(:label_account_identity_student)%>（<%= course_student_link student_num %>）
+<span>|&nbsp;</span>
+<%= l(:project_module_attachments)%>（<%= link_to course_file_num, course_files_path(@course), :class => 'info_foot_num c_blue',:id=>'courses_files_count_info' %>）</div>
+<div class="cl"></div>
+<% if is_teacher %>
+  <div class="homepagePostSetting mt5 mr5">
+    <ul>
+      <li class="homepagePostSettingIcon">
+        <ul class="homepagePostSettiongText boxShadow">
+          <li><%= link_to "课程配置", {:controller => 'courses', :action => 'settings', :id => @course}, :class => "postOptionLink" %></li>
+          <li><%= link_to @course.is_public == 0 ? "设为公开" : "设为私有", {:controller => 'courses', :action => 'private_or_public', :id => @course},:remote=>true,:confirm=>"您确定要设置为"+(@course.is_public == 0 ? "公开" : "私有")+"吗", :class => "postOptionLink" %></li>
+          <!--<li><%#= link_to "复制学期", copy_course_course_path(@course.id), :class => "postOptionLink" %></li>-->
+        </ul>
+      </li>
+    </ul>
+  </div>
+<% end %>

app/views/layouts/base_courses.html.erb

@@ -1,6 +1,4 @@
 <%# course_model %>
-<% teacher_num = searchTeacherAndAssistant(@course).count %>
-<% student_num = studentCount(@course) %>
 <% course_file_num = visable_attachemnts_incourse(@course).count%>
 <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
 <!DOCTYPE html>
@@ -51,78 +49,8 @@
 <div id="Container">
   <div id="content">
     <div id="LSide" class="fl">
-      <div class="project_info">
-        <div class="pr_info_logo fl mr10 mb5">
-          <!--<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">
-          ID:<%= @course.id%>
-        </div>
-        <div class="pr_info_join fl">
-          <% if is_teacher%>
-              <%= link_to "<span class='pr_setting'></span>#{l(:button_configure)}".html_safe, {:controller => 'courses', :action => 'settings', :id => @course}, :class => "pr_join_a" %>
-              <%= set_course_time @course%>
-              <%#= link_to "<span class='pr_copy'></span>#{l(:button_copy)}".html_safe, copy_course_course_path(@course.id), :class => "pr_join_a" %>
-          <% else%>
-              <div id="join_in_course_header"><%= join_in_course_header(@course, User.current) %></div>
-          <% end%>
-        </div>
-        <div class="cl"></div>
-
-        <!--<div >-->
-          <!--<a class="pr_info_name fl c_dark fb break_word" href="http://<%#= Setting.host_course%>/courses/<%#= @course.id%>" target="_blank">-->
-            <!--<%#= @course.name %>-->
-          <!--</a>-->
-          <!--<%# if @course.is_public == 0%>-->
-                <!--<span class="img_private ">-->
-                  <!--<%#= l(:field_is_private)%>-->
-                <!--</span>-->
-          <!--<%# end %>-->
-          <!--<%#if @course.tea_id == User.current.id && @course.outline == 0 %>-->
-            <!--<span>-->
-              <!--<a href="javascript:void(0)" onclick="course_outline('<%#= @course.id%>');">设置大纲</a>-->
-            <!--</span>-->
-          <!--<%# else%>-->
-            <!--<span>-->
-              <!--<a href="javascript:void(0)" onclick="course_outline('<%#= @course.id%>');">设置大纲</a>-->
-            <!--</span>-->
-          <!--<%# end %>-->
-        <!--</div>-->
-        <div >
-          <a class="pr_info_name fl c_dark fb break_word" href="http://<%= Setting.host_course%>/courses/<%= @course.id%>" target="_blank"></a>
-            <div>
-              <a class="pr_info_name c_dark fb break_word fl" href="http://<%= Setting.host_course%>/courses/<%= @course.id%>" target="_blank">
-                <%= @course.name %>
-              </a>
-              <% if @course.is_public == 0%>
-                <!--<span class="img_private "></span>-->
-                <span class="img_private mr5 fl">
-                  <%= l(:field_is_private)%>
-                </span>
-              <% end %>
-              <span id="course_outline_bar">
-              <%if User.current && @course.tea_id == User.current.id && (@course.outline == 0 ||  BlogComment.where(:id=>@course.outline).count == 0) %>
-                  <a href="javascript:void(0);" title="设置课程大纲" onclick="course_outline('<%= @course.id%>')" class="mr5 syllabusSetting fl"> </a>
-               <% elsif User.current && @course.tea_id == User.current.id && @course.outline != 0 && BlogComment.where(:id=>@course.outline).count != 0%>
-                  <a href="<%=syllabus_course_path(@course) %>" title="课程大纲" class="mr5 syllabusIcon fl"> </a>
-                <% elsif User.current && @course.tea_id != User.current.id && !@course.is_public? && User.current.member_of_course?(@course)  && @course.outline != 0%>
-                  <a href="<%=syllabus_course_path(@course) %>" title="课程大纲" class="mr5 syllabusIcon fl"> </a>
-                <% elsif User.current && @course.tea_id != User.current.id && @course.is_public? && @course.outline != 0%>
-                  <a href="<%=syllabus_course_path(@course) %>" title="课程大纲" class="mr5 syllabusIcon fl"> </a>
-                <%else%>
-               <%end %>
-               </span>
-            </div>
-         </div>
-        <div class="cl"></div>
-        <div class="pr_info_foot ">
-          <%= l(:label_account_identity_teacher)%>（<%= course_teacher_link teacher_num %>）
-          <span>|&nbsp;</span>
-          <%= l(:label_account_identity_student)%>（<%= course_student_link student_num %>）
-          <span>|&nbsp;</span>
-          <%= l(:project_module_attachments)%>（<%= link_to course_file_num, course_files_path(@course), :class => 'info_foot_num c_blue',:id=>'courses_files_count_info' %>）</div>
-        <div class="cl"></div>
+      <div class="project_info" style="position: relative" id="project_info_<%=@course.id %>">
+        <%=render :partial=>'layouts/project_info' %>
       </div><!--课程信息 end-->
       <div class="info_box">
         <ul>
@@ -130,7 +58,7 @@
           <li><%= l(:label_class_period)%> :&nbsp;&nbsp;<span ><%= @course.class_period %> <%= l(:label_class_hour) %></span></li>
           <li><%= l(:label_main_term)%> :&nbsp;&nbsp;<span><%= @course.time %> <%= @course.term %></span></li>
           <% if @course.school%>
-            <li><%= l(:label_course_organizers)%> :&nbsp;&nbsp;<a href="http://<%= Setting.host_course%>/?school_id=<%= @course.school.id%>" target="_blank" class="c_dblue"><%= @course.school%></a></li>
+            <li><%= l(:label_course_organizers)%> :&nbsp;&nbsp;<%= @course.school%></li>
           <% end%>
         </ul>
       </div>
@@ -154,7 +82,7 @@
         <div class="subNav">
           <%= link_to l(:label_course_news), course_news_index_path(@course), :class => "f14 c_blue02" %>
           <%= link_to "(#{@course.news.count})", course_news_index_path(@course), :class => "subnav_num c_orange"%>
-          <%= link_to( "", new_course_news_path(@course), :class => 'courseMenuSetting', :title =>"#{l(:label_course_news_new)}") if is_teacher %>
+          <%= link_to( "", new_course_news_path(@course,:is_new=>1), :class => 'courseMenuSetting', :title =>"#{l(:label_course_news_new)}") if is_teacher %>
         </div>
         <% end %>
         <% unless show_nav?(course_file_num) %>

app/views/layouts/base_org.html.erb

@@ -13,7 +13,7 @@
   <%= javascript_heads %>
   <%= heads_for_theme %>
   <%= stylesheet_link_tag  'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','courses','org' %>
-  <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','org'%>
+  <%= javascript_include_tag 'cookie','project', 'organization','header','prettify','select_list_move','org'%>
   <%= javascript_include_tag 'attachments' %>
   <%= call_hook :view_layouts_base_html_head %>
   <!-- page specific tags -->
@@ -43,16 +43,16 @@
         <%#= link_to '首页', organization_path(@organization, :show_homepage => 1),:class=>"linkGrey8 f14" %>
       </li>
       <% if User.current.logged? %>
-        <li class="navOrgMenu fr" id="orgSwitch" style="cursor:pointer;">
+          <li class="navOrgMenu fr" id="orgSwitch" style="cursor:pointer;">
           <span class="orgMenuArrow" id="orgArrow">
             <ul class="org_login_list" style="display:none;">
-              <li> <%= link_to "个人主页",user_path(User.current), :class => "linkGrey8", :target => "_blank" %></li>
-              <li><%= link_to "退出",logout_organization_path(@organization), :class =>"linkGrey8", :method => 'post', :rel => "nofollow" %></li>
+              <li> <%= link_to "个人主页",user_path(User.current), :class => "menuGrey", :target => "_blank" %></li>
+              <li><%= link_to "退出",logout_organization_path(@organization), :class =>"menuGrey", :method => 'post', :rel => "nofollow" %></li>
               <!--<li><%#= link_to "退出",signout_path, :class =>"linkGrey8", :method => 'post', :rel => "nofollow" %></li>-->
-          </ul>
+            </ul>
           </span>
-        </li>
-        <li class="navOrgMenu fr" id="orgUser" style="cursor:pointer;"><a href="javascript:void(0);" class="linkGrey8 f14" id="orgUserName"><%= User.current %></a></li>
+          </li>
+          <li class="navOrgMenu fr" id="orgUser" style="cursor:pointer;"><a href="javascript:void(0);" class="fontGrey2 f14" id="orgUserName"><%= User.current %></a></li>
           <!--<li class="navOrgMenu fr"><%#=link_to User.current, user_path(User.current), :class => "linkGrey8 f14" %></li>-->
       <% else %>
           <li class="navOrgMenu fr"><a href="<%= signin_path(:login=>true) %>" class="linkGrey8 f14">登录</a></li>
@@ -75,141 +75,136 @@
   </div>
 </div>
 <div class="cl"></div>
-  <div class="homepageContentContainer">
-    <div class="homepageContent">
-      <div class="homepageLeft">
-        <div class="homepagePortraitContainer">
-          <!--<div class="pr_info_logo fl mr10 mb5">-->
-            <!--<%#= image_tag(url_to_avatar(@organization), :width=>"60",  :height=>"60", :alt=>"组织logo") %>-->
-          <!--</div>-->
-          <div class="pr_info_logo fl fl mr10 mb5" id="homepage_portrait_image">
-            <%= image_tag(url_to_avatar(@organization),width:"60", height: "60", :id=>'nh_user_tx') %>
-            <% if User.current.logged?%>
-                <% if User.current.id == @organization.creator_id%>
-                    <div id="edit_org_file_btn" class="none">
-                      <div class="homepageEditProfile">
-                        <a href="<%= clear_org_avatar_temp_organization_path(@organization) %>" data-remote="true" class="homepageEditProfileIcon"></a>
-                      </div>
+<div class="homepageContentContainer">
+  <div class="homepageContent">
+    <div class="homepageLeft">
+      <div class="homepagePortraitContainer">
+        <!--<div class="pr_info_logo fl mr10 mb5">-->
+        <!--<%#= image_tag(url_to_avatar(@organization), :width=>"60",  :height=>"60", :alt=>"组织logo") %>-->
+        <!--</div>-->
+        <div class="pr_info_logo fl fl mr10 mb5" id="homepage_portrait_image">
+          <%= image_tag(url_to_avatar(@organization),width:"60", height: "60", :id=>'nh_user_tx') %>
+          <% if User.current.logged?%>
+              <% if User.current.id == @organization.creator_id%>
+                  <div id="edit_org_file_btn" class="none">
+                    <div class="homepageEditProfile">
+                      <a href="<%= clear_org_avatar_temp_organization_path(@organization) %>" data-remote="true" class="homepageEditProfileIcon"></a>
                     </div>
-                <% end %>
-            <% end%>
-          </div>
-          <!--<div class="orgName fl mb5 f14">组织id：<%#= @organization.id %></div>-->
-          <div class="orgName fl mb5 f14">
-            <%= link_to @organization.name, organization_path(@organization.id), :class=>"pr_info_name fl c_dark fb break_word" %>
-            <% if User.current.logged? %>
-                <% if @organization.is_public? %>
-                    <span class="img_private"><%= l(:label_public)%></span>
-                <% else %>
-                    <span class="img_private"><%= l(:label_private)%></span>
-                <% end %>
-            <% end %>
-          </div>
-
-          <% if User.current.admin_of_org?(@organization) %>
-            <a href="<%= setting_organization_path(@organization) %>" class="pr_join_a c_white"><span class="pr_setting"></span>配置</a>
+                  </div>
+              <% end %>
+          <% end%>
+        </div>
+        <!--<div class="orgName fl mb5 f14">组织id：<%#= @organization.id %></div>-->
+        <div class="orgName fl mb5 f14">
+          <%= link_to @organization.name, organization_path(@organization.id), :class=>"pr_info_name fl c_dark fb break_word" %>
+          <% if User.current.logged? %>
+              <% if @organization.is_public? %>
+                  <span class="img_private"><%= l(:label_public)%></span>
+              <% else %>
+                  <span class="img_private"><%= l(:label_private)%></span>
+              <% end %>
           <% end %>
+        </div>
 
-          <!--<div style="clear:both;">-->
-            <!--<%#= link_to l(:label_org_name)+"#{@organization.name}", organization_path(@organization.id), :class=>"pr_info_name fl c_dark fb break_word" %>-->
-            <!--<%# if @organization.is_public? %>-->
-                <!--<span class="img_private"><%#= l(:label_public)%></span>-->
-            <!--<%# else %>-->
-                <!--<span class="img_private"><%#= l(:label_private)%></span>-->
-            <!--<%# end %>-->
-          <!--</div>-->
+        <% if User.current.admin_of_org?(@organization) %>
+            <a href="<%= setting_organization_path(@organization) %>" class="pr_join_a c_white"><span class="pr_setting"></span>配置</a>
+        <% end %>
 
-          <div class="cl"></div>
-          <div class="f12 fontGrey3">
-            <%= link_to '文章', organization_org_document_comments_path(@organization) %>&nbsp;
-            <% if User.current.logged? %>
-                (
-                <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %>
-                )
-            <% end %>
-            &nbsp;|&nbsp;
-            <%= link_to '成员', members_organization_path(@organization.id) %>&nbsp;
-            <% if User.current.logged? %>
+        <!--<div style="clear:both;">-->
+        <!--<%#= link_to l(:label_org_name)+"#{@organization.name}", organization_path(@organization.id), :class=>"pr_info_name fl c_dark fb break_word" %>-->
+        <!--<%# if @organization.is_public? %>-->
+        <!--<span class="img_private"><%#= l(:label_public)%></span>-->
+        <!--<%# else %>-->
+        <!--<span class="img_private"><%#= l(:label_private)%></span>-->
+        <!--<%# end %>-->
+        <!--</div>-->
+
+        <div class="cl"></div>
+        <div class="f12 fontGrey3">
+          <%= link_to '文章', organization_org_document_comments_path(@organization) %>&nbsp;
+          <% if User.current.logged? %>
+              (
+              <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %>
+              )
+          <% end %>
+          &nbsp;|&nbsp;
+          <%= link_to '成员', members_organization_path(@organization.id) %>&nbsp;
+          <% if User.current.logged? %>
               （<%= link_to @organization.org_members.count, members_organization_path(@organization.id), :id => 'org_members_count_id', :class => "linkBlue" %>）
-            <% end %>
-          </div>
-        </div>
-        <div class="homepageLeftMenuContainer" id="sub_field_left_lists">
-            <%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %>
+          <% end %>
         </div>
       </div>
-      <div class="homepageRight" style="margin-top:<%= params[:show_homepage].nil? ? '10px':'0px' %>;">
-        <%= render_flash_messages %>
-        <%= yield %>
-        <%= call_hook :view_layouts_base_content %>
-        <div style="clear:both;"></div>
+      <div class="homepageLeftMenuContainer" id="sub_field_left_lists">
+        <%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %>
       </div>
     </div>
+    <div class="homepageRight" style="margin-top:<%= params[:show_homepage].nil? ? '10px':'0px' %>;">
+      <%= render_flash_messages %>
+      <%= yield %>
+      <%= call_hook :view_layouts_base_content %>
+      <div style="clear:both;"></div>
+    </div>
   </div>
+</div>
 
-    <!--页面底部-->
-    <div class="cl"></div>
-    <div id="Footer">
-      <div class="footerAboutContainer">
-        <ul class="footerAbout">
-          <li class="fl"><a href="<%= about_us_path %>"  class=" f_grey mw20" target="_blank">关于我们</a>|</li>
-          <li class="fl"><a href="<%= agreement_path %>" class=" f_grey mw20" target="_blank">服务协议</a>|</li>
-          <li class="fl"><a href="http://forge.trustie.net/forums/1/memos/1168" class="f_grey mw20" target="_blank">帮助中心</a>|</li>
-          <li class="fl"><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="f_grey mw20" target="_blank">贴吧交流</a></li>
-        </ul>
-      </div>
-      <div class="cl"></div>
+<!--页面底部-->
+<div class="cl"></div>
+<div id="Footer">
+  <div class="footerAboutContainer">
+    <ul class="footerAbout">
+      <li class="fl"><a href="<%= about_us_path %>"  class=" f_grey mw20" target="_blank">关于我们</a>|</li>
+      <li class="fl"><a href="<%= agreement_path %>" class=" f_grey mw20" target="_blank">服务协议</a>|</li>
+      <li class="fl"><a href="http://forge.trustie.net/forums/1/memos/1168" class="f_grey mw20" target="_blank">帮助中心</a>|</li>
+      <li class="fl"><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="f_grey mw20" target="_blank">贴吧交流</a></li>
+    </ul>
+  </div>
+  <div class="cl"></div>
 
-      <ul class="copyright mt10">
-        <li class="fl mr30">Copyright&nbsp;&copy;&nbsp;2007-2015,&nbsp;All Rights Riserved</li>
-        <li>ICP备09019772</li>
-      </ul>
-    </div>
-    <div class="cl"></div>
-    <div id="ajax-modal" style="display:none;"></div>
+  <ul class="copyright mt10">
+    <li class="fl mr30">Copyright&nbsp;&copy;&nbsp;2007-2015,&nbsp;All Rights Reserved</li>
+    <li>ICP备09019772</li>
+  </ul>
+</div>
+<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="ajax-indicator" style="display:none;">
+  <span><%= l(:label_loading) %></span>
+</div>
 
-    <script type="text/javascript">
-        $("#courseMenu").mouseenter(function(){
-            $("#topnav_course_menu").show();
-        });
-        $("#courseMenu").mouseleave(function(){
-            $("#topnav_course_menu").hide();
-        });
-        $("#projectMenu").mouseenter(function(){
-            $("#topnav_project_menu").show();
-        });
-        $("#projectMenu").mouseleave(function(){
-            $("#topnav_project_menu").hide();
-        });
+<script type="text/javascript">
+    $("#courseMenu").mouseenter(function(){
+        $("#topnav_course_menu").show();
+    });
+    $("#courseMenu").mouseleave(function(){
+        $("#topnav_course_menu").hide();
+    });
+    $("#projectMenu").mouseenter(function(){
+        $("#topnav_project_menu").show();
+    });
+    $("#projectMenu").mouseleave(function(){
+        $("#topnav_project_menu").hide();
+    });
 
-  function show_homepage(id, has_homepage){
-      if (has_homepage == 1)
-      {
-          window.location.href = "/organizations/" + id + "?show_homepage=1";
-      }
-      else
-      {
-          alert("您还未设置首页！");
-      }
-  }
+    function show_homepage(id, has_homepage){
+        if (has_homepage == 1)
+        {
+            window.location.href = "/organizations/" + id + "?show_homepage=1";
+        }
+        else
+        {
+            alert("您还未设置首页！");
+        }
+    }
     $(document).ready(function(){
-        $("#orgUser,#orgSwitch").click(function(){
-            $(".org_login_list").toggle();
-            if($("#orgArrow").attr("class") == "orgMenuArrow"){
-                $("#orgArrow").attr("class","orgMenuArrow2");
-            }
-            else {
-                $("#orgArrow").attr("class","orgMenuArrow") ;
-            }
-        });
-        if($(".org_login_list").children().click){
+        $("#orgUser,#orgSwitch,#org_login_list").mouseout(function(){
             $(".org_login_list").css("display","none");
             $("#orgArrow").attr("class","orgMenuArrow");
-        };
+        });
+        $("#orgUser,#orgSwitch,#org_login_list").mouseover(function(){
+            $(".org_login_list").css("display","block");
+            $("#orgArrow").attr("class","orgMenuArrow2");
+        });
     });
 </script>
 </body>

app/views/mailer/issue_add.html.erb

@@ -6,7 +6,7 @@
     <% if Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten][@user.mail_notification] == mail_option %>
     <label style="margin-top:20px;color:gray; margin-left:10px;"><%= l(mail_option) %></label>
     <% else %>
-    <%= link_to l(mail_option), my_change_mail_notification_url(token: @token.value,mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
+    <%= link_to l(mail_option), my_change_mail_notification_url(mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
     <% end %>
     <% end %>
 </div>

app/views/mailer/issue_add.text.erb

@@ -4,6 +4,6 @@
   <% if Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten][@user.mail_notification] == mail_option %>
     <label style="margin-top:20px;color:gray; margin-left:10px;"><%= l(mail_option) %></label>
   <% else %>
-    <%= link_to l(mail_option), my_change_mail_notification_url(token: @token.value,mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
+    <%= link_to l(mail_option), my_change_mail_notification_url(mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
   <% end %>
 <% end %>

app/views/mailer/issue_edit.html.erb

@@ -9,7 +9,7 @@
     <% if Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten][@user.mail_notification] == mail_option %>
     <label style="margin-top:20px;color:gray; margin-left:10px;"><%= l(mail_option) %></label>
     <% else %>
-    <%= link_to l(mail_option), my_change_mail_notification_url(token: @token.value,mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
+    <%= link_to l(mail_option), my_change_mail_notification_url(mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
     <% end %>
     <% end %>
 </div>

app/views/mailer/issue_edit.text.erb

@@ -9,6 +9,6 @@
   <% if Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten][@user.mail_notification] == mail_option %>
     <label style="margin-top:20px;color:gray; margin-left:10px;"><%= l(mail_option) %></label>
   <% else %>
-    <%= link_to l(mail_option), my_change_mail_notification_url(token: @token.value,mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
+    <%= link_to l(mail_option), my_change_mail_notification_url(mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
   <% end %>
 <% end %>

app/views/mailer/send_for_user_activities.html.erb

@@ -16,16 +16,16 @@
                 <li style="clear: both; list-style: none;">
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
-                  <%= link_to truncate(course_new.course.name,length: 30,omission: '...'), course_url(course_new.course, :token => @token.value),
+                  <%= link_to truncate(course_new.course.name,length: 30,omission: '...'), course_url(course_new.course),
                               :class=> "wmail_column",
                               :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
 
-                  <%= link_to course_new.author, user_activities_url(course_new.author,:token => @token.value), :class => "wmail_name",
+                  <%= link_to course_new.author, user_activities_url(course_new.author), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_notice) %></span>
 
-                  <%= link_to truncate(course_new.title.html_safe,length: 30,omission: '...'), news_url(course_new,:token => @token.value),
+                  <%= link_to truncate(course_new.title.html_safe,length: 30,omission: '...'), news_url(course_new),
                               :class => 'wmail_info',
                               :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                   %>
@@ -39,17 +39,17 @@
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
                   <% unless course_news_comment.commented.nil? %>
-                      <%= link_to truncate(course_news_comment.commented.course.name,length: 30,omission: '...'), course_url(course_news_comment.commented.course, :token => @token.value),
+                      <%= link_to truncate(course_news_comment.commented.course.name,length: 30,omission: '...'), course_url(course_news_comment.commented.course),
                                   :class=> "wmail_column",
                                   :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <% end %>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
 
-                  <%= link_to course_news_comment.author, user_activities_url(course_news_comment.author,:token => @token.value), :class => "wmail_name",
+                  <%= link_to course_news_comment.author, user_activities_url(course_news_comment.author), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_notice_reply) %></span>
 
-                  <%= link_to truncate(l(:label_course_notice_point),length: 30,omission: '...'), news_url(course_news_comment.commented,:token => @token.value),
+                  <%= link_to truncate(l(:label_course_notice_point),length: 30,omission: '...'), news_url(course_news_comment.commented),
                               :class => 'wmail_info',
                               :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                   %>
@@ -72,16 +72,16 @@
                       <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                       <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
 
-                      <%= link_to truncate(bid.course.name,length: 30,omission: '...'), course_url(bid.course, :token => @token.value),
+                      <%= link_to truncate(bid.course.name,length: 30,omission: '...'), course_url(bid.course),
                                   :class=> "wmail_column",
                                   :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                       <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
 
-                      <%= link_to bid.user, user_activities_url(bid.user,:token => @token.value), :class => "wmail_name",
+                      <%= link_to bid.user, user_activities_url(bid.user), :class => "wmail_name",
                                   :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                       <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_course_homework) %></span>
 
-                      <%= link_to truncate(bid.name.html_safe,length: 30,omission: '...'), student_work_index_url(:homework => bid.id,:token => @token.value),
+                      <%= link_to truncate(bid.name.html_safe,length: 30,omission: '...'), student_work_index_url(:homework => bid.id),
                                   :class => 'wmail_info',
                                   :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                       %>
@@ -105,16 +105,16 @@
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
 
-                  <%= link_to truncate(course_journal_message.course.name,length: 30,omission: '...'), course_url(course_journal_message.course, :token => @token.value),
+                  <%= link_to truncate(course_journal_message.course.name,length: 30,omission: '...'), course_url(course_journal_message.course),
                               :class=> "wmail_column",
                               :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
 
-                  <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user,:token => @token.value), :class => "wmail_name",
+                  <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_send_course_journals_for_messages) %></span>
 
-                  <%= link_to truncate(course_journal_message.notes.html_safe,length: 30,omission: '...'), course_feedback_url(course_journal_message.course,:token => @token.value),
+                  <%= link_to truncate(course_journal_message.notes.html_safe,length: 30,omission: '...'), course_feedback_url(course_journal_message.course),
                               :class => 'wmail_info',
                               :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                   %>
@@ -135,14 +135,14 @@
                 <li style="clear: both; list-style: none;">
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
-                  <%= link_to truncate(course_message.course.name,length: 30,omission: '...'), course_url(course_message.course.id, :token => @token.value),
+                  <%= link_to truncate(course_message.course.name,length: 30,omission: '...'), course_url(course_message.course.id),
                               :class=> "wmail_column",
                               :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
-                  <%= link_to course_message.author, user_activities_url(course_message.author,:token => @token.value), :class => "wmail_name",
+                  <%= link_to course_message.author, user_activities_url(course_message.author), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_send_course_messages) %></span>
-                  <%= link_to truncate(course_message.subject.html_safe,length: 30,omission: '...'),board_message_url(course_message, :board_id => course_message.board_id,:token => @token.value),
+                  <%= link_to truncate(course_message.subject.html_safe,length: 30,omission: '...'),board_message_url(course_message, :board_id => course_message.board_id),
                               :class => 'wmail_info',
                               :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_date" style="color:#6e6e6e; float:left;display:block; margin-left:40px;"><%= format_time(course_message.created_on) %></span>
@@ -163,16 +163,16 @@
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
 
-                  <%= link_to truncate(attachment.course.name,length: 30,omission: '...'), course_url(attachment.course, :token => @token.value),
+                  <%= link_to truncate(attachment.course.name,length: 30,omission: '...'), course_url(attachment.course),
                               :class=> "wmail_column",
                               :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
 
-                  <%= link_to attachment.author, user_activities_url(attachment.author,:token => @token.value), :class => "wmail_name",
+                  <%= link_to attachment.author, user_activities_url(attachment.author), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_course_file_upload) %></span>
 
-                  <%= link_to truncate(attachment.filename,length: 30,omission: '...'),course_files_url(attachment.course,:token => @token.value),
+                  <%= link_to truncate(attachment.filename,length: 30,omission: '...'),course_files_url(attachment.course),
                               :class => 'wmail_info',
                               :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                   %>
@@ -199,14 +199,14 @@
                 <li style="clear: both; list-style: none;">
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
-                  <%= link_to truncate(issue.project.name,length: 30,omission: '...'), project_url(issue.project, :token => @token.value),
+                  <%= link_to truncate(issue.project.name,length: 30,omission: '...'), project_url(issue.project),
                               :class=> "wmail_column",
                               :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
-                  <%= link_to issue.author, user_activities_url(issue.author,:token => @token.value), :class => "wmail_name",
+                  <%= link_to issue.author, user_activities_url(issue.author), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_issue) %></span>
-                  <%= link_to truncate(issue.subject,length: 30,omission: '...'),issue_url(issue,  :token => @token.value),
+                  <%= link_to truncate(issue.subject,length: 30,omission: '...'),issue_url(issue),
                               :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                   %>
                   <span class="wmail_date" style="color:#6e6e6e; float:left;display:block; margin-left:40px;"><%= format_time(issue.created_on) %></span>
@@ -217,14 +217,14 @@
                 <li style="clear: both; list-style: none;">
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
-                  <%= link_to truncate(issues_journal.issue.project.name,length: 30,omission: '...'), project_url(issues_journal.issue.project, :token => @token.value),
+                  <%= link_to truncate(issues_journal.issue.project.name,length: 30,omission: '...'), project_url(issues_journal.issue.project),
                               :class=> "wmail_column",
                               :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
-                  <%= link_to issues_journal.user, user_activities_url(issues_journal.user,:token => @token.value), :class => "wmail_name",
+                  <%= link_to issues_journal.user, user_activities_url(issues_journal.user), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_issue_update) %></span>
-                  <%= link_to truncate(issues_journal.issue.subject, length:30,omission:'...'),issue_url(issues_journal.issue,  :token => @token.value),
+                  <%= link_to truncate(issues_journal.issue.subject, length:30,omission:'...'),issue_url(issues_journal.issue),
                               :style => "color:#2E8DD7;float:left;font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;",
                               :onmouseover =>"message_titile_show($(this),event)",
                               :onmouseout => "message_titile_hide($(this))"
@@ -251,16 +251,16 @@
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
 
-                  <%= link_to truncate(project_message.project.name,length: 30,omission: '...'), project_url(project_message.project, :token => @token.value),
+                  <%= link_to truncate(project_message.project.name,length: 30,omission: '...'), project_url(project_message.project),
                               :class=> "wmail_column",
                               :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
 
-                  <%= link_to project_message.author, user_activities_url(project_message.author,:token => @token.value), :class => "wmail_name",
+                  <%= link_to project_message.author, user_activities_url(project_message.author), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_send_course_messages) %></span>
 
-                  <%= link_to truncate(project_message.subject,length: 30,omission: '...'),board_message_url(project_message, :board_id => project_message.board_id,:token => @token.value),
+                  <%= link_to truncate(project_message.subject,length: 30,omission: '...'),board_message_url(project_message, :board_id => project_message.board_id),
                               :class => 'wmail_info',
                               :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                   %>
@@ -283,16 +283,16 @@
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
                   <% unless wikicontent.page.nil? %>
-                    <%= link_to truncate(wikicontent.page.wiki.project.name,length: 30,omission: '...'), project_url(wikicontent.page.wiki.project, :token => @token.value),
+                    <%= link_to truncate(wikicontent.page.wiki.project.name,length: 30,omission: '...'), project_url(wikicontent.page.wiki.project),
                               :class=> "wmail_column",
                               :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <% end %>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
-                  <%= link_to wikicontent.author, user_activities_url(wikicontent.author,:token => @token.value), :class => "wmail_name",
+                  <%= link_to wikicontent.author, user_activities_url(wikicontent.author), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_wiki_mail_notification) %></span>
                   <% unless wikicontent.page.nil? %>
-                    <%= link_to wikicontent.text.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe, project_wiki_url(wikicontent.page.wiki,:token => @token.value),
+                    <%= link_to wikicontent.text.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe, project_wiki_url(wikicontent.page.wiki),
                               :class => 'wmail_info',
                               :style => "color:#2E8DD7;float:left; max-width:400px;height:23px;font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                    <% end %>
@@ -314,15 +314,15 @@
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
 
-                  <%= link_to truncate(project_new.project.name,length: 30,omission: '...'), project_url(project_new.project, :token => @token.value),
+                  <%= link_to truncate(project_new.project.name,length: 30,omission: '...'), project_url(project_new.project),
                               :class=> "wmail_column",
                               :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
-                  <%= link_to project_new.author, user_activities_url(project_new.author,:token => @token.value), :class => "wmail_name",
+                  <%= link_to project_new.author, user_activities_url(project_new.author), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_mail_notice) %></span>
 
-                  <%= link_to truncate(project_new.title,length: 30,omission: '...'), news_url(project_new,:token => @token.value),
+                  <%= link_to truncate(project_new.title,length: 30,omission: '...'), news_url(project_new),
                               :class => 'wmail_info',
                               :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_date" style="color:#6e6e6e; float:left;display:block; margin-left:40px;"><%= format_time(project_new.created_on) %></span>
@@ -336,16 +336,16 @@
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
                   <% unless project_news_comment.commented.nil? %>
-                      <%= link_to truncate(project_news_comment.commented.project.name,length: 30,omission: '...'), project_url(project_news_comment.commented.project, :token => @token.value),
+                      <%= link_to truncate(project_news_comment.commented.project.name,length: 30,omission: '...'), project_url(project_news_comment.commented.project),
                                   :class=> "wmail_column",
                                   :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <% end %>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
-                  <%= link_to project_news_comment.author, user_activities_url(project_news_comment.author,:token => @token.value), :class => "wmail_name",
+                  <%= link_to project_news_comment.author, user_activities_url(project_news_comment.author), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:lable_project_mail_notice_reply) %></span>
 
-                  <%= link_to truncate(l(:lable_project_notice_point),length: 30,omission: '...'), news_url(project_news_comment.commented,:token => @token.value),
+                  <%= link_to truncate(l(:lable_project_notice_point),length: 30,omission: '...'), news_url(project_news_comment.commented),
                               :class => 'wmail_info',
                               :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_date" style="color:#6e6e6e; float:left;display:block; margin-left:40px;"><%= format_time(project_news_comment.created_on) %></span>
@@ -366,16 +366,16 @@
                 <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                 <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
 
-                <%= link_to truncate(project_attachment.project.name,length: 30,omission: '...'), project_url(project_attachment.project, :token => @token.value),
+                <%= link_to truncate(project_attachment.project.name,length: 30,omission: '...'), project_url(project_attachment.project),
                             :class=> "wmail_column",
                             :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                 <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
 
-                <%= link_to project_attachment.author, user_activities_url(project_attachment.author,:token => @token.value), :class => "wmail_name",
+                <%= link_to project_attachment.author, user_activities_url(project_attachment.author), :class => "wmail_name",
                             :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                 <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_mail_upload) %></span>
 
-                <%= link_to truncate(project_attachment.filename,length: 30,omission: '...'), project_files_url(project_attachment.project,:token => @token.value),
+                <%= link_to truncate(project_attachment.filename,length: 30,omission: '...'), project_files_url(project_attachment.project),
                             :class => 'wmail_info',
                             :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                 %>
@@ -398,16 +398,16 @@
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
 
-                  <%= link_to truncate(project_journal_message.project.name,length: 30,omission: '...'), project_url(project_journal_message.project, :token => @token.value),
+                  <%= link_to truncate(project_journal_message.project.name,length: 30,omission: '...'), project_url(project_journal_message.project),
                               :class=> "wmail_column",
                               :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
 
-                  <%= link_to project_journal_message.user, user_activities_url(project_journal_message.user,:token => @token.value), :class => "wmail_name",
+                  <%= link_to project_journal_message.user, user_activities_url(project_journal_message.user), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_send_course_journals_for_messages) %></span>
 
-                  <%= link_to project_journal_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe, project_feedback_url(project_journal_message.project,:token => @token.value),
+                  <%= link_to project_journal_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe, project_feedback_url(project_journal_message.project),
                               :class => 'wmail_info',
                               :style => "color:#2E8DD7;float:left; max-width:400px; max-height:30px;font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                   %>
@@ -434,12 +434,12 @@
             <li  style="clear: both; list-style: none;">
               <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
 
-              <%= link_to user_journal_message.user, user_activities_url(user_journal_message.user,:token => @token.value),
+              <%= link_to user_journal_message.user, user_activities_url(user_journal_message.user),
                           :class => "wmail_name",
                           :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
               <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_show_your_message) %></span>
 
-              <%= link_to user_journal_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe,feedback_url(@user,:token => @token.value),
+              <%= link_to user_journal_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe,feedback_url(@user),
                           :class => 'wmail_info',
                           :style => "color:#2E8DD7;float:left; max-width:400px; max-height:30px;font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
               %>
@@ -466,12 +466,12 @@
                 <li  style="clear: both; list-style: none;">
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
 
-                  <%= link_to forum.creator, user_activities_url(forum.creator,:token => @token.value),
+                  <%= link_to forum.creator, user_activities_url(forum.creator),
                               :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_forum_new) %></span>
 
-                  <%= link_to truncate(forum.name,length: 30,omission: '...'),forum_url(forum,:token => @token.value),
+                  <%= link_to truncate(forum.name,length: 30,omission: '...'),forum_url(forum),
                               :class => 'wmail_info',
                               :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                   %>
@@ -492,7 +492,7 @@
                 <li  style="clear: both; list-style: none;">
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
 
-                  <%= link_to memo.author, user_activities_url(memo.author,:token => @token.value),
+                  <%= link_to memo.author, user_activities_url(memo.author),
                               :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= memo.parent_id.nil? ? l(:label_memo_new_from_forum) : l(:label_reply)  %></span>
@@ -516,7 +516,7 @@
       <% if Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten][@user.mail_notification] == mail_option %>
           <label style="margin-top:20px;color:gray; margin-left:10px;"><%= l(mail_option) %></label>
       <% else %>
-          <%= link_to l(mail_option), my_change_mail_notification_url(token: @token.value,mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
+          <%= link_to l(mail_option), my_change_mail_notification_url(mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
       <% end %>
   <% end %>
 </div>

app/views/mailer/send_for_user_activities.text.erb

@@ -6,11 +6,11 @@
         <%= l(:label_course_news) %>
         <% @course_news.each do |course_new|%>
 
-            ▪[<%= link_to truncate(course_new.course.name,length: 30,omission: '...'), course_url(course_new.course, :token => @token.value)%> ]
+            ▪[<%= link_to truncate(course_new.course.name,length: 30,omission: '...'), course_url(course_new.course)%> ]
 
-            <%= link_to course_new.author, user_activities_url(course_new.author,:token => @token.value) %>
+            <%= link_to course_new.author, user_activities_url(course_new.author) %>
             <%= l(:label_project_notice) %>
-            <%= link_to truncate(course_new.title,length: 30,omission: '...'), news_url(course_new,:token => @token.value) %>
+            <%= link_to truncate(course_new.title,length: 30,omission: '...'), news_url(course_new) %>
             <%= format_time(course_new.created_on) %>
         <% end %>
     <% end %>
@@ -19,12 +19,12 @@
         <%= l(:label_course_news) %>
         <% @course_news_comments.each do |course_news_comment|%>
             ▪[ <% unless course_news_comment.commented.nil? %>
-                <%= link_to truncate(course_news_comment.commented.course.name,length: 30,omission: '...'), course_url(course_news_comment.commented.course, :token => @token.value) %>
+                <%= link_to truncate(course_news_comment.commented.course.name,length: 30,omission: '...'), course_url(course_news_comment.commented.course) %>
             <% end %>
             ]
-            <%= link_to course_news_comment.author, user_activities_url(course_news_comment.author,:token => @token.value) %>
+            <%= link_to course_news_comment.author, user_activities_url(course_news_comment.author) %>
             <%= l(:label_project_notice_reply) %>
-            <%= link_to truncate(course_news_comment.comments,length: 30,omission: '...'), news_url(course_news_comment.commented,:token => @token.value) %>
+            <%= link_to truncate(course_news_comment.comments,length: 30,omission: '...'), news_url(course_news_comment.commented) %>
             <%= format_time(course_news_comment.created_on) %>
         <% end %>
     <% end %>
@@ -33,10 +33,10 @@
         <%= l(:label_homework_overview) %>
         <% unless @bids.first.nil?%>
             <% @bids.each do |bid| %>
-                ▪[<%= link_to truncate(bid.course.name,length: 30,omission: '...'),course_url(bid.course, :token => @token.value) %>]
-                <%= link_to bid.user, user_activities_url(bid.user,:token => @token.value) %>
+                ▪[<%= link_to truncate(bid.course.name,length: 30,omission: '...'),course_url(bid.course) %>]
+                <%= link_to bid.user, user_activities_url(bid.user) %>
                 <%= l(:label_course_homework) %>
-                <%= link_to truncate(bid.name, length: 30,omission: '...'), student_work_index_path(:homework => bid.id,:token => @token.value) %>
+                <%= link_to truncate(bid.name, length: 30,omission: '...'), student_work_index_path(:homework => bid.id) %>
                 <%= format_time(bid.created_at) %>
             <% end %>
         <% end %>
@@ -46,10 +46,10 @@
     <% unless @course_journal_messages.first.nil? %>
         <%= l(:view_course_journals_for_messages) %>
         <% @course_journal_messages.each do |course_journal_message|%>
-            [ <%= link_to truncate(course_journal_message.course.name,length: 30,omission: '...'), course_url(course_journal_message.course, :token => @token.value) %>]
-            <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user,:token => @token.value) %>
+            [ <%= link_to truncate(course_journal_message.course.name,length: 30,omission: '...'), course_url(course_journal_message.course) %>]
+            <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user) %>
             <%= l(:label_send_course_journals_for_messages) %>
-            <%= link_to truncate(course_journal_message.notes.html_safe,length: 30,omission: '...'), course_feedback_url(course_journal_message.course,:token => @token.value) %>
+            <%= link_to truncate(course_journal_message.notes.html_safe,length: 30,omission: '...'), course_feedback_url(course_journal_message.course) %>
             <%= format_time(course_journal_message.created_on) %>
         <% end %>
     <% end %>
@@ -57,10 +57,10 @@
     <% unless @course_messages.first.nil? %>
         <%= l(:view_borad_course) %>
         <% @course_messages.each do |course_message|%>
-            ▪[<%= link_to truncate(course_message.course.name,length: 30,omission: '...'), course_url(course_message.course, :token => @token.value)%>]
-            <%= link_to course_message.author, user_activities_url(course_message.author,:token => @token.value) %>
+            ▪[<%= link_to truncate(course_message.course.name,length: 30,omission: '...'), course_url(course_message.course)%>]
+            <%= link_to course_message.author, user_activities_url(course_message.author) %>
             <%= l(:label_send_course_messages) %>
-            <%= link_to truncate(course_message.subject,length: 30,omission: '...'),board_message_url(course_message, :board_id => course_message.board_id,:token => @token.value) %>
+            <%= link_to truncate(course_message.subject,length: 30,omission: '...'),board_message_url(course_message, :board_id => course_message.board_id) %>
             <%= format_time(course_message.created_on) %>
         <% end %>
     <% end %>
@@ -68,10 +68,10 @@
     <% unless @attachments.first.nil? %>
         <%= l(:label_course_mail_files) %>
         <% @attachments.each do |attachment|%>
-            ▪[<%= link_to truncate(attachment.course.name,length: 30,omission: '...'), course_url(attachment.course, :token => @token.value) %>]
-            <%= link_to attachment.author, user_activities_url(attachment.author,:token => @token.value) %>
+            ▪[<%= link_to truncate(attachment.course.name,length: 30,omission: '...'), course_url(attachment.course) %>]
+            <%= link_to attachment.author, user_activities_url(attachment.author) %>
             <%= l(:label_course_file_upload) %>
-            <%= link_to truncate(attachment.filename,length: 30,omission: '...'),course_files_url(attachment.course,:token => @token.value) %>
+            <%= link_to truncate(attachment.filename,length: 30,omission: '...'),course_files_url(attachment.course) %>
             <%= format_time(attachment.created_on) %>
         <% end %>
         <!--课件下载  end-->
@@ -86,10 +86,10 @@
     <% unless @issues.first.nil? %>
         <%= l(:label_issue_tracking) %>
         <% @issues.each do |issue|%>
-            ▪[<%= link_to truncate(issue.project.name,length: 30,omission: '...'), project_url(issue.project, :token => @token.value) %>]
-            <%= link_to issue.author, user_activities_url(issue.author,:token => @token.value) %>
+            ▪[<%= link_to truncate(issue.project.name,length: 30,omission: '...'), project_url(issue.project) %>]
+            <%= link_to issue.author, user_activities_url(issue.author) %>
             <%= l(:label_project_issue) %>
-            <%= link_to truncate(issue.subject,length: 30,omission: '...'),issue_url(issue,  :token => @token.value) %>
+            <%= link_to truncate(issue.subject,length: 30,omission: '...'),issue_url(issue) %>
             <%= format_time(issue.created_on) %>
         <% end %>
         <!--问题跟踪 end-->
@@ -99,13 +99,13 @@
     <% unless @issues_journals.first.nil? %>
         <%= l(:label_issue_tracking) %>
         <% @issues_journals.each do |issues_journal| %>
-            ▪[<%= link_to truncate(issues_journal.issue.project.name,length: 30,omission: '...'), project_url(issues_journal.issue.project, :token => @token.value) %>]
-            <%= link_to issues_journal.user, user_activities_url(issues_journal.user,:token => @token.value) %>
+            ▪[<%= link_to truncate(issues_journal.issue.project.name,length: 30,omission: '...'), project_url(issues_journal.issue.project) %>]
+            <%= link_to issues_journal.user, user_activities_url(issues_journal.user) %>
             <%= l(:label_project_issue_update) %>
             <% if issues_journal.notes.nil? %>
-                <%= link_to truncate(issues_journal.issue.subject,length: 30,omission: '...'),issue_url(issue,  :token => @token.value) %>
+                <%= link_to truncate(issues_journal.issue.subject,length: 30,omission: '...'),issue_url(issue) %>
             <% else %>
-                <%= link_to truncate(issues_journal.notes.html_safe,length: 30,omission: '...'),issue_url(issues_journal.issue,  :token => @token.value) %>
+                <%= link_to truncate(issues_journal.notes.html_safe,length: 30,omission: '...'),issue_url(issues_journal.issue) %>
             <% end %>
             <%= format_time(issues_journal.created_on) %>
         <% end %>
@@ -115,10 +115,10 @@
     <% unless @project_messages.first.nil? %>
         <%= l(:project_moule_boards_show) %>
         <% @project_messages.each do |project_message|%>
-            ▪[<%= link_to truncate(project_message.project.name,length: 30,omission: '...'), project_url(project_message.project, :token => @token.value) %>]
-            <%= link_to project_message.author, user_activities_url(project_message.author,:token => @token.value) %>
+            ▪[<%= link_to truncate(project_message.project.name,length: 30,omission: '...'), project_url(project_message.project) %>]
+            <%= link_to project_message.author, user_activities_url(project_message.author) %>
             <%= l(:label_send_course_messages) %>
-            <%= link_to truncate(project_message.subject,length: 30,omission: '...'),board_message_url(project_message, :board_id => project_message.board_id,:token => @token.value) %>
+            <%= link_to truncate(project_message.subject,length: 30,omission: '...'),board_message_url(project_message, :board_id => project_message.board_id) %>
             <%= format_time(project_message.created_on) %>
         <% end %>
         <!--项目论坛 end-->
@@ -129,13 +129,13 @@
         <%= l(:label_wiki) %>
         <% @wiki_contents.each do |wikicontent|%>
             ▪[<% unless wikicontent.page.nil? %>
-                <%= link_to truncate(wikicontent.page.wiki.project.name,length: 30,omission: '...'), project_url(wikicontent.page.wiki.project, :token => @token.value) %>
+                <%= link_to truncate(wikicontent.page.wiki.project.name,length: 30,omission: '...'), project_url(wikicontent.page.wiki.project) %>
             <% end %>
             ]
-            <%= link_to wikicontent.author, user_activities_url(wikicontent.author,:token => @token.value) %>
+            <%= link_to wikicontent.author, user_activities_url(wikicontent.author) %>
             <%= l(:label_wiki_mail_notification) %>
             <% unless wikicontent.page.nil? %>
-                <%= link_to truncate(wikicontent.text.html_safe, length: 30,omission: '...'), project_wiki_url(wikicontent.page.wiki,:token => @token.value) %>
+                <%= link_to truncate(wikicontent.text.html_safe, length: 30,omission: '...'), project_wiki_url(wikicontent.page.wiki) %>
             <% end %>
             <%= format_time(wikicontent.updated_on) %>
         <% end %>
@@ -145,10 +145,10 @@
     <% unless @project_news.first.nil? %>
         <%= l(:label_project_news) %>
         <% @project_news.each do |project_new|%>
-            ▪[<%= link_to truncate(project_new.project.name,length: 30,omission: '...'), project_url(project_new.project, :token => @token.value) %> ]
-            <%= link_to project_new.author, user_activities_url(project_new.author,:token => @token.value) %>
+            ▪[<%= link_to truncate(project_new.project.name,length: 30,omission: '...'), project_url(project_new.project) %> ]
+            <%= link_to project_new.author, user_activities_url(project_new.author) %>
             <%= l(:label_project_mail_notice) %>
-            <%= link_to truncate(project_new.title.html_safe,length: 30,omission: '...'), news_url(project_new,:token => @token.value) %>
+            <%= link_to truncate(project_new.title.html_safe,length: 30,omission: '...'), news_url(project_new) %>
             <%= format_time(project_new.created_on) %>
         <% end %>
     <% end %>
@@ -158,11 +158,11 @@
         <%= l(:label_project_news) %>
         <% @project_news_comments.each do |project_news_comment|%>
             ▪[ <% unless project_news_comment.commented.nil? %>
-                <%= link_to truncate(project_news_comment.commented.project.name,length: 30,omission: '...'), project_url(project_news_comment.commented.project, :token => @token.value) %>
+                <%= link_to truncate(project_news_comment.commented.project.name,length: 30,omission: '...'), project_url(project_news_comment.commented.project) %>
             <% end %>]
-            <%= link_to project_news_comment.author, user_activities_url(project_news_comment.author,:token => @token.value) %>
+            <%= link_to project_news_comment.author, user_activities_url(project_news_comment.author) %>
             <%= l(:lable_project_mail_notice_reply) %>
-            <%= link_to truncate(project_news_comment.comments.html_safe,length: 30,omission: '...'), news_url(project_news_comment.commented,:token => @token.value) %>
+            <%= link_to truncate(project_news_comment.comments.html_safe,length: 30,omission: '...'), news_url(project_news_comment.commented) %>
             <%= format_time(project_news_comment.created_on) %>
         <% end %>
         <!-- 项目新闻回复end -->
@@ -172,10 +172,10 @@
     <% unless @project_attachments.first.nil? %>
         <%= l(:label_project_mail_attachments) %>
          <% @project_attachments.each do |project_attachment|%>
-              ▪[<%= link_to truncate(project_attachment.project.name,length: 30,omission: '...'), project_url(project_attachment.project, :token => @token.value) %>]
-              <%= link_to project_attachment.author, user_activities_url(project_attachment.author,:token => @token.value) %>
+              ▪[<%= link_to truncate(project_attachment.project.name,length: 30,omission: '...'), project_url(project_attachment.project) %>]
+              <%= link_to project_attachment.author, user_activities_url(project_attachment.author) %>
               <%= l(:label_project_mail_upload) %>
-              <%= link_to truncate(project_attachment.filename,length: 30,omission: '...'),project_files_url(project_attachment.project,:token => @token.value) %>
+              <%= link_to truncate(project_attachment.filename,length: 30,omission: '...'),project_files_url(project_attachment.project) %>
               <%= format_time(project_attachment.created_on) %>
           <% end %> <!-- 项目上传资源  end-->
     <% end %>
@@ -184,10 +184,10 @@
     <% unless @project_journal_messages.first.nil? %>
         <%= l(:label_project_mail_feedback) %>
         <% @project_journal_messages.each do |project_journal_message|%>
-            ▪[<%= link_to truncate(project_journal_message.project.name,length: 30,omission: '...'), project_url(project_journal_message.project, :token => @token.value) %> ]
-            <%= link_to project_journal_message.user, user_activities_url(project_journal_message.user,:token => @token.value) %>
+            ▪[<%= link_to truncate(project_journal_message.project.name,length: 30,omission: '...'), project_url(project_journal_message.project) %> ]
+            <%= link_to project_journal_message.user, user_activities_url(project_journal_message.user) %>
             <%= l(:label_send_course_journals_for_messages) %>
-            <%= link_to truncate(project_journal_message.notes.html_safe,length: 30,omission: '...'), project_feedback_url(project_journal_message.project,:token => @token.value) %>
+            <%= link_to truncate(project_journal_message.notes.html_safe,length: 30,omission: '...'), project_feedback_url(project_journal_message.project) %>
             <%= format_time(project_journal_message.created_on) %>
         <% end %>
         <!--项目留言 end-->
@@ -202,9 +202,9 @@
     <%= l(:label_user_message) %>
     (<%= @user_journal_messages.count %>)
     <% @user_journal_messages.each do |user_journal_message|%>
-        ▪ <%= link_to user_journal_message.user, user_activities_url(user_journal_message.user,:token => @token.value)%>
+        ▪ <%= link_to user_journal_message.user, user_activities_url(user_journal_message.user)%>
         <%= l(:label_show_your_message) %>
-        <%= link_to truncate(user_journal_message.notes.html_safe,length: 30,omission: '...'), feedback_url(@user,:token => @token.value) %>
+        <%= link_to truncate(user_journal_message.notes.html_safe,length: 30,omission: '...'), feedback_url(@user) %>
         <%= format_time(user_journal_message.created_on) %>
     <% end %>
 <% end %>
@@ -214,9 +214,9 @@
     <% unless @forums.first.nil? %>
         <%= l(:label_user_forum) %>
         <% @forums.each do |forum|%>
-            ▪<%= link_to forum.creator, user_activities_url(forum.creator,:token => @token.value) %>
+            ▪<%= link_to forum.creator, user_activities_url(forum.creator) %>
             <%= l(:label_forum_new) %>
-            <%= link_to truncate(forum.name.html_safe,length: 30,omission: '...'),forum_url(forum,:token => @token.value) %>
+            <%= link_to truncate(forum.name.html_safe,length: 30,omission: '...'),forum_url(forum) %>
             <%= format_time(forum.created_at) %>
         <% end %>
         <!-- 新建贴吧 end-->
@@ -224,7 +224,7 @@
     <% unless @memos.first.nil? %>
         <%= l(:label_user_message_forum) %>
         <% @memos.each do |memo|%>
-            ▪<%= link_to memo.author, user_activities_url(memo.author,:token => @token.value)%>
+            ▪<%= link_to memo.author, user_activities_url(memo.author)%>
             <%= memo.parent_id.nil? ? l(:label_memo_new_from_forum) : l(:label_reply) %>
             <%= link_to truncate(memo.subject.html_safe,length: 30,omission: '...'),forum_memo_url(memo.forum, (memo.parent_id.nil? ? memo : memo.parent_id))%>
             <%= format_time(memo.created_at) %>
@@ -238,6 +238,6 @@
     <% if Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten][@user.mail_notification] == mail_option %>
         <%= l(mail_option) %>
     <% else %>
-        <%= link_to l(mail_option), my_change_mail_notification_url(token: @token.value,mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
+        <%= link_to l(mail_option), my_change_mail_notification_url(mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
     <% end %>
 <% end %>

app/views/messages/_course_show.html.erb

@@ -57,6 +57,7 @@
                               :data => {:confirm => l(:text_are_you_sure)},
                               :class => 'postOptionLink'
                       ) if @message.course_destroyable_by?(User.current) %>
+                <%= link_to "发送",messages_join_org_subfield_path(:message_id => @topic.id) , :remote=> true,:class => 'postOptionLink' %>
               </li>
             </ul>
           </li>

app/views/messages/_form_project.html.erb

@@ -1,16 +1,23 @@
+
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
 <%= error_messages_for 'message' %>
 <% replying ||= false %>
-<% extra_option = replying ? { readonly: true} : { maxlength: 200 } %>
+<% extra_option = replying ? { hidden: "hidden"} : { maxlength: 200 } %>
+
 <li>
-  <label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label>
+  <div style="display:<%= replying ? 'none' : 'block'%>;" class="fl"><label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label></div>
   <% if replying %>
-      <%= f.text_field :subject, { size: 60, id: "message_subject",:class=>"talk_input w585" }.merge(extra_option) %>
+      <div style="display: none;"><%= f.text_field :subject, { size: 60, id: "message_subject",:class=>"talk_input w585 fl" }.merge(extra_option) %></div>
   <% else %>
       <%= f.text_field :subject, { size: 60, id: "message_subject", onkeyup: "regexSubject();",:class=>"talk_input w585" }.merge(extra_option) %>
+      <p id="subject_span" class="ml55"></p>
   <% end %>
-  <p id="subject_span" class="ml55"></p>
+  <div class="cl"></div>
 </li>
-<li class="ml55 mb5">
+<li class="ml60 mb5">
   <% unless replying %>
       <% if @message.safe_attribute? 'sticky' %>
           <%= f.check_box :sticky %>
@@ -24,20 +31,45 @@
   <div class="cl"></div>
 </li>
 <li>
-  <div id="message_quote" class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;"></div>
-  <label class="fl ml3" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;：</label>
+  <div id="message_quote" class="wiki" style="width: 92%;word-break: break-all;word-wrap: break-word;margin-left: 40px;"></div>
+  <!--<label class="fl" >
+    <span class="c_red">*</span>&nbsp;
+    <%#= l(:field_description) %>&nbsp;&nbsp;：
+  </label>-->
   <%= text_area :quote,:quote,:style => 'display:none' %>
-  <%= f.text_area :content, :class => 'talk_text fl', :id => 'message_content', :onkeyup => "regexContent();", :maxlength => 5000,:placeholder => "最多3000个汉字(或6000个英文字符)" %>
+  <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+  <% if replying %>
+      <%= f.kindeditor :content, :editor_id => 'message_content_editor',
+                       :width => '99%',
+                       :height => 100,
+                       :minHeight=>100,
+                       :input_html => { :id => 'message_content',
+                                        :class => 'talk_text fl',
+                                        :maxlength => 5000 }%>
+  <% else %>
+      <%= f.kindeditor :content, :editor_id => 'message_content_editor',
+                       :owner_id => @message.nil? ? 0: @message.id,
+                       :owner_type => OwnerTypeHelper::MESSAGE,
+                       :width => '90%',
+                       :height => 300,
+                       :minHeight=>300,
+                       :class => 'talk_text fl',
+                       :input_html => { :id => 'message_content',
+                                        :class => 'talk_text fl',
+                                        :maxlength => 5000 }%>
+  <% end %>
   <div class="cl"></div>
-  <p id="message_content_span"  class="ml55"></p>
+  <p id="message_content_span"></p>
 </li>
 <div class="cl"></div>
-<li>
-  <label class="fl">&nbsp;&nbsp;<%= l(:label_attachment_plural) %>&nbsp;&nbsp;：</label>
-  <div  class="fl ml3">
-    <%= render :partial => 'attachments/form_project', :locals => {:container => @message,:isReply => @isReply} %>
-  </div>
-</li>
+<% unless replying %>
+    <li>
+      <label class="fl mt10">&nbsp;&nbsp;<%= l(:label_attachment_plural) %>&nbsp;&nbsp;：</label>
+      <div  class="fl mt10">
+        <%= render :partial => 'attachments/form_project', :locals => {:container => @message,:isReply => @isReply} %>
+      </div>
+    </li>
+<% end %>
 <li >
   <div class="cl"></div>
-</li>
+</li>

app/views/messages/_join_org_subfield_menu.html.erb

@@ -0,0 +1,60 @@
+<!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 http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+  <script>
+      $(document).ready(function(){
+          $(".resourcePopupClose").click(function(){
+              $(".shareDP").css("display","none");
+          });
+          $(".sectionRow").toggle(
+                  function(){
+                      $(this).next().css("display","block");
+                  },
+                  function(){
+                      $(this).next().css("display","none");
+                  }
+          );
+      });
+      function join_org(){
+          if ($("#org_subfield_list input[type='checkbox']:checked").size() == 0)
+          {
+              alert("您还没有选择栏目！");
+          }
+          else
+          {
+              $("#join-form").submit();
+          }
+      }
+  </script>
+</head>
+
+<body>
+
+  <div>
+    <div class="relateText fl mb10">发送到</div>
+  </div>
+  <div class="cl"></div>
+  <div class="sectionWrap fl">
+
+    <div class="pl10 fontGrey3 sectionRow">
+      <span class="shareArrow"></span>我的组织
+    </div>
+    <ul class="fontGrey3 sectionContent" id="sectionContent3">
+      <% organizations.each do |org| %>
+          <li><span><%= link_to org.name, messages_get_subfield_on_click_org_path(:organization_id => org.id), :remote => true,:style =>"border:none; outline:none;"  %></span></li>
+      <% end %>
+    </ul>
+  </div>
+  <%= form_tag url_for(:controller => 'messages', :action => 'join_org_subfields', :id => id), :id => 'join-form', :remote => true %>
+  <div id="org_subfield_list">
+    <%= render :partial => 'show_org_subfields', :locals => {:org => nil} %>
+  </div>
+  <div class="cl"></div>
+  <div class="courseSendCancel mr2" style="float:right;"><a href="javascript:void(0);" onclick="hideModal();" class="sendSourceText">取消</a></div>
+  <div class="courseSendSubmit" style="float:right;"><a href="javascript:void(0);" onclick="join_org();" class="sendSourceText">确定</a></div>
+  <div class="cl"></div>
+
+</body>
+</html>

app/views/messages/_org_subfield_show.html.erb

@@ -0,0 +1,199 @@
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+<% end %>
+
+
+<script type="text/javascript">
+    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#Container").css("width","1000px");
+    });
+</script>
+<script>
+    function expand_reply(container,btnid){
+        var target = $(container).children();
+        var btn = $(btnid);
+        if(btn.data('init')=='0'){
+            btn.data('init',1);
+            btn.html('收起回复');
+            target.show();
+        }else{
+            btn.data('init',0);
+            btn.html('展开更多');
+            target.hide();
+            target.eq(0).show();
+            target.eq(1).show();
+            target.eq(2).show();
+        }
+    }
+
+    function course_board_canel_message_replay()
+    {
+        message_content_editor.html("");
+    }
+
+    function course_board_submit_message_replay()
+    {
+        if(MessageReplayVevify())
+        {
+            message_content_editor.sync();//提交内容之前要sync，不然服务器端取不到值
+            $("#message_form").submit();
+
+        }
+    }
+
+    function MessageReplayVevify() {
+        var content = message_content_editor.html();//$.trim($("#message_content").val());
+        if (message_content_editor.isEmpty()) {
+            $("#message_content_span").text("回复不能为空");
+            $("#message_content_span").css('color', '#ff0000');
+            return  false;
+        }
+        else {
+            $("#message_content_span").text("填写正确");
+            $("#message_content_span").css('color', '#008000');
+            return true;
+        }
+    }
+
+    $(function() {
+        init_activity_KindEditor_data(<%= @topic.id%>,null,"85%", "<%=@topic.class.to_s%>");
+        showNormalImage('message_description_<%= @topic.id %>');
+    });
+</script>
+<div class="postRightContainer ml10" onmouseover="$('#message_setting_<%= @topic.id%>').show();" onmouseout="$('#message_setting_<%= @topic.id%>').hide();">
+  <div class="postThemeContainer">
+    <div class="postDetailPortrait">
+      <%= link_to image_tag(url_to_avatar(@topic.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@topic.author) %>
+    </div>
+    <div class="postThemeWrap">
+      <% if @topic.author.id == User.current.id%>
+          <div class="homepagePostSetting" id="message_setting_<%= @topic.id%>" style="display: none">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <li>
+                    <%= link_to(
+                                l(:button_edit),
+                                {:action => 'edit', :id => @topic},
+                                :class => 'postOptionLink'
+                        ) if @message.org_subfield_editable_by?(User.current) %>
+                  </li>
+                  <li>
+                    <%= link_to(
+                                l(:button_delete),
+                                {:action => 'destroy', :id => @topic},
+                                :method => :post,
+                                :data => {:confirm => l(:text_are_you_sure)},
+                                :class => 'postOptionLink'
+                        ) if @message.org_subfield_editable_by?(User.current) %>
+                  </li>
+                  <!--<li> <%#= link_to "发送",messages_join_org_subfield_path(:message_id => @topic.id) , :remote=> true,:class => 'postOptionLink' %></li>-->
+                </ul>
+              </li>
+            </ul>
+          </div>
+      <%end%>
+      <div class="postDetailTitle fl">
+        <a href="javascript:void(0);" class="f14 linkGrey4 fb" style="overflow:hidden;">主题: <%= @topic.subject%></a>
+      </div>
+      <div class="cl"></div>
+
+      <div class="postDetailCreater">
+        <% if @topic.try(:author).try(:realname) == ' ' %>
+            <%= link_to @topic.try(:author), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
+        <% else %>
+            <%= link_to @topic.try(:author).try(:realname), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
+        <% end %>
+      </div>
+      <div class="postDetailDate mb5"><%= format_time( @topic.created_on)%></div>
+      <div class="cl"></div>
+      <div class="memo-content upload_img break_word" 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>
+      <div class=" fl" style="width: 600px">
+        <%= link_to_attachments_course @topic, :author => false %>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <div class="cl"></div>
+  <div class="homepagePostReply">
+    <% unless @replies.empty? %>
+        <div class="homepagePostReplyBanner">
+          <div class="homepagePostReplyBannerCount">回复（<%=@reply_count %>）</div>
+          <div class="homepagePostReplyBannerTime"></div>
+          <!-- <div class="homepagePostReplyBannerMore">
+        <%# if @reply_count > 2%>
+           <a href="javascript:void(0);" class="replyGrey"  id="reply_btn_<%#= @topic.id%>" onclick="expand_reply('#reply_div_<%#= @topic.id %>','#reply_btn_<%#= @topic.id%>')" data-count="<%#= @reply_count %>" data-init="0" >点击展开更多回复</a>
+        <%# end %>
+      </div>-->
+        </div>
+        <div class="" id="reply_div_<%=  @topic.id %>">
+          <% @replies.each_with_index  do |reply,i| %>
+              <script type="text/javascript">
+                  $(function(){
+                      showNormalImage('reply_message_description_<%= reply.id %>');
+                  });
+              </script>
+              <div class="homepagePostReplyContainer" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id%>').hide();">
+                <div class="homepagePostReplyPortrait">
+                  <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
+                </div>
+                <div class="homepagePostReplyDes">
+                  <div class="homepagePostReplyPublisher">
+                    <% if reply.try(:author).try(:realname) == ' ' %>
+                        <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
+                    <% else %>
+                        <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
+                    <% end %>
+                  </div>
+                  <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
+                    <%= reply.content.html_safe%>
+                  </div>
+                  <div style="margin-top: -7px; margin-bottom: 5px">
+                    <%= format_time(reply.created_on) %>
+                    <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
+                      <%= link_to(
+                                  l(:button_reply),
+                                  {:action => 'quote', :id => reply},
+                                  :remote => true,
+                                  :method => 'get',
+                                  :class => 'fr newsBlue',
+                                  :title => l(:button_reply)) if !@topic.locked? && authorize_for('messages', 'reply') %>
+                      <%= link_to(
+                                  l(:button_delete),
+                                  {:action => 'destroy', :id => reply},
+                                  :method => :post,
+                                  :class => 'fr newsGrey mr10',
+                                  :data => {:confirm => l(:text_are_you_sure)},
+                                  :title => l(:button_delete)
+                          ) if reply.org_subfield_editable_by?(User.current) %>
+                    </div>
+                  </div>
+                  <p id="reply_message_<%= reply.id%>"></p>
+                </div>
+                <div class="cl"></div>
+              </div>
+          <% end %>
+        </div>
+
+    <% end %>
+    <div class="cl"></div>
+    <% if !@topic.locked? && authorize_for_course('messages', 'reply') %>
+        <div class="talkWrapMsg" nhname="about_talk_reply">
+          <em class="talkWrapArrow"></em>
+          <div class="cl"></div>
+          <div class="talkConIpt ml5 mb10" id="reply<%= @topic.id %>">
+            <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message_form'} do |f| %>
+                <%= render :partial => 'form_course', :locals => {:f => f, :replying => true} %>
+                <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'course_board_canel_message_replay();', :class => "blue_btn grey_btn fr c_white mt10 mr5" %>
+                <%= link_to l(:button_submit), "javascript:void(0)", :onclick => 'course_board_submit_message_replay();', :class => "blue_btn fr c_white mt10", :style => "margin-left: 50px;" %>
+            <% end %>
+            <div class="cl"></div>
+          </div>
+        </div>
+    <% end %>
+  </div>
+</div>

app/views/messages/_project_show.html.erb

@@ -1,104 +1,3 @@
-<div class="project_r_h">
-  <h2 class="project_h2"><%= h @board.name %></h2>
-</div>
-<div class="problem_main">
-  <div class="ping_dispic">
-    <%=link_to image_tag(url_to_avatar(@topic.author), :width => "46", :height => "46"), user_path(@topic.author) %>
-  </div>
-  <div class="talk_txt fl">
-    <p class="problem_tit fl fb" style="word-break:break-all;" >
-        <%= @topic.subject %></p>
-    <br/>
-    <p>由<%= link_to_user_header @topic.author,false,:class=> 'problem_name c_orange' %> 添加于<%= format_time(@topic.created_on) %></p>
-  </div>
-  <!-- <a class="talk_edit fr">删除</a><a class="talk_edit fr">编辑</a><a class="talk_edit fr">置顶</a> -->
-  <%#= watcher_link(@topic, User.current) %>
-  <%= link_to(
-              l(:button_edit),
-              {:action => 'edit', :id => @topic},
-              :class => 'talk_edit fr'
-      ) if @message.editable_by?(User.current) %>
-  <%= link_to(
-              l(:button_delete),
-              {:action => 'destroy', :id => @topic},
-              :method => :post,
-              :data => {:confirm => l(:text_are_you_sure)},
-              :class => 'talk_edit fr'
-      ) if @message.destroyable_by?(User.current) %>
-  <div class="cl"></div>
-  <div class="talk_info mb10" style="word-break:break-all;"><%= textilizable(@topic, :content) %></div>
-  <div class="talk_info mb10"><%= link_to_attachment_project @topic, :author => false %></div>
-  <!-- <a href="#" class=" link_file ml60">附件：爱覅俄方if.zip(27.5kB)</a>-->
-  <div class="cl"></div>
-  <% if User.current.logged? %>
-      <%= toggle_link l(:button_reply), "reply", :focus => 'message_content',:class => 'talk_edit fr' %>
-  <% else %>
-      <%= link_to l(:button_reply), signin_path,:class => 'talk_edit fr' %>
-  <% end %>
-  <%= link_to(
-              l(:button_quote),
-              {:action => 'quote', :id => @topic},
-               :remote => true,
-               :method => 'get',
-               :class => 'talk_edit fr',
-               :remote => true) if !@topic.locked? && authorize_for('messages', 'reply') %>
-  <div class="cl"></div>
-</div><!--讨论主类容 end-->
-<% unless @replies.empty? %>
-    <% reply_count = 0 %>
-    <% @replies.each do |message| %>
-        <div class="ping_C mb10" id="<%= "message-#{message.id}" %>">
-          <div class="ping_dispic"><%= link_to image_tag(url_to_avatar(message.author), :width => '46',:height => '46'), user_path(message.author) %></div>
-          <div class="ping_discon">
-            <div class="ping_distop upload_img break_word">
-              <%= link_to_user_header message.author,false,:class => 'c_blue fb fl mb10 ' %>
-              <span class="c_grey fr"><%= format_time(message.created_on) %></span>
-              <div class="cl"></div>
-              <p class="break_word"><%= textAreailizable message,:content,:attachments => message.attachments %></p>
-              <%= link_to_attachments_course message, :author => false %>
-            </div>
-            <div class="ping_disfoot">
-              <%= link_to(
-                          l(:button_quote),
-                          {:action => 'quote', :id => message},
-                           :remote => true,
-                           :method => 'get',
-                           :title => l(:button_quote)) if !@topic.locked? && authorize_for('messages', 'reply') %>
-              <%= link_to(
-                          #image_tag('edit.png'),
-                          l(:button_edit),
-                           {:action => 'edit', :id => message},
-                            :title => l(:button_edit)
-                  ) if message.course_editable_by?(User.current) %>
-              <%= link_to(
-                          #image_tag('delete.png'),
-                          l(:button_delete),
-                          {:action => 'destroy', :id => message},
-                           :method => :post,
-                           :data => {:confirm => l(:text_are_you_sure)},
-                          :title => l(:button_delete)
-                  ) if message.course_destroyable_by?(User.current) %>
-            </div>
-            <div class="cl"></div>
-          </div>
-          <div class="cl"></div>
-        </div><!---留言内容-->
-    <% end %>
-<% end %>
-<% if !@topic.locked? && authorize_for('messages', 'reply') %>
-    <div id="reply" style="display:none;">
-      <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message_form'} do |f| %>
-          <p class="talk_top"><%= l(:label_message_reply) %></p>
-          <%= render :partial => 'form_project', :locals => {:f => f, :replying => true} %>
-          <a href="#" onclick="submit_message_replay();"class="blue_btn fl c_white ml5" style="margin-left: 50px;"><%= l(:button_submit)%></a>
-      <% end %>
-      <div id="preview" class="wiki"></div>
-    </div>
-<% end %>
-<ul class="wlist">
-  <%= pagination_links_full @reply_pages, @reply_count, :per_page_links => false, :remote => false, :flag => true%>
-</ul>
-<% html_title @topic.subject %>
 
 <script type="text/javascript">
 //    var flag = false;
@@ -107,7 +6,7 @@
 //    });
     function submit_message_replay()
     {
-        if(flag)
+        if(regexContent() == false)
         {
             $("#message_form").submit();
         }
@@ -119,13 +18,208 @@
         {
             $("#message_content_span").text("<%= l(:label_reply_empty) %>");
             $("#message_content_span").css('color','#ff0000');
-            flag =  false;
+            return false;
         }
         else
         {
             $("#message_content_span").text("<%= l(:label_field_correct) %>");
             $("#message_content_span").css('color','#008000');
-            flag = true;
+            return true;
         }
     }
-</script>
+</script>
+
+
+
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+<% end %>
+
+
+<script type="text/javascript">
+    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#Container").css("width","1000px");
+    });
+</script>
+<script>
+    function expand_reply(container,btnid){
+        var target = $(container).children();
+        var btn = $(btnid);
+        if(btn.data('init')=='0'){
+            btn.data('init',1);
+            btn.html('收起回复');
+            target.show();
+        }else{
+            btn.data('init',0);
+            btn.html('展开更多');
+            target.hide();
+            target.eq(0).show();
+            target.eq(1).show();
+            target.eq(2).show();
+        }
+    }
+    function project_board_submit_message_replay()
+    {
+        if(MessageReplayVevify())
+        {
+            message_content_editor.sync();//提交内容之前要sync，不然服务器端取不到值
+            $("#message_form").submit();
+        }
+    }
+
+    function project_board_canel_message_replay()
+    {
+        $("#reply").hide(200);
+        $("#message_quote").html("");
+    }
+
+    function MessageReplayVevify() {
+        var content = message_content_editor.html();//$.trim($("#message_content").val());
+        if (message_content_editor.isEmpty()) {
+            $("#message_content_span").text("回复不能为空");
+            $("#message_content_span").css('color', '#ff0000');
+            return  false;
+        }
+        else {
+            $("#message_content_span").text("填写正确");
+            $("#message_content_span").css('color', '#008000');
+            return true;
+        }
+    }
+    $(function() {
+        init_activity_KindEditor_data(<%= @topic.id%>,null,"85%", "<%=@topic.class.to_s%>");
+        showNormalImage('message_description_<%= @topic.id %>');
+    });
+</script>
+<div class="homepageRight mt0">
+  <div class="postRightContainer ml10" onmouseover="$('#message_setting_<%= @topic.id%>').show();" onmouseout="$('#message_setting_<%= @topic.id%>').hide();">
+    <div class="postThemeContainer">
+      <div class="postDetailPortrait">
+        <%= link_to image_tag(url_to_avatar(@topic.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@topic.author) %>
+      </div>
+      <div class="postThemeWrap">
+        <% if @topic.author.id == User.current.id%>
+            <div class="homepagePostSetting" id="message_setting_<%= @topic.id%>" style="display: none">
+              <ul>
+                <li class="homepagePostSettingIcon">
+                  <ul class="homepagePostSettiongText">
+                    <li>
+                      <%= link_to(l(:button_edit), {:action => 'edit', :id => @topic}, :class => 'postOptionLink') if @message.editable_by?(User.current) %>
+                    </li>
+                    <li>
+                      <%= link_to(l(:button_delete), {:action => 'destroy', :id => @topic},:method => :post,
+                                  :data => {:confirm => l(:text_are_you_sure)},
+                                  :class => 'postOptionLink'
+                          ) if @message.destroyable_by?(User.current) %>
+                    </li>
+                    <li> <%= link_to "发送",messages_join_org_subfield_path(:message_id => @topic.id) , :remote=> true,:class => 'postOptionLink' %></li>
+                  </ul>
+                </li>
+              </ul>
+            </div>
+        <%end%>
+        <div class="postDetailTitle fl">
+          <a href="javascript:void(0);" class="f14 linkGrey4 fb" style="overflow:hidden;">主题: <%= @topic.subject%></a>
+        </div>
+        <div class="cl"></div>
+
+        <div class="postDetailCreater">
+          <% if @topic.try(:author).try(:realname) == ' ' %>
+              <%= link_to @topic.try(:author), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
+          <% else %>
+              <%= link_to @topic.try(:author).try(:realname), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
+          <% end %>
+        </div>
+        <div class="postDetailDate mb5"><%= format_time( @topic.created_on)%></div>
+        <div class="cl"></div>
+        <div class="memo-content upload_img break_word" 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>
+        <div class=" fl" style="width: 600px">
+          <%= link_to_attachments_course @topic, :author => false %>
+        </div>
+      </div>
+      <div class="cl"></div>
+    </div>
+    <div class="cl"></div>
+    <div class="homepagePostReply">
+      <% unless @replies.empty? %>
+          <div class="homepagePostReplyBanner">
+            <div class="homepagePostReplyBannerCount">回复（<%=@reply_count %>）</div>
+            <div class="homepagePostReplyBannerTime"></div>
+            <!-- <div class="homepagePostReplyBannerMore">
+        <%# if @reply_count > 2%>
+           <a href="javascript:void(0);" class="replyGrey"  id="reply_btn_<%#= @topic.id%>" onclick="expand_reply('#reply_div_<%#= @topic.id %>','#reply_btn_<%#= @topic.id%>')" data-count="<%#= @reply_count %>" data-init="0" >点击展开更多回复</a>
+        <%# end %>
+      </div>-->
+          </div>
+          <div class="" id="reply_div_<%=  @topic.id %>">
+            <% @replies.each_with_index  do |reply,i| %>
+                <script type="text/javascript">
+                    $(function(){
+                        showNormalImage('reply_message_description_<%= reply.id %>');
+                    });
+                </script>
+                <div class="homepagePostReplyContainer" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id%>').hide();">
+                  <div class="homepagePostReplyPortrait">
+                    <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
+                  </div>
+                  <div class="homepagePostReplyDes">
+                    <div class="homepagePostReplyPublisher">
+                      <% if reply.try(:author).try(:realname) == ' ' %>
+                          <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
+                      <% else %>
+                          <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
+                      <% end %>
+                    </div>
+                    <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
+                      <%= reply.content.html_safe%>
+                    </div>
+                    <div style="margin-top: -7px; margin-bottom: 5px">
+                      <%= format_time(reply.created_on) %>
+                      <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
+                        <%= link_to(
+                                    l(:button_reply),
+                                    {:action => 'quote', :id => reply},
+                                    :remote => true,
+                                    :method => 'get',
+                                    :class => 'fr newsBlue',
+                                    :title => l(:button_reply)) if !@topic.locked? && authorize_for('messages', 'reply') %>
+                        <%= link_to(
+                                    l(:button_delete),
+                                    {:action => 'destroy', :id => reply},
+                                    :method => :post,
+                                    :class => 'fr newsGrey mr10',
+                                    :data => {:confirm => l(:text_are_you_sure)},
+                                    :title => l(:button_delete)
+                            ) if reply.destroyable_by?(User.current) %>
+                      </div>
+                    </div>
+                    <p id="reply_message_<%= reply.id%>"></p>
+                  </div>
+                  <div class="cl"></div>
+                </div>
+            <% end %>
+          </div>
+
+      <% end %>
+      <div class="cl"></div>
+      <% if !@topic.locked? && authorize_for('messages', 'reply') %>
+          <div class="talkWrapMsg" nhname="about_talk_reply">
+            <em class="talkWrapArrow"></em>
+            <div class="cl"></div>
+            <div class="talkConIpt ml5 mb10" id="reply<%= @topic.id %>">
+              <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message_form'} do |f| %>
+                  <%= render :partial => 'form_project', :locals => {:f => f, :replying => true} %>
+                  <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'project_board_cancel_message_replay();', :class => "blue_btn grey_btn fr c_white mt10 mr5" %>
+                  <%= link_to l(:button_submit), "javascript:void(0)", :onclick => 'project_board_submit_message_replay();', :class => "blue_btn fr c_white mt10", :style => "margin-left: 50px;" %>
+              <% end %>
+              <div class="cl"></div>
+            </div>
+          </div>
+      <% end %>
+    </div>
+  </div>
+</div>

app/views/messages/_show_org_subfields.html.erb

@@ -0,0 +1,17 @@
+<ul class="columnWrap fl">
+  <!--<span class="fontBlue pl10">请在左侧选择要转发的位置</span>-->
+  <% if !org.nil? %>
+      <span class="fontBlue pl10">组织：<%= org.name %></span>
+      <% if org.org_subfields.where("field_type='Post'").count > 0 %>
+          <% org.org_subfields.where("field_type='Post'").each do |subfield| %>
+              <li>
+                <label><input type="checkbox" name='org_subfields[]' value='<%= subfield.id %>' class="mt3 fl mr5"/><span><%= subfield.name %></span></label>
+              </li>
+          <% end %>
+      <% else %>
+        <li><span class="mt3 fl mr5">暂无资源栏目</span></li>
+      <% end %>
+  <% else %>
+      <span class="fontBlue pl10">请在左侧选择组织</span>
+  <% end %>
+</ul>

app/views/messages/edit.html.erb

@@ -1,26 +1,16 @@
 <% if @message.project %>
-    <div class="project_r_h">
-      <h2 class="project_h2"><%= l(:label_course_board) %></h2>
-    </div>
-
-
-    <%#= board_breadcrumb(@message) %>
-    <!--<h3><%#= avatar(@topic.author, :size => "24") %><span style = "width:100%;word-break:break-all;word-wrap: break-word;"><%#=h @topic.subject %></span></h3>-->
-    <div class="ml15">
-      <ul>
         <%= form_for @message, {:as => :message,
                                 :url => {:action => 'edit'},
                                 :html => {:multipart => true,
                                           :id => 'message-form',
                                           :method => :post}
         } do |f| %>
-            <%= render :partial => 'form_project',
-                       :locals => {:f => f, :replying => !@message.parent.nil?} %>
-            <a href="#" onclick="submitProjectsBoard();" class="blue_btn fl c_white"><%= l(:button_submit) %></a>
-            <%= link_to l(:button_cancel), board_message_url(@message.board, @message.root, :r => (@message.parent_id && @message.id)), :class => "blue_btn grey_btn fl c_white" %>
-            </ul>
-            </div>
+            <%= render :partial => 'boards/project_message_edit',
+                       :locals => {:f => f, :edit_mode => true, :topic => @message, :project => @message.project} %>
+            <!--<a href="#" onclick="submitProjectsBoard();" class="blue_btn fl c_white"><%#= l(:button_submit) %></a>-->
+            <%#= link_to l(:button_cancel), board_message_url(@message.board, @message.root, :r => (@message.parent_id && @message.id)), :class => "blue_btn grey_btn fl c_white" %>
         <% end %>
+
 <% elsif @message.course %>
     <%= form_for @message, {
             :as => :message,
@@ -31,7 +21,18 @@
     } do |f| %>
         <%= render :partial => 'boards/course_message_edit',
                    :locals => {:f => f, :edit_mode => true, :topic => @message, :course => @message.course} %>
+    <% end %>
 
+<% elsif @message.board.org_subfield %>
+    <%= form_for @message, {
+                                 :as => :message,
+                                 :url => {:action => 'edit'},
+                                 :html => {:multipart => true,
+                                           :id => 'message-form',
+                                           :method => :post}
+                         } do |f| %>
+        <%= render :partial => 'boards/org_subfield_message_edit',
+                   :locals => {:f => f, :edit_mode => true, :topic => @message, :org_subfield => @message.board.org_subfield} %>
     <% end %>
 <% end %>
 

app/views/messages/get_subfield_on_click_org.js.erb

@@ -0,0 +1,2 @@
+$("#org_subfield_list").html("");
+$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'show_org_subfields', :locals => {:org => @org}) %>");

app/views/messages/join_org_subfield.js.erb

@@ -0,0 +1,11 @@
+$('#topnav_course_menu').hide();
+
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'join_org_subfield_menu', :locals => {:organizations => @organizations, :id => @message.id}) %>');
+showModal('ajax-modal', '430px');
+$('#ajax-modal').siblings().hide();
+$('#ajax-modal').before(
+        "<a href='javascript:' onclick='hideModal();' class='resourceClose' style='margin-left: 410px;'></a>");
+//$('#ajax-modal').css('position','absolute')
+$('#ajax-modal').css("top","").css("left","");
+$('#ajax-modal').parent().addClass("resourceSharePopup");
+

app/views/messages/join_org_subfields.js.erb

@@ -0,0 +1,2 @@
+hideModal();
+alert("转发成功！");

app/views/messages/reply.js.erb

@@ -2,5 +2,7 @@
     $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>");
 <%elsif @course%>
     $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>");
+<% elsif @org_subfield %>
+    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'organizations/org_subfield_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>");
 <%end%>
 init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");

app/views/messages/show.html.erb

@@ -2,4 +2,6 @@
     <%= render :partial => 'project_show', locals: {project: @project} %>
 <% elsif @course %>
     <%= render :partial => 'course_show', locals: {course: @course} %>
+<% else %>
+    <%= render :partial => 'org_subfield_show', :locals => {:org_subfield => @org_subfield} %>
 <% end %>

app/views/news/_course_news.html.erb

@@ -1,42 +1,34 @@
-<%
-   btn_tips = l(:label_news_notice)
-   label_tips = l(:label_course_news)
-%>
-<script>
-  function remote_search(){
-    $("#news_query_form").submit();
-  }
+<script type="text/javascript">
+    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#Container").css("width","1000px");
+    });
+    function reset_news(){
+        $("#news_title").val("");
+        $("#title_notice_span").text("");
+        $("#description_notice_span").text("");
+        document.getElementById("news_sticky").checked=false;
+        $("#news_attachments").html("<%= escape_javascript(render :partial => 'attachments/new_form', :locals => {:container => News.new})%>");
+        news_description_editor.html("");
+        $("#news_editor").toggle();
+    }
+    <% if @is_new%>
+    $(function(){
+        $("#news_title").focus();
+    });
+    <%end%>
 </script>
-<div class="project_r_h">
-  <h2 class="project_h2"><%= label_tips %></h2>
-</div>
-<div class="talk_top">
-  <div class="fl">
-      <p class="fl">
-        <%= l(:label_total_news) %>
-        <span><%= @news_count %></span>
-        <%= l(:label_course_news_count) %>
-      </p>
-      <% if @course && User.current.allowed_to?(:manage_news, @course) %>
-          <%= link_to(btn_tips,new_course_news_path(@course),:class => 'problem_new_btn fl c_dorange')%>
-          <div class="cl"></div>
-
-      <% end %>
+<div class="homepageRight mt0 ml10">
+  <div class="homepageRightBanner">
+    <div class="NewsBannerName">
+      课程通知
+    </div>
   </div>
-  <div class="problem_search fr" >
-    <%= form_tag({:controller => 'news', :action => 'index', :course_id => @course }, :method => :get,:id=>"news_query_form", :class => 'query_form') do %>
-    <input class="problem_search_input fl" id="v_subject" placeholder="通知主题" type="text" name="subject" value="<%= @q%>" onkeypress="" onkeydown="">
-    <a href="javascript:void(0)" class="problem_search_btn fl" onclick="remote_search();" >搜索</a>
-    <% end %>
-  </div><!--problem_search end-->
-  <div class="cl"></div>
-</div>
-
-<div id="news_list">
-  <%= render :partial => 'course_news_list', :locals=>{ :newss=>@newss,:obj_pages=>@obj_pages, :obj_count=>@obj_count} %>
-</div>
-<% content_for :header_tags do %>
-  <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
-  <%= stylesheet_link_tag 'scm' %>
-<% end %>
-<% html_title(l(:label_course_news)) -%>
+  <% if @course && User.current.allowed_to?(:manage_news, @course) %>
+      <%= labelled_form_for @news, :url =>{:controller=>'news',:action => 'new',  :course_id => @course.id},
+                            :html => {:nhname=>'form',:multipart => true, :id => 'news-form'} do |f| %>
+          <%= render :partial => 'course_news_new', :locals => {:f => f, :news => @news, :edit_mode => false, :course => @course} %>
+      <% end %>
+  <% end %>
+  <%= render :partial=> 'course_news_detail',:locals =>{:newss => @newss, :page => 0} %>
+</div>

app/views/news/_course_news_detail.html.erb

@@ -0,0 +1,56 @@
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= javascript_include_tag "init_activity_KindEditor" %>
+<% end %>
+
+<style type="text/css">
+    /*回复框*/
+    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
+    .homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}
+    .homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}
+    .homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}
+    .homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}
+    .homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}
+    .homepagePostReplyInputContainer .ke-outline {border: none;}
+    .homepagePostReplyInputContainer .ke-inline-block {display: none;}
+    .homepagePostReplyInputContainer .ke-container {float: left;}
+</style>
+<% if newss%>
+    <% newss.each do |news| %>
+        <script>
+            function expand_reply(container, btnid) {
+                var target = $(container);
+                var btn = $(btnid);
+                if (btn.data('init') == '0') {
+                    btn.data('init', 1);
+                    btn.html('收起回复');
+                    target.show();
+                } else {
+                    btn.data('init', 0);
+                    btn.html('展开更多');
+                    target.hide();
+                    target.eq(0).show();
+                    target.eq(1).show();
+                    target.eq(2).show();
+                }
+            }
+
+            function expand_reply_input(id) {
+                $(id).toggle();
+            }
+
+            $(function () {
+                init_activity_KindEditor_data(<%= news.id%>, null, "87%");
+                showNormalImage('activity_description_<%= news.id %>');
+            });
+        </script>
+        <% if news %>
+            <%= render :partial => 'users/course_news', :locals => {:activity => news, :user_activity_id => news.id} %>
+        <% end %>
+    <% end %>
+
+    <% if newss.count == 10 %>
+        <%= link_to "点击展开更多",news_index_path(:course_id => @course.id ,:page => page),:id => "show_more_course_news",:remote => "true",:class => "loadMore mt10 f_grey"%>
+    <% end %>
+<% end%>
+

app/views/news/_course_news_new.html.erb

@@ -0,0 +1,60 @@
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: true, prettify: false) %>
+<% end %>
+
+<div class="resources mt10">
+  <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%>" >
+        <p id="title_notice_span"></p>
+      </div>
+      <div id="news_editor" style="display: none;">
+        <div class="mt10">
+          <%= f.check_box :sticky, :value => edit_mode ? news.sticky : 0 %>
+          <%= label_tag 'news_sticky', l(:label_board_sticky) %>
+          <div class="cl"></div>
+        </div>
+        <div class="mt10">
+          <div id="news_quote" class="wiki" style="width: 92%;word-break: break-all;word-wrap: break-word;margin-left: 40px;"></div>
+          <%= text_area :quote,:quote,:style => 'display:none' %>
+          <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+
+          <%= f.kindeditor :description, :editor_id => 'news_description_editor',
+                           :owner_id => news.nil? ? 0: news.id,
+                           :owner_type => OwnerTypeHelper::NEWS,
+                           :width => '100%',
+                           :height => 300,
+                           :minHeight=>300,
+                           :class => 'talk_text fl',
+                           :input_html => { :id => 'news_content',
+                                            :class => 'talk_text fl',
+                                            :maxlength => 5000 },
+                           at_id: news.id, at_type: news.class.to_s
+          %>
+          <div class="cl"></div>
+          <p id="description_notice_span"></p>
+        </div>
+        <div class="cl"></div>
+        <div class="mt10">
+          <div class="fl" id="news_attachments">
+            <%= render :partial => 'attachments/form_course', :locals => {:container => news, :isReply => false} %>
+          </div>
+        </div>
+        <div class="cl"></div>
+        <div class="mt5">
+          <%if !edit_mode %>
+              <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submitNews();">确定</a>
+              <span class="fr mr10 mt3">或</span>
+              <a href="javascript:void(0);" class="fr mr10 mt3" onclick="reset_news();">取消</a>
+          <% else %>
+              <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submitNews();">确定</a>
+              <span class="fr mr10 mt3">或</span>
+              <%= link_to "取消",news_path(news), :class => "fr mr10 mt3"%>
+          <% end %>
+        </div>
+        <div class="cl"></div>
+      </div>
+    </div>
+  </div>
+</div>

app/views/news/_course_show.html.erb

@@ -2,85 +2,172 @@
     <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
 <% end %>
 
-<div class="project_r_h">
-  <h2 class="project_h2"><%= l(:label_course_news) %></h2>
-</div>
-<div class="problem_main">
-  <%= link_to image_tag(url_to_avatar(@news.author),:width => 42,:height => 42), user_path(@news.author), :class => "problem_pic fl" %>
-  <div class="problem_txt fl mt5 list_style">
-    <h4 class="r_txt_tit mb5">
-      <%=h @news.title %>
-    </h4>
-    <% if @news.sticky == 1%>
-        <span class="sticky_btn_cir ml10 fl">置顶</span>
-    <% end%>
-    <%= link_to(l(:button_edit),
-                edit_news_path(@news),
-                :class => 'talk_edit fr') if User.current.allowed_to?(:manage_news, @course) %>
-    <%= delete_link(news_path(@news),:class => 'talk_edit fr') if User.current.allowed_to?(:manage_news, @course) %>
-    <div class="cl"></div>
-    <div class="mb5 upload_img">
-      <%= @news.description.html_safe %>
-      <br />
-      <%= l(:label_create_time) %> ：  <%= format_time(@news.created_on) %>
+<script type="text/javascript">
+    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#Container").css("width","1000px");
+    });
+</script>
+<script>
+    function expand_reply(container,btnid){
+        var target = $(container).children();
+        var btn = $(btnid);
+        if(btn.data('init')=='0'){
+            btn.data('init',1);
+            btn.html('收起回复');
+            target.show();
+        }else{
+            btn.data('init',0);
+            btn.html('展开更多');
+            target.hide();
+            target.eq(0).show();
+            target.eq(1).show();
+            target.eq(2).show();
+        }
+    }
+    $(function() {
+        showNormalImage('message_description_<%= @news.id %>');
+    });
+</script>
+
+<div class="postRightContainer ml10" onmouseover="$('#message_setting_<%= @news.id%>').show();" onmouseout="$('#message_setting_<%= @news.id%>').hide();">
+  <div class="postThemeContainer">
+    <div class="postDetailPortrait">
+      <%= link_to image_tag(url_to_avatar(@news.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@news.author) %>
     </div>
-    <%= link_to_attachments_course @news %>
-    <!--<a href="#" class=" link_file">附件：爱覅俄方if.zip(27.5kB)</a> -->
+    <div class="postThemeWrap">
+      <% if User.current.allowed_to?(:manage_news, @course)%>
+          <div class="homepagePostSetting" id="message_setting_<%= @news.id%>" style="display: none">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <li>
+                    <%= link_to(
+                                l(:button_edit),
+                                {:action => 'edit', :id => @news},
+                                :class => 'postOptionLink'
+                        ) if User.current.allowed_to?(:manage_news, @course) %>
+                  </li>
+                  <li>
+                    <%= delete_link(
+                                news_path(@news),
+                                :data => {:confirm => l(:text_are_you_sure)},
+                                :class => 'postOptionLink'
+                        ) if User.current.allowed_to?(:manage_news, @course) %>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+          </div>
+      <%end%>
+      <div class="postDetailTitle fl">
+        <a href="javascript:void(0);" class="f14 linkGrey4 fb" style="overflow:hidden;">通知: <%= @news.title%></a>
+      </div>
+      <div class="cl"></div>
+
+      <div class="postDetailCreater">
+        <% if @news.try(:author).try(:realname) == ' ' %>
+            <%= link_to @news.try(:author), user_path(@news.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
+        <% else %>
+            <%= link_to @news.try(:author).try(:realname), user_path(@news.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
+        <% end %>
+      </div>
+      <div class="postDetailDate mb5"><%= format_time( @news.created_on)%></div>
+      <div class="cl"></div>
+      <div class="memo-content upload_img break_word" 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>
+      <div class=" fl" style="width: 600px">
+        <%= link_to_attachments_course @news, :author => false %>
+      </div>
+    </div>
+    <div class="cl"></div>
   </div>
   <div class="cl"></div>
-</div>
-
-  <% if @news.commentable? %>
-      <div class="msg_box fl">
-        <h4><%= l(:label_comment_add) %></h4>
-        <%= form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form") do %>
-          <div class="box"  id="news_comment">
-            <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
-            <%= kindeditor_tag :comment, '',:height=>'100',:editor_id =>'comment_editor', :placeholder=>"最多250个字"%>
-          </div>
-          <p id="add_reply_news"></p>
-         <p class="mt10">
-            <a href="javascript:void(0)" class="grey_btn fr ml10" onclick="KindEditor.instances[0].html('');">
-              <%= l(:label_cancel_with_space) %>
-            </a>
-            <a href="javascript:void(0)" class="blue_btn fr" onclick="submitComment();">
-              <%= l(:label_comment_with_space) %>
-            </a>
-          </p>
-      <% end %>
-      </div>
-  <% end %>
-<div class="cl"></div>
-  <% comments = @comments.reverse %>
-  <% comments.each do |comment| %>
-      <% next if comment.new_record? %>
-      <div class="ping_C mb10">
-        <div><%= link_to image_tag(url_to_avatar(comment.author),:width => 42,:height => 42), user_path(comment.author), :class => "problem_pic fl"%></div>
-        <div class="ping_discon">
-          <div class="ping_distop upload_img break_word list_style">
-            <%= link_to_user_header(comment.author,false,:class => 'c_blue fb fl mb10 ') if comment.respond_to?(:author) %>
-            <span class="c_grey fr">
-                <%= format_time(comment.created_on) %>
-            </span>
-            <div class="cl"></div>
-            <p><%= comment.comments.html_safe %></p>
-            </div>
-            <div class="ping_disfoot">
-              <%= link_to_if_authorized_course image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment},
-                     :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %>
-          </div>
-
+  <div class="homepagePostReply">
+    <% unless @comments.empty? %>
+        <div class="homepagePostReplyBanner">
+          <div class="homepagePostReplyBannerCount">回复（<%=@comments.count %>）</div>
+          <div class="homepagePostReplyBannerTime"></div>
+        </div>
+        <div class="" id="reply_div_<%=@news.id %>">
+          <% @comments.each_with_index  do |reply,i| %>
+              <script type="text/javascript">
+                  $(function(){
+                      showNormalImage('reply_message_description_<%= reply.id %>');
+                  });
+              </script>
+              <div class="homepagePostReplyContainer" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id%>').hide();">
+                <div class="homepagePostReplyPortrait">
+                  <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
+                </div>
+                <div class="homepagePostReplyDes">
+                  <div class="homepagePostReplyPublisher">
+                    <% if reply.try(:author).try(:realname) == ' ' %>
+                        <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
+                    <% else %>
+                        <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
+                    <% end %>
+                  </div>
+                  <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
+                    <%= reply.comments.html_safe%>
+                  </div>
+                  <div style="margin-top: -7px; margin-bottom: 5px">
+                    <%= format_time(reply.created_on) %>
+                    <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
+                      <%= link_to_if_authorized_course(
+                                  l(:button_delete),
+                                  {:controller => 'comments',
+                                  :action => 'destroy', :id => @news,
+                                  :comment_id => reply},
+                                  :method => :delete,
+                                  :class => 'fr newsGrey',
+                                  :data => {:confirm => l(:text_are_you_sure)},
+                                  :title => l(:button_delete)
+                          ) %>
+                    </div>
+                  </div>
+                  <p id="reply_message_<%= reply.id%>"></p>
+                </div>
+                <div class="cl"></div>
+              </div>
+          <% end %>
         </div>
-        <div class="cl"></div>
-      </div>
-  <% end if @comments.any? %>
 
-
-
-<!--problem_main end-->
-  <% content_for :header_tags do %>
-      <%= stylesheet_link_tag 'scm' %>
-  <% end %>
-
-
-<% html_title @news.title -%>
+    <% end %>
+    <div class="cl"></div>
+    <% if @news.commentable? %>
+        <div class="talkWrapMsg" nhname="about_talk_reply">
+          <em class="talkWrapArrow"></em>
+          <div class="cl"></div>
+          <div class="talkConIpt ml5 mb10" id="reply<%= @news.id %>">
+            <%= form_for @comment, :url=>{:controller => 'comments', :action => 'create', :id => @news}, :html => {:multipart => true, :id => 'add_comment_form'} do |f| %>
+                <div class="box"  id="news_comment">
+                  <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+                  <%= f.kindeditor :comments, :editor_id => 'comment_editor',
+                                   :owner_id => @comment.nil? ? 0: @comment.id,
+                                   :owner_type => OwnerTypeHelper::COMMENT,
+                                   :width => '99%',
+                                   :height => 100,
+                                   :minHeight=>100,
+                                   :input_html => { :id => 'comment_content',
+                                                    :class => 'talk_text fl',
+                                                    :maxlength => 5000 }%>
+                </div>
+                <p id="add_reply_news"></p>
+                <p class="mt10">
+                  <a href="javascript:void(0)" class="grey_btn fr ml10 mr5" onclick="KindEditor.instances[0].html('');">
+                    <%= l(:label_cancel_with_space) %>
+                  </a>
+                  <a href="javascript:void(0)" class="blue_btn fr" onclick="submitComment();">
+                    <%= l(:label_comment_with_space) %>
+                  </a>
+                </p>
+            <% end %>
+            <div class="cl"></div>
+          </div>
+        </div>
+    <% end %>
+  </div>
+</div>

app/views/news/edit.html.erb

@@ -1,14 +1,23 @@
 <%= content_for(:header_tags) do %>
     <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
 <% end %>
-
-<div class="project_r_h">
-  <h2 class="project_h2"><%= l(:label_course_news) %></h2>
-</div>
-<div id="edit-news">
+<script type="text/javascript">
+    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#Container").css("width","1000px");
+        $("#news_title").focus();
+    });
+</script>
+<div class="homepageRight mt0 ml10">
+  <div class="homepageRightBanner">
+    <div class="NewsBannerName">
+      编辑通知
+    </div>
+  </div>
   <%= labelled_form_for :news, @news, :url => news_path(@news),
                         :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
-      <%= render :partial => 'course_form', :locals => { :f => f, :is_new => false } %>
+  <%#= labelled_form_for :news, :url =>{:controller=>'news',:action => 'new',  :course_id => @course.id},
+                        :html => {:nhname=>'form',:multipart => true, :id => 'news-form'} do |f| %>
+      <%= render :partial => 'course_news_new', :locals => {:f => f, :news => @news, :edit_mode => true, :course => @course} %>
   <% end %>
-  <div id="preview" class="wiki"></div>
 </div>

app/views/news/index.js.erb

@@ -1 +1,5 @@
-$("#news_list").html("<%= escape_javascript(render :partial => 'course_news_list', :locals=>{ :newss=>@newss,:obj_pages=>@obj_pages, :obj_count=>@obj_count})%>");
+<% if @project %>
+    $("#news_list").html("<%= escape_javascript(render :partial => 'course_news_list', :locals=>{ :newss=>@newss,:obj_pages=>@obj_pages, :obj_count=>@obj_count})%>");
+<% else %>
+    $("#show_more_course_news").replaceWith("<%= escape_javascript( render :partial =>  'course_news_detail', :locals =>{:newss => @newss, :page => @page} )%>");
+<% end %>

app/views/org_document_comments/_attachment.html.erb

@@ -0,0 +1,79 @@
+<style type="text/css">
+    input.is_public,input.is_public_checkbox{height:12px;}
+    input.is_public_checkbox{margin-left:4px;margin-right:4px;}
+</style>
+<div class="fl">
+<span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
+<% if defined?(container) && container && container.saved_attachments %>
+  <% container.attachments.each_with_index do |attachment, i| %>
+    <span id="attachments_p<%= i %>" class="attachment">
+      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly => 'readonly') %><%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style => "display: inline-block;") %><span class="ispublic-label"><%= l(:field_is_public) %>:</span>
+      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, attachment.is_public == 1 ? true : false, :class => 'is_public') %>
+      <%= if attachment.id.nil?
+            #待补充代码
+          else
+            link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload')
+          end
+      %>
+      <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
+
+      <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
+    </span>
+    <div class="cl"></div>
+  <% end %>
+      <% container.saved_attachments.each_with_index do |attachment, i| %>
+    <span id="attachments_p<%= i %>" class="attachment">
+      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly => 'readonly') %>
+      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style => "display: inline-block;") %>
+      <span class="ispublic-label"><%= l(:field_is_public) %>:</span>
+      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, attachment.is_public == 1 ? true : false, :class => 'is_public') %>
+      <%= if attachment.id.nil?
+            #待补充代码
+          else
+            link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload')
+          end
+      %>
+      <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
+
+      <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
+    </span>
+    <div class="cl"></div>
+  <% end %>
+<% end %>
+</span>
+  <div class="cl"></div>
+  <span class="add_attachment" style="font-weight:normal;">
+    <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
+    <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
+    <%#= button_tag "文件浏览", :type=>"button", :onclick=>"$('#_file').click();",:onmouseover => 'this.focus()',:class => 'sub_btn' %>
+    <a href="javascript:void(0);" onclick="_file.click();" class="AnnexBtn fl mr15">上传附件</a>
+    <%= file_field_tag 'attachments[dummy][file]',
+                       :id => '_file',
+                       :class => 'file_selector',
+                       :multiple => true,
+                       :onchange => 'addInputFiles(this);',
+                       :style => ie8? ? '' : 'display:none',
+                       :data => {
+                               :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
+                               :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
+                               :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+                               :upload_path => uploads_path(:format => 'js'),
+                               :description_placeholder => l(:label_optional_description),
+                               :field_is_public => l(:field_is_public),
+                               :are_you_sure => l(:text_are_you_sure),
+                               :file_count => l(:label_file_count),
+                               :lebel_file_uploding => l(:lebel_file_uploding),
+                               :delete_all_files => l(:text_are_you_sure_all)
+                       } %>
+    <span id="upload_file_count">
+      <%= l(:label_no_file_uploaded) %>
+    </span>
+    (<%= l(:label_max_size) %>:
+    <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
+</span>
+
+  <% content_for :header_tags do %>
+      <%= javascript_include_tag 'attachments' %>
+  <% end %>
+</div>
+

app/views/org_document_comments/_new.html.erb

@@ -45,10 +45,14 @@
         </div>
         <div class="cl"></div>
 
-
         <p id="homework_course_id_span" class="c_red mt5"></p>
         <div class="cl"></div>
-
+        <div class="mt10">
+          <div class="fl" id="topic_attachments">
+            <%= render :partial => 'org_document_comments/attachment', :locals => {:container => nil} %>
+          </div>
+        </div>
+        <div class="cl"></div>
         <div class="mt5">
           <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="create_org_document();">确定</a>
           <span class="fr mr10 mt3">或</span>

app/views/org_document_comments/edit.html.erb

@@ -1,50 +1,55 @@
-<%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
-<% end %>
-
-<script>
-    function check_org_title(title)
-    {
-        if($("#document_title").val().trim() == "")
-        {
-            $("#doc_title_hint").html("<span class='c_red'>标题不能为空</span>").show();
-        }
-        else
-        {
-            $("#doc_title_hint").hide();
-        }
-    }
-</script>
-<div class="homepageRightBanner mb5" style="margin-bottom:5px;">
-  <div class="NewsBannerName">编辑文章</div>
-</div>
-<div class="cl"></div>
-<div>
-<%= form_tag url_for(:controller => 'org_document_comments',:action => 'update', :id => @org_document.id, :flag => @flag, :org_subfield_id => params[:org_subfield_id]),:method => 'put', :id => 'new_org_document_form' do |f| %>
-    <div class="resources">
-      <div>
-        <input class="postDetailInput fl mr15" style="margin-bottom:15px;" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" onblur="check_org_title();" value="<%= @org_document.title %>" />
-      </div>
-      <div id="doc_title_hint"></div>
-      <div class="cl"></div>
-      <div id="org_document_editor" >
-        <div class="mt10">
-          <%= kindeditor_tag 'org_document_comment[content]',@org_document.content, :editor_id => 'org_document_description_editor', :height => "150px" %>
-        </div>
-        <div class="cl"></div>
-
-
-        <p id="homework_course_id_span" class="c_red mt5"></p>
-        <div class="cl"></div>
-
-        <div class="mt5">
-          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="org_document_description_editor.sync();$('#new_org_document_form').submit();">确定</a>
-          <span class="fr mr10 mt3">或</span>
-          <a href="javascript:void(0);" onclick="location=document.referrer;" class="fr mr10 mt3">取消</a>
-          <div class="cl"></div>
-        </div>
-
-      </div>
-    </div>
-<% end %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
+<script>
+    function check_org_title(title)
+    {
+        if($("#document_title").val().trim() == "")
+        {
+            $("#doc_title_hint").html("<span class='c_red'>标题不能为空</span>").show();
+        }
+        else
+        {
+            $("#doc_title_hint").hide();
+        }
+    }
+</script>
+<div class="homepageRightBanner mb5" style="margin-bottom:5px;">
+  <div class="NewsBannerName">编辑文章</div>
+</div>
+<div class="cl"></div>
+<div>
+<%= form_tag url_for(:controller => 'org_document_comments',:action => 'update', :id => @org_document.id, :flag => @flag, :org_subfield_id => params[:org_subfield_id]),:method => 'put', :id => 'new_org_document_form' do |f| %>
+    <div class="resources">
+      <div>
+        <input class="postDetailInput fl mr15" style="margin-bottom:15px;" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" onblur="check_org_title();" value="<%= @org_document.title %>" />
+      </div>
+      <div id="doc_title_hint"></div>
+      <div class="cl"></div>
+      <div id="org_document_editor" >
+        <div class="mt10">
+          <%= kindeditor_tag 'org_document_comment[content]',@org_document.content, :editor_id => 'org_document_description_editor', :height => "150px" %>
+        </div>
+        <div class="cl"></div>
+
+        <p id="homework_course_id_span" class="c_red mt5"></p>
+        <div class="cl"></div>
+
+        <div class="mt10">
+          <div class="fl" id="topic_attachments">
+            <%= render :partial => 'org_document_comments/attachment', :locals => {:container => @org_document} %>
+          </div>
+        </div>
+        <div class="cl"></div>
+        <div class="mt5">
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="org_document_description_editor.sync();$('#new_org_document_form').submit();">确定</a>
+          <span class="fr mr10 mt3">或</span>
+          <a href="javascript:void(0);" onclick="location=document.referrer;" class="fr mr10 mt3">取消</a>
+          <div class="cl"></div>
+        </div>
+
+      </div>
+    </div>
+<% end %>
 </div>

app/views/org_document_comments/new.html.erb

@@ -1,56 +1,60 @@
-<%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
-<% end %>
-
-<script>
-    function check_org_title()
-    {
-        if($("#document_title").val().trim() == "")
-        {
-            $("#doc_title_hint").html("<span class='c_red'>标题不能为空</span>").show();
-            return false;
-        }
-        else
-        {
-            $("#doc_title_hint").hide();
-            return true;
-        }
-    }
-    function create_org_document()
-    {
-        if(check_org_title() == true)
-        {
-            org_document_description_editor.sync();
-            $('#new_org_document_form').submit();
-        }
-    }
-    function cancel_create_org_document(){
-        location.href = document.referrer;
-    }
-</script>
-<%= form_tag organization_org_document_comments_path(:organization_id => @organization.id, :field_id => params[:field_id]), :id => 'new_org_document_form' do |f| %>
-<div class="resources">
-      <div>
-        <textarea class="postDetailInput fl mr15" style="margin-bottom:15px;" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" placeholder="请输入文章标题"></textarea>
-      </div>
-      <div id="doc_title_hint"></div>
-    <div id="org_document_editor" class="mt15" >
-      <div class="mt10">
-        <%= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>
-      </div>
-      <div class="cl"></div>
-
-
-      <p id="homework_course_id_span" class="c_red mt5"></p>
-      <div class="cl"></div>
-
-      <div class="mt5">
-            <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="create_org_document();">确定</a>
-            <span class="fr mr10 mt3">或</span>
-            <a href="javascript:void(0);" onclick="cancel_create_org_document();" class="fr mr10 mt3">取消</a>
-        <div class="cl"></div>
-      </div>
-
-    </div>
-</div>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
+<script>
+    function check_org_title()
+    {
+        if($("#document_title").val().trim() == "")
+        {
+            $("#doc_title_hint").html("<span class='c_red'>标题不能为空</span>").show();
+            return false;
+        }
+        else
+        {
+            $("#doc_title_hint").hide();
+            return true;
+        }
+    }
+    function create_org_document()
+    {
+        if(check_org_title() == true)
+        {
+            org_document_description_editor.sync();
+            $('#new_org_document_form').submit();
+        }
+    }
+    function cancel_create_org_document(){
+        location.href = document.referrer;
+    }
+</script>
+<%= form_tag organization_org_document_comments_path(:organization_id => @organization.id, :field_id => params[:field_id]), :id => 'new_org_document_form' do |f| %>
+<div class="resources">
+      <div>
+        <textarea class="postDetailInput fl mr15" style="margin-bottom:15px;" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" placeholder="请输入文章标题"></textarea>
+      </div>
+      <div id="doc_title_hint"></div>
+    <div id="org_document_editor" class="mt15" >
+      <div class="mt10">
+        <%= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>
+      </div>
+      <div class="cl"></div>
+      <p id="homework_course_id_span" class="c_red mt5"></p>
+      <div class="cl"></div>
+      <div class="mt10">
+        <div class="fl" id="topic_attachments">
+          <%= render :partial => 'org_document_comments/attachment', :locals => {:container => nil} %>
+        </div>
+      </div>
+      <div class="cl"></div>
+
+      <div class="mt5">
+            <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="create_org_document();">确定</a>
+            <span class="fr mr10 mt3">或</span>
+            <a href="javascript:void(0);" onclick="cancel_create_org_document();" class="fr mr10 mt3">取消</a>
+        <div class="cl"></div>
+      </div>
+
+    </div>
+</div>
 <% end %>

app/views/org_document_comments/show.html.erb

@@ -1,148 +1,151 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor",'blog' %>
-<script>
-    $(function() {
-        init_activity_KindEditor_data(<%= @document.id%>,null,"85%", "<%=@document.class.to_s%>");
-        showNormalImage('message_description_<%= @document.id %>');
-    });
-</script>
-<div class="resources mt10" id="organization_document_<%= @document.id %>">
-  <div class="homepagePostBrief">
-    <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(User.find(@document.creator_id)), :width => 45, :heigth => 45), user_path(@document.creator_id) %>
-    </div>
-    <div class="homepagePostDes">
-      <div class="homepagePostTo">
-        <%= link_to User.find(@document.creator_id), user_path(@document.creator.id), :class => "newsBlue mr15" %>
-        TO&nbsp;&nbsp;<%= link_to @document.organization.name, organization_path(@document.organization), :class => "newsBlue" %>
-        |
-        <% if @document.organization.home_id == @document.id %>
-            <span style="color:#269ac9;">首页</span>
-        <% else %>
-            <span style="color:#269ac9;">组织文章</span>
-        <% end %>
-      </div>
-      <div class="homepagePostTitle postGrey"><%= link_to @document.title, org_document_comment_path(:id => @document.id, :organization_id => @document.organization.id) %></div>
-      <div class="homepagePostDate">
-        发布时间：<%= format_activity_day(@document.created_at) %> <%= format_time(@document.created_at, false) %></div>
-      <% unless @document.content.blank? %>
-          <div class="homepagePostIntro" style="width:640px;">
-            <%= @document.content.html_safe %>
-          </div>
-      <% end %>
-      <!--    <%# if defined?(home_id) %>
-        <div style="float:right;">最后编辑：<%#= User.find() %></div>
-    <%# end %>-->
-      <% if User.current.admin? || User.current.admin_of_org?(Organization.find(@document.organization_id) || User.current.id == @document.creator_id) %>
-          <div class="homepagePostSetting">
-            <ul>
-              <li class="homepagePostSettingIcon">
-                <ul class="homepagePostSettiongText">
-                  <li>
-                    <%= form_for('new_form', :url => {:controller => 'organizations', :action => 'set_homepage', :id => @document.organization_id, :home_id => @document.id}, :method => "put", :remote => true) do |f| %>
-                        <a href="javascript:void(0);" class="postOptionLink" onclick="$(this).parent().submit();">设为首页</a>
-                    <% end %>
-                  </li>
-                  <li>
-                    <%= link_to "编辑文章", edit_org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id, :flag => 1), :class => "postOptionLink" %>
-                  </li>
-                  <li>
-                    <%= link_to "删除文章", org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id, :detail_page => 1), :method => 'delete',
-                                :data => {:confirm => l(:text_are_you_sure)},
-                                :remote => true, :class => 'postOptionLink' %>
-                  </li>
-                </ul>
-              </li>
-            </ul>
-          </div>
-          <div class="cl"></div>
-      <% end %>
-    </div>
-  </div>
-  <% comments_for_doc = @document.children.reorder("created_at desc") %>
-  <% count = @document.children.count() %>
-
-  <div class="homepagePostReply fl" style="background-color: #f1f1f1;" id="<%= @document.id %>">
-    <% if count > 0 %>
-        <div class="homepagePostReplyBanner">
-          <div class="homepagePostReplyBannerCount">回复（<%= count %>）</div>
-        </div>
-        <div class="" id="reply_div_<%=  @document.id %>">
-          <% comments_for_doc.each_with_index  do |reply,i| %>
-              <script type="text/javascript">
-                  $(function(){
-                      showNormalImage('reply_message_description_<%= reply.id %>');
-                  });
-              </script>
-              <% user = User.find(reply.creator_id) %>
-              <div class="homepagePostReplyContainer" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id %>').hide();">
-                <div class="homepagePostReplyPortrait">
-                  <%= link_to image_tag(url_to_avatar(user), :width => 33,:height => 33), user_path(user) %>
-                </div>
-                <div class="homepagePostReplyDes">
-                  <%= link_to User.find(reply.creator_id).realname, user_path(reply.creator_id), :class => "newsBlue mr10 f14" %>
-                  <div class="homepagePostReplyContent upload_img break_word" id="reply_message_description_<%= reply.id %>">
-                    <%= reply.content.html_safe unless reply.content.nil? %>
-                  </div>
-                  <div style="margin-top: -7px; margin-bottom: 5px">
-                    <%= format_time(reply.created_at) %>
-                    <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
-                      <%= link_to(
-                                  l(:button_reply),
-                                  {:controller => 'org_document_comments',:action => 'quote',:user_id=>reply.creator_id, :id => reply.id},
-                                  :remote => true,
-                                  :method => 'get',
-                                  :class => 'fr newsBlue',
-                                  :title => l(:button_reply)) if User.current.logged? %>
-                      <%= link_to(
-                                  l(:button_delete),
-                                  {:controller => 'org_document_comments',:action => 'delete_reply', :id => reply.id},
-                                  :method => :delete,
-                                  :class => 'fr newsGrey mr10',
-                                  :data => {:confirm => l(:text_are_you_sure)},
-                                  :title => l(:button_delete)
-                          ) if reply.creator_id == User.current.id %>
-                    </div>
-                  </div>
-                  <p id="reply_message_<%= reply.id %>"></p>
-                </div>
-                <div class="cl"></div>
-              </div>
-          <% end %>
-        </div>
-        <div class="cl"></div>
-    <% end %>
-    <% if User.current.logged?%>
-        <div class="talkWrapMsg" nhname="about_talk_reply">
-          <em class="talkWrapArrow"></em>
-          <div class="cl"></div>
-          <div class="talkConIpt ml5 mb10" id="reply<%= @document.id %>">
-            <%= form_for :org_comment, :url => {:action => 'add_reply_in_doc',:controller => 'org_document_comments', :id => @document.id}, :html => {:multipart => true, :id => 'message_form'} do |f| %>
-               <%= f.kindeditor :org_content,:width=>'99%',:height => '100px;',:editor_id=>'message_content_editor' %>
-                <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'message_content_editor.html("");', :class => " grey_btn fr c_white mt10 mr5" %>
-                <%= link_to l(:button_reply), "javascript:void(0)", :onclick => "message_content_editor.sync();$('#message_form').submit();", :class => "blue_btn fr c_white mt10 mb10", :style => "margin-right: 5px;" %>
-            <% end %>
-            <div class="cl"></div>
-          </div>
-        </div>
-    <% end %>
-  </div>
-</div>
-
-<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();
-        }
-    }
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor",'blog' %>
+<script>
+    $(function() {
+        init_activity_KindEditor_data(<%= @document.id%>,null,"85%", "<%=@document.class.to_s%>");
+        showNormalImage('message_description_<%= @document.id %>');
+    });
+</script>
+<div class="resources mt10" id="organization_document_<%= @document.id %>">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait">
+      <%= link_to image_tag(url_to_avatar(User.find(@document.creator_id)), :width => 45, :heigth => 45), user_path(@document.creator_id) %>
+    </div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo">
+        <%= link_to User.find(@document.creator_id), user_path(@document.creator.id), :class => "newsBlue mr15" %>
+        TO&nbsp;&nbsp;<%= link_to @document.organization.name, organization_path(@document.organization), :class => "newsBlue" %>
+        |
+        <% if @document.organization.home_id == @document.id %>
+            <span style="color:#269ac9;">首页</span>
+        <% else %>
+            <span style="color:#269ac9;">组织文章</span>
+        <% end %>
+      </div>
+      <div class="homepagePostTitle postGrey"><%= link_to @document.title, org_document_comment_path(:id => @document.id, :organization_id => @document.organization.id) %></div>
+      <div class="homepagePostDate">
+        发布时间：<%= format_activity_day(@document.created_at) %> <%= format_time(@document.created_at, false) %></div>
+      <% unless @document.content.blank? %>
+          <div class="homepagePostIntro" style="width:640px;">
+            <%= @document.content.html_safe %>
+          </div>
+      <% end %>
+      <div class=" fl" style="width: 600px">
+        <%= link_to_attachments_course @document, :author => false %>
+      </div>
+      <!--    <%# if defined?(home_id) %>
+        <div style="float:right;">最后编辑：<%#= User.find() %></div>
+    <%# end %>-->
+      <% if User.current.admin? || User.current.admin_of_org?(Organization.find(@document.organization_id) || User.current.id == @document.creator_id) %>
+          <div class="homepagePostSetting">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <li>
+                    <%= form_for('new_form', :url => {:controller => 'organizations', :action => 'set_homepage', :id => @document.organization_id, :home_id => @document.id}, :method => "put", :remote => true) do |f| %>
+                        <a href="javascript:void(0);" class="postOptionLink" onclick="$(this).parent().submit();">设为首页</a>
+                    <% end %>
+                  </li>
+                  <li>
+                    <%= link_to "编辑文章", edit_org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id, :flag => 1), :class => "postOptionLink" %>
+                  </li>
+                  <li>
+                    <%= link_to "删除文章", org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id, :detail_page => 1), :method => 'delete',
+                                :data => {:confirm => l(:text_are_you_sure)},
+                                :remote => true, :class => 'postOptionLink' %>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+          </div>
+          <div class="cl"></div>
+      <% end %>
+    </div>
+  </div>
+  <% comments_for_doc = @document.children.reorder("created_at desc") %>
+  <% count = @document.children.count() %>
+
+  <div class="homepagePostReply fl" style="background-color: #f1f1f1;" id="<%= @document.id %>">
+    <% if count > 0 %>
+        <div class="homepagePostReplyBanner">
+          <div class="homepagePostReplyBannerCount">回复（<%= count %>）</div>
+        </div>
+        <div class="" id="reply_div_<%=  @document.id %>">
+          <% comments_for_doc.each_with_index  do |reply,i| %>
+              <script type="text/javascript">
+                  $(function(){
+                      showNormalImage('reply_message_description_<%= reply.id %>');
+                  });
+              </script>
+              <% user = User.find(reply.creator_id) %>
+              <div class="homepagePostReplyContainer" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id %>').hide();">
+                <div class="homepagePostReplyPortrait">
+                  <%= link_to image_tag(url_to_avatar(user), :width => 33,:height => 33), user_path(user) %>
+                </div>
+                <div class="homepagePostReplyDes">
+                  <%= link_to User.find(reply.creator_id).realname, user_path(reply.creator_id), :class => "newsBlue mr10 f14" %>
+                  <div class="homepagePostReplyContent upload_img break_word" id="reply_message_description_<%= reply.id %>">
+                    <%= reply.content.html_safe unless reply.content.nil? %>
+                  </div>
+                  <div style="margin-top: -7px; margin-bottom: 5px">
+                    <%= format_time(reply.created_at) %>
+                    <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
+                      <%= link_to(
+                                  l(:button_reply),
+                                  {:controller => 'org_document_comments',:action => 'quote',:user_id=>reply.creator_id, :id => reply.id},
+                                  :remote => true,
+                                  :method => 'get',
+                                  :class => 'fr newsBlue',
+                                  :title => l(:button_reply)) if User.current.logged? %>
+                      <%= link_to(
+                                  l(:button_delete),
+                                  {:controller => 'org_document_comments',:action => 'delete_reply', :id => reply.id},
+                                  :method => :delete,
+                                  :class => 'fr newsGrey mr10',
+                                  :data => {:confirm => l(:text_are_you_sure)},
+                                  :title => l(:button_delete)
+                          ) if reply.creator_id == User.current.id %>
+                    </div>
+                  </div>
+                  <p id="reply_message_<%= reply.id %>"></p>
+                </div>
+                <div class="cl"></div>
+              </div>
+          <% end %>
+        </div>
+        <div class="cl"></div>
+    <% end %>
+    <% if User.current.logged?%>
+        <div class="talkWrapMsg" nhname="about_talk_reply">
+          <em class="talkWrapArrow"></em>
+          <div class="cl"></div>
+          <div class="talkConIpt ml5 mb10" id="reply<%= @document.id %>">
+            <%= form_for :org_comment, :url => {:action => 'add_reply_in_doc',:controller => 'org_document_comments', :id => @document.id}, :html => {:multipart => true, :id => 'message_form'} do |f| %>
+               <%= f.kindeditor :org_content,:width=>'99%',:height => '100px;',:editor_id=>'message_content_editor' %>
+                <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'message_content_editor.html("");', :class => " grey_btn fr c_white mt10 mr5" %>
+                <%= link_to l(:button_reply), "javascript:void(0)", :onclick => "message_content_editor.sync();$('#message_form').submit();", :class => "blue_btn fr c_white mt10 mb10", :style => "margin-right: 5px;" %>
+            <% end %>
+            <div class="cl"></div>
+          </div>
+        </div>
+    <% end %>
+  </div>
+</div>
+
+<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();
+        }
+    }
 </script>

app/views/organizations/_join_project_menu.html.erb

@@ -29,7 +29,7 @@
   <div class="fl">
     <%=form_tag url_for(:controller => 'organizations', :action => 'join_projects', :organization_id => organization_id),:method => 'post', :id => 'join_projects_form', :remote => true,:class=>"resourcesSearchBox" do %>
         <input type="text" name="projects" placeholder="搜索您已加入的项目的名称" class="searchCourse" />
-        <div id="search_projects_result_list" class="mb8"></div>
+        <div id="search_projects_result_list" class="mb8 maxHeight100"></div>
         <div class="courseSendSubmit">
           <a href="javascript:void(0);" onclick="org_join_projects(<%= organization_id %>);" class="sendSourceText">关联</a>
         </div>

app/views/organizations/_org_activities.html.erb

@@ -1,70 +1,71 @@
-<% unless org_activities.nil? %>
-    <% org_activities.each do |act| %>
-        <script>
-            $(function() {
-                init_activity_KindEditor_data(<%= act.id%>, null, "87%", "<%=act.class.to_s%>");
-            });
-        </script>
-        <% if act.container_type == 'Organization' %>
-            <% if act.org_act_type == 'CreateOrganization' %>
-                <div class="resources mt10">
-                  <div class="homepagePostBrief">
-                    <div class="homepagePostPortrait">
-                      <a href="javascript:void(0);"><%= image_tag(url_to_avatar(User.find(act.user_id)),  :width => "45", :height => "45") %></a>
-                    </div>
-                    <div class="homepagePostDes">
-                      <div class="homepagePostTo"><%= link_to User.find(act.user_id), user_path(act.user_id) %>&nbsp;&nbsp;创建了 <a href="<%= organization_path(@organization)%>" class="newsBlue ml10"><%= Organization.find(act.org_act_id).name %>
-                        | 组织</a></div>
-                      <div class="homepagePostDate"> 创建时间：<%= format_activity_day(act.created_at) %> <%= format_time(act.created_at, false) %> </div>
-                    </div>
-                    <div class="cl"></div>
-                  </div>
-                </div>
-            <% end %>
-            <% if act.org_act_type == 'OrgDocumentComment' && act.org_act_id != @organization.home_id %>
-                <%= render :partial => 'show_org_document', :locals => {:document => act.org_act, :act => act, :flag => 2, :org_subfield_id => params[:org_subfield_id]} %>
-            <% end %>
-        <% end %>
-        <% if act.container_type == 'Project' %>
-            <% case act.org_act_type.to_s %>
-            <% when 'Issue' %>
-                <%= render :partial => 'organizations/org_project_issue', :locals => {:activity => Issue.find(act.org_act_id),:user_activity_id =>act.id} %>
-            <% when 'Message' %>
-                <%= render :partial => 'organizations/project_message', :locals => {:activity => Message.find(act.org_act_id),:user_activity_id =>act.id} %>
-            <% when 'ProjectCreateInfo'%>
-                <%= render :partial => 'organizations/project_create', :locals => {:activity => act,:user_activity_id =>act.id} %>
-            <% end %>
-        <% end %>
-        <% if act.container_type ==  'Course' %>
-            <% case act.org_act_type.to_s %>
-            <% when 'HomeworkCommon' %>
-                <%= render :partial => 'org_course_homework', :locals => {:activity => HomeworkCommon.find(act.org_act_id),:user_activity_id =>act.id,:course_activity => 0} %>
-            <% when 'News' %>
-                <%= render :partial => 'org_course_news', :locals => {:activity => News.find(act.org_act_id),:user_activity_id =>act.id} %>
-            <% when 'Message'%>
-                <%= render :partial => 'org_course_message', :locals => {:activity => Message.find(act.org_act_id),:user_activity_id =>act.id} %>
-            <% when 'Poll' %>
-                <%= render :partial => 'org_course_poll', :locals => {:activity => Poll.find(act.org_act_id), :user_activity_id => act.id} %>
-            <% when 'Course'%>
-                <%= render :partial => 'org_course_create', :locals => {:activity => Course.find(act.org_act_id), :user_activity_id => act.id} %>
-            <% end %>
-        <% end %>
-    <% 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>-->
-<% end %>
-
-<% if org_act_count == 10 %>
-    <div id="show_more_activities" class="loadMore mt10 f_grey">展开更多<%=link_to "", organization_path(org,:page => page.to_i + 1, :show_homepage =>params[:show_homepage],:type => params[:type]),:id => "more_org_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"%>
-<% end%>
-
-<script>
-    $(function(){
-        $("#show_more_activities").mouseover(function(){
-            $("#more_org_activities_link").click();
-        })
-    })
-
-</script>
+<% unless org_activities.nil? %>
+    <% org_activities.each do |act| %>
+        <script>
+            $(function() {
+                init_activity_KindEditor_data(<%= act.id%>, null, "87%", "<%=act.class.to_s%>");
+            });
+        </script>
+        <% if act.container_type == 'Organization' %>
+            <% if act.org_act_type == 'CreateOrganization' %>
+                <div class="resources mt10">
+                  <div class="homepagePostBrief">
+                    <div class="homepagePostPortrait">
+                      <a href="javascript:void(0);"><%= image_tag(url_to_avatar(User.find(act.user_id)),  :width => "45", :height => "45") %></a>
+                    </div>
+                    <div class="homepagePostDes">
+                      <div class="homepagePostTo"><%= link_to User.find(act.user_id), user_path(act.user_id) %>&nbsp;&nbsp;创建了 <a href="<%= organization_path(@organization)%>" class="newsBlue ml10"><%= Organization.find(act.org_act_id).name %>
+                        | 组织</a></div>
+                      <div class="homepagePostDate"> 创建时间：<%= format_activity_day(act.created_at) %> <%= format_time(act.created_at, false) %> </div>
+                    </div>
+                    <div class="cl"></div>
+                  </div>
+                </div>
+            <% end %>
+            <% if act.org_act_type == 'OrgDocumentComment' && act.org_act_id != @organization.home_id %>
+                <%= render :partial => 'show_org_document', :locals => {:document => act.org_act, :act => act, :flag => 2, :org_subfield_id => params[:org_subfield_id]} %>
+            <% end %>
+        <% end %>
+        <% if act.container_type == 'Project' %>
+            <% case act.org_act_type.to_s %>
+            <% when 'Issue' %>
+                <%= render :partial => 'organizations/org_project_issue', :locals => {:activity => Issue.find(act.org_act_id),:user_activity_id =>act.id} %>
+            <% when 'Message' %>
+                <%= render :partial => 'organizations/project_message', :locals => {:activity => Message.find(act.org_act_id),:user_activity_id =>act.id} %>
+            <% when 'ProjectCreateInfo'%>
+                <%= render :partial => 'organizations/project_create', :locals => {:activity => act,:user_activity_id =>act.id} %>
+            <% end %>
+        <% end %>
+        <% if act.container_type ==  'Course' %>
+            <% case act.org_act_type.to_s %>
+            <% when 'HomeworkCommon' %>
+                <%= render :partial => 'org_course_homework', :locals => {:activity => HomeworkCommon.find(act.org_act_id),:user_activity_id =>act.id,:course_activity => 0} %>
+            <% when 'News' %>
+                <%= render :partial => 'org_course_news', :locals => {:activity => News.find(act.org_act_id),:user_activity_id =>act.id} %>
+            <% when 'Message'%>
+                <%= render :partial => 'org_course_message', :locals => {:activity => Message.find(act.org_act_id),:user_activity_id =>act.id} %>
+            <% when 'Poll' %>
+                <%= render :partial => 'org_course_poll', :locals => {:activity => Poll.find(act.org_act_id), :user_activity_id => act.id} %>
+            <% when 'Course'%>
+                <%= render :partial => 'org_course_create', :locals => {:activity => Course.find(act.org_act_id), :user_activity_id => act.id} %>
+            <% end %>
+        <% end %>
+        <% if act.container_type == 'OrgSubfield' %>
+            <% if act.org_act_type == 'Message' and act.org_act_id and Message.where("id=#{act.org_act_id}").count > 0 %>
+                <% message = Message.find(act.org_act_id) %>
+                <% if !message.board.course_id.nil? %>
+                    <%= render :partial => 'org_course_message', :locals => {:activity => message,:user_activity_id =>act.id} %>
+                <% elsif message.board.project_id != -1 %>
+                    <%= render :partial => 'organizations/project_message', :locals => {:activity => message,:user_activity_id =>act.id} %>
+                <% elsif message.board.org_subfield_id %>
+                    <%= render :partial => 'organizations/org_subfield_message', :locals => {:activity => message, :user_activity_id  => act.id} %>
+                <% end %>
+            <% end %>
+        <% end %>
+    <% end %>
+
+<% end %>
+
+<% if org_act_count == 10 %>
+    <%= link_to "点击展开更多",organization_path(org,:page => page.to_i + 1, :show_homepage =>params[:show_homepage],:type => params[:type]),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
+<% end%>
+

app/views/organizations/_org_left_subfield_list.html.erb

@@ -1,42 +1,43 @@
-<div class="homepageLeftMenuBlock">
-  <%= link_to "动态",organization_path(organization), :class => "homepageMenuText" %>
-</div>
-<div class="homepageLeftMenuBlock">
-  <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuProjects').slideToggle();">项目</a>
-  <% if User.current.logged? %>
-    <%=link_to "", join_project_menu_organization_path(organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联项目"%>
-  <% end %>
-</div>
-<div class="homepageLeftMenuCourses" id="homepageLeftMenuProjects" style="display:<%= organization.projects.count == 0?'none':'' %>">
-  <ul >
-    <%= render :partial => 'layouts/org_projects',:locals=>{:projects=>organization.projects.reorder('created_at').uniq.limit(5),:org_id=>organization.id,:page=>1}%>
-  </ul>
-</div>
-<div class="homepageLeftMenuBlock">
-  <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses').slideToggle();">课程</a>
-  <% if User.current.logged? %>
-    <%=link_to "", join_course_menu_organization_path(organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联课程"%>
-  <% end %>
-</div>
-<div class="homepageLeftMenuCourses" id="homepageLeftMenuCourses" style="display:<%= organization.courses.count == 0 ?'none':'' %>">
-  <ul >
-    <%= render :partial => 'layouts/org_courses',:locals=>{:courses=>organization.courses.reorder('created_at').uniq.limit(5),:org_id=>organization.id,:page=>1}%>
-  </ul>
-</div>
-<% organization.org_subfields.each do |field| %>
-    <div class="homepageLeftMenuBlock">
-      <% if field.field_type == "Post" %>
-        <%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText" %>
-        <%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子"%>
-      <% else %>
-        <%= link_to "#{field.name}", org_subfield_files_path(field), :class => "homepageMenuText" %>
-        <% if User.current.member_of_org?organization %>
-          <%= link_to "", subfield_upload_file_org_subfield_files_path(field.id, :in_org => 1),:method => "post", :remote => true, :class => "homepageMenuSetting fr", :title => "上传资源" %>
-           <!--<a class="homepageMenuSetting fr" title="上传资源" href="javascript:void(0);" onclick="org_subfield_files_upload(<%#= field.id %>);"> </a>-->
-        <% end %>
-          <!--<a href="javascript:void(0);" class="homepageMenuText"><%#= field.name %></a>-->
-      <% end %>
-    </div>
-    <div class="homepageLeftMenuCourses" id="homepageLeftMenuField_<%= field.id %>" style="display:none;">
-    </div>
+<div class="homepageLeftMenuBlock">
+  <%= link_to "动态",organization_path(organization), :class => "homepageMenuText" %>
+</div>
+<div class="homepageLeftMenuBlock">
+  <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuProjects').slideToggle();">项目</a>
+  <% if User.current.logged? and User.current.admin_of_org?(organization) %>
+    <%=link_to "", join_project_menu_organization_path(organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联项目"%>
+  <% end %>
+</div>
+<div class="homepageLeftMenuCourses" id="homepageLeftMenuProjects" style="display:<%= organization.projects.count == 0?'none':'' %>">
+  <ul >
+
+    <%= render :partial => 'layouts/org_projects',:locals=>{:projects=>organization.projects.reorder('created_at').uniq.limit(5),:org_id=>organization.id,:page=>1}%>
+  </ul>
+</div>
+<div class="homepageLeftMenuBlock">
+  <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses').slideToggle();">课程</a>
+  <% if User.current.logged? and User.current.admin_of_org?(organization) %>
+    <%=link_to "", join_course_menu_organization_path(organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联课程"%>
+  <% end %>
+</div>
+<div class="homepageLeftMenuCourses" id="homepageLeftMenuCourses" style="display:<%= organization.courses.count == 0 ?'none':'' %>">
+  <ul >
+    <%= render :partial => 'layouts/org_courses',:locals=>{:courses=>organization.courses.reorder('created_at').uniq.limit(5),:org_id=>organization.id,:page=>1}%>
+  </ul>
+</div>
+<% organization.org_subfields.each do |field| %>
+    <div class="homepageLeftMenuBlock">
+      <% if field.field_type == "Post" %>
+        <%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText" %>
+        <%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子"%>
+      <% else %>
+        <%= link_to "#{field.name}", org_subfield_files_path(field), :class => "homepageMenuText" %>
+        <% if User.current.member_of_org?organization %>
+          <%= link_to "", subfield_upload_file_org_subfield_files_path(field.id, :in_org => 1),:method => "post", :remote => true, :class => "homepageMenuSetting fr", :title => "上传资源" %>
+           <!--<a class="homepageMenuSetting fr" title="上传资源" href="javascript:void(0);" onclick="org_subfield_files_upload(<%#= field.id %>);"> </a>-->
+        <% end %>
+          <!--<a href="javascript:void(0);" class="homepageMenuText"><%#= field.name %></a>-->
+      <% end %>
+    </div>
+    <div class="homepageLeftMenuCourses" id="homepageLeftMenuField_<%= field.id %>" style="display:none;">
+    </div>
 <% end %>

app/views/organizations/_org_subfield_message.html.erb

@@ -0,0 +1,118 @@
+<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait">
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
+    </div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo break_word mt-4">
+        <% if activity.try(:author).try(:realname) == ' ' %>
+            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% else %>
+            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% end %>
+        TO
+        <%= link_to activity.board.org_subfield.name.to_s+" | 资源栏目讨论区",org_subfield_boards_path(activity.board.org_subfield), :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">
+        <% if activity.parent_id.nil? %>
+            <%= link_to activity.subject.to_s.html_safe, board_message_path(activity.board,activity), :class=> "postGrey"
+            %>
+        <% else %>
+            <%= link_to activity.parent.subject.to_s.html_safe, board_message_path(activity.board,activity), :class=> "postGrey"
+            %>
+        <% end %>
+      </div>
+      <div class="homepagePostDate">
+        时间：<%= format_time(activity.created_on) %>
+      </div>
+      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id%>">
+        <div id="intro_content_<%= user_activity_id%>">
+          <% if activity.parent_id.nil? %>
+              <%= activity.content.to_s.html_safe%>
+          <% else %>
+              <%= activity.parent.content.to_s.html_safe%>
+          <% end %>
+        </div>
+      </div>
+      <div class="cl"></div>
+      <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
+      <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
+      <div class="cl"></div>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <% count = 0 %>
+  <% if activity.parent %>
+      <% count=activity.parent.children.count%>
+  <% else %>
+      <% count=activity.children.count%>
+  <% end %>
+  <div class="homepagePostReply">
+    <div class="topBorder" style="display: <%= count>0 ? 'none': '' %>"></div>
+    <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
+      <div class="homepagePostReplyBannerCount" onclick="expand_reply_input('#reply_input_<%= user_activity_id %>');">回复(
+        <%=count %>
+        )</div>
+      <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
+      <%if count>3 %>
+          <div class="homepagePostReplyBannerMore"><a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >展开更多</a></div>
+      <% end %>
+    </div>
+
+    <% activity= activity.parent_id.nil? ? activity : activity.parent %>
+    <% replies_all_i = 0 %>
+    <% if count > 0 %>
+        <div class="" id="reply_div_<%= user_activity_id %>">
+          <ul>
+            <% activity.children.reorder("created_on desc").each do |reply| %>
+                <script type="text/javascript">
+                    $(function(){
+                        showNormalImage('reply_content_<%= reply.id %>');
+                    });
+                </script>
+                <% replies_all_i=replies_all_i+1 %>
+                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>3 ? 'none' : '' %>">
+                  <div class="homepagePostReplyPortrait">
+                    <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_path(reply.author_id), :alt => "用户头像" %>
+                  </div>
+                  <div class="homepagePostReplyDes">
+                    <div class="homepagePostReplyPublisher mt-4">
+                      <% if reply.try(:author).try(:realname) == ' ' %>
+                          <%= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
+                      <% else %>
+                          <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
+                      <% end %>
+                      <%= format_time(reply.created_on) %>
+                    </div>
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
+                      <%= reply.content.html_safe %></div>
+                  </div>
+                  <div class="cl"></div>
+                </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 =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
+              <input type="hidden" name="quote[quote]" value="">
+              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
+              <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px; margin-left: 5px;"></div>
+              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+              <div class="cl"></div>
+              <p nhname='contentmsg_<%= user_activity_id%>'></p>
+          <% end%>
+        </div>
+        <div class="cl"></div>
+      </div>
+      <div class="cl"></div>
+    </div>
+
+  </div>
+</div>

app/views/organizations/_project_message.html.erb

@@ -16,10 +16,10 @@
       </div>
       <div class="homepagePostTitle break_word">
         <% if activity.parent_id.nil? %>
-            <%= link_to activity.subject.to_s.html_safe, project_boards_path(activity.project,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey"
+            <%= link_to activity.subject.to_s.html_safe, board_message_path(activity.board,activity), :class=> "postGrey"
             %>
         <% else %>
-            <%= link_to activity.parent.subject.to_s.html_safe, project_boards_path(activity.project,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey"
+            <%= link_to activity.parent.subject.to_s.html_safe, board_message_path(activity.board,activity), :class=> "postGrey"
             %>
         <% end %>
       </div>

app/views/organizations/_show_org_document.html.erb

@@ -18,6 +18,9 @@
             <%= document.content.html_safe %>
           </div>
       <% end %>
+      <div class=" fl" style="width: 600px">
+        <%= link_to_attachments_course document, :author => false %>
+      </div>
       <!--    <%# if defined?(home_id) %>
         <div style="float:right;">最后编辑：<%#= User.find() %></div>
     <%# end %>-->

app/views/organizations/org_subfield_message_edit.html.erb

@@ -0,0 +1,16 @@
+<script type="text/javascript">
+    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#Container").css("width","1000px");
+        $("#message_subject").focus();
+    });
+</script>
+<div class="homepageRight mt0 ml10">
+  <div class="homepageRightBanner">
+    <div class="NewsBannerName">
+      编辑帖子
+    </div>
+  </div>
+  <%= render :partial => 'boards/course_new',
+             :locals => {:f => f, :edit_mode => edit_mode, :topic => topic, :course => course} %>
+</div>

app/views/organizations/show.html.erb

@@ -69,10 +69,10 @@
 <% end  %>
 <% if @org_activities %>
     <%= render :partial =>  'organizations/org_activities',
-           :locals => {:org_activities =>@org_activities,
-                       :page=>@page,
-                       :org => @organization,
-                       :org_act_count=>@org_activities.count}%>
+               :locals => {:org_activities => @org_activities,
+                           :page=> @page,
+                           :org => @organization,
+                           :org_act_count=> @org_activities.count} %>
 <% end %>
 
 

app/views/projects/_project_activities.html.erb

@@ -92,11 +92,13 @@
 <% end %>
 
 <% if forge_acts.count == 10 %>
-    <div id="show_more_forge_activities" class="loadMore mt10 f_grey">展开更多<%= link_to "", project_path(@project.id, :type => type, :page => page), :id => "more_forge_activities_link", :remote => "true", :class => "none" %></div>
+    <!--<div id="show_more_forge_activities" class="loadMore mt10 f_grey">点击展开更多<%#= link_to "", project_path(@project.id, :type => type, :page => page), :id => "more_forge_activities_link", :remote => "true", :class => "none" %></div>-->
+    <%= link_to "点击展开更多",project_path(@project.id, :type => type, :page => page),:id => "show_more_forge_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
 <% end %>
 
+<!--
 <script type="text/javascript">
     $("#show_more_forge_activities").mouseover(function () {
         $("#more_forge_activities_link").click();
     });
-</script>
+</script>-->

app/views/repositories/show.html.erb

@@ -41,7 +41,7 @@
                     <div class="commit_content_dec fl" title="<%= @changesets_latest_coimmit.comments %>"><%= @changesets_latest_coimmit.message %></div>
                 </span>
             <% else %>
-                 <span class="fl"><div class="fb fontGrey3 mr5 fl"><%=@changesets_latest_coimmit.author_email %></div>
+                 <span class="fl"><div class="fb fontGrey3 rep_mail_name mr5 fl"><%=@changesets_latest_coimmit.author_email %></div>
                     <div class="fl">提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>：</div>
                     <div class="commit_content_dec fl" title="<%= @changesets_latest_coimmit.comments %>"><%= @changesets_latest_coimmit.message %></div>
                 </span>
@@ -51,9 +51,8 @@
             <%= @repository.branches.count %></font> 个分支
         </span>
 
-        <span class="fr mr5"><font class="fb ml2 mr2 vl_commit">
-
-            <%=link_to"提交明细", {:action => 'changes', :path => to_path_param(@path), :id => @project, :repository_id => @repository.identifier_param, :rev => @rev,:page=>1 ,:commit_count =>"#{@changesets_all_count}"} %></font>
+         <span class="fr mr5"><font class="fb ml2 mr2 vl_commit">
+           <%=link_to @changesets_all_count, {:action => 'changes', :path => to_path_param(@path), :id => @project, :repository_id => @repository.identifier_param, :rev => @rev,:page=>1 ,:commit_count =>"#{@changesets_all_count}"} %></font> 提交
 
         </span>
       </div>

app/views/student_work/_add_score.html.erb

@@ -1,9 +1,10 @@
-<%= form_for('new_form', :remote => true, :method => :post,:url => add_score_student_work_path(work.id)) do |f|%>
+<%= form_for('new_form', :remote => true, :method => :post,:url => add_score_student_work_path(work.id),:id=>'add_score_'+work.id.to_s) do |f|%>
     <li >
       <span class="tit_fb"> 评价：</span>
-      <%= f.text_area 'user_message', :class => 'hwork_ping_text', :placeholder => l(:text_caracters_maximum,:count=>250),:maxlength => 250 %>
+      <%= f.text_area 'user_message', :class => 'hwork_ping_text', :id => 'score_comment_'+work.id.to_s, :placeholder => l(:text_caracters_maximum,:count=>250),:maxlength => 250 %>
       <div class="cl"></div>
     </li>
+    <p id="hint_message_<%=work.id %>" style="margin-left: 65px;"></p>
     <li >
       <span class="tit_fb mt2"> 评分：</span>
       <input type="number" name="score" id="score_<%= work.id%>" value="<%= score.nil? ? 60 : score.score%>" min="0" max="100" size="4" data-units="dollars" />
@@ -16,7 +17,19 @@
             <%= render :partial => 'student_work/student_work_attachment_form', :locals => {:work => work,:score => score} %>
           </div>
       <%end%>
-      <a href="javascript:void(0);" class="blue_n_btn fr evaluation_submit" onclick="$(this).parent().parent().submit();$('#about_hwork_<%= work.id%>').html('');">提交</a>
+      <a href="javascript:void(0);" id="work_submit_<%= work.id %>" class="blue_n_btn fr evaluation_submit" onclick="score_submit('<%=work.id %>');">提交</a>
       <div class="cl"></div>
     </li>
-<% end%>
+<% end%>
+<script type="text/javascript">
+    function score_submit(id){
+        if ($.trim($('#score_comment_'+id).val()) == "") {
+            $('#hint_message_'+id).html("为了对其他学生的作品负责，请您务必填写评语");
+            $("#hint_message_"+id).css('color','#ff0000');
+            $("#score_comment_"+id).focus();
+        } else {
+            $("#work_submit_"+id).parent().parent().submit();
+            $('#about_hwork_'+id).html('');
+        }
+    }
+</script>

app/views/student_work/_evaluation_title.html.erb

@@ -1,19 +1,25 @@
-<ul class="hworkUl">
-  <li class="hworkList340 hworkH30 width505">
-    <span class="HomeworkNameTitle f14 fb fl">作品名称</span>
-    <% if @homework.homework_type != 3 %>
-        <span class="HomeworkStuTitle f14 fb fl">姓名</span>
-        <span class="HomeworkStuTitle f14 fb fl">学号</span>
-    <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
-        <span class="HomeworkStuTitle f14 fb fl">关联项目</span>
-    <% end %>
-  </li>
-
-  <li class="hworkList130 hworkH30 fb ml10">
-    时间
-  </li>
-
-  <li class="hworkList50 hworkH30 fb mr10 ml10">
-    我的评分
-  </li>
+<ul class="hworkUl">
+  <li class="hworkList340 hworkH30 w455">
+    <span class="HomeworkNameTitle f14 fb fl w235">作品名称</span>
+    <% if @homework.homework_type != 3 %>
+        <span class="HomeworkStuTitle f14 fb fl">姓名</span>
+        <span class="HomeworkStuTitle f14 fb fl">学号</span>
+    <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
+        <span class="HomeworkStuTitle f14 fb fl">关联项目</span>
+    <% end %>
+  </li>
+
+  <li class="hworkList130 hworkH30 fb ml10">
+    时间
+  </li>
+
+  <% if @homework.homework_type == 2%>
+      <li class="hworkList50 hworkH30 fb">
+        系统
+      </li>
+  <% end%>
+
+  <li class="hworkList50 hworkH30 fb mr10 ml10" style="float: right;">
+    我的评分
+  </li>
 </ul>

app/views/student_work/_evaluation_un_work.html.erb

@@ -74,7 +74,7 @@
   <!-- 成绩 -->
   <% score = student_work.respond_to?("score") ? student_work.score : (student_work.final_score || 0) - student_work.absence_penalty - student_work.late_penalty%>
   <li class="hworkList50 <%= score_color score%> student_final_scor_info">
-    <%= score.nil? ? "--" : format("%.1f",score)%>
+    <%= score.nil? ? "--" : format("%.1f",score<0 ? 0 : score)%>
     <% unless score.nil?%>
         <div class="infoNi none width180">
           作品最终评分为

app/views/student_work/_evaluation_work.html.erb

@@ -6,16 +6,16 @@
     <% pro = @homework.student_work_projects.where(:user_id => User.current.id).first %>
     <% is_my_work = pro && pro.student_work_id == student_work.id%>
   <% end %>
-  <li class="hworkList340 width525">
+  <li class="hworkList340 w465">
     <ul>
       <% if is_my_work%>
           <li class="hworkPortrait mt15 mr10">
             <%= image_tag(url_to_avatar(student_work.user),width:"40", height: "40") %>
           </li>
-          <li class="hworkName mt15 mr15 width255 student_work_<%= student_work.id%>">
+          <li class="hworkName mt15 mr15 w230 student_work_<%= student_work.id%>">
             <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
             <div>
-              <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%>
+              <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w230"%>
             </div>
           </li>
           <li onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;" class="student_work_<%= student_work.id%>">
@@ -40,9 +40,9 @@
           <li class="hworkPortrait mt15 mr10">
             <%= image_tag(url_to_avatar(""),width:"40", height: "40") %>
           </li>
-          <li class="hworkName mt15 mr15 width255 student_work_<%= student_work.id%>">
+          <li class="hworkName mt15 mr15 w230 student_work_<%= student_work.id%>">
             <div>
-              <%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%>
+              <%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w230"%>
             </div>
           </li>
           <li onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;" class="student_work_<%= student_work.id%>">
@@ -75,8 +75,15 @@
   </li>
 
   <!-- 成绩 -->
+  <% if @homework.homework_type == 2%>
+      <!-- 系统评分 -->
+      <li class="hworkList50 <%= score_color student_work.system_score%>">
+        <%= student_work.system_score.nil? ? "--" : format("%.1f",student_work.system_score)%>
+      </li>
+  <% end%>
+
   <% my_score = student_work_score(student_work,User.current) %>
-  <li class="hworkList50 <%= my_score.nil? ? 'c_grey' : score_color(my_score.score)%> mr10">
+  <li class="hworkList50 <%= my_score.nil? ? 'c_grey' : score_color(my_score.score)%> mr10 ml10" style="float:right; ">
     <%= my_score.nil? ? "--" : format("%.1f",my_score.score)%>
   </li>
   <li class="hworkTip" style="display: none" id="work_click_<%= student_work.id%>"><em></em><span></span><font class="fontGrey2">点击查看详情</font></li>

app/views/student_work/_programing_work_show.html.erb

@@ -115,8 +115,20 @@
         $('#ajax-modal').parent().addClass("resourceUploadPopup");
         $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
     }
-    function submit_files(){
-        $("#upload_form").submit();
+    function regex_des() {
+        if ($.trim($("#attachment_des").val()) == "") {
+            $("#hint_message").text("附件描述不能为空");
+            $("#hint_message").css('color','#ff0000');
+            return false;
+        } else {
+            $("#hint_message").text("");
+            return true;
+        }
+    }
+    function submit_revise_files(){
+        if (regex_des()) {
+            $("#upload_form").submit();
+        }
     }
     function closeModal(){
         hideModal($(".uploadBoxContainer"));

app/views/student_work/_revise_attachment.html.erb

@@ -7,8 +7,12 @@
         <div class="mb10" id="revise_attachment_div_<%=revise_attachment.id %>">
           <span class="tit_fb"> 追加附件：</span>
           <%= render :partial => 'work_attachments_status', :locals => {:attachments => work.attachments.where("attachtype = 7"), :status => 2} %>
-          <span class="tit_fb">追加时间：</span><%=format_time revise_attachment.created_on.to_s %>&nbsp;&nbsp;(<%=revise_attachment_status @homework,revise_attachment %>)
+          <span class="tit_fb">追加时间：</span><%=format_time revise_attachment.created_on.to_s %>&nbsp;&nbsp;(<%=revise_attachment_status @homework,revise_attachment %>)<br />
+          <% unless revise_attachment.description == "" %>
+            <span class="tit_fb">追加理由：</span><p class="showHworkP"><%=revise_attachment.description %></p>
+          <% end %>
         </div>
+        <div class="cl"></div>
     <% end %>
     <% if work.user == User.current %>
         <div class="resubAtt mb15">
@@ -18,10 +22,14 @@
             <div class="mb10" id="revise_attachment_div_<%=revise_attachment.id %>">
               <span class="tit_fb"> 追加附件：</span>
               <%= render :partial => 'work_attachments_status', :locals => {:attachments => work.attachments.where("attachtype = 7"), :status => 1} %>
-              <span class="tit_fb">追加时间：</span><%=format_time revise_attachment.created_on.to_s %>
+              <span class="tit_fb">追加时间：</span><%=format_time revise_attachment.created_on.to_s %><br />
+              <% unless revise_attachment.description == "" %>
+                  <span class="tit_fb">追加理由：</span><p class="showHworkP"><%=revise_attachment.description %></p>
+              <% end %>
             </div>
         <% end %>
-        <div class="mb10">
+        <div class="cl"></div>
+        <div class="mb10 mt5">
           <a href="javascript:void(0);" onclick="show_upload();" class="blueCir ml5" title="请选择文件上传">上传附件</a>
         </div>
     <% end %>

app/views/student_work/_show.html.erb

@@ -113,8 +113,20 @@
         $('#ajax-modal').parent().addClass("resourceUploadPopup");
         $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
     }
-    function submit_files(){
-        $("#upload_form").submit();
+    function regex_des() {
+        if ($.trim($("#attachment_des").val()) == "") {
+            $("#hint_message").text("附件描述不能为空");
+            $("#hint_message").css('color','#ff0000');
+            return false;
+        } else {
+            $("#hint_message").text("");
+            return true;
+        }
+    }
+    function submit_revise_files(){
+        if (regex_des()) {
+            $("#upload_form").submit();
+        }
     }
     function closeModal(){
         hideModal($(".uploadBoxContainer"));

app/views/student_work/_upload_attachment.html.erb

@@ -9,7 +9,7 @@
       </div>
       <div class="uploadBox" id="uploadReviseBox">
         <input type="hidden" name="attachment_type" value="7">
-        <a href="javascript:void(0);" class="uploadIcon f14" name="button" id="choose_revise_attach"  onclick="_file.click();" onmouseover="" style="<%= ie8? ? 'display:none' : ''%>">
+        <a href="javascript:void(0);" class="uploadIcon f14" name="button" id="choose_revise_attach"  onclick="_file.click();" style="<%= ie8? ? 'display:none' : ''%>">
           <span class="chooseFile">选择文件</span></a>
         <%= file_field_tag 'attachments[dummy][file]',
                            :id => '_file',
@@ -37,9 +37,16 @@
         <div class="uploadResourceName">最多只能上传一个小于<span class="c_red">50MB</span>的附件</div>
       </div>
       <div class="cl"></div>
+      <div class="mt10">
+        <textarea class="reUploadDetail" id="attachment_des" name="description" placeholder="请在此输入您追加附件的理由（必填）"></textarea>
+      </div>
+      <div class="cl"></div>
+      <p id="hint_message"></p>
+      <div class="cl"></div>
       <div style="margin-top: 10px" >
         <div class="courseSendSubmit">
-          <%= submit_tag '确定',:onclick=>'submit_files();',:onfocus=>'this.blur()',:id=>'upload_files_submit_btn',:class=>'sendSourceText' %>
+          <a href="javascript:void(0);" id="upload_files_submit_btn" class="sendSourceText" onclick="submit_revise_files();">确定</a>
+          <%#= submit_tag '确定',:onclick=>'submit_revise_files();',:onfocus=>'this.blur()',:id=>'upload_files_submit_btn',:class=>'sendSourceText' %>
         </div>
         <div class="courseSendCancel">
           <a href="javascript:void(0);" id="upload_files_cancle_btn" class="sendSourceText" onclick="closeModal();">取消</a>