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

app/controllers/attachments_controller.rb

@@ -242,6 +242,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/courses_controller.rb

@@ -399,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

@@ -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/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
@@ -270,7 +270,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]
@@ -301,6 +306,31 @@ 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|
+      OrgSubfieldMessage.create(:org_subfield_id => field_id.to_i, :message_id => @message.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 => @message.id, :user_id => User.current.id)
+      end
+    end
+  end
+
   private
   def find_message
     return unless find_board

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

@@ -6,6 +6,17 @@ class OrgSubfieldsController < ApplicationController
     @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)
@@ -18,7 +29,4 @@ class OrgSubfieldsController < ApplicationController
     @subfield.update_attributes(:name => params[:name])
   end
 
-  def show
-    
-  end
 end

app/controllers/organizations_controller.rb

@@ -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
@@ -98,7 +98,7 @@ class OrganizationsController < ApplicationController
             @org_activities = OrgActivity.where("container_type = 'Course' and org_act_type = 'Poll' and container_id in (#{course_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
         end
       end
-      @page = params[:page] || 1
+      @page = params[:page]
       respond_to do |format|
         format.html
         format.js

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/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

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

app/models/org_document_comment.rb

@@ -5,6 +5,7 @@ class OrgDocumentComment < ActiveRecord::Base
   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
 
@@ -17,4 +18,9 @@ class OrgDocumentComment < ActiveRecord::Base
     end
   end
 
+
+  def project
+
+  end
+
 end

app/models/org_subfield.rb

@@ -2,6 +2,8 @@ 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
   acts_as_attachable
 
   def project

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

@@ -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/_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>
+<%= 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();
+        $("#RSide").removeAttr("id");
+        $("#Container").css("width","1000px");
+    });
+    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();
     });
-        });
-        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%>
-        });
-    });
 </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,9 +32,8 @@
 <% end %>
 
 
-
 <% if @project %>
-    <%= render :partial => 'project_show', locals: {project: @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 %>

app/views/boards/show.js.erb

@@ -1 +1,5 @@
+<% 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/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/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/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

@@ -9,7 +9,6 @@
     <!--编辑的整个属性-->
         <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,14 +40,14 @@
      <%= 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>-->
-     <%= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
+     <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">-->
    <!--<%#= pagination_links_full issue_pages, issue_count, :per_page_links => false, :remote => true, :flag => true %>-->
  <!--</ul>-->
- <!--<script type="text/javascript">
+ <script type="text/javascript">
      $("#show_more_issues").mouseover(function(){
          $("#more_issues_link").click();
      });
- </script>-->
+ </script>

app/views/issues/show.html.erb

@@ -31,14 +31,9 @@
           <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>

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>

app/views/layouts/base_org.html.erb

@@ -161,7 +161,7 @@
   <div class="cl"></div>
 
   <ul class="copyright mt10">
-    <li class="fl mr30">Copyright&nbsp;&copy;&nbsp;2007-2015,&nbsp;All Rights Riserved</li>
+    <li class="fl mr30">Copyright&nbsp;&copy;&nbsp;2007-2015,&nbsp;All Rights Reserved</li>
     <li>ICP备09019772</li>
   </ul>
 </div>

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) %>
-  <% end %>
       <p id="subject_span" class="ml55"></p>
+  <% end %>
+  <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>
+<% unless replying %>
     <li>
-  <label class="fl">&nbsp;&nbsp;<%= l(:label_attachment_plural) %>&nbsp;&nbsp;：</label>
-  <div  class="fl ml3">
+      <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>

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/_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,206 @@
         {
             $("#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>
+
+
+
+<%= 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="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) %>
+                    <%#= 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>

app/views/messages/_show_org_subfields.html.erb

@@ -0,0 +1,13 @@
+<ul class="columnWrap fl">
+  <!--<span class="fontBlue pl10">请在左侧选择要转发的位置</span>-->
+  <% if !org.nil? %>
+      <span class="fontBlue pl10">组织：<%= org.name %></span>
+      <% 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 %>
+      <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,6 @@
     } do |f| %>
         <%= render :partial => 'boards/course_message_edit',
                    :locals => {:f => f, :edit_mode => true, :topic => @message, :course => @message.course} %>
-
     <% 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/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

@@ -33,10 +33,15 @@
         </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>

app/views/org_document_comments/new.html.erb

@@ -39,10 +39,14 @@
         <%= 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>

app/views/org_document_comments/show.html.erb

@@ -29,6 +29,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/_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

@@ -49,6 +49,16 @@
                 <%= 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' %>
+                <% 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} %>
+                <% else %>
+                    <%= render :partial => 'organizations/project_message', :locals => {:activity => message,:user_activity_id =>act.id} %>
+                <% end %>
+            <% 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%>
@@ -68,4 +78,3 @@
         })
     })
 
