From 2220e0b7cc315aaab6c446c642bc42a010f4d0e7 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 22 Dec 2015 15:48:41 +0800
Subject: [PATCH 01/29] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B8=96=E5=AD=90-?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A0=8F=E7=9B=AE=E5=85=B3=E8=81=94=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/boards_controller.rb               | 14 ++++++++++++--
 app/models/board.rb                                |  2 ++
 app/models/org_subfield.rb                         |  2 ++
 app/models/org_subfield_board.rb                   |  5 +++++
 config/routes.rb                                   |  1 +
 .../20151221023622_create_org_subfield_boards.rb   | 13 +++++++++++++
 ...072758_add_board_type_to_org_subfield_boards.rb |  5 +++++
 db/schema.rb                                       | 14 +++++++++++++-
 spec/factories/org_subfield_boards.rb              |  6 ++++++
 spec/models/org_subfield_boards_spec.rb            |  5 +++++
 10 files changed, 64 insertions(+), 3 deletions(-)
 create mode 100644 app/models/org_subfield_board.rb
 create mode 100644 db/migrate/20151221023622_create_org_subfield_boards.rb
 create mode 100644 db/migrate/20151222072758_add_board_type_to_org_subfield_boards.rb
 create mode 100644 spec/factories/org_subfield_boards.rb
 create mode 100644 spec/models/org_subfield_boards_spec.rb

diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index 0c3236d4e..291593fc5 100644
--- a/app/controllers/boards_controller.rb
+++ b/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
   
 
@@ -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')
diff --git a/app/models/board.rb b/app/models/board.rb
index 67d59e599..ba1fae30a 100644
--- a/app/models/board.rb
+++ b/app/models/board.rb
@@ -19,6 +19,8 @@ class Board < ActiveRecord::Base
   include Redmine::SafeAttributes
   belongs_to :project,:touch => true
   belongs_to :course,:touch=>true
+  has_many :org_subfield_boards
+  has_many :org_subfields, :class_name => "OrgSubfield", :through => :org_subfield_boards
   has_many :topics, :class_name => 'Message', :conditions => "#{Message.table_name}.parent_id IS NULL", :order => "#{Message.table_name}.created_on DESC"
   has_many :messages, :dependent => :destroy, :order => "#{Message.table_name}.created_on DESC"
   belongs_to :last_message, :class_name => 'Message', :foreign_key => :last_message_id
diff --git a/app/models/org_subfield.rb b/app/models/org_subfield.rb
index f95bb3eba..062226e0e 100644
--- a/app/models/org_subfield.rb
+++ b/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_boards
+  has_many :boards, :through => :org_subfield_boards
   acts_as_attachable
 
   def project
diff --git a/app/models/org_subfield_board.rb b/app/models/org_subfield_board.rb
new file mode 100644
index 000000000..ac820e319
--- /dev/null
+++ b/app/models/org_subfield_board.rb
@@ -0,0 +1,5 @@
+class OrgSubfieldBoard < ActiveRecord::Base
+  belongs_to :org_subfield
+  belongs_to :board
+  # attr_accessible :title, :body
+end
diff --git a/config/routes.rb b/config/routes.rb
index 4121639c0..da04f63f3 100644
--- a/config/routes.rb
+++ b/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'
diff --git a/db/migrate/20151221023622_create_org_subfield_boards.rb b/db/migrate/20151221023622_create_org_subfield_boards.rb
new file mode 100644
index 000000000..06f6f2f17
--- /dev/null
+++ b/db/migrate/20151221023622_create_org_subfield_boards.rb
@@ -0,0 +1,13 @@
+class CreateTableOrgSubfieldBoards < ActiveRecord::Migration
+  def up
+    create_table :org_subfield_boards do |t|
+      t.integer :org_subfield_id
+      t.integer :board_id
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table :org_subfield_boards
+  end
+end
diff --git a/db/migrate/20151222072758_add_board_type_to_org_subfield_boards.rb b/db/migrate/20151222072758_add_board_type_to_org_subfield_boards.rb
new file mode 100644
index 000000000..d53f9952f
--- /dev/null
+++ b/db/migrate/20151222072758_add_board_type_to_org_subfield_boards.rb
@@ -0,0 +1,5 @@
+class AddBoardTypeToOrgSubfieldBoards < ActiveRecord::Migration
+  def change
+    add_column :org_subfield_boards, :board_type, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 8e946c493..f2c61ac5f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20151218110033) do
+ActiveRecord::Schema.define(:version => 20151222072758) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1196,6 +1196,14 @@ ActiveRecord::Schema.define(:version => 20151218110033) do
     t.datetime "created_at"
   end
 
+  create_table "org_subfield_boards", :force => true do |t|
+    t.integer  "org_subfield_id"
+    t.integer  "board_id"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+    t.string   "board_type"
+  end
+
   create_table "org_subfields", :force => true do |t|
     t.integer  "organization_id"
     t.integer  "priority"
@@ -1634,6 +1642,10 @@ ActiveRecord::Schema.define(:version => 20151218110033) 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
diff --git a/spec/factories/org_subfield_boards.rb b/spec/factories/org_subfield_boards.rb
new file mode 100644
index 000000000..0af4bc0d3
--- /dev/null
+++ b/spec/factories/org_subfield_boards.rb
@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :org_subfield_board, :class => 'OrgSubfieldBoards' do
+    
+  end
+
+end
diff --git a/spec/models/org_subfield_boards_spec.rb b/spec/models/org_subfield_boards_spec.rb
new file mode 100644
index 000000000..9a011c015
--- /dev/null
+++ b/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

From 9dc2cb8541c5c2e0ec4fce897c98c7f97afbf967 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Wed, 23 Dec 2015 10:40:50 +0800
Subject: [PATCH 02/29] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=96=87=E7=AB=A0=E9=99=84=E4=BB=B6=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/attachments_controller.rb     |  2 +
 .../org_document_comments_controller.rb       |  5 +-
 app/models/org_document_comment.rb            |  6 ++
 .../_attachment.html.erb                      | 79 +++++++++++++++++++
 app/views/org_document_comments/edit.html.erb |  7 +-
 app/views/org_document_comments/new.html.erb  |  8 +-
 app/views/org_document_comments/show.html.erb |  3 +
 7 files changed, 106 insertions(+), 4 deletions(-)
 create mode 100644 app/views/org_document_comments/_attachment.html.erb

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 664dc4cf5..9ce76dca8 100644
--- a/app/controllers/attachments_controller.rb
+++ b/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) }
diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb
index b8584fea3..67d3b247a 100644
--- a/app/controllers/org_document_comments_controller.rb
+++ b/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
@@ -40,6 +42,7 @@ class OrgDocumentCommentsController < ApplicationController
   def update
     @org_document =  OrgDocumentComment.find(params[:id])
     @org_document.update_attributes(:title => params[:org_document_comment][:title], :content => params[:org_document_comment][:content])
+    @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)
diff --git a/app/models/org_document_comment.rb b/app/models/org_document_comment.rb
index e2ce350ce..8febbf981 100644
--- a/app/models/org_document_comment.rb
+++ b/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
diff --git a/app/views/org_document_comments/_attachment.html.erb b/app/views/org_document_comments/_attachment.html.erb
new file mode 100644
index 000000000..86298a330
--- /dev/null
+++ b/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>
+
diff --git a/app/views/org_document_comments/edit.html.erb b/app/views/org_document_comments/edit.html.erb
index 33244ef14..6ee42bb08 100644
--- a/app/views/org_document_comments/edit.html.erb
+++ b/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>
diff --git a/app/views/org_document_comments/new.html.erb b/app/views/org_document_comments/new.html.erb
index 24160f6eb..6b0a275c3 100644
--- a/app/views/org_document_comments/new.html.erb
+++ b/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>
diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb
index 0848bc4e5..5815483e5 100644
--- a/app/views/org_document_comments/show.html.erb
+++ b/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 %>-->

From b9ae579622e024060f7f3fb3891a7b3e70ba86b1 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Wed, 23 Dec 2015 15:35:26 +0800
Subject: [PATCH 03/29] =?UTF-8?q?=E5=B0=86=E8=AF=BE=E7=A8=8B=E5=B8=96?=
 =?UTF-8?q?=E5=AD=90=E8=BD=AC=E5=8F=91=E8=87=B3=E7=BB=84=E7=BB=87=E5=B8=96?=
 =?UTF-8?q?=E5=AD=90=E6=A0=8F=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/messages_controller.rb        | 20 ++++++-
 app/models/board.rb                           |  2 -
 app/models/message.rb                         |  2 +
 app/models/org_subfield.rb                    |  4 +-
 app/models/org_subfield_board.rb              |  5 --
 app/views/messages/_course_show.html.erb      |  1 +
 .../messages/_join_org_subfield_menu.html.erb | 60 +++++++++++++++++++
 .../messages/_show_org_subfields.html.erb     | 13 ++++
 .../messages/get_subfield_on_click_org.js.erb |  2 +
 app/views/messages/join_org_subfield.js.erb   | 11 ++++
 app/views/messages/join_org_subfields.js.erb  |  2 +
 .../_org_left_subfield_list.html.erb          |  1 +
 config/routes.rb                              |  3 +
 ...151221023622_create_org_subfield_boards.rb | 13 ----
 ...8_add_board_type_to_org_subfield_boards.rb |  5 --
 db/schema.rb                                  |  8 +--
 public/stylesheets/org.css                    | 15 ++++-
 public/stylesheets/public.css                 | 15 ++++-
 18 files changed, 148 insertions(+), 34 deletions(-)
 delete mode 100644 app/models/org_subfield_board.rb
 create mode 100644 app/views/messages/_join_org_subfield_menu.html.erb
 create mode 100644 app/views/messages/_show_org_subfields.html.erb
 create mode 100644 app/views/messages/get_subfield_on_click_org.js.erb
 create mode 100644 app/views/messages/join_org_subfield.js.erb
 create mode 100644 app/views/messages/join_org_subfields.js.erb
 delete mode 100644 db/migrate/20151221023622_create_org_subfield_boards.rb
 delete mode 100644 db/migrate/20151222072758_add_board_type_to_org_subfield_boards.rb

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 6f173b7c2..957d77b8a 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -22,7 +22,7 @@ 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]
 
   helper :boards
@@ -301,6 +301,24 @@ 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])
+    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)
+    end
+  end
+
   private
   def find_message
     return unless find_board
diff --git a/app/models/board.rb b/app/models/board.rb
index ba1fae30a..67d59e599 100644
--- a/app/models/board.rb
+++ b/app/models/board.rb
@@ -19,8 +19,6 @@ class Board < ActiveRecord::Base
   include Redmine::SafeAttributes
   belongs_to :project,:touch => true
   belongs_to :course,:touch=>true
-  has_many :org_subfield_boards
-  has_many :org_subfields, :class_name => "OrgSubfield", :through => :org_subfield_boards
   has_many :topics, :class_name => 'Message', :conditions => "#{Message.table_name}.parent_id IS NULL", :order => "#{Message.table_name}.created_on DESC"
   has_many :messages, :dependent => :destroy, :order => "#{Message.table_name}.created_on DESC"
   belongs_to :last_message, :class_name => 'Message', :foreign_key => :last_message_id
diff --git a/app/models/message.rb b/app/models/message.rb
index 4cdae1f6e..19531e270 100644
--- a/app/models/message.rb
+++ b/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
diff --git a/app/models/org_subfield.rb b/app/models/org_subfield.rb
index 062226e0e..b63883e81 100644
--- a/app/models/org_subfield.rb
+++ b/app/models/org_subfield.rb
@@ -2,8 +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_boards
-  has_many :boards, :through => :org_subfield_boards
+  has_many :org_subfield_messages, :dependent => :destroy
+  has_many :messages, :through => :org_subfield_messages
   acts_as_attachable
 
   def project
diff --git a/app/models/org_subfield_board.rb b/app/models/org_subfield_board.rb
deleted file mode 100644
index ac820e319..000000000
--- a/app/models/org_subfield_board.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class OrgSubfieldBoard < ActiveRecord::Base
-  belongs_to :org_subfield
-  belongs_to :board
-  # attr_accessible :title, :body
-end
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index e06c04775..1b4c8a0f6 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/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>
diff --git a/app/views/messages/_join_org_subfield_menu.html.erb b/app/views/messages/_join_org_subfield_menu.html.erb
new file mode 100644
index 000000000..692195892
--- /dev/null
+++ b/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  %></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>
diff --git a/app/views/messages/_show_org_subfields.html.erb b/app/views/messages/_show_org_subfields.html.erb
new file mode 100644
index 000000000..c1fa92990
--- /dev/null
+++ b/app/views/messages/_show_org_subfields.html.erb
@@ -0,0 +1,13 @@
+<ul class="columnWrap fr">
+  <!--<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>
\ No newline at end of file
diff --git a/app/views/messages/get_subfield_on_click_org.js.erb b/app/views/messages/get_subfield_on_click_org.js.erb
new file mode 100644
index 000000000..858236a96
--- /dev/null
+++ b/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}) %>");
diff --git a/app/views/messages/join_org_subfield.js.erb b/app/views/messages/join_org_subfield.js.erb
new file mode 100644
index 000000000..68e21d4e3
--- /dev/null
+++ b/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");
+
diff --git a/app/views/messages/join_org_subfields.js.erb b/app/views/messages/join_org_subfields.js.erb
new file mode 100644
index 000000000..7cb64e228
--- /dev/null
+++ b/app/views/messages/join_org_subfields.js.erb
@@ -0,0 +1,2 @@
+hideModal();
+alert("转发成功！");
\ No newline at end of file
diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
index 4d85342a6..9032ba62e 100644
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/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>
diff --git a/config/routes.rb b/config/routes.rb
index da04f63f3..c5e890d15 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -415,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
diff --git a/db/migrate/20151221023622_create_org_subfield_boards.rb b/db/migrate/20151221023622_create_org_subfield_boards.rb
deleted file mode 100644
index 06f6f2f17..000000000
--- a/db/migrate/20151221023622_create_org_subfield_boards.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class CreateTableOrgSubfieldBoards < ActiveRecord::Migration
-  def up
-    create_table :org_subfield_boards do |t|
-      t.integer :org_subfield_id
-      t.integer :board_id
-      t.timestamps
-    end
-  end
-
-  def down
-    drop_table :org_subfield_boards
-  end
-end
diff --git a/db/migrate/20151222072758_add_board_type_to_org_subfield_boards.rb b/db/migrate/20151222072758_add_board_type_to_org_subfield_boards.rb
deleted file mode 100644
index d53f9952f..000000000
--- a/db/migrate/20151222072758_add_board_type_to_org_subfield_boards.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddBoardTypeToOrgSubfieldBoards < ActiveRecord::Migration
-  def change
-    add_column :org_subfield_boards, :board_type, :string
-  end
-end
diff --git a/db/schema.rb b/db/schema.rb
index f2c61ac5f..50575eca8 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20151222072758) do
+ActiveRecord::Schema.define(:version => 20151223062932) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1196,12 +1196,12 @@ ActiveRecord::Schema.define(:version => 20151222072758) do
     t.datetime "created_at"
   end
 
-  create_table "org_subfield_boards", :force => true do |t|
+  create_table "org_subfield_messages", :force => true do |t|
     t.integer  "org_subfield_id"
-    t.integer  "board_id"
+    t.integer  "message_id"
+    t.string   "message_type"
     t.datetime "created_at",      :null => false
     t.datetime "updated_at",      :null => false
