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

Conflicts:
	app/views/boards/_project_show.html.erb
	app/views/boards/_project_show_detail.html.erb

解决冲突

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 :find_project_by_project_id, :find_board_if_available, :except => [:join_to_org_subfields]
-  before_filter :authorize, :except => [:new, :show, :create, :index]
+  before_filter :authorize, :except => [:new, :show, :create, :index, :join_to_org_subfields]
   accept_rss_auth :index, :show
   
 
@@ -225,6 +225,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/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 :find_message, :except => [:new, :preview, :join_org_subfield, :get_subfield_on_click_org, :join_org_subfields]
-  before_filter :authorize, :except => [:preview, :edit, :destroy, :new]
+  before_filter :authorize, :except => [:preview, :edit, :destroy, :new,:join_org_subfield, :get_subfield_on_click_org, :join_org_subfields]
 
   helper :boards
   helper :watchers
@@ -301,6 +301,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/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),
+        :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>

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_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| %>
+<%= content_for(:header_tags) do %>
-
+    <%= import_ke(enable_at: true, prettify: false) %>
-    <%= render :partial => 'form_project', :locals => {:f => f,  :topic => @message} %>
-    <li>
-      <div class="ml55 fl" nhname="toolbar_container"></div>
-      <a href="javascript:void(0)"  nhname="cancelbtn" class="grey_btn fr ml10"><%= l(:button_cancel) %></a>
-
-      <a href="javascript:void(0)" nhname="submitbtn" class="blue_btn fr " style="margin-left: 55px"><%= l(:button_submit)%></a>
-      <div class="cl"></div>
-    </li>
 <% end %>
+
+<%= 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_detail.html.erb

@@ -1,8 +1,16 @@
+<<<<<<< .mine
 <%= content_for(:header_tags) do %>
     <%= import_ke(enable_at: false, prettify: false) %>
     <%= javascript_include_tag "init_activity_KindEditor" %>
 <% end %>
 
+=======
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= javascript_include_tag "init_activity_KindEditor" %>
+<% end %>
+
+>>>>>>> .theirs
 <style type="text/css">
     /*回复框*/
     .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}

app/views/layouts/base_projects.html.erb

@@ -12,7 +12,7 @@
   <%= favicon %>
   <%= javascript_heads %>
   <%= heads_for_theme %>
-  <%= stylesheet_link_tag 'public', 'pleft', 'project','prettify','jquery/jquery-ui-1.9.2','header','repository' %>
+  <%= stylesheet_link_tag 'public', 'pleft', 'project','courses','prettify','jquery/jquery-ui-1.9.2','header','repository' %>
   <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','attachments' %>
 
   <%= call_hook :view_layouts_base_html_head %>

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>
+  <div id="message_quote" class="wiki" style="width: 92%;word-break: break-all;word-wrap: break-word;margin-left: 40px;"></div>
-  <label class="fl ml3" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;：</label>
+  <!--<label class="fl" >
+    <span class="c_red">*</span>&nbsp;
+    <%#= l(:field_description) %>&nbsp;&nbsp;：
+  </label>-->
   <%= text_area :quote,:quote,:style => 'display:none' %>
-  <%= f.text_area :content, :class => 'talk_text fl', :id => 'message_content', :onkeyup => "regexContent();", :maxlength => 5000,:placeholder => "最多3000个汉字(或6000个英文字符)" %>
+  <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+  <% if replying %>
+      <%= f.kindeditor :content, :editor_id => 'message_content_editor',
+                       :width => '99%',
+                       :height => 100,
+                       :minHeight=>100,
+                       :input_html => { :id => 'message_content',
+                                        :class => 'talk_text fl',
+                                        :maxlength => 5000 }%>
+  <% else %>
+      <%= f.kindeditor :content, :editor_id => 'message_content_editor',
+                       :owner_id => @message.nil? ? 0: @message.id,
+                       :owner_type => OwnerTypeHelper::MESSAGE,
+                       :width => '90%',
+                       :height => 300,
+                       :minHeight=>300,
+                       :class => 'talk_text fl',
+                       :input_html => { :id => 'message_content',
+                                        :class => 'talk_text fl',
+                                        :maxlength => 5000 }%>
+  <% end %>
   <div class="cl"></div>
-  <p id="message_content_span"  class="ml55"></p>
+  <p id="message_content_span"></p>
 </li>
 <div class="cl"></div>
-<li>
+<% unless replying %>
-  <label class="fl">&nbsp;&nbsp;<%= l(:label_attachment_plural) %>&nbsp;&nbsp;：</label>
+    <li>
-  <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>
+    </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,213 @@
         {
             $("#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',
+            <%= render :partial => 'boards/project_message_edit',
-                       :locals => {:f => f, :replying => !@message.parent.nil?} %>
+                       :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>
+            <!--<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" %>
+            <%#= 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>
         <% 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/_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

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

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

config/routes.rb

@@ -406,6 +406,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'
@@ -414,6 +415,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

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"
@@ -1634,6 +1642,10 @@ ActiveRecord::Schema.define(:version => 20151224090313) do
     t.string   "extra"
   end
 
+  create_table "temp", :id => false, :force => true do |t|
+    t.integer "id", :default => 0, :null => false
+  end
+
   create_table "time_entries", :force => true do |t|
     t.integer  "project_id",  :null => false
     t.integer  "user_id",     :null => false

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