-</script>-->

app/views/organizations/_org_left_subfield_list.html.erb

@@ -3,18 +3,19 @@
 </div>
 <div class="homepageLeftMenuBlock">
   <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuProjects').slideToggle();">项目</a>
-  <% if User.current.logged? %>
+  <% 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? %>
+  <% 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>

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

@@ -115,9 +115,21 @@
         $('#ajax-modal').parent().addClass("resourceUploadPopup");
         $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
     }
-    function submit_files(){
+    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,9 +113,21 @@
         $('#ajax-modal').parent().addClass("resourceUploadPopup");
         $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
     }
-    function submit_files(){
+    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>

app/views/student_work/index.html.erb

@@ -170,7 +170,11 @@
           <div class="cl"></div>
         </div>
         <div class="mt5">
-          <div class="fontGrey2 db fl">截止时间：<%= @homework.end_time %>&nbsp;23:59</div>
+          <% if @homework.homework_detail_manual && @homework.homework_detail_manual.comment_status < 2 %>
+            <div class="fontGrey2 db fl">提交截止时间：<%= @homework.end_time %>&nbsp;23:59</div>
+          <% elsif @homework.homework_detail_manual && @homework.homework_detail_manual.comment_status >= 2 %>
+              <div class="fontGrey2 db fl">匿评截止时间：<%= @homework.homework_detail_manual.evaluation_end %>&nbsp;23:59</div>
+          <% end %>
           <% if @homework.homework_detail_manual.comment_status == 0 %>
             <div class="fontGrey2 db fl ml10">发布时间：<%= @homework.publish_time %>&nbsp;00:00</div>
           <% end %>

app/views/users/_course_homework.html.erb

@@ -86,7 +86,11 @@
               分组人数：<%=activity.homework_detail_group.min_num %>-<%=activity.homework_detail_group.max_num %> 人
             </div>
         <% end %>
-        <div class="homepagePostDeadline">截止时间：<%= activity.end_time.to_s %>&nbsp;23:59</div>
+        <% if activity.homework_detail_manual && activity.homework_detail_manual.comment_status < 2 %>
+            <div class="homepagePostDeadline">提交截止时间：<%= activity.end_time.to_s %>&nbsp;23:59</div>
+        <% elsif activity.homework_detail_manual && activity.homework_detail_manual.comment_status >= 2 %>
+            <div class="homepagePostDeadline">匿评截止时间：<%= activity.homework_detail_manual.evaluation_end.to_s %>&nbsp;23:59</div>
+        <% end %>
       </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%>">

app/views/users/_project_issue.html.erb

@@ -81,6 +81,7 @@
                     <%= format_time(attachment.created_on) %>
                   </span>
                 </div>
+                <div class="cl"></div>
             <% end %>
         <% end %>
       </div>

app/views/users/_project_message.html.erb

@@ -16,15 +16,20 @@
       </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 fl" %>
         <% 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 fl" %>
         <% end %>
+        <% if activity.sticky == 1%>
+            <span class="sticky_btn_cir ml10">置顶</span>
+        <% end%>
+        <% if activity.locked %>
+            <span class="locked_btn_cir ml10 fl mt3" title="已锁定">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+        <% end%>
+        <div class="cl"></div>
       </div>
       <div class="homepagePostDate">
-        时间：<%= format_time(activity.created_on) %>
+        发帖时间：<%= 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%>">

app/views/users/_user_homework_detail.html.erb

@@ -84,9 +84,11 @@
               分组人数：<%=homework_common.homework_detail_group.min_num %>-<%=homework_common.homework_detail_group.max_num %> 人
             </div>
         <% end %>
-        <div class="homepagePostDeadline">
-          <%= l(:label_end_time)%>：<%= homework_common.end_time%>&nbsp;23:59
-        </div>
+        <% if homework_common.homework_detail_manual && homework_common.homework_detail_manual.comment_status < 2 %>
+            <div class="homepagePostDeadline">提交截止时间：<%= homework_common.end_time.to_s %>&nbsp;23:59</div>
+        <% elsif homework_common.homework_detail_manual && homework_common.homework_detail_manual.comment_status >= 2 %>
+            <div class="homepagePostDeadline">匿评截止时间：<%= homework_common.homework_detail_manual.evaluation_end.to_s %>&nbsp;23:59</div>
+        <% end %>
         <% if homework_common.homework_detail_manual.comment_status == 0 %>
             <div class="homepagePostDeadline ml15">
               <%= l(:label_publish_time)%>：<%= homework_common.publish_time%>&nbsp;00:00

config/locales/zh.yml

@@ -110,6 +110,8 @@ zh:
 
   label_week_mail: 一周动态
   label_day_mail: 您好！Trustie平台上与您相关的今日动态
+  label_day_mail_first: 您好！今天有
+  label_day_mail_last: 个动态与您相关，Trustie让您更高效！
   #added by huang
   field_tea_name: 教师
   field_couurse_time: 学时

config/routes.rb

@@ -409,6 +409,7 @@ RedmineApp::Application.routes.draw do
 
   # boards
   match 'boards/:board_id/topics/new', :to => 'messages#new', :via => [:get, :post], :as => 'new_board_message'
+  match 'boards/:id/join_to_org_subfields', :to => 'boards#join_to_org_subfields'
   get 'boards/:board_id/topics/:id', :to => 'messages#show', :as => 'board_message'
   match 'boards/:board_id/topics/quote/:id', :to => 'messages#quote', :via => [:get, :post]
   get 'boards/:board_id/topics/:id/edit', :to => 'messages#edit'
@@ -417,6 +418,9 @@ RedmineApp::Application.routes.draw do
   post 'boards/:board_id/topics/:id/replies', :to => 'messages#reply'
   post 'boards/:board_id/topics/:id/edit', :to => 'messages#edit'
   post 'boards/:board_id/topics/:id/destroy', :to => 'messages#destroy'
+  match 'messages/join_org_subfield', :to => 'messages#join_org_subfield'
+  match 'messages/get_subfield_on_click_org', :to => 'messages#get_subfield_on_click_org'
+  match 'messages/join_org_subfields', :to => 'messages#join_org_subfields'
   # boards end
 
   # Misc issue routes. TODO: move into resources
@@ -442,6 +446,7 @@ RedmineApp::Application.routes.draw do
   post '/courses/:id/course_activity', :to => 'courses#show', :as => 'course_activity'
   get '/boards/:id/boards_topic', :to =>'boards#show', :as => 'boards_topic'
   match 'courses/:course_id/news/index', :to => 'news#index', :via => [:get, :post], :as => 'new_course_news'
+  match 'courses/:course_id/news/new', :to => 'news#new', :via => [:get, :post]
 
   #added by young
   resources :users do
@@ -926,6 +931,7 @@ RedmineApp::Application.routes.draw do
       post 'join_in/join_group', :to => 'courses#join_group', :as => 'join_group'
       delete 'join_in/join_group', :to => 'courses#unjoin_group'
       get 'copy_course'
+      get 'private_or_public'
       match 'course_activity', :to => 'courses#course_activity',  :via => :get, :as => "course_activity"
       get 'course_outline'
       post 'search_course_outline'

db/migrate/20151223062932_create_org_subfield_messages.rb

@@ -0,0 +1,10 @@
+class CreateOrgSubfieldMessages < ActiveRecord::Migration
+  def change
+    create_table :org_subfield_messages do |t|
+      t.integer :org_subfield_id
+      t.integer :message_id
+      t.string :message_type
+      t.timestamps
+    end
+  end
+end

db/schema.rb

@@ -1196,6 +1196,14 @@ ActiveRecord::Schema.define(:version => 20151224090313) do
     t.datetime "created_at"
   end
 
+  create_table "org_subfield_messages", :force => true do |t|
+    t.integer  "org_subfield_id"
+    t.integer  "message_id"
+    t.string   "message_type"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
   create_table "org_subfields", :force => true do |t|
     t.integer  "organization_id"
     t.integer  "priority"

public/javascripts/project.js

@@ -552,3 +552,62 @@ function issueDetailShow(){
     $("#issue_edit").hide();
     $("#issue_detail").show();
 }
+
+//项目讨论区提交
+function regexTopicSubject() {
+    var name = $("#message_subject").val();
+    if(name.length ==0)
+    {
+        $("#subjectmsg").text("标题不能为空");
+        $("#subjectmsg").css('color','#ff0000');
+        $("#message_subject").focus();
+        return false;
+    }
+    else if(name.length <= 255)
+    {
+        $("#subjectmsg").text("填写正确");
+        $("#subjectmsg").css('color','#008000');
+        return true;
+    }
+    else
+    {
+        $("#subjectmsg").text("标题超过255个字符");
+        $("#subjectmsg").css('color','#ff0000');
+        $("#message_subject").focus();
+        return false;
+    }
+}
+
+function regexTopicDescription()
+{
+    var name = message_content_editor.html();
+    if(message_content_editor.isEmpty())
+    {
+        $("#message_content_span").text("描述不能为空");
+        $("#message_content_span").css('color','#ff0000');
+        return false;
+    }
+    else if(name.length >=6000){
+        $("#message_content_span").text("描述最多3000个汉字(或6000个英文字符)");
+        $("#message_content_span").css('color','#ff0000');
+        return false;
+    }
+    else
+    {
+        $("#message_content_span").text("填写正确");
+        $("#message_content_span").css('color','#008000');
+        return true;
+    }
+}
+function submit_topic_project()
+{
+    if(regexTopicSubject() && regexTopicDescription())
+    {
+        message_content_editor.sync();
+        $("#message-form-project").submit();
+    }
+}
+
+function reset_topic(){
+
+}

public/stylesheets/courses.css

@@ -1227,6 +1227,7 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat;
 .mb10 {margin-bottom: 10px}
 .mb15 {margin-bottom: 15px}
 div.disable_link {background-color: #c1c1c1 !important;}
+.reUploadDetail{border:1px solid #dddddd; float:left; resize:none; width:400px; height:80px; overflow-y:auto;outline: none;}
 
 /*新课程资源库*/
 .reCon{ margin:5px; width:710px;}
@@ -1238,3 +1239,5 @@ div.disable_link {background-color: #c1c1c1 !important;}
 .support{ background:url(../images/public_icon.png) -66px -45px no-repeat; width:18px; height:21px;}
 .function{ background:url(../images/public_icon.png) -66px -70px no-repeat; width:18px; height:21px;}
 .weekly{ background:url(../images/public_icon.png) -66px -95px no-repeat; width:18px; height:21px;}
+
+.boxShadow {box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5);}

public/stylesheets/org.css

@@ -70,6 +70,7 @@ a.linkGrey8:hover {color:#585858;}
 .org_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-53px;
                    position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 30px;}
 #orgUserName {max-width:50px; overflow:hidden; white-space: nowrap; text-overflow: ellipsis; display:inline-block;}
+.org_login_list a {color:#269ac9;}
 
 .orgListStatus {width:55px; float:left;}
 .reCon{ margin:5px; width:710px;}
@@ -86,6 +87,19 @@ a.linkGrey8:hover {color:#585858;}
 .re_con_top span{ color:#999999; font-weight:bold;}
 ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }
 
-.popbox_polls{width:300px;height:100px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-100px 0 0 -150px;
+.popbox_polls{width:300px;height:100px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-100px 0 0 -150px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
+
+/*转发样式*/
+.shareDP {width:415px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; z-index:1000;}
+.shareArrow {background:url(../images/arrowList.png) -90px -108px no-repeat; display:inline-block; width:5px; height:10px; margin-right:3px;}
+.sectionWrap {float:left; max-height:150px; margin-bottom:10px; overflow:auto; overflow-x:hidden; width:220px; background-color:#f1f1f1; min-height:150px; padding-top:5px;}
+.columnWrap {float:left; max-height:148px; margin-bottom:10px; overflow:auto; overflow-x:hidden; width:178px; background-color:#fffff; min-height:148px; padding-top:5px; border:1px solid #f1f1f1;}
+.columnWrap li {padding-left:10px; color:#585858;}
+.columnWrap span {width:150px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:inline-block;}
+.sectionRow:hover {background-color:#cccccc; cursor:pointer;}
+.sectionContent {display:none;}
+.sectionContent li {padding-left:30px;}
+.sectionContent li:hover {background-color:#cccccc; cursor:pointer;}
+.sectionContent span {width:175px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; display:inline-block; height:18px; vertical-align:middle;}.popbox_polls{width:300px;height:100px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-100px 0 0 -150px;
                 background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
 .org_login_list a {color:#269ac9;}

public/stylesheets/project.css

@@ -1092,3 +1092,53 @@ a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; c
 .support{ background:url(../images/public_icon.png) -66px -45px no-repeat; width:18px; height:21px;}
 .function{ background:url(../images/public_icon.png) -66px -70px no-repeat; width:18px; height:21px;}
 .weekly{ background:url(../images/public_icon.png) -66px -95px no-repeat; width:18px; height:21px;}
+
+.upload_img img{max-width: 100%;}
+.table_maxWidth table {max-width: 642px;}
+
+/*新讨论区*/
+select.InputBox, input.InputBox, textarea.InputBox {border: 1px solid #D9D9D9;color: #888;height: 28px;line-height: 28px;padding-left: 5px;font-size: 14px;}
+.w713 {width: 713px;}
+a.BlueCirBtnMini{ display:block;width:40px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle;  text-align:center; border:1px solid #269ac9; color:#269ac9;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
+a.AnnexBtn{  background: url(images/homepage_icon2.png) 0px -343px no-repeat !important; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
+a:hover.BlueCirBtnMini{ background:#269ac9; color:#fff;}
+.sticky_btn_cir{ background:#269ac9; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
+.locked_btn_cir{background: url("../images/locked.png") 0 0 no-repeat; cursor: default;}
+/*讨论区内部样式*/
+.postDetailContainer {padding:15px; border:1px solid #dddddd; background-color:#ffffff;}
+.postlabel {background-color:#edf1f2; color:#888888; padding:2px 5px; float:left; margin-bottom:5px;}
+.postRightContainer {width:718px; border:1px solid #dddddd; padding:15px; background-color:#ffffff; float:left; margin-bottom:10px;}
+.postDetailBanner {height:30px; width:720px; border-bottom:1px solid #efefef;}
+.postDetailRow {width:720px; border-bottom:1px solid #efefef; padding:15px 0;}
+.postDetailPortrait {width:50px; height:50px; float:left; margin-right:15px;}
+.postDetailWrap {width:580px; float:left;}
+.postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;}
+.postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
+.postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
+.postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
+.postDetailDate {color:#888888; font-size:12px; float:left;}
+.postDetailReply { margin-top:28px; color:#888888; float:right;}
+a.postReplyIcon {background:url(images/post_image_list.png) -40px 2px no-repeat; width:18px; height:18px; float:left;}
+a.postReplyIcon:hover {background:url(images/post_image_list.png) -40px -29px no-repeat;}
+.postDetailInput {width:713px; height:28px; border:1px solid #d9d9d9; outline:none !important;}
+.postAttIcon {background:url(images/post_image_list.png) 0px -91px no-repeat; width:16px; height:16px; padding-left:20px;}
+.postAttIcon:hover {background:url(images/post_image_list.png) 0px -113px no-repeat;}
+.postThemeContainer {width:720px;}
+.postThemeWrap {width:655px; float:left;position: relative}
+.postLikeIcon {background:url(images/post_image_list.png) 0px -42px no-repeat ;float:right; padding-left:18px; margin-top:3px;}
+.postLikeIcon:hover {background:url(images/post_image_list.png) 0px -64px no-repeat ;}
+a.AnnexBtn{  background: url(images/homepage_icon2.png) 0px -343px no-repeat !important; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
+a:hover.AnnexBtn{background: url(images/homepage_icon2.png) -90px -343px no-repeat !important; color:#3598db;}
+.postEdit {background:url(images/post_image_list.png) 0px -94px no-repeat; width:18px; height:18px; display:block; float:left;}
+.postDelete {background:url(images/post_image_list.png) -42px -93px no-repeat; width:18px; height:18px; display:block; float:right;}
+.pageBanner {width:968px; margin:0px auto; border:1px solid #dddddd; background-color: #FFF; padding: 10px 15px; float:left;}
+.homepagePostReplyInput {width:543px; height:33px; max-width:543px; max-height:33px; border:1px solid #d9d9d9; outline:none;}
+.postRouteContainer {padding:10px 15px; background-color:#ffffff; border:1px solid #dddddd; margin-top:10px; font-size:14px;}
+a.postRouteLink {font-weight:bold; color:#484848;}
+a.postRouteLink:hover {text-decoration:underline;}
+.homepagePostSetting ul li:hover ul {display:block;}
+
+.ReplyToMessageContainer {border-bottom:1px solid #e3e3e3; width:632px; margin:0px auto; margin-top:15px; min-height:60px;}
+.ReplyToMessageInputContainer {width:582px; float:left;}
+a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;}
+a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}

public/stylesheets/public.css

@@ -119,6 +119,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .mb8 {margin-bottom:8px;}
 .mb10{ margin-bottom:10px !important;}
 .mb20{ margin-bottom:20px;}
+.pl10 {padding-left:10px;}
 .pl15{ padding-left:15px;}
 .pl5{ padding-left:5px;}
 .pt5{ padding-top:5px;}
@@ -408,7 +409,7 @@ a:hover.search_btn{ background: #0fa9bb;}
 
 /*发送资源弹窗*/
 /*.resourceShareContainer {width:100%; height:100%; background:#666; filter:alpha(opacity=50); opacity:0.5; -moz-opacity:0.5; position:absolute; left:0; top:0; z-index:-999;}*/
-.resourceSharePopup {width:300px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}
+.resourceSharePopup {width:300px; height:auto; border:3px solid #269ac9 !important; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}
 .sendText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; width:100px; display:inline-block; font-weight:bold;}
 .resourcesSendTo {float:left; height:20px; margin-top:15px;}
 .resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;}
@@ -424,7 +425,7 @@ a:hover.search_btn{ background: #0fa9bb;}
 .courseSendCancel {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#c1c1c1; float:left}
 .courseSendCancel:hover {background-color:#717171;}
 .courseReferContainer {float:left; max-height:120px; overflow:scroll; overflow-x:hidden; margin-right:16px; margin-bottom:10px;}
-a.sendSourceText {font-size:14px; color:#ffffff; display:block;}
+a.sendSourceText {font-size:14px; color:#ffffff !important; display:block;}
 
 /*上传资源弹窗*/
 .resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;}
@@ -918,3 +919,15 @@ a.resourcesTypeUser {background:url(images/homepage_icon.png) -178px -453px no-r
 /* @功能 定义 */
 span.at {color:#269ac9;}
 .del_line{text-decoration:line-through !important;}
+/*转发样式*/
+.shareDP {width:415px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; z-index:1000;}
+.shareArrow {background:url(../images/arrowList.png) -90px -108px no-repeat; display:inline-block; width:5px; height:10px; margin-right:3px;}
+.sectionWrap {float:left; max-height:150px; margin-bottom:10px; overflow:auto; overflow-x:hidden; width:220px; background-color:#f1f1f1; min-height:150px; padding-top:5px;}
+.columnWrap {float:left; max-height:148px; margin-bottom:10px; overflow:auto; overflow-x:hidden; width:178px; background-color:#fffff; min-height:148px; padding-top:5px; border:1px solid #f1f1f1;}
+.columnWrap li {padding-left:10px; color:#585858;}
+.columnWrap span {width:150px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:inline-block;}
+.sectionRow:hover {background-color:#cccccc; cursor:pointer;}
+.sectionContent {display:block;}
+.sectionContent li {padding-left:30px;}
+.sectionContent li:hover {background-color:#cccccc; cursor:pointer;}
+.sectionContent span {width:175px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; display:inline-block; height:18px; vertical-align:middle;}

spec/factories/org_subfield_boards.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :org_subfield_board, :class => 'OrgSubfieldBoards' do
+    
+  end
+
+end

spec/factories/org_subfield_messages.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :org_subfield_message, :class => 'OrgSubfieldMessage' do
+    
+  end
+
+end

spec/models/org_subfield_boards_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe OrgSubfieldBoards, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

spec/models/org_subfield_message_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe OrgSubfieldMessage, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end