-    t.string   "board_type"
   end
 
   create_table "org_subfields", :force => true do |t|
diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index 44dcc70e3..2ffefa48a 100644
--- a/public/stylesheets/org.css
+++ b/public/stylesheets/org.css
@@ -85,4 +85,17 @@ 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;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
\ No newline at end of file
+.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;}
\ No newline at end of file
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index d9f370c7d..f73f389ae 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -916,4 +916,17 @@ a.resourcesTypeUser {background:url(images/homepage_icon.png) -178px -453px no-r
 .list_style ul li{list-style-type: disc;margin-left: 20px;}
 
 /* @功能 定义 */
-span.at {color:#269ac9;}
\ No newline at end of file
+span.at {color:#269ac9;}
+
+/*转发样式*/
+.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;}
\ No newline at end of file

From 73d377d06d71cf6c626962b2fa7a53bc84310756 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Wed, 23 Dec 2015 16:49:05 +0800
Subject: [PATCH 04/29] =?UTF-8?q?=E7=BB=84=E7=BB=87=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=A0=8F=E7=9B=AE=E6=98=BE=E7=A4=BA=E8=BD=AC=E5=8F=91=E7=9A=84?=
 =?UTF-8?q?=E5=B8=96=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/messages_controller.rb             |  7 +++++++
 app/controllers/org_subfields_controller.rb        | 14 +++++++++++---
 app/controllers/organizations_controller.rb        |  2 +-
 app/models/org_subfield_message.rb                 |  3 +++
 app/views/org_subfields/show.html.erb              |  0
 app/views/organizations/_org_activities.html.erb   | 10 ++++++++++
 .../20151223062932_create_org_subfield_messages.rb | 10 ++++++++++
 spec/factories/org_subfield_messages.rb            |  6 ++++++
 spec/models/org_subfield_message_spec.rb           |  5 +++++
 9 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 app/models/org_subfield_message.rb
 create mode 100644 app/views/org_subfields/show.html.erb
 create mode 100644 db/migrate/20151223062932_create_org_subfield_messages.rb
 create mode 100644 spec/factories/org_subfield_messages.rb
 create mode 100644 spec/models/org_subfield_message_spec.rb

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 957d77b8a..d5ce9e0eb 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -313,9 +313,16 @@ class MessagesController < ApplicationController
   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
 
diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb
index 1dc7885fe..26e35fc16 100644
--- a/app/controllers/org_subfields_controller.rb
+++ b/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
diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 38402f68e..69437e87f 100644
--- a/app/controllers/organizations_controller.rb
+++ b/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
diff --git a/app/models/org_subfield_message.rb b/app/models/org_subfield_message.rb
new file mode 100644
index 000000000..ba8778783
--- /dev/null
+++ b/app/models/org_subfield_message.rb
@@ -0,0 +1,3 @@
+class OrgSubfieldMessage < ActiveRecord::Base
+  # attr_accessible :title, :body
+end
diff --git a/app/views/org_subfields/show.html.erb b/app/views/org_subfields/show.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/organizations/_org_activities.html.erb b/app/views/organizations/_org_activities.html.erb
index 8bd1f5bbf..f9dfa8ea2 100644
--- a/app/views/organizations/_org_activities.html.erb
+++ b/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%>
diff --git a/db/migrate/20151223062932_create_org_subfield_messages.rb b/db/migrate/20151223062932_create_org_subfield_messages.rb
new file mode 100644
index 000000000..b5e4c2028
--- /dev/null
+++ b/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
diff --git a/spec/factories/org_subfield_messages.rb b/spec/factories/org_subfield_messages.rb
new file mode 100644
index 000000000..a3d6b391b
--- /dev/null
+++ b/spec/factories/org_subfield_messages.rb
@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :org_subfield_message, :class => 'OrgSubfieldMessage' do
+    
+  end
+
+end
diff --git a/spec/models/org_subfield_message_spec.rb b/spec/models/org_subfield_message_spec.rb
new file mode 100644
index 000000000..806fa5ba9
--- /dev/null
+++ b/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

From 9e0b88c186d84c1bce17e706e5f158394fd87daa Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Thu, 24 Dec 2015 09:46:18 +0800
Subject: [PATCH 05/29] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=A8=E8=AE=BA?=
 =?UTF-8?q?=E5=8C=BA=E6=A0=B7=E5=BC=8F=E6=94=B9=E6=88=90=E6=96=B9=E5=9D=97?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/_project_new_topic.html.erb  |  72 +++-
 app/views/boards/_project_show.html.erb       | 232 ++-----------
 .../boards/_project_show_detail.html.erb      |  70 ++++
 app/views/layouts/base_projects.html.erb      |   2 +-
 app/views/messages/_form_project.html.erb     |  64 +++-
 app/views/messages/_project_show.html.erb     | 309 ++++++++++++------
 app/views/users/_project_message.html.erb     |   4 +-
 7 files changed, 424 insertions(+), 329 deletions(-)
 create mode 100644 app/views/boards/_project_show_detail.html.erb

diff --git a/app/views/boards/_project_new_topic.html.erb b/app/views/boards/_project_new_topic.html.erb
index 00a3d2016..2259cc5bb 100644
--- a/app/views/boards/_project_new_topic.html.erb
+++ b/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) %>
+<% end %>
 
-    <%= 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>
+<%= 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' %>
 
-      <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 %>
\ No newline at end of file
+          <%= 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>
\ No newline at end of file
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 839d587b2..8a11d2859 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -1,204 +1,44 @@
-<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" %>
+<script type="text/javascript">
+    $(function(){
+        $("#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_course', :locals => {:container => Message.new, :isReply => @isReply})%>");
+        message_content_editor.html("");
+        $("#topic_editor").toggle();
+    }
+    <% if @is_new%>
+    $(function(){
+        $("#message_subject").focus();
+    });
+    <%end%>
+</script>
+
+<div class="homepageRight mt0 ml10">
+  <div class="homepageRightBanner">
+    <div class="NewsBannerName">
+      项目讨论区
     </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>
+  <% 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'} do |f| %>
+          <%#= render :partial => 'project_new_topic', :locals => {:f => f, :topic => @message, :edit_mode => false, :course => @board.course} %>
+          <%= render :partial => 'project_new_topic', :locals => {:f => f, :topic => @message, :edit_mode => false, :project => @board.project} %>
       <% 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 %>
+  <%= render :partial=> 'project_show_detail',:locals =>{:topics => @topics, :page => 0} %>
 </div>
-<div style="display:none;"><a href="#" id="nhjump"></a></div>
+
+
+
+
+
 
 <script type="text/javascript">
     $(function(){
diff --git a/app/views/boards/_project_show_detail.html.erb b/app/views/boards/_project_show_detail.html.erb
new file mode 100644
index 000000000..cd2bbc887
--- /dev/null
+++ b/app/views/boards/_project_show_detail.html.erb
@@ -0,0 +1,70 @@
+<%= 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, :project_id => @board.project.id ,:page => page), :id => "more_topic_link", :remote => "true", :class => "none" %></div>
+    <% end %>
+<% end%>
+
+<script type="text/javascript">
+    $("#show_more_course_topic").mouseover(function () {
+        $("#more_topic_link").click();
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index f7dcc40f5..433d30214 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/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 %>
diff --git a/app/views/messages/_form_project.html.erb b/app/views/messages/_form_project.html.erb
index bf91b3517..57d8a27c2 100644
--- a/app/views/messages/_form_project.html.erb
+++ b/app/views/messages/_form_project.html.erb
@@ -1,16 +1,23 @@
+
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
 <%= error_messages_for 'message' %>
 <% replying ||= false %>
-<% extra_option = replying ? { readonly: true} : { maxlength: 200 } %>
+<% extra_option = replying ? { hidden: "hidden"} : { maxlength: 200 } %>
+
 <li>
-  <label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label>
+  <div style="display:<%= replying ? 'none' : 'block'%>;" class="fl"><label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label></div>
   <% if replying %>
-      <%= f.text_field :subject, { size: 60, id: "message_subject",:class=>"talk_input w585" }.merge(extra_option) %>
+      <div style="display: none;"><%= f.text_field :subject, { size: 60, id: "message_subject",:class=>"talk_input w585 fl" }.merge(extra_option) %></div>
   <% else %>
       <%= f.text_field :subject, { size: 60, id: "message_subject", onkeyup: "regexSubject();",:class=>"talk_input w585" }.merge(extra_option) %>
+      <p id="subject_span" class="ml55"></p>
   <% end %>
-  <p id="subject_span" class="ml55"></p>
+  <div class="cl"></div>
 </li>
-<li class="ml55 mb5">
+<li class="ml60 mb5">
   <% unless replying %>
       <% if @message.safe_attribute? 'sticky' %>
           <%= f.check_box :sticky %>
@@ -24,20 +31,45 @@
   <div class="cl"></div>
 </li>
 <li>
-  <div id="message_quote" class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;"></div>
-  <label class="fl ml3" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;：</label>
+  <div id="message_quote" class="wiki" style="width: 92%;word-break: break-all;word-wrap: break-word;margin-left: 40px;"></div>
+  <!--<label class="fl" >
+    <span class="c_red">*</span>&nbsp;
+    <%#= l(:field_description) %>&nbsp;&nbsp;：
+  </label>-->
   <%= text_area :quote,:quote,:style => 'display:none' %>
-  <%= f.text_area :content, :class => 'talk_text fl', :id => 'message_content', :onkeyup => "regexContent();", :maxlength => 5000,:placeholder => "最多3000个汉字(或6000个英文字符)" %>
+  <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+  <% if replying %>
+      <%= f.kindeditor :content, :editor_id => 'message_content_editor',
+                       :width => '99%',
+                       :height => 100,
+                       :minHeight=>100,
+                       :input_html => { :id => 'message_content',
+                                        :class => 'talk_text fl',
+                                        :maxlength => 5000 }%>
+  <% else %>
+      <%= f.kindeditor :content, :editor_id => 'message_content_editor',
+                       :owner_id => @message.nil? ? 0: @message.id,
+                       :owner_type => OwnerTypeHelper::MESSAGE,
+                       :width => '90%',
+                       :height => 300,
+                       :minHeight=>300,
+                       :class => 'talk_text fl',
+                       :input_html => { :id => 'message_content',
+                                        :class => 'talk_text fl',
+                                        :maxlength => 5000 }%>
+  <% end %>
   <div class="cl"></div>
-  <p id="message_content_span"  class="ml55"></p>
+  <p id="message_content_span"></p>
 </li>
 <div class="cl"></div>
-<li>
-  <label class="fl">&nbsp;&nbsp;<%= l(:label_attachment_plural) %>&nbsp;&nbsp;：</label>
-  <div  class="fl ml3">
-    <%= render :partial => 'attachments/form_project', :locals => {:container => @message,:isReply => @isReply} %>
-  </div>
-</li>
+<% unless replying %>
+    <li>
+      <label class="fl mt10">&nbsp;&nbsp;<%= l(:label_attachment_plural) %>&nbsp;&nbsp;：</label>
+      <div  class="fl mt10">
+        <%= render :partial => 'attachments/form_project', :locals => {:container => @message,:isReply => @isReply} %>
+      </div>
+    </li>
+<% end %>
 <li >
   <div class="cl"></div>
-</li>
\ No newline at end of file
+</li>
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index 28b9e28d5..b20a7c22d 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/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>
\ No newline at end of file
+</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>
\ No newline at end of file
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index 14c37096e..96d74d82f 100644
--- a/app/views/users/_project_message.html.erb
+++ b/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>

From eb7d0761cb5c8b81be42296b762e15d7cd527c88 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Thu, 24 Dec 2015 10:37:13 +0800
Subject: [PATCH 06/29] =?UTF-8?q?=E7=BB=84=E7=BB=87=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=A0=8F=E4=BF=AE=E6=94=B9=E6=88=90=E5=92=8C=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=9B=B8=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org.html.erb |  27 ++---
 public/stylesheets/org.css          | 175 ++++++++++++++--------------
 2 files changed, 99 insertions(+), 103 deletions(-)

diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb
index 93af3fd29..e17562ecc 100644
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@@ -46,13 +46,13 @@
         <li class="navOrgMenu fr" id="orgSwitch" style="cursor:pointer;">
           <span class="orgMenuArrow" id="orgArrow">
             <ul class="org_login_list" style="display:none;">
-              <li> <%= link_to "个人主页",user_path(User.current), :class => "linkGrey8", :target => "_blank" %></li>
-              <li><%= link_to "退出",logout_organization_path(@organization), :class =>"linkGrey8", :method => 'post', :rel => "nofollow" %></li>
+              <li> <%= link_to "个人主页",user_path(User.current), :class => "menuGrey", :target => "_blank" %></li>
+              <li><%= link_to "退出",logout_organization_path(@organization), :class =>"menuGrey", :method => 'post', :rel => "nofollow" %></li>
               <!--<li><%#= link_to "退出",signout_path, :class =>"linkGrey8", :method => 'post', :rel => "nofollow" %></li>-->
           </ul>
           </span>
         </li>
-        <li class="navOrgMenu fr" id="orgUser" style="cursor:pointer;"><a href="javascript:void(0);" class="linkGrey8 f14" id="orgUserName"><%= User.current %></a></li>
+        <li class="navOrgMenu fr" id="orgUser" style="cursor:pointer;"><a href="javascript:void(0);" class="fontGrey2 f14" id="orgUserName"><%= User.current %></a></li>
           <!--<li class="navOrgMenu fr"><%#=link_to User.current, user_path(User.current), :class => "linkGrey8 f14" %></li>-->
       <% else %>
           <li class="navOrgMenu fr"><a href="<%= signin_path(:login=>true) %>" class="linkGrey8 f14">登录</a></li>
@@ -197,19 +197,14 @@
       }
   }
     $(document).ready(function(){
-        $("#orgUser,#orgSwitch").click(function(){
-            $(".org_login_list").toggle();
-            if($("#orgArrow").attr("class") == "orgMenuArrow"){
-                $("#orgArrow").attr("class","orgMenuArrow2");
-            }
-            else {
-                $("#orgArrow").attr("class","orgMenuArrow") ;
-            }
-        });
-        if($(".org_login_list").children().click){
-            $(".org_login_list").css("display","none");
-            $("#orgArrow").attr("class","orgMenuArrow");
-        };
+            $("#orgUser,#orgSwitch,.org_login_list").mouseover(function () {
+                $(".org_login_list").css("display", "block");
+                $("#orgArrow").attr("class", "orgMenuArrow2");
+            });
+            $("#orgUser,#orgSwitch,.org_login_list").mouseout(function () {
+                $(".org_login_list").css("display", "none");
+                $("#orgArrow").attr("class", "orgMenuArrow");
+            });
     });
 </script>
 </body>
diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index 44dcc70e3..e425d12c9 100644
--- a/public/stylesheets/org.css
+++ b/public/stylesheets/org.css
@@ -1,88 +1,89 @@
-@charset "utf-8";
-/* CSS Document */
-
-.orgName {width:130px; color:#484848;}
-.organization_r_h02{ width:980px; height:40px; background:#eaeaea; margin-bottom:10px;}
-.organization_h2{ background:#64bdd9; color:#fff; height:33px; width:90px; text-align:center; font-weight:normal; padding-top:7px; font-size:16px;}
-
-.orgSettingOp {width:45px; height:21px; color:#269ac9; text-align:center; border-bottom:3px solid #e4e4e4; float:left; font-weight:bold; cursor:pointer;}
-.orgBorder {width:628px; height:21px; border-bottom:3px solid #e4e4e4; float:left;}
-.orgOpActive {border-bottom:3px solid #269ac9 !important; color:#444444;}
-.logoBorder {border:1px solid #eaeaea; padding:2px;}
-.logoBorder:hover {border:1px solid #269ac9;}
-.logoEnter {border:1px solid #eaeaea; padding:2px 5px; margin-top:37px;}
-.orgNameInput {width:600px; outline:none; border:1px solid #eaeaea; float:right; height:22px;}
-.orgRow {font-size:14px; color:#484848;}
-.orgDes {width:600px; height:150px; outline:none; border:1px solid #eaeaea; float:right; resize:none;}
-.w607 {width:607px;}
-.orgUrlInput {width:200px; outline:none; border:1px solid #eaeaea; height:22px;}
-a.saveBtn {padding:3px 5px; background-color:#269ac9; color:#ffffff;}
-a.saveBtn:hover {background-color:#297fb8;}
-.orgMemberList {width:410px; float:left;}
-.orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px;}
-.orgListUser {width:119px; float:left;}
-.orgListRole {width:180px; float:left;}
-.orgMemContainer {width:278px;}
-.orgMemberAdd {float:right; width:240px;}
-.orgAddSearch {border:1px solid #dddddd; outline:none; width:180px; height:22px; color:#9b9b9b;}
-.undis {display:none;}
-.dis {display:inline-block;}
-.upbtn {    margin: 40px 0px 0px 15px;
-    display: block;
-    padding: 2px 5px;
-    border: 1px solid #EAEAEA;}
-
-a.org_member_btn{ padding:1px 5px; background:#15bccf; color:#fff;}
-
-/*项目关联css*/
-.relateOrg {width:335px;}
-.relatedList {width:335px;}
-.searchOrg {height:24px; width:200px; color:#9b9b9b; border:1px solid #15bccf;}
-a.cancelBtn {padding:3px 5px; background-color:#D9D9D9; color:#656565;}
-a.cancelBtn:hover {background-color:#717171; color:#ffffff;}
-.relatedList ul li {border-bottom:1px solid #e4e4e4; width:320px; height:22px; vertical-align:middle; line-height:22px;}
-.relatedListName {width:240px; text-align:left; max-width:240px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;}
-.relatedListOption {width:80px; text-align:center;}
-.relateOrgName {width:240px; max-width:240px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;color:#656565;}
-.search_org {width:150px; max-width:200px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;color:#656565;}
-
-/*组织列表*/
-.mt28 {margin-top:28px;}
-.orgWrap {width:880px; float:left;}
-.orgTitle {width:880px; max-width:880px; margin-bottom:5px;word-break: break-all; word-wrap:break-word; }
-.orgIntro {width:880px; max-width:880px; margin-bottom:6px; color:#484848;}
-
-/*关联项目弹窗*/
-.projectRelate {float:left; max-height:118px;margin-right:16px;margin-bottom:10px;    overflow:auto; overflow-x:hidden; width:288px;}
-.relateText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; display:inline-block; font-weight: bold;}
-
-/*组织首页新151204Tim*/
-.orgNav {width:1000px; height:30px; background-color:#cfcfcf; margin:0 auto;}
-.orgContainer {width:100%; margin:0 auto; background-color:#cfcfcf;}
-.navOrgLogo {width:21px; height:30px; margin-left:2px; margin-right:15px;}
-.navOrgMenu {display:inline-block;height:30px; line-height:30px; vertical-align:middle;}
-a.linkGrey8 {color:#888888;}
-a.linkGrey8:hover {color:#585858;}
-.orgBorder {width:583px; height:21px; border-bottom:3px solid #e4e4e4; float:left;}
-.orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px; color:#555555;}
-.orgMenuArrow {background:url(../images/nav_icon.png) -10px -165px no-repeat; position:relative; display:inline-block; width:20px; height:30px;}
-.orgMenuArrow2 {background:url(../images/nav_icon.png) -10px -132px no-repeat; position:relative; display:inline-block; width:20px; height:30px;}
-.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;}
-
-.orgListStatus {width:55px; float:left;}
-.reCon{ margin:5px; width:710px;}
-.retop{width:710px; height:40px; background:#eaeaea; padding:5px;}
-.resources {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;float: right}
-.re_search{ margin-top:7px; margin-left:5px;}
-.re_search{ margin-top:7px; margin-left:5px;}
-.re_schbox{ width:240px; height:24px; border:1px solid #64bdd9; color:#666666;}
-.re_schbtn{ width:60px; height:26px;  color:#fff; margin-right:5px; border:none;  margin-left:0px;padding-left: 0px;}
-.b_lblue{ background:#64bdd9;}
-.c_grey{ color:#888888;}
-.re_con{ margin:5px; width:665px;}
-.re_con_top{color:#494949; }
-.re_con_top span{ color:#999999; font-weight:bold;}
-ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }
-
+@charset "utf-8";
+/* CSS Document */
+
+.orgName {width:130px; color:#484848;}
+.organization_r_h02{ width:980px; height:40px; background:#eaeaea; margin-bottom:10px;}
+.organization_h2{ background:#64bdd9; color:#fff; height:33px; width:90px; text-align:center; font-weight:normal; padding-top:7px; font-size:16px;}
+
+.orgSettingOp {width:45px; height:21px; color:#269ac9; text-align:center; border-bottom:3px solid #e4e4e4; float:left; font-weight:bold; cursor:pointer;}
+.orgBorder {width:628px; height:21px; border-bottom:3px solid #e4e4e4; float:left;}
+.orgOpActive {border-bottom:3px solid #269ac9 !important; color:#444444;}
+.logoBorder {border:1px solid #eaeaea; padding:2px;}
+.logoBorder:hover {border:1px solid #269ac9;}
+.logoEnter {border:1px solid #eaeaea; padding:2px 5px; margin-top:37px;}
+.orgNameInput {width:600px; outline:none; border:1px solid #eaeaea; float:right; height:22px;}
+.orgRow {font-size:14px; color:#484848;}
+.orgDes {width:600px; height:150px; outline:none; border:1px solid #eaeaea; float:right; resize:none;}
+.w607 {width:607px;}
+.orgUrlInput {width:200px; outline:none; border:1px solid #eaeaea; height:22px;}
+a.saveBtn {padding:3px 5px; background-color:#269ac9; color:#ffffff;}
+a.saveBtn:hover {background-color:#297fb8;}
+.orgMemberList {width:410px; float:left;}
+.orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px;}
+.orgListUser {width:119px; float:left;}
+.orgListRole {width:180px; float:left;}
+.orgMemContainer {width:278px;}
+.orgMemberAdd {float:right; width:240px;}
+.orgAddSearch {border:1px solid #dddddd; outline:none; width:180px; height:22px; color:#9b9b9b;}
+.undis {display:none;}
+.dis {display:inline-block;}
+.upbtn {    margin: 40px 0px 0px 15px;
+    display: block;
+    padding: 2px 5px;
+    border: 1px solid #EAEAEA;}
+
+a.org_member_btn{ padding:1px 5px; background:#15bccf; color:#fff;}
+
+/*项目关联css*/
+.relateOrg {width:335px;}
+.relatedList {width:335px;}
+.searchOrg {height:24px; width:200px; color:#9b9b9b; border:1px solid #15bccf;}
+a.cancelBtn {padding:3px 5px; background-color:#D9D9D9; color:#656565;}
+a.cancelBtn:hover {background-color:#717171; color:#ffffff;}
+.relatedList ul li {border-bottom:1px solid #e4e4e4; width:320px; height:22px; vertical-align:middle; line-height:22px;}
+.relatedListName {width:240px; text-align:left; max-width:240px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;}
+.relatedListOption {width:80px; text-align:center;}
+.relateOrgName {width:240px; max-width:240px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;color:#656565;}
+.search_org {width:150px; max-width:200px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;color:#656565;}
+
+/*组织列表*/
+.mt28 {margin-top:28px;}
+.orgWrap {width:880px; float:left;}
+.orgTitle {width:880px; max-width:880px; margin-bottom:5px;word-break: break-all; word-wrap:break-word; }
+.orgIntro {width:880px; max-width:880px; margin-bottom:6px; color:#484848;}
+
+/*关联项目弹窗*/
+.projectRelate {float:left; max-height:118px;margin-right:16px;margin-bottom:10px;    overflow:auto; overflow-x:hidden; width:288px;}
+.relateText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; display:inline-block; font-weight: bold;}
+
+/*组织首页新151204Tim*/
+.orgNav {width:1000px; height:30px; background-color:#cfcfcf; margin:0 auto;}
+.orgContainer {width:100%; margin:0 auto; background-color:#cfcfcf;}
+.navOrgLogo {width:21px; height:30px; margin-left:2px; margin-right:15px;}
+.navOrgMenu {display:inline-block;height:30px; line-height:30px; vertical-align:middle;}
+a.linkGrey8 {color:#888888;}
+a.linkGrey8:hover {color:#585858;}
+.orgBorder {width:583px; height:21px; border-bottom:3px solid #e4e4e4; float:left;}
+.orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px; color:#555555;}
+.orgMenuArrow {background:url(../images/nav_icon.png) -10px -165px no-repeat; position:relative; display:inline-block; width:20px; height:30px;}
+.orgMenuArrow2 {background:url(../images/nav_icon.png) -10px -132px no-repeat; position:relative; display:inline-block; width:20px; height:30px;}
+.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;}
+.retop{width:710px; height:40px; background:#eaeaea; padding:5px;}
+.resources {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;float: right}
+.re_search{ margin-top:7px; margin-left:5px;}
+.re_search{ margin-top:7px; margin-left:5px;}
+.re_schbox{ width:240px; height:24px; border:1px solid #64bdd9; color:#666666;}
+.re_schbtn{ width:60px; height:26px;  color:#fff; margin-right:5px; border:none;  margin-left:0px;padding-left: 0px;}
+.b_lblue{ background:#64bdd9;}
+.c_grey{ color:#888888;}
+.re_con{ margin:5px; width:665px;}
+.re_con_top{color:#494949; }
+.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;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
\ No newline at end of file

From 59f42bb54fcd95608091ea90275a7ecf97928191 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Thu, 24 Dec 2015 11:09:57 +0800
Subject: [PATCH 07/29] =?UTF-8?q?1.=E5=B0=86=E6=B7=BB=E5=8A=A0=E9=99=84?=
 =?UTF-8?q?=E5=8A=A0=E5=8A=9F=E8=83=BD=E5=8A=A0=E5=85=A5=E5=88=B0=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E5=88=97=E8=A1=A8=E4=B8=AD=E7=9A=84=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=96=87=E7=AB=A0=EF=BC=9B=202.=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E7=BC=96=E8=BE=91=E6=96=87=E7=AB=A0=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E4=B8=8A=E4=BC=A0=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/org_document_comments_controller.rb  | 5 ++++-
 app/views/attachments/_form_course.html.erb          | 3 +--
 app/views/org_document_comments/_attachment.html.erb | 2 +-
 app/views/org_document_comments/_new.html.erb        | 8 ++++++--
 app/views/organizations/_project_message.html.erb    | 4 ++--
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb
index 67d3b247a..7685b77a8 100644
--- a/app/controllers/org_document_comments_controller.rb
+++ b/app/controllers/org_document_comments_controller.rb
@@ -28,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
@@ -39,10 +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])
-    @org_document.save_attachments(params[:attachments])
+    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)
diff --git a/app/views/attachments/_form_course.html.erb b/app/views/attachments/_form_course.html.erb
index ef5385647..348c5339d 100644
--- a/app/views/attachments/_form_course.html.erb
+++ b/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>
diff --git a/app/views/org_document_comments/_attachment.html.erb b/app/views/org_document_comments/_attachment.html.erb
index 86298a330..5cdcfa041 100644
--- a/app/views/org_document_comments/_attachment.html.erb
+++ b/app/views/org_document_comments/_attachment.html.erb
@@ -63,7 +63,7 @@
                                :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)
+                               :containerid => "#{container.id}"
                        } %>
     <span id="upload_file_count">
       <%= l(:label_no_file_uploaded) %>
diff --git a/app/views/org_document_comments/_new.html.erb b/app/views/org_document_comments/_new.html.erb
index 8d9eb6b02..3d8e8bc23 100644
--- a/app/views/org_document_comments/_new.html.erb
+++ b/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>
diff --git a/app/views/organizations/_project_message.html.erb b/app/views/organizations/_project_message.html.erb
index 2708bb546..037dfe61b 100644
--- a/app/views/organizations/_project_message.html.erb
+++ b/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>

From 7d7d9b77b53ca1a172dd5473e52e1387b69a2e7e Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Thu, 24 Dec 2015 11:58:00 +0800
Subject: [PATCH 08/29] =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=B8=96=E5=AD=90=E6=A0=B7=E5=BC=8F=E6=94=B9=E6=88=90=E6=96=B9?=
 =?UTF-8?q?=E5=9D=97=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../boards/_project_message_edit.html.erb     | 16 ++++++++++++++
 app/views/messages/edit.html.erb              | 21 +++++--------------
 2 files changed, 21 insertions(+), 16 deletions(-)
 create mode 100644 app/views/boards/_project_message_edit.html.erb

diff --git a/app/views/boards/_project_message_edit.html.erb b/app/views/boards/_project_message_edit.html.erb
new file mode 100644
index 000000000..88297bd79
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/app/views/messages/edit.html.erb b/app/views/messages/edit.html.erb
index 624174b14..7543e16e2 100644
--- a/app/views/messages/edit.html.erb
+++ b/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 %>
 

From 1a24505eac99ed6c421bc924412c7e8390497ea7 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 25 Dec 2015 15:27:45 +0800
Subject: [PATCH 09/29] =?UTF-8?q?footer=E6=96=B0=E5=A2=9E=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=EF=BC=8C=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_footer.html.erb            |  80 +++++++++---------
 app/views/layouts/base_org.html.erb           |  17 +---
 .../images/footer_logo/BeiHang_university.png | Bin 0 -> 8096 bytes
 public/images/footer_logo/CVICSE.png          | Bin 0 -> 9688 bytes
 public/images/footer_logo/ISCAS_logo.png      | Bin 0 -> 7948 bytes
 .../images/footer_logo/PekingUniversity.png   | Bin 0 -> 9854 bytes
 public/images/footer_logo/bee_logo.png        | Bin 0 -> 7265 bytes
 public/stylesheets/new_user.css               |   3 +-
 public/stylesheets/public.css                 |   2 +-
 9 files changed, 46 insertions(+), 56 deletions(-)
 create mode 100644 public/images/footer_logo/BeiHang_university.png
 create mode 100644 public/images/footer_logo/CVICSE.png
 create mode 100644 public/images/footer_logo/ISCAS_logo.png
 create mode 100644 public/images/footer_logo/PekingUniversity.png
 create mode 100644 public/images/footer_logo/bee_logo.png

diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 13730fd96..1db3091d7 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -1,39 +1,43 @@
-<div id="Footer" class="f12">
-  <div class="footerAboutContainer">
-    <ul class="footerAbout">
-      <li class="fl"><a href="<%= about_us_path %>" class="f_grey mw20" target="_blank"><%= l(:label_about_us)%></a>|</li>
-      <li class="fl"><a href="<%= agreement_path %>" class="f_grey mw20" target="_blank">服务协议</a>|</li>
-      <li class="fl" style="display: none"><span class="f_grey mw20" title="暂未开放"><%= l(:label_recruitment_information)%></span>|</li>
-      <li class="fl"><%= link_to l(:label_surpport_group), "https://#{Setting.host_name}/forums/1/memos/1168", :class => "f_grey mw20", :target=>"_blank" %>|</li>
-      <li class="fl"><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="f_grey mw20" target="_blank" ><%= l(:label_forums)%></a></li>
-
-    </ul>
-  </div>
-
-  <div class="cl"></div>
-  <ul class="departments">
-    <li class="fl mr10">
-      <strong><%= l(:label_hosted_organization)%></strong><a href="http://www.nudt.edu.cn/ArticleShow.asp?ID=47" class=" ml10 f_grey" target="_blank"><%= l(:label_hosted_by)%></a>
-    </li>
-    <li class="fl">
-      <a href="http://www.nudt.edu.cn/ArticleShow.asp?ID=41" class="mr45 f_grey" target="_blank"><%= l(:label_sponsor)%></a>
-    </li>
-    <li class="fl mr10">
-      <strong><%= l(:label_partners)%></strong><a href="http://eecs.pku.edu.cn" class="ml10 f_grey" target="_blank"><%= l(:label_co_organizer_EECS)%></a>
-    </li>
-    <li class="fl">
-      <a href="http://scse.buaa.edu.cn/" class="mr10 f_grey" target="_blank"><%= l(:label_co_organizer_BHU)%></a>
-    </li>
-    <li class="fl">
-      <a href="http://www.iscas.ac.cn/" class="mr10 f_grey" target="_blank"><%= l(:label_co_organizer_CAS)%></a>
-    </li>
-    <li class="fl">
-      <a href="http://www.inforbus.com/" class="f_grey" target="_blank"><%= l(:label_co_organizer_InforS)%></a>
-    </li>
-  </ul>
-  <div class="cl"></div>
-  <ul class="copyright">
-    <li class="fl mr30"><%= l(:label_rights_reserved)%></li>
-    <li class="fl"><a href="http://www.miibeian.gov.cn/" class="fl f_grey" target="_blank"><%= l(:label_license)%></a></li>
-  </ul>
+<div id="Footer" class="f12">
+  <div class="footerAboutContainer">
+    <ul class="footerAbout">
+      <li class="fl"><a href="<%= about_us_path %>" class="f_grey mw20" target="_blank"><%= l(:label_about_us)%></a>|</li>
+      <li class="fl"><a href="<%= agreement_path %>" class="f_grey mw20" target="_blank">服务协议</a>|</li>
+      <li class="fl" style="display: none"><span class="f_grey mw20" title="暂未开放"><%= l(:label_recruitment_information)%></span>|</li>
+      <li class="fl"><%= link_to l(:label_surpport_group), "https://#{Setting.host_name}/forums/1/memos/1168", :class => "f_grey mw20", :target=>"_blank" %>|</li>
+      <li class="fl"><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="f_grey mw20" target="_blank" ><%= l(:label_forums)%></a></li>
+
+    </ul>
+  </div>
+
+  <div class="cl"></div>
+  <ul class="departments">
+    <!--li class="fl mr10">
+      <strong><%#= l(:label_hosted_organization)%></strong><a href="http://www.nudt.edu.cn/ArticleShow.asp?ID=47" class=" ml10 f_grey" target="_blank"><%#= l(:label_hosted_by)%></a>
+    </li>
+    <li class="fl">
+      <a href="http://www.nudt.edu.cn/ArticleShow.asp?ID=41" class="mr45 f_grey" target="_blank"><%#= l(:label_sponsor)%></a>
+    </li-->
+    <li class="fl mr10">
+      <strong><%= l(:label_partners)%></strong>
+    </li>
+    <li class="fl mr20">
+      <a href="http://eecs.pku.edu.cn" class="f_grey" target="_blank"><%#= l(:label_co_organizer_EECS)%><img src="/images/footer_logo/PekingUniversity.png" width="121" height="40" style="display: inline-block;" alt="北京大学" /></a>
+    </li>
+    <li class="fl mr20">
+      <a href="http://scse.buaa.edu.cn/" class="f_grey" target="_blank"><%#= l(:label_co_organizer_BHU)%><img src="/images/footer_logo/BeiHang_university.png" width="173" height="40" style="display: inline-block;" alt="北京航空航天大学" /></a>
+    </li>
+    <li class="fl mr20">
+      <a href="http://www.iscas.ac.cn/" class="f_grey" target="_blank"><%#= l(:label_co_organizer_CAS)%><img src="/images/footer_logo/ISCAS_logo.png" width="91" height="40" style="display: inline-block;" alt="ISCAS" /></a>
+    </li>
+    <li class="fl mr20">
+      <a href="http://www.inforbus.com/" class="f_grey" target="_blank"><%#= l(:label_co_organizer_InforS)%><img src="/images/footer_logo/CVICSE.png" width="165" height="40" style="display: inline-block;" alt="中创软件" /></a>
+    </li>
+    <li class="fl"><a href="http://www.webxmf.com/" target="_blank"><img src="/images/footer_logo/bee_logo.png" width="167" height="40" style="display: inline-block;" alt="web小蜜蜂" /></a></li>
+  </ul>
+  <div class="cl"></div>
+  <ul class="copyright">
+    <li class="fl mr30"><%= l(:label_rights_reserved)%></li>
+    <li class="fl"><a href="http://www.miibeian.gov.cn/" class="fl f_grey" target="_blank"><%= l(:label_license)%></a></li>
+  </ul>
 </div><!--Footer end-->
\ No newline at end of file
diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb
index e17562ecc..e3b691253 100644
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@@ -149,22 +149,7 @@
 
     <!--页面底部-->
     <div class="cl"></div>
-    <div id="Footer">
-      <div class="footerAboutContainer">
-        <ul class="footerAbout">
-          <li class="fl"><a href="<%= about_us_path %>"  class=" f_grey mw20" target="_blank">关于我们</a>|</li>
-          <li class="fl"><a href="<%= agreement_path %>" class=" f_grey mw20" target="_blank">服务协议</a>|</li>
-          <li class="fl"><a href="http://forge.trustie.net/forums/1/memos/1168" class="f_grey mw20" target="_blank">帮助中心</a>|</li>
-          <li class="fl"><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="f_grey mw20" target="_blank">贴吧交流</a></li>
-        </ul>
-      </div>
-      <div class="cl"></div>
-
-      <ul class="copyright mt10">
-        <li class="fl mr30">Copyright&nbsp;&copy;&nbsp;2007-2015,&nbsp;All Rights Riserved</li>
-        <li>ICP备09019772</li>
-      </ul>
-    </div>
+    <%= render :partial => 'layouts/new_footer' %>
     <div class="cl"></div>
     <div id="ajax-modal" style="display:none;"></div>
 
diff --git a/public/images/footer_logo/BeiHang_university.png b/public/images/footer_logo/BeiHang_university.png
new file mode 100644
index 0000000000000000000000000000000000000000..f393aa3e8579d1ddb355bed47cc32928186fd72b
GIT binary patch
literal 8096
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
M@LIk?)-ve-05zX^ivR!s

literal 0
HcmV?d00001

diff --git a/public/images/footer_logo/CVICSE.png b/public/images/footer_logo/CVICSE.png
new file mode 100644
index 0000000000000000000000000000000000000000..c252e0f9366afd9918c016ef07b8d8d04277b871
GIT binary patch
literal 9688
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

literal 0
HcmV?d00001

diff --git a/public/images/footer_logo/ISCAS_logo.png b/public/images/footer_logo/ISCAS_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c2eb9ff7263062b4b472a2544791044aec1f3c9
GIT binary patch
literal 7948
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
P{j`drrb3mRRmlGV(~{0^

literal 0
HcmV?d00001

diff --git a/public/images/footer_logo/PekingUniversity.png b/public/images/footer_logo/PekingUniversity.png
new file mode 100644
index 0000000000000000000000000000000000000000..533e9f7e238f577cdd709e5a16cacfe78a6608ce
GIT binary patch
literal 9854
zcmaKSWmFv9wk__~5ZoJrH8dJ%+%33-;O^SE6I_B@a3@#@8r(GyAV46vySq2?_|CoO
z-uL63SEH)7j5+68d+qtBBuZ6T78`>M0}c)jTV75|{k8Rey_nEYUhfM`AIM)DQa5RB
zHw`CCH%}863pjCeCsPX=c?T0K3v~+<b8qKi3n4f-M4*kPwwtz+qJWu`1K8vr4A{#7
z`pSlb6B6};nwZ&HxY3weSlKuV15ew!fHXGd!oZL3lsJ^2k`~rBay~8=8a~RJW<GXi
z{N_MW5gH*cfmZ<s3pW!QF9&-^R{<|!;J<VQUi<${vjb`V1#z<z2L4x4+DfW4l1?rb
zH1ELNY-SvsoHV?=U{0QQyu6&OG+Z2<T<jdLCodZ(kH9-#0WLn8|2}}P(Ok?e1=OWv
z{yWy|NEm4C<^~mDXZQ5<1bcFWom{NgIr;hd|Iy&$VtYlfxq3UgnRu}|y3+kyLCV6_
z%*6)kX5-{Y^N*s5sgt{#Fz_|g|5}0r^nYX>UH`jGuLWcGGJ&#lf;s+K(!YU9O8<YT
zgTw!zUES0z{x{$Mr?9K0H`Ib%-NMz$-No#6<1Fd^2?Z69bg?jTb8^via<cz-6;-XB
z+?-skouD+58oV@2A8j1XojhHc|Akjl5|DRvbu)1^vyhh(2EHnQZEVa1IJo#Y_@!mI
z#l<<fIXR`@@r!dxO1zVi;gJ&Okdfq-`Zrg~$;{os!qM&DT=W0s^882cKUQ#nzDAa^
zaIx{QFqd(0a-jLwk_Bx3b1t0!QSZOG=KnbtuK&noe@%w{pN;*$Hu~RFukQJ$`#-jQ
z9sG~+EgWCn?(%ADKdO~;I5^;iyp*`6*TRt>sxhHO<BQYI&C(T>I+{(Wm~~-b<QyKd
zJ8|tuaO)f)p_+CNAtnX}kXOopT&o|YinSvYUydd=^lD|Xqow21>FDT~QlP5G>S7b@
z(@PGtB{`!y??!M}&<G+!3`h6u`lP{blEEJbTRq_o6dB7-8+vJZJ~bSCK}q!e=KQiH
z@H+e$#Y%V;XqGL-bTXZ$oD8qbZ4*$6*&Y)j1i^FZGByIlYe!ELxy!%2fTm|ZMf!D)
zC{gFWzx^{fy%bti#1C!c?be;eioiOH#tKq$B0{gixd>sQK>|lmEW}7j8So-!b|<_H
zU3QTt&cpRvkMYN3Qg;T4RtITRg|iCaGkY$D&$RnpnNy3ODQN(5Qs761xp*k~BiCxI
z_r8s+InQ_B+i-5h!SLP?U%td)+<Nh63C>nL+I8!nF62lulWp&&8phLfC~9_rJK$5v
zXNt;csE4N<;fd)(G|DBU2BoYe5dj>wBp9N8#4}Ym^c^ik*bZzQx??2nKabJMs>9d4
zs1{sZp>C6Oa_O7|lBbz;%+Pq$n4&mHMj7+-^4>9?wc?;m&pFUrTBA?M(DkyKymF#z
zaT8^HiqC5j>!LJEO&pdxjxl0$j*P&!P0`a+dJ<7kK#)8e5Yw+`B|%Auxg7U>@1Qbt
z-~^5xS8ONmi|Np5iSOI)u(A~M^O>4Y)Cai7;yWM^hxalg$E+reRga&xfNu9W4;BN#
zcizqCj_ytlvbSSh?l7mJoB+a#`bLGhV6>B-u7FA|!|)limc8=taO2L17uoit23C3b
zNO5G1kHHn5tJ2ds^?-Yrp2<5;Nm7cK{5@@`3%0;vW*N6w!R%D9b@xxy9{ojz3jQV;
z#FtR|A)fbM2*I38Y?Lm9spqqW-|Fzc<^_aDuG8g5eZDA{J~5)FM7*z~dH@vnS#lQK
z?~C?a?x$H-LxKY3KT1lw-g!1-oVMZ4JiM1u$vNp$!s^IGiQ{&t3rxz$qW^{bwp8M{
zT2HlWom>BTIc>-rrU4}b3Hd=}Rsuk*!opCJ>phlVAuUA&wC$7^RNeM;6JO6mK51fQ
zX5*;uWAs~=&~oq-hzA8Rz1;cpoGyj+&uaC3FbsLXomt!9`v^21;y5k5Aa(@PmNS{j
z@_CukfA8wLQ&ca0@wWsF(s59$;A?a|5H=Hw#0&UT`5RL)RJ~Y>kuSFumvYC{HbiM<
z%gSlS;12!LVK>8_=4;qa><mM|D0lXP{6+=%*p5K`9<WKCCausic!uqiLtpeaS~-+G
zc(X>MkWT0W|K1(*$?0|m=i1=$1F2dweWc>Yr2Msrjt0SA%5NkW)ln@>06uX<63TRw
z_!TGnKe{W`XxuK|)-Yg8E69Sdlqe?>`|FGe-)K~a$`naY{{R()5%PaBj8hPOj7*oj
z^aKRmf>oAhj3&?5ebbxIQOi&Vp5o=vPuKn5&r5YQOnGh`@t<XJFUq3jIun~`>aD!s
zHL!PuhJFAgJYE44t#d_k`18Tn3Ej+S-@JTC!#i{6A=i4(7{3>yeupU}KrR{X2!iZH
zy~(Ru$*dWSBFgMa<WDM8w-w!#ShT#PW2sv`aSE$4rRY`rHrF|Ja(zuI?WFuC0X2;{
zXF7{(_uiO1!j6y)3B0Q-bx7P%@IGuc|7ofoI{8K)^fA#k|5N$8s-Y<6%w%%DQgn!|
z>YI%S^X>)B=)nzqlA9AmD`(>+J-cT^N=!Z_{hGaqs!pVmWqy+Lec8xPt6UXojvo7o
z6!T!DE9F}We>WEJsH8H!_RX@4wV4^7=e)TtRgyD8>e*#cfO#_>)=aZIV{54jq1h0?
z?hD=V@NRo8qWbsU2}6FT?-Ei6s`S5`)yyFU$~{>lCWY5GMZU9io;?PdI9-+c>B!F6
zp19zLy(z;d(>IzU%xOPiIZva>NBw%$H6=&(U!L}aD=&6WwH5Z|zbLG3=T({_OA=_K
z*S^<~KogW#sP()csWsdkbeeNSP9L*1lZi+@{;Nt#s%_^+A}GGCZ0O7ndN@(g^53I5
zbo_1tJ8enz7ktLoO6tf;ZLf*^;4nwuxalGYLvf88Q3_jfO!IOoUUm72V+AYA`*Zs-
zPrd4_-cx&k&q&U-cw<_?_3HQhX2Gg(>GzPcO%XFRu#bAfjdUYFOA2A7mswz{Aj|^V
zqH~j)R;N#9H1#phd-2dA-RCk};PVRXfV$H>t6X_fVcd6jG(A=XxoOmNyJ=~dmB&X?
zmf&0S4w;9XHB2he)45-VWXp=hR?NsP+btPq|8kY)Bu!GhJBr_ak5ve#>jWp=NIy34
z3(;KUy{@jCF<lbC116dD;L=u5xa(L?m081tBm}|D`SgTc_1Urv0sf@}X0n#UA$0R*
zR9L3pNRYB35nGP>)7z^|<CN-8)bjOKiOXq{gTGHzq7E|CqHdqB^roY$^Unt}`rTn`
z-d;gW)E*Dot1l!<vY2>6C-|YISl2DKQap9hc;=I{sd({bg@V1&<D)oyZi1ge*1xG3
zKRsCOH3X2{97IQU`r=R^JXi*QggRo;xDku(@z`H{wVrcDJLi=2J7x9Y-g0@n)oU;0
zFM^xAMi9Q_$2XmqET82o3a>91&ZdKYd1J8VAOJbZ#7xUN;HM~CZXpOEX78mzs5ABN
z(J-+RhkR(0+qOlcad<{<tWuWhm&!kuqGC08r`mNZ!sE_nUGQ+C!$)H~4j%)m=#P}8
zPDt;!B<KkaNocIOGMn`aEwE5RyT4F?$iz!FP28XKseZa-HYcKM-coDcD&HMw%}g{~
zQ?pik+Kk5^x<iE~GjJj!?6N>gom^&ic!#i2Lea!5o)|akPZo3$V!{f^ZW1s(1>`ou
zcCX6zuG7@;%EJN%m7w@Rghdf%rUsPiJM5vntoZM7+rOOlb{Db;C?n}7@b|ACegyyg
zeMUp_{#Ut51{}fzlJXkGX*H+oj>+g0ZlUY`;T|hk?EH`&o{|#U-as~h6s+*ffm%K;
z8b3X&g*KzcV-}pns2D9uI0Bd@k5S!cCAp69H5mbkt@xf6fEiIS!bF4XTqoTtk#>qn
z=pE<76IUI?DM%l4FSvM~&yuHO)EQ{S5kBB#D&G$}txuD3Zk@Do+8W_#p0>k(6Xoo=
z)eGA2OIQ3}ljXoPf5z`2bVu^0Z_3!7r6Zq-<PxRm;pdoFyiVnI?Je6EJdaesL)_Q-
zM(U9-3CFdYOzE764sD*1(SNAZBN5h)4V2`PGL9xN-5t|E7eu(O6BDg4o^OTSF*$36
zf>To^P^p|J4SIBc96u3mN2i&d{UAM~PIMm3mPSx($XpVN60gbzFDw;qkKn<Mfb^#j
zI7c~rO}$T{6?J64%4hpF8l#W7XJ$*s83a3K3a)0y?8oznU`N4Y6;@vb`RWU|tLq5f
z*F5fjtf4AW^P8PAGfq_z>aHux_--@2QD5cMWrkXoy=-qPP?QVU*U8oWU9tKpYreyw
zkpg5K1~92KHbohEIUvyTzk^%6-r)Mu;q!Kid_nsL5w|`!^Yi5bq{ouq!5p@@IQ%F_
zRC%~Z>k<0En#Vt8HFdD+o3#xHD2u~24eOJwNy5&ntI(?=<m`=WhFC%ul<m^&YkwYd
zf2M4BSINAaZjISScBsAmXW;0L`qU!UyTvdo;D!@}xBUh7CoQd3Vk2ua%EX=={<gKc
z3vw#dwCX|!(z&7F_9WGQZgb+yng_;y+n`_Mz0}pZnLw-rzm0p6xwIJ?*+(V=R^a8s
ztuhiO86+Pr3=w~cVi{PPNB93AOu@@{7p{Jl5RRU4jf#}St_z!`R!hna{L(-jtP&^w
zkoobg@^y3nmuyS!;HQv;T3ht=Jc{f1QQ4k>jEU5g1WaE11HqHPT_}3<piFaA8zZY>
z%sFPRw5k}r`LnGXm1w|oO)iIFDn{zz?Als?^h8D;wu+UY=7xffC}nwQbbz}p;@as^
z`0<K&+3JrRp3nIE>}=wJ`tG`I*^wRw%Dp&X@?KO%pyiTwO0_@Y2fF0R>t7gdRKJ6P
zJpFue^#h&eE6sH@r<Ab`(1a@%q`&LLQJl#4a?O{xr2_@y?S;ctGpwH|4<_JZe6G-;
z7;jmKgu@=EO-Pb5(A{^S(^|Yh_jzD{qI}AcvytjBYP*k<S1Go5Vo1$ym=*2mG_A{@
zzh@A1k{>+4KSnrHtxbt9Pgc+;HU%W|b?PdKgC~_DPkCRQ<B+)Y0@oMEGOOjFAEib?
z$5F&;+%JZ1-xmWbm^TYL%z5_nWxR&o-rx<@mtYfzFt;WV)aWdog(8W`Y&It(6mi5(
zC@}UtJld6!aRch6&5`huy{5_XHZJqLNEd)bJsHOw=>qxL&hNs7A6XMJ!iU78OeKLU
z>kqZKPxW{;<@)C+K$$q1S=3XBPWG&B$_^hBS{Zg<#P^91DyOrs%L?ydoSV2YWzR3i
zqD4Cme>qNsBUA8@4??yh{jJ!5GBLqYdc&Of8{=FaJ2H_Q3#4)x-XUe-b|1e>>~oKc
zMKTn(-yjH;n>o7-hsYVW#Xx&8{jsKS&CdMc6(h-!8^OYlo16I#He#w?^gK4hTW>Xb
zX0(PRforo`sBZyt860TLVaRff2yI8o)0F{)uq_IKi_3&s2LjvEF4XNPbnAsXVRIMK
z@QxScjZb$N?JG!+9&lu)*<zxf$`-EH8nDJ>;|eW55qX7S!Vk;WWQ^{nnX}(s7EBfv
zBN_MrdP`J7{z_pL?kAhy=ZmjNAQnK=*Z(9+;dY^^O;t(10cfW;W$~{Av8O?bj)1@T
z?W*_UE%%H+miWnq=AnNR@aC#A;k=hr=h%1wIw1sTbabpVH1<@nTepj4)CB>Hjd^N9
zerR!uZ5b<i33vUHHGtyjBqiKmLr0s8amhU8-S$srw^Goczf)Ar)X$RKwQOL7zfx-{
z(&NS$*t{O+TyBfl=|2w3<cx#X(>*ss1=$P_+m29#LE2{|+<d(Ee$6FGK&@IwN{|9&
zZv_FJP6pYL*bcPB$&qN}$2OHEEEzcOXlt8BQ5i5obbdd)OI(+8rFf=uIT&laJQllg
z*-F_}O9#)QMMgPVQG}>7Y>`$&koVoHBwS_{qU&*LDh)C+A@)fXxj_?5Pome&uM+l^
z68&*e8zD{pt6jw6CI%!;o-OLn!p+ZC8R2*5Q#baLA=b*`v`S=v{rG7n^-awZny3fY
zyEsat#)KS_?4gVD*qkDb^z!<tkLgQlx}fqVI*?Xf<uGx51v7zEr3(`<^zZS5wBKy=
zxt>R0F5zhV;H>O@No=JfOe@cUxK`{GQf5M)?Dvpt^wRyS^DgEjCuw~7Pk+VGsguvM
zjTYA~?~L0O)M;(aEq)n_abnd!h7jW^@V!up2=W1JR_IO8@jch$2eNI##r-bY=O}U5
z&8n)9Bak-Jqd1@w=Oceqn`1M)BPyNVEy^IEX+ZQEV&B53%9W()BKZ!#s)dTysXgSk
zmT>waEen0i`=H!hur{`VH7h8rpo-{u7weguxeQb$X@*M{cO-scG!wmKS2-FYZ>>ST
z?n;RiO)h-s0mwkny|QkGf#1OH3o?Zw8$)E*M0s7sSjUkkNd#Ee24jLON9p%s9MJqO
z-^B>}QM|h{xOs57Vi+DupVpJJrEt^X-=qIa^)TU2qB9#9`pq$T%u?pC=u!$DSFdJz
zHZAt(BFe5>c5$Xl-Zs}v1jcIL^(#GeaO$+3)aFxqbR(OdDntZvJH*ta*%fEO&@gs^
zowv7V9u|mUR=RMfk-$<g+Dlkn^KkshjGwyNZ1H3J=r51Q*i?TQGKf6mH-_9dO}}PC
z)>T8zp&O0s5OLiZ`CH(Eovo>X#aEyTU*3=vPPBY`_2V`wCw{Up<crRChFbgQ;Ga4G
zVNjbX0%*Q9Bj?VBPO!#YWW>i2U9fY9Q0wWsbXV-JV_y4qwb96DUI)BW*VEjAIAqk%
zN&43-FvIEszJ)FG7QS)3x94)UJfK{EV!Ou?S;f_PKbiht$H(Fm=Ew?prr3I&CO;js
zhA*fyLDDn!M2&oq^hEB#_l7X;!%NjYN}DLH3snJ37k@xQZnC$%ksry(hWCsMG>_f(
zZQQr2B*H(f7<M}Mvw6SMzYXkL8n|Ou9)&cpvI{F;QQVAlf1X0E|1+Gd{j(}Zadzg&
z0Fd_P+ohaZJ2$<~8V7%YV%Hg-+ef0ll&n}1iLX=_zV1XIeOuBa`SZxO7x=klDosNH
zaU{DwmpB@GDTeuJVF(F%bhzg#A%Ar`{q9f#Q+k_jg5T6w<lO}U<RDYkdqlCe>#pqu
zEyVZ*A=u<#k}lxacKX#X-C|K5T;+(YqheU4g#E3Iue-Z@O~*9@@b=_qRktx@<X7U^
zXmSmJ1wEUiC)yF&C{rAiOlQ_N8#yc*H+lcg?S;_vG%F&%hGY_<Z9S<uPhO2@MUU^O
zm0YdG1v|ZpoCU!Rf#c?*4c^mk>A*WXzbDE)MVadO-$T_iG`54WXyo32qwh*{9>;%&
zG9d7in~WyrdZ0q~4t-4tW!hZukJJRL5r;pSOoX4gOY|;R^q5E~a7QFny0zY~-OeM+
zRaeU%opbFymeFRA_at(z97`()+b-D%8v8GS3{t7v2R^UpZf_RHHS#vzepAsI$kv-v
z+sOZ%W@t>vr%3#^exs=AE7wn)$j00JOsm#pM*2nAa)f=v87t@KX0@ahy4&Sp98C3_
z>7vSqs0bb2Smsaru9ZA?<IHs_^;`T}&wb(b@9X;XY8vV^e>exfdGoX{f39=9V>EX|
zUV=^YoXhQJKOFBS?{at$t*N)zrqfr&#(Fx*51c9UdDgL<XsYd#57AyM$m!(VV%O<q
zS@HYZ6aaSWGki&LPYeecc4U&;RXjWpnoS3Hq#jkP*0mMIk_rm;^JbUE)<3P`G{z1l
zkW=>R-X2>%?Z54(!`NN+UP<6rHVUm!TCLrzZvS=U!8euq;eB^_B=jn5S6heX=V#<z
zG-KOeUe4;hj38&ck-yd%okh~>oE>nsFr37R`=%9EPQ>yYvsyr<_M8}Ay7>l^$Hry6
zP7mK|T}g<qHY_ouvgk()rQf6YjGEU`B|M%DEwY$}*+4XLO(yQl{fei16Q_YylV{I(
zmkmuhFLU~;!q%XJ;QTm(H9oH<kq86)FncE+v0l^up~h%;U>1R)`#xzt_jn60mk=V7
zFVdMWB%<Nt?E4r4^`ScI^f8xknHtIh7OgI;aqp<35iDotq-sV?jIjC&q_MEC5ar)p
zv5)V&CP<)wo{2eqC}B>huv}Cmp&cMQH!f3D7<03FF(KO*tw7$U>|sP#b43)_76GJ|
zrUK|u*vxDy$lyX(EBcvV+J<>@6aq~sQCoG!Y~iK@2=GvT*K5k>FD0p}vb?i-M<R52
zQ;#CnpQGw5nIb#=ZkE<-3BpXp`lEbO;<yyxKZ7ZMpQ=f&JS=yvLWSk419)Uqky%)9
zFFe4ZeuvR|Vp%i66dFeg`pN)XBk&xgX$iuI|DAU2@&M|2TbP%Br)@16{MJdgAh@U;
z`&YlYx!?0!iQ!oh6+?X^%g8lyj7Evyu8`V`4<rs$Wg4ioU|uSKMoFR9tfiOojM)93
zXb#WA1oe-I$Q>i=Tale139Edf`5BQPMbEj=GG-{t<(rG!-yaFGt7CT2+6)OLMU+&F
zh(8^P0=F(WYgTUYg7LW%c`SgHID$tQIE2wgQpPeE;lDd>EBO=u$aLt9(mGG}4iD%<
zqtvzy71`()?s>gQm4^weI*?2|n3Y#@%RcMT<6T-tVwTMxW2X$Q)l8Atv^=KR4tb>|
zz%y<qxcVn@?L4h_;0ha>Vzw!C$mvHmjm(v|DRq$Jo3e(=Z?0ur$$T~hXta5An)W$&
zoI?xHo0_T=msIzSelE5ro>B)S`$~$yBjMjwk;SweiX?WMTC-X3j0Od*5wqh7mbaeE
zq$sy)+cRwi-J51qd1^^O{Zjf+Bn{MJ2OI1L%2Y>3KqmZ|@xA*W^UWqV(Uc<*PTJD?
z!FcEdU_eB<TE$w$_n`TS@Z#0wqh&?W#hb!6jc@R0QxcX0O@2y)kpXWJKAR|Yeyl7`
zJv2}}b?q_Ok5%?Yk{eKn9``QBH_d;2jUey)!|Q!22E1)U`uL!b%T*zTQQnh8;pjKu
zondwOWk7r4yTLpvnQcG6y&WGFAasM`>l;~MVP(7;|EerQK!0m)z~*^Pr}=LEwt<zf
zH+ydqcf$D{_gV8-w#C6mp=rV$U`Y{j+}n|YIzeNazmz!!NL^b}DS-3f?f(0Kb>r)I
zP?hwUEn(Q?^Hcm@i^G?c6E0Tl$0Vx)SC+(p<9BFOZ$ehsrrS%2B~r5kV`O*w2J|<0
z*IF9SvKh!J7!c*t;g#F4*Q0D|bYf~UuWFhO3$U>x7{FvRH(-tygy-Umm{@n{rHl16
z7H>)5(vFOnA_Zh6q^d-K2{9Otgb3cuAJK=53?RUoI{Kmc^&`c#$)SCOp8Ow*6fyl}
z9Kqed#e;C(Ib1(Edd1_|wQQUrNCO1*w@C<)3Cqu#V=0`9EG^+h25XF!!^4A)i5`J9
zbHX_-cPBrh;b&+~0ja7jPYsFhgn@o&cd^ukPoc5RemF32+C2>?Mu-Zzz#r9yES3ci
zCj&Dx5)HB-utx7=Gc={<!!7yyy}5=j2uI`@kAYP$DBonC-obH$m~<gpIsf2}7D+FA
zt?T|v^Ew<W^SNr6Y;ScZk)s1m3K)K2(ZnsWUWFxx4pzc3NfYpil6A^4RQ@C$%OxXt
zV^iw76nOIOc>~1r@&E!a-o=s>ZdnI~hK5}l{4~@?$yh>^zQE(iKwvSzZH<KNyIRq~
zj<4mi{4psa;=~d&(XaD4rURZi!`TB+wyQhB?_k7YP1}qvN*A0SeGFUeS1c&2?gWqy
z!c@_K*#1=|$z{H_M9xz+q&O1R8_%_<do+@yKs6O`|1j<f9kFWcS){fmtKR2xRNSJA
z<oJS#3)N<x8c(-g`x)^QHRG+kmzWB+ER%A(p!X)hQAf5**)3&v_K50MtDmb@Z~At4
zY5jWX-K?l(r>7MrbMykwKw#P9gX_pHe-@wjStiG2VGIrs#jyLcDLlFXED1X;A_-Fh
z==nwJkdFyEkkK&i$6-m2oqLQ`@z%}BWX01{&&W39{@Iu05k}r~X$qlwR#TfmLdsuu
z2n5j)vWidzF>F-UNu-bB%()3bu;}Gw1m)8SgBrnQvaw-Ljr=wGp4eVVDKR6}4Es^|
ze}<$83P7WhlY(}fK7S7<Lc=kBDKCh1C2-Re8wCG}pbHDs-Cwv}Bd&aX_NPG@jFT}|
z6p~;xKmldITe-5`KVp@;Qj5_5zNY#e7H4o5;KYj!ms0nBIx`N9rN&(`mifzQM033&
z3OpzrStBMy@C~F0pfxG<Ibs>2V<rtf8&%sY_DG!!0SMXvD_(BMx4?|k&dd{1lRs6M
zE9TG2KNi8dMX)k?DIJhoBD+p>n+1K=YRL;I6XC%uMCWFVg@<?WNi*8?D|f!xcYADi
z=NLau7o$U+&DKTF)sbSduw0*Mfi9>rBIlI}JLvHPfwZ?{vc|S#6w+aPHg+MbV4^;!
z#~kAP&zc@s>CbeRCD9CH?Z`9XE=R3a;HsrF!g7@sJT5UW7cvQgqzNA&Zungf6mNGg
zjxwZo0=uDCJ{tsq2~mV12?C1%ye@ALqP#w*Tlas(N+ubmqd&gnz)upbv!>-D7LK3T
zdXw1W#m*w4XA3$^8?2bFFc!!RQ*R?>zTA<pI26CWC0FaJgYSFs!bK?4j93h-a6hHH
z@$8cQb)_erPe%vCC?zGzv>C*#F7m!)KvHSJ7*%#yU_&eA#0-*fb?3J)UZERy4fK>m
zc+YIz1By%lqh^G7n6vt$hfBgHn%yY}t9;0rj)NpuL*{+}m}-4h-yd3i07adf4!DBC
z56CpT9t31WA49DZ9xVdOmLDl?Js!iaP^n~>iigo!tywQtV1YYj{R7n<%Asn>=t+OP
zz4=1=Y$J4k(=xcyFQpO}osIEv?EhrzM3UVxpnJAgHQX8VAQ5@t?^h;?UvByx+*0(R
zJ9!2Dmx-ODjQJc*sG%Qvp;H@yje?QbQIU$|<piCab`6Onu}E0ip%d_SlWUHgY~uaF
z+}~&nZ>sMR9ww*4w{)&O^^qML7^h!yP>J0*g06RD_tEc>flrNX9M&83ZXagptoJw+
zz3s4D>?kMFz7VjraeCa_tqtF#wm-F^DIRHIo<}9o7ZK7D$4lP*oh`5#z@Q&*CK5*K
zCA)DXHd|3@yXg@#lw{8u&eodyRx#k~ssKvYMFz>gDNUjCzR^z)ctZB`B+sU2<}FfY
zC6)#o&Xcp7P1KkqF;{+*o<8GjUhf+>cB~LLP~)A~B;7bokB$Un6d$lz53@^+tWzjH
z@3~6Fw36J9tm46E{AC*`J1%~gKEH9vo3fvQMw+Rp%OcUc7;`^3ng^1uY6^<^Nkrp3
z^L+?7Tn0O|JoknTt7{%VBNvcL0y45=CeDnrmmcWM6VFM6T!0IUZEE%2prr7mX+{}9
z8An0T5-R~bS;2Pi^`YtyTWp5T7L;0z()*+f$ay>9GRKl+Xm-1~GxqN0vkzpuK%|x2
zJ!g-lQfxpC!H>LCT2Du0l!))DIIIxdL6NG*S7f@Y)oh(;>k^;O+=ND1986%f60WMA
zit_?z&YB+oIghV!Z&9h(sR*D9S9|;3|4dE20muBiJ_3?WqTjr^CO)`)r4!RdeLqU!
zi`eX+xSIn@w;z1bn7O=%M1L%c)`@8-H;;KUR22d%cA!MMH>Y839mvOH4ii(MTtwjB
zVI|T0O>=loWAclxJ0uj;h~~Ca8Ch4s7|U;S;hiOvIoM-J?e-f!H$1!r^*>R}9FohT
z!W_m8#UU@{G8cTyg}xFuWyR_CS7b=2vOOdekwejgwD-Th4Y&-5283;-eOW)qYoxW8
z!)L)c`k81&wEp0^B0bj}EoE80(n3&`%s6520ZW-YIGTtxjEnV*T7+(oCe((Or$W^x
zA7cisJPp{oWACvi(29o#KycSa)Ay0+MnVcRV*}SGPn1*rIupAX%b|a#HH5}m5hC$*
zieyWEc-V;VM}yc$qj+mzT!MdZTgNlE37S<C)!2va;y)3R-~LFft}q}-zf4$jgkd?h
zVe(2mfh*or;^3=z%sFVC6<1jlw|>`xufFP@SqL{)Uv)WHESa73C43ACo+z>-P?<-T
zmM+?t0!%N^AYm&98mzJflKd$QI7=Ue`s#-^BIaLc^sP7qr|uNa*shgczX*;q;zH|w
ztncPc2C$|P$s(5ahV&#?1%_yJpYQ+!mgt%O@}Sj`HoUz@!^M*JR1<Og`}T|vzjU60
z#O;z*DxP$fc<xSCr4U_K#%uWAEgHblW40yz>FU%mIg<WvhKjSs#qy?PF{_vcg}S{g
z&pUp9=%J8xWe)Swdn`8qb0{hcT-rGHPz|4aA!!cWGcV2kwwHFieolq6(IHO6$7mxQ
zuqN4Hh2Qd0P(6hkm@~ts>w2l$wy(#LMOA>b{$bq&y1-h4DMF!Su&vTbbszj-N%<zK
zR<6yTC>UQI1!ClTvYD~VvY3ZDaPCb|^}t>y=QdON02|-DlHP~qT#u}5pzNhR;pQ|7
z98>%a?5N|$naT$H?oNag1Bai0j1-<)@J;)RCS?_29re-EC9iI#T{wf@F_s43UY;h0
zKNGDk-Y_5M@@5AmT#Ie9(<_hp^bEZieH!eQHQ&5fsn3(g;%pr`w|dfpA0;+QwQn>2
ygLJ(>jzkeD_F@k-vYvmTOS@yteO3sBhf6UTDoH`%U;O8fFnMWZsVWKM;Qs^KEt+Kj

literal 0
HcmV?d00001

diff --git a/public/images/footer_logo/bee_logo.png b/public/images/footer_logo/bee_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..6628eee95747676d3bd2824b49ea5df2fa0816d6
GIT binary patch
literal 7265
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
E2e(s<y8r+H

literal 0
HcmV?d00001

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 9b6f4f9fe..43127d1eb 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -860,7 +860,8 @@ a.postRouteLink:hover {text-decoration:underline;}
 .footerAboutContainer {width:auto; border-bottom:1px solid #efefef;}
 .footerAbout{ width:365px; margin:0 auto;height:35px; line-height:35px; padding-top: 10px; }
 .languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;}
-.departments{ width:890px; margin:5px auto 0 auto;height:30px;line-height:30px;}
+.departments{ width:855px; margin:5px auto;height:40px;line-height:40px;}
+.departments li {height:40px; line-height:40px;}
 .copyright{ width:375px; margin:0 auto;height:20px;line-height:20px;}
 a.f_grey {color:#666666;}
 a.f_grey:hover {color:#000000;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index d600ed0d5..8f54df445 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -581,7 +581,7 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;}
 .table_maxWidth table {max-width: 642px;}
 .homepagePostProjectState {width:42px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
-.homepagePostAssignTo {float:left; font-size:14px; color:#15bccf; height:30px; line-height:30px; vertical-align:middle;}
+.homepagePostAssignTo {float:left; font-size:14px; color:#15bccf;}
 .homepagePostFileAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/homepage_icon.png) -85px -150px no-repeat; padding-left:35px; font-size:14px;}
 .homepagePostImageAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/homepage_icon.png) -86px -195px no-repeat; padding-left:35px; font-size:14px; margin-right:25px;}
 .postAttSize {color:#888888; font-size:12px; margin-left: 5px;}

From 805d7851400b9108030fb036c2c56e1195106731 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Mon, 28 Dec 2015 14:35:13 +0800
Subject: [PATCH 10/29] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E8=BD=AC=E5=8F=91=E9=A1=B9=E7=9B=AE/=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=B8=96=E5=AD=90=E6=B2=A1=E6=9C=89=E5=8F=8D=E5=BA=94=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/messages_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index d5ce9e0eb..b9fe14aba 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -23,7 +23,7 @@ class MessagesController < ApplicationController
   before_filter :find_board, :only => [:new, :preview,:edit]
   before_filter :find_attachments, :only => [: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

From 77722f0211d411421cfaa169c41a4a9d2606b16b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 28 Dec 2015 14:52:36 +0800
Subject: [PATCH 11/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9issue=E4=B8=ADke?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_form.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb
index 464104335..8b313a2ef 100644
--- a/app/views/issues/_form.html.erb
+++ b/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 %>

From af9bc9a12463eed854ba42a6b1ccb1eb0a8b2f24 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 28 Dec 2015 15:09:41 +0800
Subject: [PATCH 12/29] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=BA=93=E7=82=B9=E5=87=BB=E6=96=B0=E5=A2=9E=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=BF=A1=E6=81=AF=E4=B8=A2=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_attributes.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb
index 1b6bebb01..f0967843a 100644
--- a/app/views/issues/_attributes.html.erb
+++ b/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>

From 900d7d62cb7db2539e5e16559202f623ea6cf390 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 28 Dec 2015 16:14:32 +0800
Subject: [PATCH 13/29] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=8C=89=E5=A4=A9?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B7=BB=E5=8A=A0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/mailer.rb  | 6 ++++--
 config/locales/zh.yml | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 1cbe7421c..737a1ea69 100644
--- a/app/models/mailer.rb
+++ b/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
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 10241b4b3..230532d71 100644
--- a/config/locales/zh.yml
+++ b/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: 学时

From 5ce9a5109d5e81ce4239dca044e65a685734ab80 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Mon, 28 Dec 2015 16:55:46 +0800
Subject: [PATCH 14/29] =?UTF-8?q?issue=E5=AD=98=E5=9C=A8=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/issues_controller.rb | 3 ++-
 app/views/issues/_list.html.erb      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 9b81ac775..77dc1a9aa 100644
--- a/app/controllers/issues_controller.rb
+++ b/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,
diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index fd6171f18..58fbda6d6 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -40,7 +40,7 @@
      <%= render :partial => 'users/project_issue', :locals => {:activity => issue, :user_activity_id => issue.id} %>
  <% end %>
  <% if issues.count == 10%>
-     <div id="show_more_issues" class="loadMore mt10 f_grey">展开更多<%=link_to "",  project_issues_path({:project_id => project.id,:page => issue_pages.page}.merge(params)),:id => "more_issues_link",:remote => "true",:class => "none" %></div>
+     <div id="show_more_issues" class="loadMore mt10 f_grey">展开更多<%=link_to "",  project_issues_path({:project_id => project.id}.merge(params)),:id => "more_issues_link",:remote => "true",:class => "none" %></div>
      <%#= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
  <% end%>
  <!--<ul class="wlist">-->

From 33ea55ecca210b4cf4b7865488cbbebaec72a9f3 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Mon, 28 Dec 2015 17:03:13 +0800
Subject: [PATCH 15/29] =?UTF-8?q?=E9=A1=B9=E7=9B=AE/=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=B8=96=E5=AD=90=E5=8F=91=E9=80=81=E5=BC=B9=E7=AA=97=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/messages/_course_show.html.erb       |   2 +-
 .../messages/_join_org_subfield_menu.html.erb  |   4 ++--
 app/views/messages/_project_show.html.erb      |   2 +-
 .../messages/_show_org_subfields.html.erb      |   4 ++--
 public/images/arrowList.png                    | Bin 518 -> 1336 bytes
 public/stylesheets/public.css                  |   9 +++++----
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 1b4c8a0f6..294f9b7d4 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -57,7 +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' %>
+                <%= link_to "发送",messages_join_org_subfield_path(:message_id => @topic.id) , :remote=> true,:class => 'postOptionLink' %>
               </li>
             </ul>
           </li>
diff --git a/app/views/messages/_join_org_subfield_menu.html.erb b/app/views/messages/_join_org_subfield_menu.html.erb
index 0bdc19f44..f4af91c87 100644
--- a/app/views/messages/_join_org_subfield_menu.html.erb
+++ b/app/views/messages/_join_org_subfield_menu.html.erb
@@ -33,7 +33,7 @@
 <body>
 
   <div>
-    <div class="relateText fl mb10">转发到</div>
+    <div class="relateText fl mb10">发送到</div>
   </div>
   <div class="cl"></div>
   <div class="sectionWrap fl">
@@ -43,7 +43,7 @@
     </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  %></span></li>
+          <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>
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index b20a7c22d..9468e05ce 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -118,7 +118,7 @@
                                 :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' %>
+                    <%= link_to "发送",messages_join_org_subfield_path(:message_id => @topic.id) , :remote=> true,:class => 'postOptionLink' %>
                   </li>
                 </ul>
               </li>
diff --git a/app/views/messages/_show_org_subfields.html.erb b/app/views/messages/_show_org_subfields.html.erb
index 78e8a4c92..659e1230e 100644
--- a/app/views/messages/_show_org_subfields.html.erb
+++ b/app/views/messages/_show_org_subfields.html.erb
@@ -1,4 +1,4 @@
-<ul class="columnWrap fr">
+<ul class="columnWrap fl">
   <!--<span class="fontBlue pl10">请在左侧选择要转发的位置</span>-->
   <% if !org.nil? %>
       <span class="fontBlue pl10">组织：<%= org.name %></span>
@@ -8,6 +8,6 @@
           </li>
       <% end %>
   <% else %>
-      <span class="fontBlue pl10">请在左侧选择要转发的位置</span>
+      <span class="fontBlue pl10">请在左侧选择组织</span>
   <% end %>
 </ul>
\ No newline at end of file
diff --git a/public/images/arrowList.png b/public/images/arrowList.png
index 99dcfc0f572cacd8984e7155be7e9e5cc4e4a5ca..8385a6a7da9095de90199592ec6ab78af4df9c87 100644
GIT binary patch
literal 1336
zcmeAS@N?(olHy`uVBq!ia0vp^sX$!8!3HE>o7i*#DajJoh?3y^w370~qErUQl>DSr
z1<%~X^wgl##FWaylc_cg49rTIArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8
zNvY|XdA3ULckfqH$V{<S3ODsN@GWpo&B*kqDoPEm@(W3>%1*XSQL?vFu&J;D8jzb>
zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XRMoSU}&gdW~OIo
zVrph)sH0$HU}&Uo07PcGh9*{~W>!Y#3Q(W~w5=#5%__*n4QdyVXRDM^Qc_^0uU}qX
zu2*iXmtT~wZ)j<02{OaTNEfI=x41H|B(Xv_uUHvof=g;~a#3bMNoIbY0?5R~r2Ntn
zTP2`NAzsKWfE$}v3=Jk=fazBx7U&!58GyV5Q|Rl9UukYGTy=3tP%6T`SPd=?sVqp<
z4@xc0FD*(2MqHXQ$f^P>=c3falKi5O{QMkPC<bKYm*f{`<QFJ72b(EqglFcZ<d+v~
zg4O%_T6yLbmn7yTr+T{BDgjN<%gju%GB>bvwy<<^cC@f?HZ*iKb+m9YcQG(BaCJ5|
zb2WE1gz0t3PcF?(%`1WFO+n~&!KoLN6mkoIHoK%2WtOF;xE1B+DuBIgm5JLejyTPO
z>P^Az7AKr~^?{Dj2SqGWM8kxDsRzV_CtDx~p72xifT_I*n5=(_@Fg-ZFs|`*aSW-r
z_2%|o-@^_P4G(1&End!U$Y8yJF+{MV&!<s=NwJKBd5J?3bJ+s-B!;#FHS8Q8(;vR7
zVLz{3>-*?bzuv~D#jkedE!q`T$hF|l?Q8k(tu%NKJFFC7^J+B+aC=dhZta-K!Q$1b
zu=B~Yi?v+~90Wx)nwVSzSXjHNqE+~JMzu8tDe_F=N?g!$an0umt5pRwM4O)2JSm#5
zqybU{(%{$#Wpi*r*dhL_{Tw&e-8P%DX3D3xM{T~=ls|l)Jtr@TFZtd6nmW1SpP46b
z^n~weo^g4`+8L{7+}wWOP-C%4eYELp`+qwf3O#jjo6X`Huz<s>`)sn@f-AxIy!Xg&
z7TnxmR44g3<<qX6*5x9_Vw=BxRH*Jey;ZvS?q-2czcr5soHGC6tGE98RBc|{3-w*z
zNf-_W8wzne$n*c=wyhP*vYPvB?~(V>;nPnqof_oXTz1(R8f?cjp<$-aUb*+&*~JUC
d+}zB-%&^?SXWEuI-`qfDnWw9t%Q~loCIA9O$(#TH

literal 518
zcmeAS@N?(olHy`uVBq!ia0vp^sX$!8!3HE>o7i*#Db50q$YKTtZeb8+WSBKa0w}1E
z>=ES4z)+>iz|hdl!0_`wkbcR)P-?)y@G60U!D<ErgLwX=_@izN42(UVE{-7;x8B^|
zn|sZHq2b~6K&xM0IwcxpZ!ny4d3i#FLn+`0-$@RSoC&foCK@p~9}!uiU_aj@b^g@n
zy8F*xwY9pv+}i)M&GL=6j9CKWa@eoir)x;JH5w`KOkqr1u;#-1?fGgN(o8@BkE<yk
zGv+F31hBAnEpQMNaco>PH`dQ==QbYZR0jzS=0gsVi#Oj?yFSff0S`xz+0He=P=y+8
z3}6i!O-!yZ%^FfGYn?Yl{I@nUnW=gD`@UUwKi+S>eckHs3cuCy{B{4MYImEb${dT{
zGx=5V*Im0-os+wJe8HMaKku%wtornj>8SQbkP}c$Y(jRLl1B8KJ-Zr>{M4@&mPW)n
zMecw6D!87%JiK<rzL53*_MV7*^t39x_P(K@-m3n9Y42~w7yaCmw{zL^xEC`YO^pax
xz`+Idpc2>uFdJ&w0uC%*S!fT8wEzE^83O(|&G1-YYzX8sc)I$ztaD0e0swTs!L9%R

diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 99c5168d9..42186ed36 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -5,7 +5,7 @@ body,table,input,textarea,select,button { font-family: "微软雅黑","宋体";
 div,img,tr,td,table{ border:0;}
 table,tr,td{border:0;cellspacing:0; cellpadding:0;}
 ol,ul,li{ list-style-type:none}
-a:link,a:visited{color:#7f7f7f;text-decoration:none;}
+a:link,a:visited{color:#7f7f7f !important;text-decoration:none;}
 a:hover,a:active{color:#000;}
 a:hover {text-decoration: none;  }
 textarea {resize: none;}
@@ -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;}
@@ -926,7 +927,7 @@ span.at {color:#269ac9;}
 .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 {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;}
\ No newline at end of file

From 5334a3d40f24bc3678ca66fd2bd39f8088185175 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Mon, 28 Dec 2015 17:14:15 +0800
Subject: [PATCH 16/29] =?UTF-8?q?=E9=93=BE=E6=8E=A5=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/public.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 42186ed36..51f0be25d 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -5,7 +5,7 @@ body,table,input,textarea,select,button { font-family: "微软雅黑","宋体";
 div,img,tr,td,table{ border:0;}
 table,tr,td{border:0;cellspacing:0; cellpadding:0;}
 ol,ul,li{ list-style-type:none}
-a:link,a:visited{color:#7f7f7f !important;text-decoration:none;}
+a:link,a:visited{color:#7f7f7f;text-decoration:none;}
 a:hover,a:active{color:#000;}
 a:hover {text-decoration: none;  }
 textarea {resize: none;}

From 0d98dba25c524031953c7be8126aa271501b3f20 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 29 Dec 2015 09:53:44 +0800
Subject: [PATCH 17/29] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=B8=96=E5=AD=90=E4=B8=AD=EF=BC=8C=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E5=8F=96=E6=B6=88=E6=8C=89=E9=92=AE=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=8F=8D=E5=BA=94=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/_project_show.html.erb | 4 ++--
 db/schema.rb                            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 8a11d2859..4b8101cf7 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -6,8 +6,8 @@
     function reset_topic(){
         $("#message_subject").val("");
         $("#subjectmsg").text("");
-        document.getElementById("message_sticky").checked=false;
-        document.getElementById("message_locked").checked=false;
+//        document.getElementById("message_sticky").checked=false;
+//        document.getElementById("message_locked").checked=false;
         $("#topic_attachments").html("<%= escape_javascript(render :partial => 'attachments/form_course', :locals => {:container => Message.new, :isReply => @isReply})%>");
         message_content_editor.html("");
         $("#topic_editor").toggle();
diff --git a/db/schema.rb b/db/schema.rb
index 6448833c6..fab2d5700 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20151223062932) do
+ActiveRecord::Schema.define(:version => 20151224090313) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false

From 5060ec26bb667d60217d99472e9752175e2f7499 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 29 Dec 2015 11:04:20 +0800
Subject: [PATCH 18/29] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=A8=E8=AE=BA?=
 =?UTF-8?q?=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attachments/_form_project_new.html.erb    |  77 +++++
 app/views/boards/_project_new.html.erb        |  65 ++++
 app/views/boards/_project_show.html.erb       | 307 ++----------------
 .../boards/_project_show_detail.html.erb      |  72 ++++
 app/views/boards/show.html.erb                |   2 +-
 public/javascripts/project.js                 |  62 +++-
 public/stylesheets/project.css                |   9 +-
 7 files changed, 316 insertions(+), 278 deletions(-)
 create mode 100644 app/views/attachments/_form_project_new.html.erb
 create mode 100644 app/views/boards/_project_new.html.erb
 create mode 100644 app/views/boards/_project_show_detail.html.erb

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

From b6cf7096962b5079673aab5c009cc6341e047818 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 29 Dec 2015 11:29:43 +0800
Subject: [PATCH 19/29] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=AE=A8=E8=AE=BA?=
 =?UTF-8?q?=E5=8C=BA=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/_project_show.html.erb        | 8 +++-----
 app/views/boards/_project_show_detail.html.erb | 9 ---------
 app/views/boards/show.html.erb                 | 9 ++++-----
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 50fd7f34b..3dac2a3d5 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -21,14 +21,12 @@
 
 <div class="homepageRight mt0 ml10">
   <div class="homepageRightBanner">
-    <div class="NewsBannerName">
-      项目讨论区
-    </div>
+    <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} %>
+                                     :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} %>
diff --git a/app/views/boards/_project_show_detail.html.erb b/app/views/boards/_project_show_detail.html.erb
index 428d987aa..6d77452a8 100644
--- a/app/views/boards/_project_show_detail.html.erb
+++ b/app/views/boards/_project_show_detail.html.erb
@@ -1,16 +1,7 @@
-<<<<<<< .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;}
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index d6d825d46..89f43e0d6 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -32,12 +32,11 @@
 <% end %>
 
 
-
-  <% if @project %>
+<% if @project %>
     <%= render :partial => 'project_show', locals: {:topics => @topics, :page => 0, project: @project} %>
-  <% elsif @course %>
-      <%= render :partial => 'course_show', :locals => {:topics => @topics, :page => 0, :course => @course} %>
-    <% end %>
+<% elsif @course %>
+    <%= render :partial => 'course_show', :locals => {:topics => @topics, :page => 0, :course => @course} %>
+<% end %>
 
 
 <script type="text/javascript">//侧导航

From 41cd0387580d79ac9d571e27d5f345bb60a8ea93 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 29 Dec 2015 15:05:07 +0800
Subject: [PATCH 20/29] =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E5=B8=96?=
 =?UTF-8?q?=E5=AD=90=E6=B7=BB=E5=8A=A0=E9=94=81=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_projects.html.erb  |  2 +-
 app/views/users/_project_message.html.erb | 15 ++++++++++-----
 db/schema.rb                              |  4 ----
 public/javascripts/project.js             |  1 -
 public/stylesheets/project.css            |  4 +++-
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 433d30214..f7dcc40f5 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -12,7 +12,7 @@
   <%= favicon %>
   <%= javascript_heads %>
   <%= heads_for_theme %>
-  <%= stylesheet_link_tag 'public', 'pleft', 'project','courses','prettify','jquery/jquery-ui-1.9.2','header','repository' %>
+  <%= stylesheet_link_tag 'public', 'pleft', 'project','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 %>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index 1eecc6b18..b9ebc2135 100644
--- a/app/views/users/_project_message.html.erb
+++ b/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, board_message_path(activity.board,activity), :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,  board_message_path(activity.board,activity), :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%>">
diff --git a/db/schema.rb b/db/schema.rb
index fab2d5700..0960439bb 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1642,10 +1642,6 @@ 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
diff --git a/public/javascripts/project.js b/public/javascripts/project.js
index 1e2e71e4e..24e864780 100644
--- a/public/javascripts/project.js
+++ b/public/javascripts/project.js
@@ -603,7 +603,6 @@ function submit_topic_project()
 {
     if(regexTopicSubject() && regexTopicDescription())
     {
-        alert("Test");
         message_content_editor.sync();
         $("#message-form-project").submit();
     }
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 672db9bcc..826dbf98f 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -1101,4 +1101,6 @@ select.InputBox, input.InputBox, textarea.InputBox {border: 1px solid #D9D9D9;co
 .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;}
\ No newline at end of file
+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;}

From d6e765cf4a38d608a75931ab127710b5dbbf502a Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 29 Dec 2015 15:46:20 +0800
Subject: [PATCH 21/29] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=AE=A8=E8=AE=BA?=
 =?UTF-8?q?=E5=8C=BA=E5=88=A0=E9=99=A4=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/messages_controller.rb    |  7 ++++-
 app/views/messages/_project_show.html.erb | 15 +++------
 public/stylesheets/project.css            | 38 +++++++++++++++++++++++
 3 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index b9fe14aba..7b70dffe5 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -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]
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index 9468e05ce..a29c02225 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -104,19 +104,12 @@
               <li class="homepagePostSettingIcon">
                 <ul class="homepagePostSettiongText">
                   <li>
-                    <%= link_to(
-                                l(:button_edit),
-                                {:action => 'edit', :id => @topic},
-                                :class => 'postOptionLink'
-                        ) if @message.editable_by?(User.current) %>
+                    <%= 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'
+                    <%= 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>
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 826dbf98f..a60198593 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -1104,3 +1104,41 @@ a.AnnexBtn{  background: url(images/homepage_icon2.png) 0px -343px no-repeat !im
 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;}

From 2e41e9890a7129397bf207c244bf84cd6b4510aa Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 29 Dec 2015 15:50:29 +0800
Subject: [PATCH 22/29] =?UTF-8?q?=E5=B0=86riserved=E6=94=B9=E6=88=90reserv?=
 =?UTF-8?q?ed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb
index 4ece1ba8c..808e80239 100644
--- a/app/views/layouts/base_org.html.erb
+++ b/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>

From 5618fe067a4b02642decb0977c4998e0d0f609ca Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 29 Dec 2015 16:40:07 +0800
Subject: [PATCH 23/29] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/boards_controller.rb          | 47 +++++--------------
 .../boards/_project_show_detail.html.erb      |  2 +-
 app/views/boards/show.js.erb                  |  6 ++-
 3 files changed, 17 insertions(+), 38 deletions(-)

diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index 291593fc5..c8518e8a3 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -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").
diff --git a/app/views/boards/_project_show_detail.html.erb b/app/views/boards/_project_show_detail.html.erb
index 6d77452a8..8fb663aff 100644
--- a/app/views/boards/_project_show_detail.html.erb
+++ b/app/views/boards/_project_show_detail.html.erb
@@ -59,7 +59,7 @@
 
     <% 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, :course_id => @board.course.id ,:page => page),:id => "show_more_course_topic",:remote => "true",:class => "loadMore mt10 f_grey"%>
+        <%= 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%>
 
diff --git a/app/views/boards/show.js.erb b/app/views/boards/show.js.erb
index c088abce5..c9208fd2c 100644
--- a/app/views/boards/show.js.erb
+++ b/app/views/boards/show.js.erb
@@ -1 +1,5 @@
-$("#show_more_course_topic").replaceWith("<%= escape_javascript( render :partial =>  'boards/course_show_detail',:locals => {:topics => @topics, :page => @page} )%>");
\ No newline at end of file
+<% 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 %>
\ No newline at end of file

From 0cf2279cf512611c2bab826a239c7ad53befe87b Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 29 Dec 2015 16:46:20 +0800
Subject: [PATCH 24/29] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=80=E4=B8=8Bbug:?=
 =?UTF-8?q?=201.=E7=BB=84=E7=BB=87=EF=BC=9A=E5=BC=95=E7=94=A8=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E8=87=B3=E6=9F=90=E6=A0=8F=E7=9B=AE=EF=BC=8C=E8=8B=A5?=
 =?UTF-8?q?=E8=AF=A5=E7=BB=84=E7=BB=87=E5=8F=AA=E6=9C=89=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E6=A0=8F=E7=9B=AE=EF=BC=8C=E4=B8=94=E8=AF=A5=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=B7=B2=E6=88=90=E5=8A=9F=E5=BC=95=E7=94=A8=E8=87=B3=E8=AF=A5?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A0=8F=E7=9B=AE=EF=BC=8C=E5=A6=82=E5=9B=BE?=
 =?UTF-8?q?=E5=B0=B1=E4=B8=8D=E8=A6=81=E5=86=8D=E6=98=BE=E7=A4=BA=E4=B8=BA?=
 =?UTF-8?q?=E2=80=9C=E9=80=89=E5=85=A5=E7=BB=84=E7=BB=87=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E6=A0=8F=E7=9B=AE=E2=80=9D=E4=BA=86=202.=E7=BB=84=E7=BB=87:?=
 =?UTF-8?q?=E5=8F=AA=E6=9C=89=E7=AE=A1=E7=90=86=E5=91=98=E6=89=8D=E8=83=BD?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E8=AF=BE=E7=A8=8B/=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/_org_subfield_list.html.erb              | 2 +-
 app/views/organizations/_org_left_subfield_list.html.erb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/files/_org_subfield_list.html.erb b/app/views/files/_org_subfield_list.html.erb
index 029570047..ad90550d4 100644
--- a/app/views/files/_org_subfield_list.html.erb
+++ b/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;') %>
diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
index 4d85342a6..fa276605c 100644
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@@ -3,7 +3,7 @@
 </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>
@@ -14,7 +14,7 @@
 </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>

From 2cd48a1ca291db14ade753247786452f5a4171a9 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 29 Dec 2015 18:09:27 +0800
Subject: [PATCH 25/29] =?UTF-8?q?=E6=9A=82=E6=97=B6=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E5=B8=96=E5=AD=90=E5=8F=91=E9=80=81=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/messages/_course_show.html.erb  | 2 +-
 app/views/messages/_project_show.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 294f9b7d4..cc93d99b9 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -57,7 +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' %>
+                <%#= link_to "发送",messages_join_org_subfield_path(:message_id => @topic.id) , :remote=> true,:class => 'postOptionLink' %>
               </li>
             </ul>
           </li>
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index 9468e05ce..abd2dca75 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -118,7 +118,7 @@
                                 :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' %>
+                    <%#= link_to "发送",messages_join_org_subfield_path(:message_id => @topic.id) , :remote=> true,:class => 'postOptionLink' %>
                   </li>
                 </ul>
               </li>

From 0763963ca4a8c35ec6034bf020a9414be67f6af5 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 29 Dec 2015 18:12:14 +0800
Subject: [PATCH 26/29] =?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_edit.html.erb |  3 +--
 app/views/issues/show.html.erb  | 27 +++++++++++----------------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb
index 529de3480..ccd37dc91 100644
--- a/app/views/issues/_edit.html.erb
+++ b/app/views/issues/_edit.html.erb
@@ -3,13 +3,12 @@
     <%= import_ke(enable_at: true, prettify: false, init_activity: false) %>
 <% end %>
 
-<%= labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true,:remote=>true} do |f| %>
+<%= labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true, :remote => true} do |f| %>
     <%= error_messages_for 'issue', 'time_entry' %>
     <%= render :partial => 'conflict' if @conflict %>
     <!--编辑的整个属性-->
         <div id="all_attributes" >
           <%= render :partial => 'issues/form', :locals => {:f => f} %>
-
         </div>
     <%# if @journals.present? %>
         <!--<div id="history">-->
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 4af757c77..b9d463855 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -26,20 +26,15 @@
       <!--problem_main end-->
       <div style="clear: both;"></div>
       <div class="homepagePostReply">
-            <div class="topBorder" style="display: <%= @issue.journals.count>0 ? 'none': '' %>"></div>
-            <div class="homepagePostReplyBanner" >
-              <div class="homepagePostReplyBannerCount" >回复（<%= @issue.journals.count %>）</div>
-              <div class="homepagePostReplyBannerTime"></div>
-            </div>
-
-            <div class="" id="reply_div_<%= @issue.id %>" >
-                       <%= render :partial => 'issue_replies',:locals => {:issue=>@issue,:replies_all_i=>0} %>
-            </div>
-
-
-
-         </div>
-     </div>
+        <div class="topBorder" style="display: <%= @issue.journals.count>0 ? 'none': '' %>"></div>
+        <div class="homepagePostReplyBanner" >
+          <div class="homepagePostReplyBannerCount" >回复（<%= @issue.journals.count %>）</div>
+          <div class="homepagePostReplyBannerTime"></div>
+        </div>
+        <div class="" id="reply_div_<%= @issue.id %>" >
+          <%= render :partial => 'issue_replies',:locals => {:issue => @issue, :replies_all_i => 0} %>
+        </div>
+      </div>
+    </div>
   </div>
-</div>
-    </div>
\ No newline at end of file
+</div>
\ No newline at end of file

From aa87ef6f1b1fa0af00debb856643dfd31a71a99e Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 30 Dec 2015 09:40:15 +0800
Subject: [PATCH 27/29] =?UTF-8?q?=E8=A7=A3=E5=86=B3Chrome=E6=B5=8F?=
 =?UTF-8?q?=E8=A7=88=E5=99=A8=E7=AD=89=E6=AF=94=E7=BC=A9=E6=94=BE=E5=90=8E?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=94=99=E4=B9=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/messages/_project_show.html.erb | 236 +++++++++++-----------
 1 file changed, 119 insertions(+), 117 deletions(-)

diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index bd2e3469a..a0a340a2a 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -92,132 +92,134 @@
         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 class="homepageRight mt0">
+  <div class="postRightContainer ml10" onmouseover="$('#message_setting_<%= @topic.id%>').show();" onmouseout="$('#message_setting_<%= @topic.id%>').hide();">
+    <div class="postThemeContainer">
+      <div class="postDetailPortrait">
+        <%= link_to image_tag(url_to_avatar(@topic.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@topic.author) %>
       </div>
-      <div class="cl"></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 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 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">
+    <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 class="" id="reply_div_<%=  @topic.id %>">
+            <% @replies.each_with_index  do |reply,i| %>
+                <script type="text/javascript">
+                    $(function(){
+                        showNormalImage('reply_message_description_<%= reply.id %>');
+                    });
+                </script>
+                <div class="homepagePostReplyContainer" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id%>').hide();">
+                  <div class="homepagePostReplyPortrait">
+                    <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
+                  </div>
+                  <div class="homepagePostReplyDes">
+                    <div class="homepagePostReplyPublisher">
+                      <% if reply.try(:author).try(:realname) == ' ' %>
+                          <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
+                      <% else %>
+                          <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
+                      <% end %>
+                    </div>
+                    <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
+                      <%= reply.content.html_safe%>
+                    </div>
+                    <div style="margin-top: -7px; margin-bottom: 5px">
+                      <%= format_time(reply.created_on) %>
+                      <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
+                        <%= link_to(
+                                    l(:button_reply),
+                                    {:action => 'quote', :id => reply},
+                                    :remote => true,
+                                    :method => 'get',
+                                    :class => 'fr newsBlue',
+                                    :title => l(:button_reply)) if !@topic.locked? && authorize_for('messages', 'reply') %>
+                        <%= link_to(
+                                    l(:button_delete),
+                                    {:action => 'destroy', :id => reply},
+                                    :method => :post,
+                                    :class => 'fr newsGrey mr10',
+                                    :data => {:confirm => l(:text_are_you_sure)},
+                                    :title => l(:button_delete)
+                            ) if reply.destroyable_by?(User.current) %>
+                      </div>
+                    </div>
+                    <p id="reply_message_<%= reply.id%>"></p>
+                  </div>
+                  <div class="cl"></div>
+                </div>
+            <% end %>
+          </div>
+
+      <% end %>
+      <div class="cl"></div>
+      <% if !@topic.locked? && authorize_for('messages', 'reply') %>
+          <div class="talkWrapMsg" nhname="about_talk_reply">
+            <em class="talkWrapArrow"></em>
+            <div class="cl"></div>
+            <div class="talkConIpt ml5 mb10" id="reply<%= @topic.id %>">
+              <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message_form'} do |f| %>
+                  <%= render :partial => 'form_project', :locals => {:f => f, :replying => true} %>
+                  <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'project_board_cancel_message_replay();', :class => "blue_btn grey_btn fr c_white mt10 mr5" %>
+                  <%= link_to l(:button_submit), "javascript:void(0)", :onclick => 'project_board_submit_message_replay();', :class => "blue_btn fr c_white mt10", :style => "margin-left: 50px;" %>
+              <% end %>
+              <div class="cl"></div>
+            </div>
+          </div>
+      <% end %>
+    </div>
   </div>
-</div>
\ No newline at end of file
+</div>

From 4f331d95c708e32388a7efd9319290f212c7064c Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 30 Dec 2015 10:08:59 +0800
Subject: [PATCH 28/29] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AE=A8=E8=AE=BA?=
 =?UTF-8?q?=E5=8C=BA=E3=80=81=E9=A1=B9=E7=9B=AE=E8=AE=A8=E8=AE=BA=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E7=9A=84=E6=97=B6=E5=80=99=E6=98=BE=E7=A4=BA=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E4=BF=A1=E6=81=AF=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/attachments/_form_course.html.erb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/views/attachments/_form_course.html.erb b/app/views/attachments/_form_course.html.erb
index 348c5339d..6d921903d 100644
--- a/app/views/attachments/_form_course.html.erb
+++ b/app/views/attachments/_form_course.html.erb
@@ -4,10 +4,10 @@
   <% container.saved_attachments.each_with_index do |attachment, i| %>
     <span id="attachments_p<%= i %>" class="sub_btn">
 
-      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
-      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
-      <span class="ispublic-label"><%= l(:field_is_public)%>:</span>
-      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public_checkbox')%>
+      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'upload_filename readonly', :readonly=>'readonly')%>
+      <%#= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
+      <!--<span class="ispublic-label"><%#= l(:field_is_public)%>:</span>-->
+      <%#= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public_checkbox')%>
 
       <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
       <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
@@ -17,10 +17,10 @@
   <% container.attachments.each_with_index do |attachment, i| %>
      <span id="attachments_p<%= i %>" class="attachment">
 
-      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
-       <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
-       <span class="ispublic-label"><%= l(:field_is_public)%>:</span>
-       <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public_checkbox')%>
+      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'upload_filename readonly', :readonly=>'readonly')%>
+       <%#= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
+       <!--<span class="ispublic-label"><%#= l(:field_is_public)%>:</span>-->
+       <%#= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public_checkbox')%>
 
        <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
        <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>

From 40bf109223a03fbd84345716b2e48e7dff8e4032 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Wed, 30 Dec 2015 10:34:37 +0800
Subject: [PATCH 29/29] =?UTF-8?q?=E7=BB=99=E8=B5=84=E6=BA=90=E6=A0=8F?=
 =?UTF-8?q?=E7=9B=AE=E5=A2=9E=E5=8A=A0board?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/board.rb                               |  1 +
 app/models/org_subfield.rb                        | 15 +++++++++++++++
 config/locales/zh.yml                             |  1 +
 .../20151230015225_add_quotes_to_messages.rb      |  4 ++++
 ...0151230015410_add_org_subfield_id_to_boards.rb |  5 +++++
 .../20151230015904_set_board_for_org_subfields.rb | 11 +++++++++++
 db/schema.rb                                      |  4 +++-
 7 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20151230015225_add_quotes_to_messages.rb
 create mode 100644 db/migrate/20151230015410_add_org_subfield_id_to_boards.rb
 create mode 100644 db/migrate/20151230015904_set_board_for_org_subfields.rb

diff --git a/app/models/board.rb b/app/models/board.rb
index 67d59e599..b66719edf 100644
--- a/app/models/board.rb
+++ b/app/models/board.rb
@@ -19,6 +19,7 @@ class Board < ActiveRecord::Base
   include Redmine::SafeAttributes
   belongs_to :project,:touch => true
   belongs_to :course,:touch=>true
+  belongs_to :org_subfield, :touch => true
   has_many :topics, :class_name => 'Message', :conditions => "#{Message.table_name}.parent_id IS NULL", :order => "#{Message.table_name}.created_on DESC"
   has_many :messages, :dependent => :destroy, :order => "#{Message.table_name}.created_on DESC"
   belongs_to :last_message, :class_name => 'Message', :foreign_key => :last_message_id
diff --git a/app/models/org_subfield.rb b/app/models/org_subfield.rb
index 6a31203b0..0747114ca 100644
--- a/app/models/org_subfield.rb
+++ b/app/models/org_subfield.rb
@@ -4,7 +4,22 @@ class OrgSubfield < ActiveRecord::Base
   has_many :files
   has_many :org_subfield_messages, :dependent => :destroy
   has_many :messages, :through => :org_subfield_messages
+  has_many :boards, :dependent => :destroy
   acts_as_attachable
+  after_create :create_board_sync
+  # 创建资源栏目讨论区
+  def create_board_sync
+    @board = self.boards.build
+    #self.name=" #{l(:label_borad_course) }"
+    @board.name = " #{l(:label_borad_org_subfield) }"#self.name
+    @board.description = self.name.to_s
+    @board.project_id = -1
+    if @board.save
+      logger.debug "[OrgSubfield Model] ===> #{@board.to_json}"
+    else
+      logger.error "[OrgSubfield Model] ===> Auto create board when org_subfield saved, because #{@board.full_messages}"
+    end
+  end
 
   def project
   end
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 230532d71..e4a23373d 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1728,6 +1728,7 @@ zh:
   label_hot_project: '热门项目'
   label_borad_project: 项目讨论区
   label_borad_course: 课程讨论区
+  label_borad_org_subfield: 资源栏目讨论区
   view_borad_course: 课程讨论
   label_memo_create_succ: 发布成功
   label_memo_create_fail: 发布失败
diff --git a/db/migrate/20151230015225_add_quotes_to_messages.rb b/db/migrate/20151230015225_add_quotes_to_messages.rb
new file mode 100644
index 000000000..4e19725d5
--- /dev/null
+++ b/db/migrate/20151230015225_add_quotes_to_messages.rb
@@ -0,0 +1,4 @@
+class AddQuotesToMessages < ActiveRecord::Migration
+  def change
+  end
+end
diff --git a/db/migrate/20151230015410_add_org_subfield_id_to_boards.rb b/db/migrate/20151230015410_add_org_subfield_id_to_boards.rb
new file mode 100644
index 000000000..853238813
--- /dev/null
+++ b/db/migrate/20151230015410_add_org_subfield_id_to_boards.rb
@@ -0,0 +1,5 @@
+class AddOrgSubfieldIdToBoards < ActiveRecord::Migration
+  def change
+    add_column :boards, :org_subfield_id, :integer
+  end
+end
diff --git a/db/migrate/20151230015904_set_board_for_org_subfields.rb b/db/migrate/20151230015904_set_board_for_org_subfields.rb
new file mode 100644
index 000000000..cad6526a0
--- /dev/null
+++ b/db/migrate/20151230015904_set_board_for_org_subfields.rb
@@ -0,0 +1,11 @@
+# encoding: utf-8
+class SetBoardForOrgSubfields < ActiveRecord::Migration
+  def up
+    OrgSubfield.where("field_type='Post'").each do |field|
+      Board.create(:org_subfield_id => field.id, :name => "资源栏目讨论区", :project_id => -1, :description => field.name)
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index fab2d5700..925192317 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20151224090313) do
+ActiveRecord::Schema.define(:version => 20151230015904) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -198,6 +198,7 @@ ActiveRecord::Schema.define(:version => 20151224090313) do
     t.integer "last_message_id"
     t.integer "parent_id"
     t.integer "course_id"
+    t.integer "org_subfield_id"
   end
 
   add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id"
@@ -1045,6 +1046,7 @@ ActiveRecord::Schema.define(:version => 20151224090313) do
     t.boolean  "locked",        :default => false
     t.integer  "sticky",        :default => 0
     t.integer  "reply_id"
+    t.integer  "quotes"
   end
 
   add_index "messages", ["author_id"], :name => "index_messages_on_author_id"