Merge branch 'hjq_beidou' into develop

Conflicts:
	app/controllers/organizations_controller.rb
	app/helpers/organizations_helper.rb
	db/schema.rb
	public/images/homepage_icon.png
	public/stylesheets/new_user.css

app/assets/javascripts/sub_document_comments.js.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/javascripts/sub_domains.js.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/stylesheets/sub_document_comments.css.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the sub_document_comments controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/sub_domains.css.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the sub_domains controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/organizations_controller.rb

@@ -76,7 +76,7 @@ class OrganizationsController < ApplicationController
 
   def show
     # 组织新类型 show_mode：判断标准 1为新类型，0为旧
-    if @organization.show_mode == 1 && params[:org_subfield_id].nil? && params[:list] .nil?
+    if @organization.show_mode.to_i == 1 && params[:org_subfield_id].nil? && params[:list] .nil?
       if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
         # REDO:时间紧，暂时先这样
         @org_logo_attchment = Attachment.find_by_sql("SELECT * from attachments WHERE container_id = #{@organization.id} and container_type = 'Organization' and attachtype = 0 and filename REGEXP '(.jpg|.png|.bmp|.gif|.jpeg)' ORDER BY created_on desc limit 1").first
@@ -84,10 +84,6 @@ class OrganizationsController < ApplicationController
 
         @subfield_content = @organization.org_subfields.order("priority")
         @organization = Organization.find(params[:id])
-          # @org_subfield = OrgSubfield.find(params[:org_subfield_id])
-          # @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0
-          # @org_acts = 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)
-
           shield_project_ids = ShieldActivity.where("container_type='Organization' and container_id=#{@organization.id} and shield_type='Project'").map(&:shield_id)
           shield_course_ids = ShieldActivity.where("container_type='Organization' and container_id=#{@organization.id} and shield_type='Course'").map(&:shield_id)
           project_ids = (@organization.projects.map(&:id)-shield_project_ids) << 0
@@ -95,24 +91,6 @@ class OrganizationsController < ApplicationController
           course_types = "('Message','News','HomeworkCommon','Poll','Course')"
           @project_acts = get_project_activities_org @organization, project_ids
           @course_acts = get_course_activities_org @organization, course_ids
-          #@org_acts = OrgActivity.where("container_id =? and container_type =?",@organization.id, 'Organization').order('updated_at desc')
-          #@project_acts = OrgActivity.where("(container_id =? and container_type =?) " +
-                                                # "or (container_type ='Project' and org_act_type in ('Issue','Message') and container_id in (#{project_ids.join(',')})) ",
-                                                # @organization.id, 'Organization').order('updated_at desc').limit(8)
-
-          #@course_acts  = OrgActivity.where("(container_id =? and container_type =?) " +
-                                               # "or (container_type ='Course' and org_act_type in #{course_types} and container_id in (#{course_ids.join(',')}))",
-                                              # @organization.id, 'Organization').order('updated_at desc').limit(8)
-
-
-
-        # 项目两种动态
-        #@project_acts = get_project_activities_org @organization
-
-        # 课程动态
-        #@project_acts_issues = get_project_activities_org @organization
-        #@course_acts = get_course_activities_org @organization
-
         render :layout => 'base_org_newstyle'
       else
         render_403
@@ -187,7 +165,7 @@ class OrganizationsController < ApplicationController
   def get_project_activities_org org, project_ids
     unless project_ids.blank?
       project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{project_ids.join(',')}) and container_type = 'project'
-                  and org_act_type in ('Message', 'Issue') order by updated_at desc limit 8;")
+                  and org_act_type in ('Message', 'Issue') order by updated_at desc limit 5;")
     else
       project_acts = nil
     end
@@ -198,7 +176,7 @@ class OrganizationsController < ApplicationController
   def get_course_activities_org org, course_ids
     unless course_ids.blank?
       project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{course_ids.join(',')}) and container_type = 'course'
-                  and org_act_type in ('HomeworkCommon', 'Poll',  'Message', 'News', 'Course') order by updated_at desc limit 8;")
+                  and org_act_type in ('HomeworkCommon', 'Poll',  'Message', 'News', 'Course') order by updated_at desc limit 5;")
     else
       project_acts = nil
     end

app/controllers/sub_document_comments_controller.rb

@@ -0,0 +1,206 @@
+class SubDocumentCommentsController < ApplicationController
+  before_filter :find_subdomain_and_subfield, :only => [:new, :create, :show, :index, :destroy, :edit]
+  before_filter :find_subfield_content, :only => [:show, :index]
+  helper :attachments,:organizations
+  layout 'base_sub_domain'
+
+  def new
+    @sub_document_comment = SubDocumentComment.new
+  end
+
+
+  def create
+    @sub_document_comment = SubDocumentComment.new(:sub_domain_id => params[:sub_domain_id], :creator_id => User.current.id, :org_subfield_id => params[:org_subfield_id])
+    @sub_document_comment.title = params[:sub_document_comment][:title]
+    @sub_document_comment.content = params[:sub_document_comment][:content]
+    # @sub_document_comment.save_attachments(params[:attachments])
+    if params[:field_id]
+      @sub_document_comment.org_subfield_id = params[:field_id].to_i
+    end
+    if @sub_document_comment.save
+      flash.keep[:notice] = l(:notice_successful_create)
+      redirect_to org_subfield_sub_domain_sub_document_comments_path(:org_subfield_id => @org_subfield.id, :sub_domain_id => @subdomain.id)
+      # EditorOfDocument.create(:editor_id => User.current.id, :org_document_comment_id => @sub_document_comment.id, :created_at => @sub_document_comment.updated_at)
+      # if params[:field_id]
+      #   @org_subfield = OrgSubfield.find(params[:field_id])
+      #   if @org_subfield.subfield_subdomain_dir.nil?
+      #     redirect_to organization_path(@organization, :org_subfield_id => params[:field_id])
+      #   else
+      #     redirect_to show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => @org_subfield.subfield_subdomain_dir.name)
+      #   end
+      # else
+      #   redirect_to organization_org_document_comments_path(@organization)
+      # end
+    else
+      redirect_to new_org_document_comment_path(:organization_id => @organization.id)
+    end
+  end
+
+  def show
+    if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
+      @document = SubDocumentComment.find(params[:id])
+      respond_to do |format|
+        format.html {render :layout => @organization.switch_type ? 'base_sub_domain' : 'base_org'}
+      end
+    else
+      render_403
+    end
+  end
+
+  def index
+    if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
+      @documents = @subdomain.sub_document_comments.where("parent_id is null").order("created_at desc")
+      @is_remote = true
+      @limit = 20
+      @atta_count = @documents.count
+      @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+      @offset ||= @atta_pages.offset
+      @documents = paginateHelper @documents,20
+      respond_to do |format|
+        format.html {render :layout => @organization.switch_type ? 'base_sub_domain' : 'base_org'}
+      end
+    else
+      render_403
+    end
+  end
+
+  def update
+    @org_document =  OrgDocumentComment.find(params[:id])
+    @org_document.update_attributes(:title => params[:org_document_comment][:title], :content => params[:org_document_comment][:content])
+    Attachment.attach_files(@org_document, params[:attachments])
+    # @org_document.save_attachments(params[:attachments])
+    if @org_document.parent.nil?
+      act  = OrgActivity.where("org_act_type='OrgDocumentComment' and org_act_id =?", @org_document.id).first
+      act.update_attributes(:updated_at => @org_document.updated_at)
+      EditorOfDocument.create(:editor_id => User.current.id, :org_document_comment_id => @org_document.id, :created_at => Time.now)
+    end
+    respond_to do |format|
+      format.html {
+        if params[:flag].to_i == 0
+          redirect_to organization_org_document_comments_path(:organization_id => @org_document.organization.id)
+        else
+          if params[:flag].to_i == 1
+            redirect_to org_document_comment_path(@org_document.root.id, :organization_id => @org_document.organization.id)
+          else
+            redirect_to organization_path(@org_document.organization.id, :org_subfield_id => params[:org_subfield_id])
+          end
+        end
+      }
+    end
+  end
+
+  def edit
+    @sub_document = SubDocumentComment.find(params[:id])
+    @flag = params[:flag]
+  end
+
+  def add_reply
+    @document = SubDocumentComment.find(params[:id]).root
+    @subdomain = @document.sub_domain
+    @org_subfield = @subdomain.org_subfield
+    @organization = @org_subfield.organization
+    @act = OrgActivity.find(params[:id])
+    @comment = SubDocumentComment.new(:sub_domain_id => @document.sub_domain, :creator_id => User.current.id, :reply_id => params[:id])
+    @comment.content = params[:sub_content]
+    @document.children << @comment
+    @document.save
+  end
+
+  def add_reply_in_doc
+    @document = SubDocumentComment.find(params[:id]).root
+    @subdomain = @document.sub_domain
+    @org_subfield = @subdomain.org_subfield
+    @organization = @org_subfield.organization
+    @comment = SubDocumentComment.new(:sub_domain_id => @document.sub_domain_id, :creator_id => User.current.id, :reply_id => params[:id])
+    @comment.content = params[:flag] ? params[:sub_content] : params[:org_comment][:sub_content]
+    @document.children << @comment
+    @document.save
+    respond_to do |format|
+      format.html {redirect_to org_subfield_sub_domain_sub_document_comment_path(:id => @document.id, :org_subfield_id => @org_subfield.id, :sub_domain_id => @subdomain.id)}
+    end
+  end
+
+  def destroy
+    @sub_document_comment = SubDocumentComment.find(params[:id])
+    @sub_document_comment.destroy
+  rescue ActiveRecord::RecordNotFound
+    respond_to do |format|
+      # format.html{
+      #   redirect_to org_subfield_sub_domain_sub_document_comments_path(:id => params[:sub_domain_id], :org_subfield_id => params[:org_subfield_id])
+      # }
+      format.js
+    end
+  end
+
+  def delete_reply
+    @sub_document_comment = OrgDocumentComment.find(params[:id])
+    @document = @sub_document_comment.root
+    org = @sub_document_comment.organization
+    @sub_document_comment.destroy
+    respond_to do |format|
+      format.html {redirect_to org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id)}
+    end
+  end
+  def quote
+    @org_comment = OrgDocumentComment.find(params[:id])
+    @subject = @org_comment.content
+    @subject = "RE: #{@subject}" unless @subject.starts_with?('RE:')
+
+    @content = "> #{ll(Setting.default_language, :text_user_wrote, User.find(@org_comment.creator_id).realname)}\n> "
+    @temp = OrgDocumentComment.new
+    #@course_id = params[:course_id]
+    @temp.content = "<blockquote>#{ll(Setting.default_language, :text_user_wrote, User.find(@org_comment.creator_id).realname)} <br/>#{@org_comment.content.html_safe}</blockquote>".html_safe
+    respond_to do | format|
+      format.js
+    end
+  end
+
+  def reply
+    @document = OrgDocumentComment.find(params[:id]).root
+    @quote = params[:quote][:quote]
+    @org_document = OrgDocumentComment.new(:creator_id => User.current.id, :reply_id => params[:id])
+
+    # params[:blog_comment][:sticky] = params[:blog_comment][:sticky] || 0
+    # params[:blog_comment][:locked] =  params[:blog_comment][:locked] || 0
+    @org_document.title = params[:org_document_comment][:title]
+    @org_document.content = params[:org_document_comment][:content]
+    @org_document.content = @quote + @org_document.content
+    #@org_document.title = "RE: #{@article.title}" unless params[:blog_comment][:title]
+    @document.children << @org_document
+    # @user_activity_id = params[:user_activity_id]
+    # user_activity = UserActivity.where("act_type='BlogComment' and act_id =#{@article.id}").first
+    # if user_activity
+    #   user_activity.updated_at = Time.now
+    #   user_activity.save
+    # end
+    # attachments = Attachment.attach_files(@org_document, params[:attachments])
+    # render_attachment_warning_if_needed(@org_document)
+    #@article.save
+    # redirect_to user_blogs_path(:user_id=>params[:user_id])
+    respond_to do |format|
+      format.html {
+        # if params[:course_id] #如果呆了course_id过来了，那么这是要跳到课程大纲去的
+        #   redirect_to syllabus_course_path(:id=>params[:course_id])
+        # else
+        redirect_to org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id)
+        # end
+
+      }
+      format.js
+    end
+  end
+
+  private
+  def find_subdomain_and_subfield
+    @subdomain = SubDomain.find(params[:sub_domain_id])
+    @org_subfield = OrgSubfield.find(params[:org_subfield_id])
+    @organization = @org_subfield.organization
+  rescue ActiveRecord::RecordNotFound
+    # source_subdomain_subfield not found
+    render_404
+  end
+
+  def find_subfield_content
+    @subfield_content = @organization.org_subfields.order("priority")
+  end
+end

app/controllers/sub_domains_controller.rb

@@ -0,0 +1,63 @@
+class SubDomainsController < ApplicationController
+  layout 'base_org'
+  before_filter :find_org_subfield_and_subdomain, :only => [:show, :index, :domain_update_priority, :destroy, :update, :hide_sub_domain, :show_sub_domain]
+
+  def new
+    @subdomain = SubDomain.new
+    @org_subfield = OrgSubfield.find(params[:org_subfield_id])
+    @organization = @org_subfield.organization
+  end
+
+  def create
+    if SubDomain.where("org_subfield_id=#{params[:org_subfield_id]} and name=?",params[:name]).count == 0
+      @res = true
+      @subfield = OrgSubfield.find(params[:org_subfield_id])
+      @organization = @subfield.organization
+      @subdomain = SubDomain.create(:name => params[:name], :org_subfield_id => params[:org_subfield_id], :priority => @subfield.sub_domains.blank? ? 1 : @subfield.sub_domains.order("priority").last.priority + 1)
+      @subdomain.update_column(:field_type, params[:field_type])
+    else
+      @res = false
+    end
+  end
+
+  def update
+    @subdomain.update_column(:name, params[:name])
+  end
+
+  def domain_update_priority
+    @subdomain.update_attribute(:priority, params[:priority].to_i)
+  end
+
+  def destroy
+    @subdomain.destroy
+  end
+
+  def show
+    render_404
+    # @subfield_content = @organization.org_subfields.order("priority")
+    # render layout: @organization.switch_type ? 'base_sub_domain' : 'base_org'
+  end
+
+  def index
+
+  end
+
+  def hide_sub_domain
+    @subdomain.update_attribute(:hide, 1)
+  end
+
+  def show_sub_domain
+    @subdomain.update_attribute(:hide, 0)
+  end
+
+
+  private
+  def find_org_subfield_and_subdomain
+    @subfield = OrgSubfield.find(params[:org_subfield_id])
+    @subdomain = SubDomain.find(params[:id])
+    @organization = @subfield.organization
+  rescue ActiveRecord::RecordNotFound
+    # source_subdomain not found
+    render_404
+  end
+end

app/helpers/application_helper.rb

@@ -37,6 +37,12 @@ module ApplicationHelper
     container.update_column(:visits, container.visits + 1)
   end
 
+  def if_hidden_subdomain  field
+    domains = field.sub_domains.select{|domain| domain.hide.to_i == 0}
+    result = domains.length > 0 ? true : false
+    return result
+  end
+
   # Time 2015-03-24 15:27:29
   # Author lizanle
   # Description 从硬盘上删除对应的资源文件

app/helpers/organizations_helper.rb

@@ -63,14 +63,89 @@ module OrganizationsHelper
   def subfield_status_option
     type = []
     option1 = []
-    option1 << "列表"
+    option1 << "左上"
     option1 << "1"
     type << option1
-    option2 = []
-    option2 << "图片"
-    option2 << "0"
-    type << option2
+    # option2 = []
+    # option2 << "中一"
+    # option2 << "2"
+    # type << option2
+    option3 = []
+    option3 << "中上"
+    option3 << "3"
+    type << option3
+    option4 = []
+    option4 << "中下"
+    option4 << "4"
+    type << option4
+    option5 = []
+    option5 << "左下"
+    option5 << "5"
+    type << option5
+    option6 = []
+    option6 << "右上"
+    option6 << "6"
+    type << option6
+    option7 = []
+    option7 << "右中"
+    option7 << "7"
+    type << option7
+    option8 = []
+    option8 << "右下"
+    option8 << "8"
+    type << option8
     type
   end
 
+  # 课程和项目不参与某些模块的排列
+  def subfield_status_option_default
+    type = []
+    option1 = []
+    option1 << "左上"
+    option1 << "1"
+    type << option1
+    option3 = []
+    option3 << "中上"
+    option3 << "3"
+    type << option3
+    option4 = []
+    option4 << "中下"
+    option4 << "4"
+    type << option4
+    option6 = []
+    option6 << "右上"
+    option6 << "6"
+    type << option6
+    type
+  end
+
+  def subfield_list_type subfield
+    case subfield.to_i
+      when 1
+        resulet = "左上"
+      when 2
+        resulet = "中一"
+      when 3
+        resulet = "中二"
+      when 4
+        resulet = "中下"
+      when 5
+        resulet = "左下"
+      when 6
+        resulet = "右上"
+      when 7
+        resulet = "右中"
+      when 8
+        resulet = "右下"
+    end
+  end
+
+
+  def get_subfield_acts field
+    org_subfield = OrgSubfield.find(field.id)
+    org_subfield_ids = org_subfield.org_document_comments.map(&:id) << 0
+    org_acts = 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')
+    org_acts
+  end
+
 end

app/helpers/sub_document_comments_helper.rb

@@ -0,0 +1,2 @@
+module SubDocumentCommentsHelper
+end

app/helpers/sub_domains_helper.rb

@@ -0,0 +1,5 @@
+module SubDomainsHelper
+  include OrganizationsHelper
+
+
+end

app/models/org_subfield.rb

@@ -7,6 +7,7 @@ class OrgSubfield < ActiveRecord::Base
   has_many :messages, :through => :org_subfield_messages
   has_many :boards, :dependent => :destroy
   has_many :news, :dependent => :destroy
+  has_many :sub_domains, :dependent => :destroy
   acts_as_attachable
   after_create :create_board_sync
   after_destroy :update_priority

app/models/organization.rb

@@ -22,4 +22,8 @@ class Organization < ActiveRecord::Base
     OrgSubfield.create(:organization_id => self.id, :name => 'course', :field_type => 'default', :priority => 2)
     OrgSubfield.create(:organization_id => self.id, :name => 'project', :field_type => 'default', :priority => 3)
   end
+
+  def switch_type
+    self.show_mode.to_i == 1 ? true : false
+  end
 end

app/models/sub_document_comment.rb

@@ -0,0 +1,32 @@
+class SubDocumentComment < ActiveRecord::Base
+  attr_accessible :content, :creator_id, :locked, :org_subfield_id, :parent_id, :reply_id, :sticky, :sub_domain_id, :title
+
+  include Redmine::SafeAttributes
+  include ApplicationHelper
+  belongs_to :sub_domain
+  belongs_to :creator, :class_name => 'User', :foreign_key => 'creator_id'
+  acts_as_tree :order => "#{SubDocumentComment.table_name}.sticky asc, #{SubDocumentComment.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_sub_activity
+  after_update :update_activity
+
+  #动态的更新
+  private
+  def update_activity
+    org_activity = OrgActivity.where("org_act_type='SubDocumentComment' and org_act_id =?", id).first
+    if org_activity
+      org_activity.updated_at = Time.now
+      org_activity.save
+    end
+  end
+
+  def document_save_as_sub_activity
+    if(self.parent().nil?)
+      self.org_acts << OrgActivity.new(:user_id => User.current.id, :container_id => self.sub_domain.id, :container_type => 'SubDomain')
+    else
+      act = OrgActivity.where("org_act_type='SubDocumentComment' and org_act_id =?", self.root.id).first
+      act.update_attributes(:updated_at => self.updated_at)
+    end
+  end
+end

app/models/sub_domain.rb

@@ -0,0 +1,5 @@
+class SubDomain < ActiveRecord::Base
+  attr_accessible :field_type, :hide, :name, :org_subfield_id, :priority, :status
+  belongs_to :org_subfield, :foreign_key => :org_subfield_id
+  has_many :sub_document_comments
+end

app/views/layouts/base_org.html.erb

@@ -134,6 +134,7 @@
       </div>
       <div class="homepageLeftMenuContainer" id="sub_field_left_lists">
         <%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %>
+
       </div>
       <div class="fontGrey5 mt10 ml20">访问计数 <%= @organization.visits.to_i %></div>
     </div>

app/views/layouts/base_org2.html.erb

@@ -27,14 +27,26 @@
           tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
         });
   </script>
-  <script type="text/javascript" src="/javascripts/jquery-1.8.3.min.js"></script><!--焦点图-->
+  <script type="text/javascript" src="/javascripts/jquery-1.8.3.min.js"></script>
   <script type="text/javascript" src="/javascripts/koala.min.1.5.js"></script><!--焦点图-->
 
   <script src="/javascripts/scrollPic.js"></script><!--滚动-->
   <script>
-      window.onload = function(){
+    $(document).ready(function(){
         scrollPic();
-      }
+        $(".nav-element").mouseover(function(){
+            $(this).next().show();
+        });
+        $(".sn-grey-opacity").mouseover(function(){
+            $(this).show();
+        });
+        $(".nav-element").mouseout(function(){
+            $(this).next().hide();
+        });
+        $(".sn-grey-opacity").mouseout(function(){
+            $(this).hide();
+        });
+    });
       function scrollPic() {
           var scrollPic = new ScrollPic();
           scrollPic.scrollContId   = "scrollPic"; //内容容器ID
@@ -50,7 +62,7 @@
           scrollPic.autoPlayTime   = 3; //自动播放间隔时间(秒)
 
           scrollPic.initialize(); //初始化
-      }
+      };
   </script>
 
 </head>
@@ -83,7 +95,17 @@
   <div class="sn-header">
     <%= render :partial => 'organizations/org_logined_header' %>
     <div class="sn-row sn-bg-white">
-      <div class="sn-logo"> <img src="/images/sn_logo.jpg" width="367" height="63" alt="logo" class="sn-mt13" /> <a href="javascript:void(0);" class="sn-search-button sn-mt28"></a>
+      <div class="sn-logo">
+        <% if @org_logo_attchment.blank? %>
+            <img src="/images/org_new_style/logo.jpg"  width="367" height="63" class="sn-mt13" alt=""/>
+        <% else %>
+            <img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" width="367" height="63" class="sn-mt13" alt="">
+        <% end %>
+        <% if User.current.admin_of_org?(@organization) %>
+            <a href="#" class="sn-logo-add" title="点击替换LOGO" onclick="org_new_files_upload();"></a>
+        <% end %>
+        <a href="javascript:void(0);" class="sn-search-button sn-mt28"></a>
+
         <input type="text" class="sn-search-input sn-mt28" placeholder="搜索" />
       </div>
     </div>
@@ -94,15 +116,15 @@
             <% if is_default_field?(field) %>
                 <% case field.name %>
             <% when 'activity' %>
-                    <li class="nav-element">
+                    <li class="nav-element-default">
                       <%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %>
                     </li>
                 <% when 'course' %>
-                    <li class="nav-element">
+                    <li class="nav-element-default">
                       <a href="#course_<%= field.id %>" class="sn-link-white"> 课程动态</a>
                     </li>
                 <% when 'project' %>
-                    <li class="nav-element">
+                    <li class="nav-element-default">
                       <a href="#project_<%= field.id %>" class="sn-link-white">项目动态</a>
                     </li>
                 <% end %>
@@ -111,6 +133,14 @@
                     <li class="nav-element">
                       <a href="#message_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
                     </li>
+                    <!--二级目录-->
+                    <div class="sn-row sn-subnav-position sn-grey-opacity" style="display:none;">
+                      <ul class="sn-sub-nav" style="display:<%= if_hidden_subdomain( field) ? 'block':'none' %>;">
+                        <% field.sub_domains.each do |subdomain| %>
+                            <li><%=link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => field.id), :class => "sn-link-grey" %></li>
+                        <% end %>
+                      </ul>
+                    </div>
                 <% elsif field.field_type == "Resource" && field.hide == 0 %>
                     <li class="nav-element">
                       <a href="#resource_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
@@ -136,11 +166,10 @@
   <% @subfield_content.each do |field| %>
       <% if field.status.to_i == 1 %>
           <%= render :partial => 'organizations/org_subfield_leftT', :locals => {:field => field} %>
-      <% elsif field.status.to_i == 2 %>
+      <% elsif field.status.to_i == 3 %>
           <%#= render :partial => 'organizations/org_subfield_leftM', :locals => {:field => field} %>
           <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
             <%= render :partial => 'organizations/org_subfield_leftM1', :locals => {:field => field} %>
-      <% elsif field.status.to_i == 3 %>
             <%= render :partial => 'organizations/org_subfield_leftM2', :locals => {:field => field} %>
             <div class="cl"></div>
           </div>

app/views/layouts/base_sub_domain.html.erb

@@ -0,0 +1,184 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" />
+  <title><%= h html_title %></title>
+  <meta name="description" content="<%= Redmine::Info.app_name %>" />
+  <meta name="keywords" content="issue,bug,tracker" />
+  <%= csrf_meta_tag %>
+  <%= favicon %>
+  <%= javascript_heads %>
+  <%= heads_for_theme %>
+  <%= stylesheet_link_tag  'org2','jquery/jquery-ui-1.9.2' %>
+  <%= javascript_include_tag 'cookie','project', 'organization','header','prettify','select_list_move','org'%>
+  <%= javascript_include_tag 'attachments' %>
+  <%#= call_hook :view_layouts_base_html_head %>
+  <!-- page specific tags -->
+  <%#= yield :header_tags -%>
+  <!-- MathJax的配置 -->
+  <script type="text/javascript"
+          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+  </script>
+  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+  <script type="text/x-mathjax-config">
+        MathJax.Hub.Config({
+        showMathMenu: false,
+        showMathMenuMSIE: false,
+          tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+        });
+  </script>
+  <script type="text/javascript" src="/javascripts/jquery-1.8.3.min.js"></script>
+  <script type="text/javascript" src="/javascripts/koala.min.1.5.js"></script><!--焦点图-->
+
+  <script>
+      $(document).ready(function(){
+        $(".nav-element").mouseover(function(){
+            $(this).next().show();
+      });
+        $(".sn-grey-opacity").mouseover(function(){
+              $(this).show();
+        });
+        $(".nav-element").mouseout(function(){
+            $(this).next().hide();
+    });
+        $(".sn-grey-opacity").mouseout(function(){
+              $(this).hide();
+        });
+    });
+  </script>
+
+</head>
+
+<!--add by huang-->
+<script type="text/javascript">
+    function org_new_files_upload()
+    {
+        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files',:locals => {:org => @organization, :org_attachment_type => 0}) %>');
+        showModal('ajax-modal', '513px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+        $('#ajax-modal').parent().css("top","40%").css("left","36%").css("border","3px solid #269ac9");
+        $('#ajax-modal').parent().addClass("popbox_polls");
+    }
+
+    function org_new_files_banner_upload()
+    {
+        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files_banner',:locals => {:org => @organization, :org_attachment_type => 1}) %>');
+        showModal('ajax-modal', '513px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+        $('#ajax-modal').parent().css("top","40%").css("left","36%").css("border","3px solid #269ac9");
+        $('#ajax-modal').parent().addClass("popbox_polls");
+    }
+</script>
+<body onload="prettyPrint();">
+<!--内容开始-->
+<div class="sn-inner-body">
+  <header>
+    <div class="sn-header">
+      <%= render :partial => 'organizations/org_logined_header' %>
+      <div class="sn-row sn-bg-white">
+        <div class="sn-logo">
+          <% if @org_logo_attchment.blank? %>
+              <img src="/images/org_new_style/logo.jpg"  width="367" height="63" class="sn-mt13" alt=""/>
+          <% else %>
+              <img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" width="367" height="63" class="sn-mt13" alt="">
+          <% end %>
+          <% if User.current.admin_of_org?(@organization) %>
+                <a href="#" class="logo-add" title="点击替换LOGO" onclick="org_new_files_upload();"></a>
+          <% end %>
+          <a href="javascript:void(0);" class="sn-search-button sn-mt28"></a>
+          <input type="text" class="sn-search-input sn-mt28" placeholder="搜索" />
+        </div>
+      </div>
+      <!--导航-->
+      <div class="sn-row sn-bg-blue">
+        <ul class="sn-nav">
+          <% @subfield_content.each do |field| %>
+              <% if is_default_field?(field) %>
+                  <% case field.name %>
+                  <% when 'activity' %>
+                      <li class="nav-element-default"  style="display:<%= field.hide == 0?'block':'none' %>;">
+                        <%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %>
+                      </li>
+                  <% when 'course' %>
+                      <li class="nav-element-default"  style="display:<%= field.hide == 0?'block':'none' %>;">
+                        <a href="#course_<%= field.id %>" class="sn-link-white"> 课程动态</a>
+                      </li>
+                  <% when 'project' %>
+                      <li class="nav-element-default"  style="display:<%= field.hide == 0?'block':'none' %>;">
+                        <a href="#project_<%= field.id %>" class="sn-link-white">项目动态</a>
+                      </li>
+                  <% end %>
+              <% else %>
+                  <% if field.field_type == "Post" && field.hide == 0 %>
+                      <li class="nav-element">
+                        <a href="#message_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
+                      </li>
+                      <!--二级目录-->
+                      <div class="sn-row sn-subnav-position sn-grey-opacity" style="display:none;">
+                        <ul class="sn-sub-nav" style="display:<%= if_hidden_subdomain( field) ? 'block':'none' %>;">
+                          <% field.sub_domains.each do |subdomain| %>
+                              <li><%=link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => @org_subfield.id), :class => "sn-link-grey" %></li>
+                          <% end %>
+                        </ul>
+                      </div>
+                  <% elsif field.field_type == "Resource" && field.hide == 0 %>
+                      <li class="nav-element">
+                        <a href="#resource_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
+                      </li>
+                  <% end %>
+              <% end %>
+          <% end %>
+          <% if User.current.admin_of_org?(@organization) %>
+              <li class="nav-element">
+                <a href="<%= setting_organization_path(@organization) %>" class="sn-link-white">配置</a>
+              </li>
+          <% end %>
+        </ul>
+      </div>
+      <div class="sn-row">
+        <div class="sn-banner"><img src="/images/sn_banner.jpg" width="1200" height="210" alt="banner image" />
+          <a href="#" class="sn-banner-add" title="点击替换图片" ></a>
+        </div>
+      </div>
+    </div>
+  </header>
+<%# 更新访问数,刷新的时候更新访问次数 %>
+  <%  update_visiti_count @organization %>
+<%# over %>
+  <!--内容开始-->
+
+  <!--内容结束-->
+  <%= render_flash_messages %>
+  <%= yield %>
+  <%= call_hook :view_layouts_base_content %>
+  <div style="clear:both;"></div>
+
+  <footer>
+    <!--footer-->
+    <div class="sn-row sn-bg-grey2">
+      <div class="sn-footer">
+        <ul class="sn-footer-link">
+          <li class="sn-mr50"><a href="<%= about_us_path %>" class="sn-link-white sn-f18">关于我们</a></li>
+          <li class="sn-mr50"><a href="<%= agreement_path %>" class="sn-link-white sn-f18">服务协议</a></li>
+          <li class="sn-mr50"><a href="http://forge.trustie.net/forums/1/memos/1168" class="sn-link-white sn-f18">帮助中心</a></li>
+          <li><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="sn-link-white sn-f18">在线报名</a></li>
+        </ul>
+        <div class="sn-contact">联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org</div>
+        <div class="sn-address">地 址：湖南省长沙市开福区东风路89号观园大厦23层<br />
+          卫星导航仿真与测试开放实验室</div>
+      </div>
+    </div>
+  </footer>
+</div>
+
+<div id="ajax-indicator" style="display:none;">
+  <span><%= l(:label_loading) %></span>
+</div>
+<%#= call_hook :view_layouts_base_body_bottom %>
+</body>
+</html>
+
+
+

app/views/organizations/_org_left_subfield_list.html.erb

@@ -43,6 +43,13 @@
             $(this).prev().css("color","#808080");
             $(this).css("z-index", "1");
         })
+
+        //二级菜单滑动时箭头方向控制
+        $(".homepageLeftMenuMoreIcon").toggle(function(){
+            $(this).css("background","url(/images/homepage_icon.png) 100px -624px no-repeat");
+        },function(){
+            $(this).css("background","url(/images/homepage_icon.png) -74px -240px no-repeat");
+        });
     })
 </script>
 
@@ -83,21 +90,37 @@
             </div>
         <% end %>
     <% else %>
-        <div class="homepageLeftMenuBlock" style="display:<%= field.hide == 0?'block':'none' %>;" id="org_subfield_<%= field.id %>">
+        <div style="display:<%= field.hide == 0?'block':'none' %>;" id="org_subfield_<%= field.id %>">
           <% if field.field_type == "Post" %> <!--讨论帖子-->
+              <div class="homepageLeftMenuBlock">
+                <!--<a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuProjects').slideToggle();">项目</a>-->
                 <% if !field.subfield_subdomain_dir.nil? %> <!--讨论帖子-->
                     <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", organization.id).map(&:subname).include?(request.subdomain) %>
-                      <%= link_to "#{field.name}", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
+                        <%= link_to "#{field.name}", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
                     <% else %>
-                      <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
+                        <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
                     <% end %>
                 <% else %>
-                  <%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText" %>
+                    <%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
                 <% end %>
-              <% if User.current.member_of_org?organization %>
+                <% if User.current.logged? and User.current.admin_of_org?(organization) %>
                     <%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子" %>
                 <% end %>
+              </div>
+              <div class="<%= (field.sub_domains.count == 0) ? 'homepageLeftMenuCourses':'homepageLeftMenuCourses borderBottomNone' %>" id="PostDomain_<%= field.id %>" style="display:none;">
+                <ul>
+                  <%= render :partial => 'organizations/org_subdomain',:locals=>{:subdomains => field.sub_domains.reorder('created_at').uniq.limit(5), :org_subfield_id => field.id} %>
+                </ul>
+              </div>
+
+              <% unless (field.sub_domains.count == 0 || !if_hidden_subdomain(field)) %>
+                  <li class="homepageLeftMenuMore" id="sub_domain_jiantou_<%= field %>">
+                    <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="$('#PostDomain_<%= field.id %>').slideToggle();" style="border-bottom: 1px solid #ddd;"></a>
+                  </li>
+              <% end %>
+
           <% else %>
+              <div class="homepageLeftMenuBlock">
                   <% if !field.subfield_subdomain_dir.nil? %>
                       <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", organization.id).map(&:subname).include?(request.subdomain) %>
                           <%= link_to "#{field.name}", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
@@ -112,6 +135,7 @@
                       <!--<a class="homepageMenuSetting fr" title="上传资源" href="javascript:void(0);" onclick="org_subfield_files_upload(<%#= field.id %>);"> </a>-->
                   <% end %>
                   <!--<a href="javascript:void(0);" class="homepageMenuText"><%#= field.name %></a>-->
+              </div>
           <% end %>
         </div>
         <div class="homepageLeftMenuCourses" id="homepageLeftMenuField_<%= field.id %>" style="display:none;">

app/views/organizations/_org_subdomain.html.erb

@@ -0,0 +1,11 @@
+<% subdomains.each do |subdomain|%>
+    <li class="homepageLeftMenuCoursesLine" style="display:<%= subdomain.hide.to_i == 0?'block':'none' %>;position:relative;" id="sub_domain_hide_<%= subdomain.id %>">
+      <%= link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => org_subfield_id), :class => "coursesLineGrey hidden", :title => subdomain.name %>
+    </li>
+<% end %>
+<%# if subdomains.size == 5 %>
+    <!--<li class="homepageLeftMenuMore" id="show_more_org_project">-->
+      <!--<input type="hidden" value="<%#= page %>" id="org_project_page_num">-->
+      <!--<a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="show_more_org_project('<%#=  more_org_projects_organization_path(org_id) %>');"></a>-->
+    <!--</li>-->
+<%# end%>

app/views/organizations/_org_subfield_leftD.html.erb

@@ -1,25 +1,3 @@
-<div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
-  <h2 class="h2-title">合作伙伴<a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
-  <div class="sn-index-partnerbox " >
-    <ul id="scrollPic" >
-      <li>
-        <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-dhyq.jpg" width="363" height="43" alt=""/></a>
-        <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-qhdx.jpg" width="363" height="43" alt=""/></a>
-      </li>
-      <li>
-        <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-jzdz.jpg" width="363" height="43" alt=""/></a>
-        <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-zgdz.jpg" width="363" height="43" alt=""/></a>
-      </li>
-    </ul>
-    <div class="cl"></div>
-    <div class="partner-btnbox">
-      <div class="partner-prev partner-btn fl " id="LeftArr">&lt;</div>
-      <div class="partner-next partner-btn fl" id="RightArr">&gt;</div>
-      <div class="cl"></div>
-    </div>
-  </div>
-</div>
-
 <% if is_default_field?(field) %>
     <% case field.name %>
 <% when 'course' %>
@@ -31,19 +9,22 @@
     <% if field.field_type == "Post" %> <%# 讨论类型 %>
         <% org_acts = get_subfield_acts field %>
         <% unless org_acts.blank? %>
-           <% org_acts.each do |activity| %>
             <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
               <h2 class="h2-title">合作伙伴<a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
-                  <div class="sn-index-smallbanner" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <div class="sn-index-partnerbox " >
+                <ul id="scrollPic" >
+                  <div class="scroll-control">
+                      <div class="scroll-container">
+                        <% org_acts.first(8).each do |activity| %>
                             <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
                                 <% document = activity.org_act %>
                                 <% org_subfield_id = params[:org_subfield_id] %>
                                 <% flag = 2 %>
                                 <% iamge_path = get_image_path_from_content(document.content) %>
                                 <% if iamge_path.nil? %>
-                            <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
+                                    <li class="sn-fl"><%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "368", :height => "43"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "partnerimg" %></li>
                                 <% else %>
-                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
+                                    <li class="sn-fl"><%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "368", :height => "43"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "partnerimg"  %></li>
                                 <% end %>
                             <% elsif activity.container_type == 'OrgSubfield' %>
                                 <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
@@ -51,16 +32,16 @@
                                     <% if message.board.org_subfield_id %>
                                         <% iamge_path = get_image_path_from_content(message.content) %>
                                         <% if iamge_path.nil? %>
-                                    <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
+                                            <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "368", :height => "43"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "partnerimg" %>
                                         <% else %>
-                                    <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
+                                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "368", :height => "43"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "partnerimg" %>
                                         <% end %>
                                     <% else %>
                                         <% iamge_path = get_image_path_from_content(message.content) %>
                                         <% if iamge_path.nil? %>
-                                    <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank" %>
+                                            <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank", :class => "partnerimg" %>
                                         <% else %>
-                                    <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank" %>
+                                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank", :class => "partnerimg" %>
                                         <% end %>
                                     <% end %>
                                 <% end %>
@@ -68,28 +49,15 @@
                                     <% news = News.find(activity.org_act_id) %>
                                     <% iamge_path = get_image_path_from_content(news.description) %>
                                     <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), news_path(news), :target => "_blank" %>
+                                        <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "368", :height => "43"), news_path(news), :target => "_blank", :class => "partnerimg" %>
                                     <% else %>
-                                <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), news_path(news), :target => "_blank" %>
+                                        <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "368", :height => "43"), news_path(news), :target => "_blank", :class => "partnerimg" %>
+                                    <% end %>
                                 <% end %>
                             <% end %>
                         <% end %>
                       </div>
                   </div>
-           <% end %>
-        <% else %>
-            <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
-              <h2 class="h2-title">合作伙伴<a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
-              <div class="sn-index-partnerbox " >
-                <ul id="scrollPic" >
-                  <li>
-                    <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-dhyq.jpg" width="363" height="43" alt=""/></a>
-                    <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-qhdx.jpg" width="363" height="43" alt=""/></a>
-                  </li>
-                  <li>
-                    <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-jzdz.jpg" width="363" height="43" alt=""/></a>
-                    <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-zgdz.jpg" width="363" height="43" alt=""/></a>
-                  </li>
                 </ul>
                 <div class="cl"></div>
                 <div class="partner-btnbox">
@@ -99,19 +67,36 @@
                 </div>
               </div>
             </div>
+        <% else %>
+            <%= render :partial => 'organizations/org_subfield_leftD_default', :locals => {:field => field} %>
         <% end %>
     <% elsif field.field_type == "Resource" %>
         <% org_attachs = get_attach_org2(field) %>
         <div class="sn-index-smallbanner" style="display:<%= field.hide == 0?'block':'none' %>;">
           <% if !field.subfield_subdomain_dir.nil? %>
               <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %>
-                  <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %>
+                  <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "368", :height => "43"), show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %>
               <% else %>
-                  <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank"  %>
+                  <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "368", :height => "43"), show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank"  %>
               <% end %>
           <% else %>
-              <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank"  %>
+              <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "368", :height => "43"), org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank"  %>
           <% end %>
         </div>
     <% end %>
 <% end %>
+
+<script>
+  $(document).ready(function(){
+      var num = $(".scroll-container").children().size();
+      var num = Math.round(num/4);
+      var divWidth = 380*num;
+      $(".scroll-container").css("width",divWidth).css("height",110);
+      if(num%2 != 0) {
+          var controlWidth = 380*num + 380;
+      }else{
+          var controlWidth = 380*num;
+      }
+      $(".scroll-control").css("width",controlWidth);
+  });
+</script>

app/views/organizations/_org_subfield_leftD_default.html.erb

@@ -0,0 +1,19 @@
+<div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+  <h2 class="h2-title">示例：合作伙伴<a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
+  <div class="sn-index-partnerbox " >
+    <ul id="scrollPic" >
+      <div style="width: 760px;">
+        <li class="fl"><a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="/images/default_blank/left-05.jpg" width="368" height="43" alt="" /></a></li>
+        <li class="fl"><a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="/images/default_blank/left-05.jpg" width="368" height="43" alt="" /></a></li>
+        <li class="fl"><a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="/images/default_blank/left-05.jpg" width="368" height="43" alt="" /></a></li>
+        <li class="fl"><a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="/images/default_blank/left-05.jpg" width="368" height="43" alt="" /></a></li>
+      </div>
+    </ul>
+    <div class="cl"></div>
+    <div class="partner-btnbox">
+      <div class="partner-prev partner-btn fl " id="LeftArr">&lt;</div>
+      <div class="partner-next partner-btn fl" id="RightArr">&gt;</div>
+      <div class="cl"></div>
+    </div>
+  </div>
+</div>

app/views/organizations/_org_subfield_leftM1.html.erb

@@ -1,20 +1,23 @@
-<h2 class="h2-title"><%= field.name %><a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
-<div class="cl"></div>
+
 <% if is_default_field?(field) %>
     <% case field.name %>
     <% when 'course' %>
         <% if @course_acts.blank? %>
+            <h2 class="h2-title"><%= field.name %></h2>
+            <div class="cl"></div>
             <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
         <% else %>
+            <h2 class="h2-title"><%= field.name %><a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
+            <div class="cl"></div>
             <% @course_acts.first(1).each do |act| %>
                 <% if act.org_act_type == "HomeworkCommon" %>
                     <% activity = HomeworkCommon.find(act.org_act_id) %>
                     <% iamge_path = get_image_path_from_content(activity.description) %>
                     <div class="sn-news-bigbox fl">
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                       <% else %>
-                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                       <% end %>
                       <h3>
                         <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %>
@@ -29,9 +32,9 @@
                     <% iamge_path = get_image_path_from_content(activity.content) %>
                     <div class="sn-news-bigbox fl">
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                       <% else %>
-                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                       <% end %>
                       <h3>
                         <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
@@ -50,9 +53,9 @@
                     <% iamge_path = get_image_path_from_content(activity.description) %>
                     <div class="sn-news-bigbox fl">
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                       <% else %>
-                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                       <% end %>
                       <h3>
                         <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %>
@@ -70,9 +73,9 @@
                     <% if ( activity.polls_status==2) %>
                         <div class="sn-news-bigbox fl">
                           <% if iamge_path.nil? %>
-                              <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-bigimg" %>
+                              <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                           <% else %>
-                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-bigimg" %>
+                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                           <% end %>
                           <h3>
                             <% if has_commit %>
@@ -92,17 +95,21 @@
         <% end %>
     <% when 'project' %>
         <% if @project_acts.blank? %>
+            <h2 class="h2-title"><%= field.name %></h2>
+            <div class="cl"></div>
             <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
         <% else %>
-            <% @project_acts.first(4).each do |act| %>
+            <h2 class="h2-title"><%= field.name %><a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
+            <div class="cl"></div>
+            <% @project_acts.first(1).each do |act| %>
                 <% if act.org_act_type == "Issue" %>
                     <% activity = Issue.find(act.org_act_id) %>
                     <% iamge_path = get_image_path_from_content(activity.description) %>
                     <div class="sn-news-bigbox fl">
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                       <% else %>
-                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                       <% end %>
                       <h3>
                         <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %>
@@ -117,9 +124,9 @@
                     <% iamge_path = get_image_path_from_content(activity.content) %>
                     <div class="sn-news-bigbox fl">
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                       <% else %>
-                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                       <% end %>
                       <h3>
                         <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
@@ -138,9 +145,9 @@
                     <% iamge_path = get_image_path_from_content(activity.description) %>
                     <div class="sn-news-bigbox fl">
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                       <% else %>
-                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                       <% end %>
                       <h3>
                         <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %>
@@ -158,9 +165,13 @@
     <% if field.field_type == "Post" %>
         <% org_acts = get_subfield_acts field %>
         <% if org_acts.blank? %>
+            <h2 class="h2-title"><%= field.name %></h2>
+            <div class="cl"></div>
             <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
         <% else %>
-            <% org_acts.first(4).each do |activity| %>
+            <h2 class="h2-title"><%= field.name %><a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
+            <div class="cl"></div>
+            <% org_acts.first(1).each do |activity| %>
                 <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
                     <% document = activity.org_act %>
                     <% org_subfield_id = params[:org_subfield_id] %>
@@ -168,9 +179,9 @@
                     <% iamge_path = get_image_path_from_content(document.content) %>
                     <div class="sn-news-bigbox fl">
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                       <% else %>
-                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                       <% end %>
                       <h3>
                         <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "h3-title" %>
@@ -192,9 +203,9 @@
                         <% if message.board.org_subfield_id %>
                             <div class="sn-news-bigbox fl">
                               <% if iamge_path.nil? %>
-                                  <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                                  <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                               <% else %>
-                                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                               <% end %>
                               <h3>
                                 <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
@@ -211,9 +222,9 @@
                         <% else %>
                             <div class="sn-news-bigbox fl">
                               <% if iamge_path.nil? %>
-                                  <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-bigimg" %>
+                                  <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                               <% else %>
-                                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-bigimg" %>
+                                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                               <% end %>
                               <h3>
                                 <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
@@ -234,9 +245,9 @@
                         <% iamge_path = get_image_path_from_content(news.description) %>
                         <div class="sn-news-bigbox fl">
                           <% if iamge_path.nil? %>
-                              <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), news_path(news), :target => "_blank", :class =>"sn-news-bigimg" %>
+                              <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), news_path(news), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                           <% else %>
-                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), news_path(news), :target => "_blank", :class =>"sn-news-bigimg" %>
+                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), news_path(news), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                           <% end %>
                           <h3>
                             <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "h3-title" %>

app/views/organizations/_org_subfield_leftM1_default.html.erb

@@ -1,5 +1,5 @@
 <div class="sn-news-bigbox fl">
-  <a href="javascript:void(0);" target="_blank" class="sn-news-bigimg"><img src="/images/news/img-news-big.jpg" width="380" height="165" alt=""/></a>
+  <a href="javascript:void(0);" target="_blank" class="sn-news-bigimg"><img src="/images/default_blank/left-02.jpg" width="380" height="165" alt="" style="display:block;" /></a>
   <h3><a href="javascript:void(0);" target="_blank" class="h3-title"></a></h3>
   <span class="txt-grey"></span>
   <div class="sn-news-txt">

app/views/organizations/_org_subfield_leftM2.html.erb

@@ -5,18 +5,19 @@
         <% if @course_acts.blank? %>
             <%= render :partial => 'organizations/org_subfield_leftM2_default', :locals => {:field => field} %>
         <% else %>
-            <% @course_acts.first(4).each do |act| %>
+            <% @course_acts[1..4].each do |act| %>
                 <% if act.org_act_type == "HomeworkCommon" %>
                     <% activity = HomeworkCommon.find(act.org_act_id) %>
                     <% iamge_path = get_image_path_from_content(activity.description) %>
                     <div class="sn-news-small mb18">
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/right_top.jpg", :width => "85", :height => "85"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                          <%= link_to image_tag("/images/default_blank/left-03.jpg", :width => "85", :height => "85"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                       <% end %>
                       <h3>
-                        <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                        <div class="sn-title-wrap"><%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
+           
                       </h3>
                       <span class="txt-grey fl "><%= format_date activity.updated_at %></span>
                       <div class="cl"></div>
@@ -26,15 +27,15 @@
                     <% iamge_path = get_image_path_from_content(activity.content) %>
                     <div class="sn-news-small mb18">
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                          <%= link_to image_tag("/images/default_blank/left-03.jpg", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                       <% end %>
                       <h3>
                         <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
-                            <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                            <div class="sn-title-wrap"><%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                         <% else %>
-                            <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                            <div class="sn-title-wrap"><%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                         <% end %>
                       </h3>
                       <span class="txt-grey fl "><%= format_date activity.updated_on %></span>
@@ -45,12 +46,12 @@
                     <% iamge_path = get_image_path_from_content(activity.description) %>
                     <div class="sn-news-small mb18">
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                          <%= link_to image_tag("/images/default_blank/left-03.jpg", :width => "85", :height => "85"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                       <% end %>
                       <h3>
-                        <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                        <div class="sn-title-wrap"><%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                       </h3>
                       <span class="txt-grey fl "><%= format_date activity.created_on %></span>
                       <div class="cl"></div>
@@ -63,15 +64,15 @@
                     <% if ( activity.polls_status==2) %>
                         <div class="sn-news-small mb18">
                           <% if iamge_path.nil? %>
-                              <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                              <%= link_to image_tag("/images/default_blank/left-03.jpg", :width => "85", :height => "85"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-smallimg fl" %>
                           <% else %>
                               <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-smallimg fl" %>
                           <% end %>
                           <h3>
                             <% if has_commit %>
-                                <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h4-title fl mt10"  %>
+                                <div class="sn-title-wrap"><%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h4-title fl mt10"  %><span class="title-ellipsis">...</span></div>
                             <% else %>
-                                <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h4-title fl mt10"  %>
+                                <div class="sn-title-wrap"><%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h4-title fl mt10"  %><span class="title-ellipsis">...</span></div>
                             <% end %>
                           </h3>
                           <span class="txt-grey fl "><%= format_date activity.published_at %></span>
@@ -85,18 +86,18 @@
         <% if @project_acts.blank? %>
             <%= render :partial => 'organizations/org_subfield_leftM2_default', :locals => {:field => field} %>
         <% else %>
-            <% @project_acts.first(4).each do |act| %>
+            <% @project_acts[1..4].each do |act| %>
                 <% if act.org_act_type == "Issue" %>
                     <% activity = Issue.find(act.org_act_id) %>
                     <% iamge_path = get_image_path_from_content(activity.description) %>
                     <div class="sn-news-small mb18">
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                          <%= link_to image_tag("/images/default_blank/left-03.jpg", :width => "85", :height => "85"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                       <% end %>
                       <h3>
-                        <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                        <div class="sn-title-wrap"><%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                       </h3>
                       <span class="txt-grey fl "><%= format_date activity.updated_on %></span>
                       <div class="cl"></div>
@@ -106,15 +107,15 @@
                     <% iamge_path = get_image_path_from_content(activity.content) %>
                     <div class="sn-news-small mb18">
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                          <%= link_to image_tag("/images/default_blank/left-03.jpg", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                       <% end %>
                       <h3>
                         <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
-                            <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                            <div class="sn-title-wrap"><%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                         <% else %>
-                            <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                            <div class="sn-title-wrap"><%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                         <% end %>
                       </h3>
                       <span class="txt-grey fl "><%= format_date activity.updated_on %></span>
@@ -125,12 +126,12 @@
                     <% iamge_path = get_image_path_from_content(activity.description) %>
                     <div class="sn-news-small mb18">
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                          <%= link_to image_tag("/images/default_blank/left-03.jpg", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                       <% end %>
                       <h3>
-                        <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                        <div class="sn-title-wrap"><%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                       </h3>
                       <span class="txt-grey fl "><%= format_date activity.created_on %></span>
                       <div class="cl"></div>
@@ -145,7 +146,7 @@
         <% if org_acts.blank? %>
             <%= render :partial => 'organizations/org_subfield_leftM2_default', :locals => {:field => field} %>
         <% else %>
-            <% org_acts.first(4).each do |activity| %>
+            <% org_acts[1..4].each do |activity| %>
                 <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
                     <% document = activity.org_act %>
                     <% org_subfield_id = params[:org_subfield_id] %>
@@ -153,12 +154,12 @@
                     <% iamge_path = get_image_path_from_content(document.content) %>
                     <div class="sn-news-small mb18">
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                          <%= link_to image_tag("/images/default_blank/left-03.jpg", :width => "85", :height => "85"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                       <% end %>
                       <h3>
-                        <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                        <div class="sn-title-wrap"><%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                       </h3>
                       <span class="txt-grey fl "><%= format_date document.created_at %></span>
                       <div class="cl"></div>
@@ -175,15 +176,15 @@
                         <% if message.board.org_subfield_id %>
                             <div class="sn-news-small mb18">
                               <% if iamge_path.nil? %>
-                                  <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                                  <%= link_to image_tag("/images/default_blank/left-03.jpg", :width => "85", :height => "85"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                               <% else %>
                                   <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                               <% end %>
                               <h3>
                                 <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
-                                    <%= link_to message.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                                    <div class="sn-title-wrap"><%= link_to message.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                                 <% else %>
-                                    <%= link_to message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                                    <div class="sn-title-wrap"><%= link_to message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                                 <% end %>
                               </h3>
                               <span class="txt-grey fl "><%= format_date message.created_on %></span>
@@ -192,15 +193,15 @@
                         <% else %>
                             <div class="sn-news-small mb18">
                               <% if iamge_path.nil? %>
-                                  <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                                  <%= link_to image_tag("/images/default_blank/left-03.jpg", :width => "85", :height => "85"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                               <% else %>
                                   <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                               <% end %>
                               <h3>
                                 <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
-                                    <%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "h4-title fl mt10" %>
+                                    <div class="sn-title-wrap"><%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                                 <% else %>
-                                    <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "h4-title fl mt10" %>
+                                    <div class="sn-title-wrap"><%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                                 <% end %>
                               </h3>
                               <span class="txt-grey fl "><%= format_date message.created_on %></span>
@@ -213,12 +214,12 @@
                         <% iamge_path = get_image_path_from_content(news.description) %>
                         <div class="sn-news-small mb18">
                           <% if iamge_path.nil? %>
-                              <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), news_path(news), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                              <%= link_to image_tag("/images/default_blank/left-03.jpg", :width => "85", :height => "85"), news_path(news), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                           <% else %>
                               <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), news_path(news), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                           <% end %>
                           <h3>
-                            <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "h4-title fl mt10" %>
+                            <div class="sn-title-wrap"><%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                           </h3>
                           <span class="txt-grey fl "><%= format_date news.created_on %></span>
                           <div class="cl"></div>
@@ -231,3 +232,14 @@
 <% end %>
 <div class="cl"></div>
 </div>
+<script>
+      $(".h4-title").each(function(){
+          var titleHeight = $(this).height();
+          if (titleHeight > 52){
+              $(this).next().show();
+          }
+          else {
+              $(this).next().hide();
+          }
+      });
+</script>

app/views/organizations/_org_subfield_leftM2_default.html.erb

@@ -1,26 +1,38 @@
-<div class="sn-news-smallbox fl">
 <div class="sn-news-small mb18">
-    <a href="javascript:void()" target="_blank" class="sn-news-smallimg fl"><img src="/images/news/img-news-small01.jpg" width="85" height="85" alt=""/></a>
-    <h4><a href="javascript:void()" target="_blank" class="h4-title fl mt10">北斗开放实验室迎湖南省省直机关领导调研参观</a></h4>
-    <span class="txt-grey fl">2016-04-08</span>
+  <a href="javascript:void(0);" target="_blank" class="sn-news-smallimg fl"><img src="/images/default_blank/left-03.jpg" width="85" height="85" alt=""/></a>
+  <h4><div class="sn-title-wrap"><a href="javascript:void(0);" target="_blank" class="h4-title fl mt10">帖子标题</a><span class="title-ellipsis"></span></div></h4>
+  <span class="txt-grey fl">时间</span>
   <div class="cl"></div>
 </div>
 <div class="sn-news-small mb18">
-    <a href="javascript:void()" target="_blank" class="sn-news-smallimg fl"><img src="/images/news/img-news-small02.jpg" width="85" height="85" alt=""/></a>
-    <h4><a href="javascript:void()" target="_blank" class="h4-title fl mt10">北斗开放实验室迎湖南省省直机关领导调研参观</a></h4>
-    <span class="txt-grey fl">2016-04-08</span>
+  <a href="javascript:void(0);" target="_blank" class="sn-news-smallimg fl"><img src="/images/default_blank/left-03.jpg" width="85" height="85" alt=""/></a>
+  <h4><div class="sn-title-wrap"><a href="javascript:void(0);" target="_blank" class="h4-title fl mt10">帖子标题</a><span class="title-ellipsis"></span></div></h4>
+  <span class="txt-grey fl">时间</span>
   <div class="cl"></div>
 </div>
   <div class="sn-news-small mb18">
-    <a href="javascript:void()" target="_blank" class="sn-news-smallimg fl"><img src="/images/news/img-news-small03.jpg" width="85" height="85" alt=""/></a>
-    <h4><a href="javascript:void()" target="_blank" class="h4-title fl mt10">北斗开放实验室迎湖南省省直机关领导调研参观</a></h4>
-    <span class="txt-grey fl">2016-04-08</span>
+    <a href="javascript:void(0);" target="_blank" class="sn-news-smallimg fl"><img src="/images/default_blank/left-03.jpg" width="85" height="85" alt=""/></a>
+    <h4><div class="sn-title-wrap"><a href="javascript:void(0);" target="_blank" class="h4-title fl mt10">帖子标题</a><span class="title-ellipsis"></span></div></h4>
+    <span class="txt-grey fl">时间</span>
     <div class="cl"></div>
   </div>
   <div class="sn-news-small ">
-    <a href="javascript:void()" target="_blank" class="sn-news-smallimg fl"><img src="/images/news/img-news-small04.jpg" width="85" height="85" alt=""/></a>
-    <h4><a href="javascript:void()" target="_blank" class="h4-title fl mt10">北斗开放实验室迎湖南省省直机关领导调研参观</a></h4>
-    <span class="txt-grey fl">2016-04-08</span>
+    <a href="javascript:void(0);" target="_blank" class="sn-news-smallimg fl"><img src="/images/default_blank/left-03.jpg" width="85" height="85" alt=""/></a>
+    <h4><div class="sn-title-wrap"><a href="javascript:void(0);" target="_blank" class="h4-title fl mt10">帖子标题</a><span class="title-ellipsis"></span></div></h4>
+    <span class="txt-grey fl">时间</span>
     <div class="cl"></div>
 </div>
-</div>
+
+<script>
+    $(document).ready(function(){
+        $(".h4-title").each(function(){
+            var titleHeight = $(this).height();
+            if (titleHeight > 52){
+                $(this).next().show();
+            }
+            else {
+                $(this).next().hide();
+            }
+        });
+    });
+</script>

app/views/organizations/_org_subfield_leftMD.html.erb

@@ -1,24 +1,31 @@
-<div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
-  <h2 class="h2-title"><%= field.name %><a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
-  <div class="sn-index-resourcescon">
+
   <% if is_default_field?(field) %>
       <% case field.name %>
       <% when 'course' %>
           <% if @course_acts.blank? %>
+              <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+                <h2 class="h2-title"><%= field.name %></h2>
+                <div class="sn-index-resourcescon">
                     <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
+                    <div class="cl"></div>
+                </div>
+              </div>
           <% else %>
+              <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+                <h2 class="h2-title"><%= field.name %><a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
+                <div class="sn-index-resourcescon">
                   <% @course_acts.first(4).each do |act| %>
                       <% if act.org_act_type == "HomeworkCommon" %>
                           <% activity = HomeworkCommon.find(act.org_act_id) %>
                           <% iamge_path = get_image_path_from_content(activity.description) %>
                           <div class="sn-index-resourcesbox">
                             <% if iamge_path.nil? %>
-                            <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                                <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "185", :height => "125"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
                             <% end %>
                             <h3>
-                          <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "resources-title" %>
+                              <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                             </h3>
                             <div class="resources-tagbox">
                               <%= link_to activity.description.to_s.html_safe, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
@@ -30,15 +37,15 @@
                           <% iamge_path = get_image_path_from_content(activity.content) %>
                           <div class="sn-index-resourcesbox">
                             <% if iamge_path.nil? %>
-                            <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                                <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
                             <% end %>
                             <h3>
                               <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
-                              <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-title" %>
+                                  <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                               <% else %>
-                              <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-title" %>
+                                  <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                               <% end %>
                             </h3>
                             <div class="resources-tagbox">
@@ -51,12 +58,12 @@
                           <% iamge_path = get_image_path_from_content(activity.description) %>
                           <div class="sn-index-resourcesbox">
                             <% if iamge_path.nil? %>
-                            <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                                <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "185", :height => "125"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
                             <% end %>
                             <h3>
-                          <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "resources-title" %>
+                              <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                             </h3>
                             <div class="resources-tagbox">
                               <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
@@ -71,15 +78,15 @@
                           <% if ( activity.polls_status==2) %>
                               <div class="sn-index-resourcesbox">
                                 <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-resourcesimg" %>
+                                    <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "185", :height => "125"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-resourcesimg" %>
                                 <% else %>
                                     <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-resourcesimg" %>
                                 <% end %>
                                 <h3>
                                   <% if has_commit %>
-                                  <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "resources-title"  %>
+                                      <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "resources-title sn-hidden"  %>
                                   <% else %>
-                                  <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "resources-title"  %>
+                                      <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "resources-title sn-hidden"  %>
                                   <% end %>
                                 </h3>
                                 <div class="resources-tagbox">
@@ -90,23 +97,35 @@
                           <% end %>
                       <% end %>
                   <% end %>
+                  <div class="cl"></div>
+                </div>
+              </div>
           <% end %>
       <% when 'project' %>
           <% if @project_acts.blank? %>
+              <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+                <h2 class="h2-title"><%= field.name %></h2>
+                <div class="sn-index-resourcescon">
                   <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
+                  <div class="cl"></div>
+                </div>
+              </div>
           <% else %>
+              <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+                <h2 class="h2-title"><%= field.name %><a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
+                <div class="sn-index-resourcescon">
                   <% @project_acts.first(4).each do |act| %>
                       <% if act.org_act_type == "Issue" %>
                           <% activity = Issue.find(act.org_act_id) %>
                           <% iamge_path = get_image_path_from_content(activity.description) %>
                           <div class="sn-index-resourcesbox">
                             <% if iamge_path.nil? %>
-                            <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                                <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "185", :height => "125"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
                             <% end %>
                             <h3>
-                          <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "resources-title" %>
+                              <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                             </h3>
                             <div class="resources-tagbox">
                               <%= link_to activity.description.to_s.html_safe, issue_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
@@ -118,15 +137,15 @@
                           <% iamge_path = get_image_path_from_content(activity.content) %>
                           <div class="sn-index-resourcesbox">
                             <% if iamge_path.nil? %>
-                              <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                                <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
                             <% end %>
                             <h3>
                               <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
-                                <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-title" %>
+                                  <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                               <% else %>
-                                <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-title" %>
+                                  <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                               <% end %>
                             </h3>
                             <div class="resources-tagbox">
@@ -139,12 +158,12 @@
                           <% iamge_path = get_image_path_from_content(activity.description) %>
                           <div class="sn-index-resourcesbox">
                             <% if iamge_path.nil? %>
-                            <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                                <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
                             <% end %>
                             <h3>
-                            <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-title" %>
+                              <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                             </h3>
                             <div class="resources-tagbox">
                               <%= link_to activity.content.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
@@ -153,14 +172,27 @@
                           </div>
                       <% end %>
                   <% end %>
+                  <div class="cl"></div>
+                </div>
+              </div>
+
           <% end %>
       <% end %>
   <% else %>
       <% if field.field_type == "Post" %>
           <% org_acts = get_subfield_acts field %>
           <% if org_acts.blank? %>
+              <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+                  <h2 class="h2-title"><%= field.name %></h2>
+                  <div class="sn-index-resourcescon">
                   <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
+                  <div class="cl"></div>
+                </div>
+              </div>
           <% else %>
+              <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+                <h2 class="h2-title"><%= field.name %><a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
+                <div class="sn-index-resourcescon">
                   <% org_acts.first(4).each do |activity| %>
                       <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
                           <% document = activity.org_act %>
@@ -169,12 +201,12 @@
                           <% iamge_path = get_image_path_from_content(document.content) %>
                           <div class="sn-index-resourcesbox">
                             <% if iamge_path.nil? %>
-                            <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                                <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "185", :height => "125"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-resourcesimg" %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-resourcesimg" %>
                             <% end %>
                             <h3>
-                          <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "resources-title" %>
+                              <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                             </h3>
                             <div class="resources-tagbox">
                               <%= link_to document.content.to_s.html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "resources-tag" %>
@@ -193,15 +225,15 @@
                               <% if message.board.org_subfield_id %>
                                   <div class="sn-index-resourcesbox">
                                     <% if iamge_path.nil? %>
-                                    <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                                        <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "185", :height => "125"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-resourcesimg" %>
                                     <% else %>
                                         <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-resourcesimg" %>
                                     <% end %>
                                     <h3>
                                       <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
-                                      <%= link_to message.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "resources-title" %>
+                                          <%= link_to message.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                                       <% else %>
-                                      <%= link_to message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "resources-title" %>
+                                          <%= link_to message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                                       <% end %>
                                     </h3>
                                     <div class="resources-tagbox">
@@ -212,15 +244,15 @@
                               <% else %>
                                   <div class="sn-index-resourcesbox">
                                     <% if iamge_path.nil? %>
-                                    <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-resourcesimg" %>
+                                        <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "185", :height => "125"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-resourcesimg" %>
                                     <% else %>
                                         <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-resourcesimg" %>
                                     <% end %>
                                     <h3>
                                       <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
-                                      <%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "resources-title" %>
+                                          <%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "resources-title sn-hidden" %>
                                       <% else %>
-                                      <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "resources-title" %>
+                                          <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "resources-title sn-hidden" %>
                                       <% end %>
                                     </h3>
                                     <div class="resources-tagbox">
@@ -235,12 +267,12 @@
                               <% iamge_path = get_image_path_from_content(news.description) %>
                               <div class="sn-index-resourcesbox">
                                 <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), news_path(news), :target => "_blank", :class =>"sn-resourcesimg" %>
+                                    <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "185", :height => "125"), news_path(news), :target => "_blank", :class =>"sn-resourcesimg" %>
                                 <% else %>
                                     <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), news_path(news), :target => "_blank", :class =>"sn-resourcesimg" %>
                                 <% end %>
                                 <h3>
-                              <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "resources-title" %>
+                                  <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "resources-title sn-hidden" %>
                                 </h3>
                                 <div class="resources-tagbox">
                                   <%= link_to news.description.to_s.html_safe, news_path(news), :target => '_blank', :class => "resources-tag" %>
@@ -250,9 +282,10 @@
                           <% end %>
                       <% end %>
                   <% end %>
-          <% end %>
-      <% end %>
-  <% end %>
                   <div class="cl"></div>
                 </div>
               </div>
+
+          <% end %>
+      <% end %>
+  <% end %>

app/views/organizations/_org_subfield_leftMD_default.html.erb

@@ -1,11 +1,11 @@
 <div class="sn-index-resourcesbox">
-  <a href="javascript:void()" target="_blank" class="sn-resourcesimg"><img src="/images/default_blank/files-default.jpg" width="185" height="125" alt=""/></a>
-  <h3><a href="javascript:void()" target="_blank" class="resources-title">仪器资源</a></h3>
-  <div class="resources-tagbox">
-    <a href="javascript:void()" target="_blank" class="resources-tag">测试服务</a>
-    <a href="javascript:void()" target="_blank" class="resources-tag">开放日</a>
-    <a href="javascript:void()" target="_blank" class="resources-tag">仪器共享</a>
-    <a href="javascript:void()" target="_blank" class="resources-tag">定制测试</a>
-  </div>
-  <a href="javascript:void()" target="_blank" class="more-btn">更多</a>
+  <a href="javascript:void(0);" target="_blank" class="sn-resourcesimg"><img src="/images/default_blank/left-04.jpg" width="185" height="125" alt=""/></a>
+  <!--<h3><a href="javascript:void(0);" target="_blank" class="resources-title sn-hidden">仪器资源</a></h3>-->
+  <!--<div class="resources-tagbox">-->
+    <!--<a href="javascript:void(0);" target="_blank" class="resources-tag">测试服务</a>-->
+    <!--<a href="javascript:void(0);" target="_blank" class="resources-tag">开放日</a>-->
+    <!--<a href="javascript:void(0);" target="_blank" class="resources-tag">仪器共享</a>-->
+    <!--<a href="javascript:void(0);" target="_blank" class="resources-tag">定制测试</a>-->
+  <!--</div>-->
+  <!--<a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>-->
 </div>

app/views/organizations/_org_subfield_leftT.html.erb

@@ -14,7 +14,7 @@
                           <% iamge_path = get_image_path_from_content(activity.description) %>
                           <div class="fcon" style="display: none;">
                             <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), student_work_index_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
+                                <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), student_work_index_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), student_work_index_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% end %>
@@ -25,7 +25,7 @@
                           <% iamge_path = get_image_path_from_content(activity.content) %>
                           <div class="fcon" style="display: none;">
                             <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :style =>"opacity: 1; " %>
+                                <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% end %>
@@ -42,7 +42,7 @@
                           <% iamge_path = get_image_path_from_content(activity.description) %>
                           <div class="fcon" style="display: none;">
                             <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), news_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
+                                <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), news_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), news_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% end %>
@@ -58,7 +58,7 @@
                           <% if ( activity.polls_status==2) %>
                               <div class="fcon" style="display: none;">
                                 <% if iamge_path.nil? %>
-                                    <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :style =>"opacity: 1; " %>
+                                    <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :style =>"opacity: 1; " %>
                                 <% else %>
                                     <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :style =>"opacity: 1; " %>
                                 <% end %>
@@ -101,7 +101,7 @@
                           <% iamge_path = get_image_path_from_content(activity.description) %>
                           <div class="fcon" style="display: none;">
                             <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), issue_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
+                                <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), issue_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), issue_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% end %>
@@ -112,7 +112,7 @@
                           <% iamge_path = get_image_path_from_content(activity.content) %>
                           <div class="fcon" style="display: none;">
                             <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :style =>"opacity: 1; " %>
+                                <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% end %>
@@ -129,7 +129,7 @@
                           <% iamge_path = get_image_path_from_content(activity.description) %>
                           <div class="fcon" style="display: none;">
                             <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), news_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
+                                <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), news_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), news_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% end %>
@@ -172,7 +172,7 @@
                           <% iamge_path = get_image_path_from_content(document.content) %>
                           <div class="fcon" style="display: none;">
                             <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :style =>"opacity: 1; " %>
+                                <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% end %>
@@ -190,7 +190,7 @@
                                   <% iamge_path = get_image_path_from_content(content) %>
                                   <div class="fcon" style="display: none;">
                                     <% if iamge_path.nil? %>
-                                        <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :style =>"opacity: 1; " %>
+                                        <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :style =>"opacity: 1; " %>
                                     <% else %>
                                         <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :style =>"opacity: 1; " %>
                                     <% end %>
@@ -211,7 +211,7 @@
                                   <% iamge_path = get_image_path_from_content(content) %>
                                   <div class="fcon" style="display: none;">
                                     <% if iamge_path.nil? %>
-                                        <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), board_message_path(message.board,activity), :target => "_blank", :style =>"opacity: 1; " %>
+                                        <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), board_message_path(message.board,activity), :target => "_blank", :style =>"opacity: 1; " %>
                                     <% else %>
                                         <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), board_message_path(message.board,activity), :target => "_blank", :style =>"opacity: 1; " %>
                                     <% end %>
@@ -230,7 +230,7 @@
                               <% iamge_path = get_image_path_from_content(news.description) %>
                               <div class="fcon" style="display: none;">
                                 <% if iamge_path.nil? %>
-                                    <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), news_path(news), :target => "_blank", :style =>"opacity: 1; " %>
+                                    <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), news_path(news), :target => "_blank", :style =>"opacity: 1; " %>
                                 <% else %>
                                     <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), news_path(news), :target => "_blank", :style =>"opacity: 1; " %>
                                 <% end %>

app/views/organizations/_org_subfield_leftT_default.html.erb

@@ -3,7 +3,7 @@
     <div id="fsD1" class="focus">
         <div  class="fPic">
             <div class="fcon-default">
-                <a target="_blank" href="javascript:void(0);"><img src="/images/default_blank/banner-default.jpg" alt="" ></a>
+                <a><img src="/images/default_blank/left_01.jpg" alt="" ></a>
             </div>
         </div>
     </div>

app/views/organizations/_org_subfield_rightD.html.erb

@@ -17,7 +17,7 @@
                   <% flag = 2 %>
                   <% iamge_path = get_image_path_from_content(document.content) %>
                   <% if iamge_path.nil? %>
-                      <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
+                      <%= link_to image_tag("/images/default_blank/right-03.jpg", :width => "369", :height => "169"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
                   <% else %>
                       <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
                   <% end %>
@@ -27,14 +27,14 @@
                       <% if message.board.org_subfield_id %>
                           <% iamge_path = get_image_path_from_content(message.content) %>
                           <% if iamge_path.nil? %>
-                              <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
+                              <%= link_to image_tag("/images/default_blank/right-03.jpg", :width => "369", :height => "169"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
                           <% else %>
                               <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
                           <% end %>
                       <% else %>
                           <% iamge_path = get_image_path_from_content(message.content) %>
                           <% if iamge_path.nil? %>
-                              <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank" %>
+                              <%= link_to image_tag("/images/default_blank/right-03.jpg", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank" %>
                           <% else %>
                               <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank" %>
                           <% end %>
@@ -44,7 +44,7 @@
                       <% news = News.find(activity.org_act_id) %>
                       <% iamge_path = get_image_path_from_content(news.description) %>
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), news_path(news), :target => "_blank" %>
+                          <%= link_to image_tag("/images/default_blank/right-03.jpg", :width => "369", :height => "169"), news_path(news), :target => "_blank" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), news_path(news), :target => "_blank" %>
                       <% end %>
@@ -53,7 +53,7 @@
             </div>
         <% else %>
             <div class="sn-index-smallbanner" style="display:<%= field.hide == 0?'block':'none' %>;">
-              <a href="javascript:void(0);" target="_blank" ><img  src="/images/default_blank/ad-default.jpg" width="369" height="169" alt=""/></a>
+              <a href="javascript:void(0);" target="_blank" ><img  src="/images/default_blank/right-03.jpg" width="369" height="169" alt=""/></a>
             </div>
         <% end %>
     <% elsif field.field_type == "Resource" %>
@@ -61,12 +61,12 @@
         <div class="sn-index-smallbanner" style="display:<%= field.hide == 0?'block':'none' %>;">
           <% if !field.subfield_subdomain_dir.nil? %>
               <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %>
-                  <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %>
+                  <%= link_to image_tag("/images/default_blank/right-03.jpg", :width => "369", :height => "169"), show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %>
               <% else %>
-                  <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank"  %>
+                  <%= link_to image_tag("/images/default_blank/right-03.jpg", :width => "369", :height => "169"), show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank"  %>
               <% end %>
           <% else %>
-              <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank"  %>
+              <%= link_to image_tag("/images/default_blank/right-03.jpg", :width => "369", :height => "169"), org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank"  %>
           <% end %>
         </div>
     <% end %>

app/views/organizations/_org_subfield_rightM.html.erb

@@ -19,7 +19,7 @@
                   <h2 class="h2-title "><%= field.name %></h2>
                   <div class="sn-index-wx">
                     <% if iamge_path.nil? %>
-                        <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "fl sn-index-wximg" %>
+                        <%= link_to image_tag("/images/default_blank/right-02.jpg", :width => "104", :height => "104"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "fl sn-index-wximg" %>
                     <% else %>
                         <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "fl sn-index-wximg" %>
                     <% end %>
@@ -34,11 +34,11 @@
                           <h2 class="h2-title "><%= field.name %></h2>
                           <div class="sn-index-wx">
                             <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "fl sn-index-wximg" %>
+                                <%= link_to image_tag("/images/default_blank/right-02.jpg", :width => "104", :height => "104"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "fl sn-index-wximg" %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "fl sn-index-wximg" %>
                             <% end %>
-                            <p class="fl sn-index-txt"><%=link_to message.content.to_s.html_safe, board_message_url_in_org(message.board.id, message.id), :target => "_blank" %></p>
+                            <p class="fl sn-index-txt sn-w229"><%=link_to message.content.to_s.html_safe, board_message_url_in_org(message.board.id, message.id), :target => "_blank" %></p>
                             <div class="cl"></div>
                           </div>
                       <% else %>
@@ -46,11 +46,11 @@
                           <h2 class="h2-title "><%= field.name %></h2>
                           <div class="sn-index-wx">
                             <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), board_message_path(message.board, activity), :target => "_blank", :class => "fl sn-index-wximg" %>
+                                <%= link_to image_tag("/images/default_blank/right-02.jpg", :width => "104", :height => "104"), board_message_path(message.board, activity), :target => "_blank", :class => "fl sn-index-wximg" %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), board_message_path(message.board, activity), :target => "_blank", :class => "fl sn-index-wximg" %>
                             <% end %>
-                            <p class="fl sn-index-txt"><%=link_to message.content.to_s.html_safe, board_message_path(message.board, activity), :target => "_blank" %></p>
+                            <p class="fl sn-index-txt sn-w229"><%=link_to message.content.to_s.html_safe, board_message_path(message.board, activity), :target => "_blank" %></p>
                             <div class="cl"></div>
                           </div>
                       <% end %>
@@ -61,11 +61,11 @@
                       <h2 class="h2-title "><%= field.name %></h2>
                       <div class="sn-index-wx">
                         <% if iamge_path.nil? %>
-                            <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), news_path(news), :target => "_blank", :class => "fl sn-index-wximg" %>
+                            <%= link_to image_tag("/images/default_blank/right-02.jpg", :width => "104", :height => "104"), news_path(news), :target => "_blank", :class => "fl sn-index-wximg" %>
                         <% else %>
                             <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), news_path(news), :target => "_blank", :class => "fl sn-index-wximg" %>
                         <% end %>
-                        <p class="fl sn-index-txt"><%=link_to news.description.to_s.html_safe, news_path(news), :target => "_blank" %></p>
+                        <p class="fl sn-index-txt sn-w229"><%=link_to news.description.to_s.html_safe, news_path(news), :target => "_blank" %></p>
                         <div class="cl"></div>
                       </div>
                   <% end %>
@@ -75,8 +75,8 @@
             <div class="sn-index-wxbox" style="display:<%= field.hide == 0?'block':'none' %>;">
               <h2 class="h2-title "><%= field.name %></h2>
               <div class="sn-index-wx">
-                <img class="fl sn-index-wximg" src="/images/wx.gif" width="104" height="104" alt=""/>
-                <p class="fl sn-index-txt">暂无内容！</p>
+                <img class="fl sn-index-wximg" src="/images/default_blank/right-02.jpg" width="104" height="104" alt=""/>
+                <p class="fl sn-index-txt sn-w229">暂无内容！</p>
                 <div class="cl"></div>
               </div>
             </div>
@@ -86,12 +86,12 @@
         <div class="sn-index-smallbanner" style="display:<%= field.hide == 0?'block':'none' %>;">
           <% if !field.subfield_subdomain_dir.nil? %>
               <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %>
-                  <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %>
+                  <%= link_to image_tag("/images/default_blank/right-02.jpg", :width => "104", :height => "104"), show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %>
               <% else %>
-                  <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank"  %>
+                  <%= link_to image_tag("/images/default_blank/right-02.jpg", :width => "104", :height => "104"), show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank"  %>
               <% end %>
           <% else %>
-              <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank"  %>
+              <%= link_to image_tag("/images/default_blank/right-02.jpg", :width => "104", :height => "104"), org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank"  %>
           <% end %>
         </div>
     <% end %>

app/views/organizations/_org_subfield_rightT.html.erb

@@ -1,18 +1,22 @@
-<div class="sn-index-activebox" style="display:<%= field.hide == 0?'block':'none' %>;">
-<h2 class="h2-title mb18"><%= field.name %><a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
 <% if is_default_field?(field) %>
     <% case field.name %>
     <% when 'course' %>
         <% if @course_acts.blank? %>
+            <div class="sn-index-activebox" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <h2 class="h2-title mb18"><%= field.name %></h2>
               <%= render :partial => 'organizations/org_subfield_rightT_default', :locals => {:field => field} %>
+              <div class="cl"></div>
+            </div>
         <% else %>
+            <div class="sn-index-activebox" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <h2 class="h2-title mb18"><%= field.name %></h2>
               <% @course_acts.first(4).each do |act| %>
                   <% if act.org_act_type == "HomeworkCommon" %>
                       <% activity = HomeworkCommon.find(act.org_act_id) %>
                       <% iamge_path = get_image_path_from_content(activity.description) %>
                       <div class="sn-index-active">
                         <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/right_top.jpg", :width => "330", :height => "210"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+                            <%= link_to image_tag("/images/default_blank/right-01.jpg", :width => "330", :height => "210"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
                         <% else %>
                             <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
                         <% end %>
@@ -26,7 +30,7 @@
                       <% iamge_path = get_image_path_from_content(activity.content) %>
                       <div class="sn-index-active">
                         <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+                            <%= link_to image_tag("/images/default_blank/right-01.jpg", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
                         <% else %>
                             <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
                         <% end %>
@@ -44,7 +48,7 @@
                       <% iamge_path = get_image_path_from_content(activity.description) %>
                       <div class="sn-index-active">
                         <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+                            <%= link_to image_tag("/images/default_blank/right-01.jpg", :width => "330", :height => "210"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
                         <% else %>
                             <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
                         <% end %>
@@ -61,7 +65,7 @@
                       <% if ( activity.polls_status==2) %>
                           <div class="sn-index-active">
                             <% if iamge_path.nil? %>
-                              <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-activeimg" %>
+                                <%= link_to image_tag("/images/default_blank/right-01.jpg", :width => "330", :height => "210"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-activeimg" %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-activeimg" %>
                             <% end %>
@@ -77,18 +81,27 @@
                       <% end %>
                   <% end %>
               <% end %>
+              <div class="cl"></div>
+            </div>
+
         <% end %>
     <% when 'project' %>
         <% if @project_acts.blank? %>
-            <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
+            <div class="sn-index-activebox" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <h2 class="h2-title mb18"><%= field.name %></h2>
+              <%= render :partial => 'organizations/org_subfield_rightT_default', :locals => {:field => field} %>
+              <div class="cl"></div>
+            </div>
         <% else %>
+            <div class="sn-index-activebox" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <h2 class="h2-title mb18"><%= field.name %><a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
               <% @project_acts.first(4).each do |act| %>
                   <% if act.org_act_type == "Issue" %>
                       <% activity = Issue.find(act.org_act_id) %>
                       <% iamge_path = get_image_path_from_content(activity.description) %>
                       <div class="sn-index-active">
                         <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+                            <%= link_to image_tag("/images/default_blank/right-01.jpg", :width => "330", :height => "210"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
                         <% else %>
                             <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
                         <% end %>
@@ -102,7 +115,7 @@
                       <% iamge_path = get_image_path_from_content(activity.content) %>
                       <div class="sn-index-active">
                         <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+                            <%= link_to image_tag("/images/default_blank/right-01.jpg", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
                         <% else %>
                             <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
                         <% end %>
@@ -120,7 +133,7 @@
                       <% iamge_path = get_image_path_from_content(activity.description) %>
                       <div class="sn-index-active">
                         <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+                            <%= link_to image_tag("/images/default_blank/right-01.jpg", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
                         <% else %>
                             <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
                         <% end %>
@@ -131,14 +144,22 @@
                       </div>
                   <% end %>
               <% end %>
+              <div class="cl"></div>
+            </div>
         <% end %>
     <% end %>
 <% else %>
     <% if field.field_type == "Post" %>
         <% org_acts = get_subfield_acts field %>
         <% if org_acts.blank? %>
-            <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
+            <div class="sn-index-activebox" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <h2 class="h2-title mb18"><%= field.name %></h2>
+              <%= render :partial => 'organizations/org_subfield_rightT_default', :locals => {:field => field} %>
+              <div class="cl"></div>
+            </div>
         <% else %>
+            <div class="sn-index-activebox" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <h2 class="h2-title mb18"><%= field.name %><a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
               <% org_acts.first(4).each do |activity| %>
                   <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
                       <% document = activity.org_act %>
@@ -147,7 +168,7 @@
                       <% iamge_path = get_image_path_from_content(document.content) %>
                       <div class="sn-index-active">
                         <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-activeimg" %>
+                            <%= link_to image_tag("/images/default_blank/right-01.jpg", :width => "330", :height => "210"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-activeimg" %>
                         <% else %>
                             <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-activeimg" %>
                         <% end %>
@@ -168,7 +189,7 @@
                           <% if message.board.org_subfield_id %>
                               <div class="sn-index-active">
                                 <% if iamge_path.nil? %>
-                                  <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-activeimg" %>
+                                    <%= link_to image_tag("/images/default_blank/right-01.jpg", :width => "330", :height => "210"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-activeimg" %>
                                 <% else %>
                                     <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-activeimg" %>
                                 <% end %>
@@ -184,7 +205,7 @@
                           <% else %>
                               <div class="sn-index-active">
                                 <% if iamge_path.nil? %>
-                                  <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-activeimg" %>
+                                    <%= link_to image_tag("/images/default_blank/right-01.jpg", :width => "330", :height => "210"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-activeimg" %>
                                 <% else %>
                                     <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-activeimg" %>
                                 <% end %>
@@ -204,7 +225,7 @@
                           <% iamge_path = get_image_path_from_content(news.description) %>
                           <div class="sn-index-active">
                             <% if iamge_path.nil? %>
-                              <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), news_path(news), :target => "_blank", :class =>"sn-activeimg" %>
+                                <%= link_to image_tag("/images/default_blank/right-01.jpg", :width => "330", :height => "210"), news_path(news), :target => "_blank", :class =>"sn-activeimg" %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), news_path(news), :target => "_blank", :class =>"sn-activeimg" %>
                             <% end %>
@@ -216,8 +237,8 @@
                       <% end %>
                   <% end %>
               <% end %>
+              <div class="cl"></div>
+            </div>
         <% end %>
     <% end %>
 <% end %>
-<div class="cl"></div>
-</div>

app/views/organizations/_org_subfield_rightT_default.html.erb

@@ -0,0 +1,5 @@
+<div class="sn-index-active">
+  <a href="javascript:void()" target="_blank" class="sn-activeimg"><img src="/images/default_blank/right-01.jpg" width="330" height="210" alt=""/></a>
+  <h3><a href="javascript:void()" target="_blank" class="active-title">北斗第二次工作会议在北京召议在北京召开议在北京召开开</a></h3>
+  <span class="txt-grey ">2016-04-08</span>
+</div>

app/views/organizations/_subfield_list.html.erb

@@ -1,10 +1,11 @@
-<ul class="orgListRow">
+<ul class="orgListRow borderBottomNone orgListBg">
   <li class="orgOrder fb">顺序</li>
   <li class="orgListUser fb">已有栏目</li>
   <li class="orgListStatus fb">状态</li>
   <li class="orgListStatusList fb fb">排列</li>
-  <li class="orgListStatus fb">类型</li>
-  <li class="orgListUser fb">域名目录</li>
+  <li class="orgListType fb">类型</li>
+  <li class="orgListCatalog fb">域名目录</li>
+  <li class="orgListOperation fb"><span class="mr10">操作</span></li>
   <div class="cl"></div>
 </ul>
 
@@ -13,10 +14,10 @@
         <% name = get_default_name(field) %>
         <ul class="orgListRow">
           <li class="orgOrder">
-            <div id="show_priority_<%= field.id %>" ondblclick="edit_priority('#show_priority_<%= field.id %>','#edit_priority_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3;" title="双击可编辑">
+            <div id="show_priority_<%= field.id %>" ondblclick="edit_priority('#show_priority_<%= field.id %>','#edit_priority_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3; width:30px; margin-left:20px;" title="双击可编辑">
               <%= field.priority %>
             </div>
-            <div id="edit_priority_<%= field.id %>" style="display:none;width:30px;">
+            <div id="edit_priority_<%= field.id %>" style="display:none; width:30px; margin-left:20px;">
               <input type="text" onblur="update_priority('#show_priority_<%= field.id %>','#edit_priority_<%= field.id %>','<%= field.id %>',$(this).val());" style="width:20px;" value="<%= field.priority %>"/>
             </div>
           </li>
@@ -30,24 +31,23 @@
                     <div class="update_status_class"><span  class="hidden"><%=field.status== 1 ? "列表" : "图片" %></span>
                       <a style="display: inline-block;" href="javascript:void(0)" class="pic_edit2"></a>
                     </div>
-                    <%= select( :name,:group_id, subfield_status_option,
-                                { :include_blank => false,:selected => field.status},
+                    <%= select( :name,:group_id, subfield_status_option_default, { :include_blank => false,:selected => field.status},
                            { :onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:56px;"}) %>
                 <% end %>
             <% end %>
 
           </li>
-          <li class="orgListStatus">默认</li>
-          <a href="javascript:void(0);" class="linkBlue fr mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"隐藏":"可见" %></a>
+          <li class="orgListType">默认</li>
+          <a href="javascript:void(0);" class="linkGrey fr mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"隐藏":"可见" %></a>
           <div class="cl"></div>
         </ul>
     <% else %>
         <ul class="orgListRow">
           <li class="orgOrder">
-            <div id="show_priority_<%= field.id %>" ondblclick="edit_priority('#show_priority_<%= field.id %>','#edit_priority_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3;" title="双击可编辑">
+            <div id="show_priority_<%= field.id %>" ondblclick="edit_priority('#show_priority_<%= field.id %>','#edit_priority_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3; width:30px; margin-left:20px;" title="双击可编辑">
               <%= field.priority %>
             </div>
-            <div id="edit_priority_<%= field.id %>" style="display:none;width:30px;">
+            <div id="edit_priority_<%= field.id %>" style="display:none; width:30px; margin-left:20px;">
               <input type="text" onblur="update_priority('#show_priority_<%= field.id %>','#edit_priority_<%= field.id %>','<%= field.id %>',$(this).val());" style="width:20px;" value="<%= field.priority %>"/>
             </div>
           </li>
@@ -73,10 +73,10 @@
 
             <% end %>
           </li>
-          <li class="orgListStatus"><%= field.field_type == "Post" ? "帖子" : "资源" %></li>
-          <li class="orgListUser hidden">
+          <li class="orgListType"><%= field.field_type == "Post" ? "帖子" : "资源" %></li>
+          <li class="orgListCatalog hidden">
             <% if Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 %>
-                <div id="sub_dir_show_<%= field.id %>" ondblclick="edit_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3;" title="双击可编辑">
+                <div id="sub_dir_show_<%= field.id %>" ondblclick="edit_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3;  width:30px; margin-left:20px;" title="双击可编辑">
                   <%= field.subfield_subdomain_dir.nil? ?  '未设置': field.subfield_subdomain_dir.name  %>
                 </div>
             <% else %>
@@ -89,16 +89,39 @@
             </div>
           </li>
           <%#= link_to "隐藏", hide_org_subfield_organizations_path(field), :method => 'post', :remote => true, :id => "hide_#{field.id}", :class => "linkBlue fr mr5" %>
-          <a href="javascript:void(0);" class="linkBlue fr mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"隐藏":"可见" %></a>
-          <%= link_to "删除", org_subfield_path(field), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkBlue fr mr10" %>
-          <a href="javascript:void(0);" class="linkBlue fr mr10" onclick="edit('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>');">编辑</a>
-
+          <li class="orgListOperation">
+            <a href="javascript:void(0);" class="linkGrey fr ml5 mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"隐藏":"可见" %></a>
+            <span class="fr">|</span>
+            <%= link_to "删除", org_subfield_path(field), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkGrey fr ml5 mr5" %>
+            <span class="fr">|</span>
+            <a href="javascript:void(0);" class="linkGrey fr ml5 mr5" onclick="edit('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>');">编辑</a>
+            <span class="fr">|</span>
+            <!--escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (Setting.cross_project_issue_relations? ? 'all' : nil)-->
+            <!--<a href="javascript:void(0);" class="linkGrey fr mr5" onclick="org_submain_new('<%#= escape_javascript new_org_subfield_sub_domain_path(:org_subfield_id => field.id, :field => field) %>');">添加二级目录</a>-->
+            <%= link_to("添加二级目录", new_org_subfield_sub_domain_path(:org_subfield_id => field.id, :field => field), :class => "linkGrey fr mr5", :remote => true) %>
+          </li>
           <div class="cl"></div>
+          <%= render :partial => 'organizations/subfield_sub_domains_list', :locals => {:field => field} %>
         </ul>
     <% end %>
 <% end %>
 
 <script>
+    function org_submain_new(url) {
+        alert(url);
+        $.post(
+                url,
+                function (data) {
+                }
+        );
+    }
+    //二级子目录样式处理
+    $(".orgListRow").each(function(){
+        $(this).children(".orgSubList:first").css({"border-top":"1px solid #e4e4e4","marginTop":"5px"});
+        $(this).children(".orgSubList:last").css("marginBottom","-5px");
+        $(this).children(".orgSubList:last").children("li:first").addClass("orgSubTree2");
+    });
+
     $(document).ready(function(){
         $(".pic_edit2").click(function(){
             $(this).parent().hide();

app/views/organizations/_subfield_sub_domains_list.html.erb

@@ -0,0 +1,84 @@
+<% sub_domains = field.sub_domains %>
+<% if sub_domains %>
+    <% sub_domains.each do |subdomain| %>
+        <ul class="orgSubList">
+          <li class="orgSubTree"></li>
+          <li class="orgSubNum ml5 mr5">
+            <div id="show_domain_priority_<%= subdomain.id %>" ondblclick="edit_priority('#show_domain_priority_<%= subdomain.id %>','#edit_domain_priority_<%= subdomain.id %>');"  class="subNumBlock" title="双击可编辑">
+              <%= subdomain.priority %>
+            </div>
+            <div id="edit_domain_priority_<%= subdomain.id %>" style="display:none; width:30px;">
+              <input type="text" onblur="domain_update_priority('#show_domain_priority_<%= subdomain.id %>','#edit_domain_priority_<%= subdomain.id %>','<%= subdomain.org_subfield.id %>','<%= subdomain.id %>',$(this).val());" style="width:20px;" value="<%= subdomain.priority %>"/>
+            </div>
+          </li>
+          <li class="orgSubColumn">
+            <div id="subsubdomain_show_<%= subdomain.id %>" class="subColumnControl"><%= subdomain.name %></div>
+            <div id="subsubdomain_edit_<%= subdomain.id %>" style="display:none;">
+              <input type="text" name="name" onblur="update_subfield_subdomain('#subsubdomain_show_<%= subdomain.id %>','#subsubdomain_edit_<%= subdomain.id %>','<%= subdomain.org_subfield.id %>','<%= subdomain.id %>',$(this).val());" value="<%= subdomain.name %>" style="width:70px;"/>
+            </div>
+          </li>
+          <li class="orgSubStatus">新增</li>
+          <li class="orgSubOrder">
+            默认
+          </li>
+          <li class="orgSubType"><%= subdomain.field_type == "Post" ? "帖子" : "资源" %></li>
+          <li class="orgListCatalog hidden"> -- </li>
+          <%#= link_to "隐藏", hide_org_subsubdomain_organizations_path(subdomain), :method => 'post', :remote => true, :id => "hide_#{subdomain.id}", :class => "linkBlue fr mr5" %>
+          <li class="orgSubOperation">
+            <a href="javascript:void(0);" class="linkGrey fr ml5 mr10" onclick="hide_domain($(this),'<%= subdomain.org_subfield.id %>','<%= subdomain.id %>');" id="hide_<%= subdomain.id %>"><%= subdomain.hide==0?"隐藏":"可见" %></a>
+            <span class="fr">|</span>
+            <%= link_to "删除", org_subfield_sub_domain_path(subdomain, :org_subfield_id => subdomain.org_subfield.id), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkGrey fr ml5 mr5" %>
+            <span class="fr">|</span>
+            <a href="javascript:void(0);" class="linkGrey fr ml5 mr5" onclick="edit('#subsubdomain_show_<%= subdomain.id %>','#subsubdomain_edit_<%= subdomain.id %>');">编辑</a>
+          </li>
+          <div class="cl"></div>
+        </ul>
+    <% end %>
+<% end %>
+
+<script>
+    function update_subfield_subdomain(show_id, edit_id, field_id, domain_id, input_value) {
+        if ($(show_id).html().trim() != input_value.trim()) {
+            if (confirm('确定修改为' + input_value + "?"))
+                $.ajax({
+                    url: "/org_subfields/" + field_id + "/sub_domains/"  + domain_id + "?name=" + input_value,
+                    type: 'put'
+                });
+            else{
+                $(edit_id).children("input").val($(show_id).html().trim());
+            }
+        }
+        $(show_id).show();
+        $(edit_id).hide();
+//       $(edit_id).focus();
+    }
+
+
+    function domain_update_priority(show_id, edit_id, field_id, domain_id, input_value){
+        var re = /^[0-9]*[1-9]*[0-9]$/
+        if(re.test(input_value) && $(show_id).html().trim() != input_value.trim() && input_value.trim() != ''){
+            $.ajax({
+                url: "/org_subfields/" + field_id + "/sub_domains/"  + domain_id + "/domain_update_priority?priority=" + input_value,
+                type: 'put'
+            });
+        }
+        else{
+            $(edit_id).children("input").val($(show_id).html().trim());
+        }
+        $(show_id).show();
+        $(edit_id).hide();
+    }
+
+    function hide_domain(content, field_id, domain_id){
+        if (content.text() == '隐藏')
+            $.ajax({
+                url: "/org_subfields/" + field_id + "/sub_domains/"  + domain_id + "/hide_sub_domain",
+                type: "post"
+            });
+        else
+            $.ajax({
+                url: "/org_subfields/" + field_id + "/sub_domains/"  + domain_id + "/show_sub_domain",
+                type: "post"
+            });
+    }
+</script>

app/views/organizations/setting.html.erb

@@ -128,41 +128,43 @@
         <div class="cl"></div>
       </div>
       <div class="undis ml15 mr15" id="orgContent_3">
-        <div class="orgMemberList" id="org_subfield_list">
-          <%= render :partial => 'organizations/subfield_list', :locals => {:subfields => @organization.org_subfields.order("priority")} %>
-        </div>
-        <div class="fr orgMemContainer">
-          <div class="fr">
-            <p class="fontBlue fb mb5">新增栏目</p>
+<!--新增二级栏目-->
+      <div>
         <%= form_tag url_for(:controller => 'org_subfields', :action => 'create', :organization_id => @organization.id), :id=> 'add_subfield_form',:remote => true do %>
+            <span class="fontGrey3 fb mb5 mr10" >新增一级栏目</span>
             <input type="text" id="subfield_name" name="name" placeholder="栏目名称" class="orgAddSearch mb10" />
-                <div class="mb5">
-                  <p class="fontGrey3"><span class="fb">域名目录</span>（用户自定义url，可选）</p>
+            <div class="mb10">
+              <span class="fontGrey3 fb mr10 ml24">域名目录</span>
               <% if domain %>
-                    <span class="fl"><%= domain.subname %>.trustie.net/</span><input id="sub_dir" class="fl personalUrl ml3" type="text" name="sub_dir" onfocus="observe_input_to_lowercase($(this));">
+                  <span><%= domain.subname %>.trustie.net/</span><input id="sub_dir" class="fl personalUrl ml3" type="text" name="sub_dir" onfocus="observe_input_to_lowercase($(this));">
               <% else %>
-                      <span class="fl" style="width:195px;">您还没有子域名，请先在左侧信息栏申请子域名</span>
+                  <span class="fontGrey2">(用户自定义url，可选) 您还没有子域名，请先在左侧信息栏申请子域名</span>
               <% end %>
               <div class="cl"></div>
             </div>
-                <ul class="orgAddRole">
-                  <li class="fontGrey3 fb mb10">栏目类型</li>
+            <ul class="orgAddRole mb10">
+              <li class="fontGrey3 fb ml24 mr10 fl">栏目类型</li>
               <li class="fl mr15">
                 <input type="radio" id="orgMng" value="Post" name="field_type" checked="checked"/>
                 <label for="orgMng">帖子</label>
               </li>
-                  <li class="fl">
+              <li class="fl mr15">
                 <input type="radio" id="orgMeb" value="Resource" name="field_type" />
                 <label for="orgMeb">资源</label>
               </li>
+              <!--<li class="fl">-->
+                <!--<input type="radio" id="orgCom" value="Complex" name="field_type" />-->
+                <!--<label for="orgMeb">综合</label>-->
+              <!--</li>-->
+              <li class="fr"><a href="javascript:void(0);" class="saveBtn db" onclick="add_org_subfield();">新增</a></li>
               <li class="cl"></li>
             </ul>
-                <div class="cl"></div>
-                <a href="javascript:void(0);" class="saveBtn db fl mt10" onclick="add_org_subfield();">确定</a>
         <% end %>
       </div>
+<!--over-->
+        <div class="orgColumnList" id="org_subfield_list">
+          <%= render :partial => 'organizations/subfield_list', :locals => {:subfields => @organization.org_subfields.order("priority")} %>
         </div>
-        <div class="cl"></div>
     </div>
 </div>
 <script>
@@ -170,6 +172,11 @@
       if ($("#subfield_name").val().trim() != "")
         $("#add_subfield_form").submit();
   }
+  function add_org_subfield_subdomain(){
+      if ($("#subfield_name_subdomain").val().trim() != "")
+      $("#add_subfield_form_subdomain").submit();
+      $("#org_subfield_list").html('<%= escape_javascript(render(:partial => 'organizations/subfield_list', :locals => {:subfields => @organization.org_subfields.order("priority")}  )) %>');
+  }
   var $is_exist = false;
   function apply_subdomain(id, domain){
       var reg = new RegExp("^[a-zA-Z0-9_]{1,}$");

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

app/views/sub_document_comments/_new.html.erb

@@ -0,0 +1,70 @@
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+    <%= javascript_include_tag "des_kindEditor"  %>
+<% end %>
+
+<script>
+    $(function(){
+        init_des_data(150);
+    });
+    function check_org_title()
+    {
+        if($("#document_title").val().trim() == "")
+        {
+            $("#doc_title_hint").html("<span class='c_red'>标题不能为空</span>").show();
+            return false;
+        }
+        else
+        {
+            $("#doc_title_hint").hide();
+            return true;
+        }
+    }
+    function create_org_document()
+    {
+        if(check_org_title() == true)
+        {
+            org_document_description_editor.sync();
+            $('#new_sub_document_form').submit();
+        }
+    }
+    function cancel_create_org_document(){
+        $("#document_title").val("");
+        //org_document_description_editor.html("");
+        //org_document_description_editor.sync();
+        $('#sub_document_editor').hide();
+        $('#doc_title_hint').hide();
+    }
+</script>
+<div class="resources" nhname="new_topic_form">
+  <%= form_tag org_subfield_sub_domain_sub_document_comments_path(:org_subfield_id => @org_subfield.id, :sub_domain_id => @subdomain.id), :id => 'new_sub_document_form' do |f| %>
+      <div>
+        <input class="postDetailInput fl" maxlength="250" name="sub_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#sub_document_editor').show();" placeholder="请输入文章标题" />
+      </div>
+      <div id="doc_title_hint"></div>
+      <div class="cl"></div>
+      <div id="sub_document_editor" class="mt10" style="display: none">
+        <div>
+          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='description_textarea' name="sub_document_comment[content]"></textarea>
+          <%#= kindeditor_tag 'sub_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>
+        <p id="e_tip" class="c_grey"></p>
+        <p id="e_tips" class="c_grey"></p>
+        <div class="cl"></div>
+        <div class="mt10">
+          <div class="fl" id="topic_attachments">
+            <%#= render :partial => 'sub_document_comments/attachment', :locals => {:container => nil} %>
+          </div>
+        </div>
+        <div class="cl"></div>
+        <div class="mt5">
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" id="new_topic_submit_btn">确定</a>
+          <span class="fr mr10 mt3">或</span>
+          <a href="javascript:void(0);" id="new_topic_cancel_btn" class="fr mr10 mt3">取消</a>
+          <div class="cl"></div>
+        </div>
+      </div>
+  <% end %>
+</div>

app/views/sub_document_comments/_show_newstyle.html.erb

@@ -0,0 +1,54 @@
+<div class="sn-innner-content">
+  <div class="sn-row sn-bg-white">
+    <div class="sn-content-position sn-hidden"> 您的位置：<%= link_to "首页", organization_path(@organization), :class => "sn-link-grey2" %> &gt;
+      <%=  @org_subfield.name %> &gt;
+      <%= link_to @subdomain.name, org_subfield_sub_domain_path(@subdomain), :class => "sn-link-grey2" %> &gt;
+      <%= link_to @document.title, org_subfield_sub_domain_sub_document_comment_path(@document), :class => "sn-link-grey2"  %> </div>
+  </div>
+  <div class="sn-inner-newslist">
+    <h2 class="sn-inner-newsh2 sn-hidden"><%= @document.title %></h2>
+    <div class="sn-inner-newscon">
+      <p class=" sn-inner-psmall">来源：<%= @organization.name %> 发布时间:：<%= format_date(@document.created_at) %>  浏览：<%= @organization.visits %>次</p>
+      <p class=" sn-inner-pcon"><%= @document.content.html_safe %></p>
+    </div>
+  </div>
+  <!--回复-->
+  <% if User.current.logged? %>
+      <% comments_for_doc = @document.children.reorder("created_at desc") %>
+      <% count = @document.children.count() %>
+      <div class="sn-replybox">
+        <h2 class="sn-reply-h2">留言板<span class="sn-fr sn-f14 sn-font-grey3 sn-mt10"><%= count %>条留言</span></h2>
+        <%= form_for :org_comment, :url => {:action => 'add_reply_in_doc',:controller => 'sub_document_comments', :id => @document.id, :flag => true}, :html => {:multipart => true, :id => 'message_form', :class => "sn-reply-form", } do |f| %>
+            <textarea class="sn-reply-text" name="sub_content" ></textarea>
+            <%#= f.kindeditor :sub_content,:width=>'99%',:height => '100px;',:editor_id=>'message_content_editor', :class => "sn-reply-text" %>
+            <div class="sn-reply-btnbox">
+              <%= link_to l(:button_reply), "javascript:void(0)", :onclick => "$('#message_form').submit();", :class => "submit-btn" %>
+            </div>
+            <%#= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'message_content_editor.html("");', :class => " grey_btn fr c_white mt10 mr5" %>
+        <% end %>
+
+        <div class="sn-reply-comment">
+          <h2 class="sn-comment-h2">全部评论</h2>
+
+            <div id="newstyle_reply_div_<%= document.id %>" style="display:<%= count == 0 ? 'none' : 'block' %>">
+              <% comments_for_doc.each_with_index  do |reply,i| %>
+                  <div class="sn-comment-listbox">
+                    <a href="javascript:void(0)"  class="sn-reply-userpic fl"><img  src="images/img-news-con.jpg" width="824" height="522" alt="" /></a>
+                    <%= link_to User.find(reply.creator_id).realname, user_url_in_org(reply.creator_id), :class => "sn-reply-username fl" %><span class="fl"><%= time_from_now(reply.created_at) %></span>
+                    <p class="fl sn-reply-usertxt "><%= reply.content.html_safe unless reply.content.nil? %></p>
+                    <!--<a href="javascript:void(0)" target="_blank" class="sn-reply-zan fl">（100）</a>-->
+                    <div class="cl"></div>
+                  </div>
+              <% end %>
+            </div>
+            <% if count > 3 %>
+                <div class="sn-reply-more">
+                  <a id="reply_btn_<%= document.id %>" onclick="expand_reply('#newstyle_reply_div_<%= document.id %> li','#reply_btn_<%=document.id%>')" data-count="<%= count %>" data-init="0" href="javascript:void(0)" value="show_help">
+                    展开回复
+                  </a>
+                </div>
+            <% end %>
+          </div>
+      </div>
+  <% end %>
+</div>

app/views/sub_document_comments/_show_sub_document.html.erb

@@ -0,0 +1,158 @@
+<div class="resources mt10" id="organization_document_<%= document.id %>">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait">
+      <%= link_to image_tag(url_to_avatar(User.find(document.creator_id)), :width => 45, :heigth => 45), user_url_in_org(document.creator_id) %>
+      <%= render :partial => 'users/show_detail_info', :locals => {:user => User.find(document.creator_id)} %>
+    </div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo">
+        <%= link_to User.find(document.creator_id), user_url_in_org(document.creator.id), :class => "newsBlue mr15" %>
+        TO&nbsp;&nbsp;<%= link_to @organization.name, organization_path(@organization), :class => "newsBlue" %>
+        |
+        <span style="color:#269ac9;"><a class="newsBlue"><%= document.sub_domain.name %></a></span>
+        <%# if document.organization.home_id == document.id %>
+            <!--<span class="red_homework_btn_cir ml5">已设为首页</span>-->
+        <%# end %>
+      </div>
+      <div class="homepagePostTitle postGrey"><a><%= link_to document.title, org_subfield_sub_domain_sub_document_comment_path(document, :org_subfield_id=> @org_subfield.id, :sub_domain_id => document.sub_domain.id) %></a></div>
+      <div class="homepagePostDate fl">
+        发布时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %>
+      </div>
+      <div class="homepagePostDate fl ml15" id="sub_document_update_time_<%= document.id %>">
+        更新时间：<%= format_time(OrgActivity.where("org_act_type='#{document.class}' and org_act_id =#{document.id}").first.updated_at) %>
+      </div>
+      <div class="cl"></div>
+      <% unless document.content.blank? %>
+          <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id => document.id, :content => document.content} %>
+      <% end %>
+      <div class="cl"></div>
+      <div id="intro_content_show_<%= document.id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
+      <div id="intro_content_hide_<%= document.id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
+      <div class="cl"></div>
+      <div class="mt10" style="font-weight:normal;">
+        <%#= render :partial=>"attachments/activity_attach", :locals=>{:activity => document} %>
+      </div>
+      <!--    <%# if defined?(home_id) %>
+        <div style="float:right;">最后编辑：<%#= User.find() %></div>
+    <%# end %>-->
+      <% if User.current.admin? || User.current.admin_of_org?(@organization) || User.current.id == document.creator_id %>
+          <div class="homepagePostSetting">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <!--<li>-->
+                    <!--<%#= form_for('new_form', :url => {:controller => 'organizations', :action => 'set_homepage', :id => document.organization_id, :home_id => document.id, :show_homepage => 1}, :method => "put", :remote => true) do |f| %>-->
+                        <!--<a href="javascript:void(0);" class="postOptionLink" onclick="$(this).parent().submit();">设为首页</a>-->
+                    <!--<%# end %>-->
+                  <!--</li>-->
+                  <li>
+                    <%= link_to "编辑文章", edit_org_subfield_sub_domain_sub_document_comment_path(document, :org_subfield_id=> params[:org_subfield_id], :sub_domain_id => document.sub_domain.id, :flag => flag), :method => 'update', :class => "postOptionLink" %>
+                  </li>
+                  <li>
+                    <%= link_to "删除文章", org_subfield_sub_domain_sub_document_comment_path(document, :org_subfield_id=> params[:org_subfield_id], :sub_domain_id => document.sub_domain.id, :flag => flag), :method => 'delete',
+                                :data => {:confirm => l(:text_are_you_sure)},
+                                :remote => true, :class => 'postOptionLink' %>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+          </div>
+          <div class="cl"></div>
+      <% end %>
+      <!--over-->
+
+    </div>
+  </div>
+  <!--回复暂时不提供-->
+  <% comments_for_doc = document.children.reorder("created_at desc") %>
+  <% count = document.children.count() %>
+
+  <div class="homepagePostReply fl" style="background-color: #f1f1f1;" id="sub_document_comment_reply_<%= document.id %>">
+    <div class="homepagePostReplyBanner">
+      <div class="homepagePostReplyBannerCount">回复
+        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
+        <!--<span id="praise_count_<%#=document.id %>">-->
+          <!--<%# if document.creator_id.to_i == User.current.id.to_i %>-->
+            <!--<span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%#= get_praise_num(document) > 0 ? "（#{get_praise_num(document)}）" : "" %></span></span>-->
+          <!--<%# else %>-->
+            <!--<%#=render :partial=> "praise_tread/praise", :locals => {:activity=>document, :user_activity_id=>document.id,:type=>"activity"}%>-->
+          <!--<%# end %>-->
+        <!--</span>-->
+      </div>
+      <% if count > 3 %>
+          <div class="homepagePostReplyBannerMore">
+            <a id="reply_btn_<%= document.id %>" onclick="expand_reply('#reply_div_<%= document.id %> li','#reply_btn_<%=document.id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
+              展开更多
+            </a>
+          </div>
+      <% end %>
+    </div>
+    <div class="homepagePostReplyContainer" id="reply_div_<%= document.id %>" style="display:<%= count == 0 ? 'none' : 'block' %>">
+      <ul>
+        <% reply_id = 0 %>
+        <% comments_for_doc.each do |comment| %>
+            <% reply_id += 1 %>
+            <li style="display:<%= reply_id > 3 ? 'none' : '' %>">
+              <div class="homepagePostReplyPortrait"><%= link_to image_tag(url_to_avatar(User.find(comment.creator_id)), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_id) %></div>
+              <div class="homepagePostReplyDes">
+                <div class="homepagePostReplyPublisher">
+                  <%= link_to User.find(comment.creator_id), user_url_in_org(comment.creator_id), :class => "newsBlue mr10 f14" %>
+                  <%= format_activity_day(comment.created_at) %> <%= format_time(comment.created_at, false) %>
+                  <!--<span id="reply_praise_count_<%#=comment.id %>">-->
+                          <!--<%# if comment.creator_id.to_i == User.current.id.to_i %>-->
+                            <!--<span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%#= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>-->
+                          <!--<%# else %>-->
+                            <!--<%#=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>-->
+                          <!--<%# end %>-->
+                  <!--</span>-->
+                </div>
+                <% unless comment.content.blank? %>
+                    <div class="homepagePostReplyContent"><%= comment.content.html_safe %></div>
+                <% end %>
+              </div>
+              <div class="cl"></div>
+            </li>
+        <% end %>
+      </ul>
+    </div>
+    <div class="homepagePostReplyContainer borderBottomNone minHeight48">
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= act.id %>">
+        <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像"), user_url_in_org(User.current.id) %>
+      </div>
+      <div class="homepagePostReplyInputContainer">
+        <div nhname='new_message_<%= act.id %>' style="display:none;">
+          <%= form_for('new_form', :url => add_reply_org_subfield_sub_domain_sub_document_comment_path(:id => document.id, :act_id => act.id, :flag => flag), :method => "post", :remote => true) do |f| %>
+              <input type="hidden" name="org_activity_id" value="<%= act.id %>"/>
+              <div nhname='toolbar_container_<%= act.id %>'></div>
+              <textarea placeholder="有问题或建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= act.id %>' name="sub_content"></textarea>
+              <a id="new_message_submit_btn_<%= act.id %>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;line-height:18px;">发送</a>
+
+              <div class="cl"></div>
+              <p nhname='contentmsg_<%= act.id %>'></p>
+          <% end %>
+        </div>
+      </div>
+      <div class="cl"></div>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div>
+
+<script type="text/javascript">
+    function expand_reply(container, btnid) {
+        var target = $(container);
+        var btn = $(btnid);
+        if (btn.data('init') == '0') {
+            btn.data('init', 1);
+            btn.html('收起回复');
+            target.show();
+        } else {
+            btn.data('init', 0);
+            btn.html('展开更多');
+            target.hide();
+            target.eq(0).show();
+            target.eq(1).show();
+            target.eq(2).show();
+        }
+    }
+</script>

app/views/sub_document_comments/_show_sub_document_newstyle.html.erb

@@ -0,0 +1,32 @@
+<div class="sn-inner-body">
+  <div class="sn-innner-content">
+    <div class="sn-row sn-bg-white">
+      <div class="sn-content-position">
+        您的位置：<%= link_to "首页", organization_path(@organization), :class => "sn-link-grey2" %> &gt;
+        <%=  @org_subfield.name %> &gt;
+        <%= link_to @subdomain.name, org_subfield_sub_domain_path(@subdomain, :org_subfield_id => @org_subfield.id), :class => "sn-link-grey2" %>
+      </div>
+    </div>
+    <div class="sn-inner-newslist">
+      <h2 class="sn-inner-newsh2"><%= @subdomain.name %></h2>
+      <ul>
+        <% documents.each do |document| %>
+            <li>
+              <div class="sn-circle fl"></div><%=link_to document.title, org_subfield_sub_domain_sub_document_comment_path(document, :org_subfield_id => @org_subfield, :sub_domain_id => @subdomain), :class => "sn-newslist-titile fl", :target => "_blank" %>
+              <span class=" txt-grey fr"><%= time_from_now(document.created_at) %></span>
+              <a href="javascript:void(0)" target="_blank" class="sn-newslist-reply fr mr10">回复（<%= document.children.count %>）</a>
+              <!--<a href="javascript:void(0)" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>-->
+              <div class="cl"></div>
+            </li>
+        <% end %>
+      </ul>
+
+      <div>
+        <ul class="sn-inner-pages" id="pages" style="margin-top: 5px;">
+          <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => true, :remote => @is_remote, :flag => true %>
+          <div class="cl"></div>
+        </ul>
+      </div>
+    </div>
+  </div>
+</div>

app/views/sub_document_comments/add_reply.js.erb

@@ -0,0 +1,2 @@
+$("#organization_document_<%= @act.id %>").replaceWith("<%= escape_javascript(render :partial => 'sub_document_comments/show_sub_document', :locals => {:document => @document,:flag => params[:flag], :act => @act, :organization => @organization}) %>");
+sd_create_editor_from_data(<%= @act.id %>,"","100%", "<%=@act.class.to_s%>");

app/views/sub_document_comments/destroy.js.erb

@@ -0,0 +1,6 @@
+//location.reload();
+<% if params[:detail_page] %>
+window.location.href = '<%= org_subfield_sub_domain_sub_document_comments_path(@subdomain, :org_subfield_id => @org_subfield.id)%>';
+<% else %>
+window.location.reload();
+<% end %>

app/views/sub_document_comments/edit.html.erb

@@ -0,0 +1,63 @@
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+    <%= javascript_include_tag "des_kindEditor" %>
+<% end %>
+
+<script>
+    $(function(){
+        init_des_data(150);
+    });
+    function check_org_title()
+    {
+        if($("#document_title").val().trim() == "")
+        {
+            $("#doc_title_hint").html("<span class='c_red'>标题不能为空</span>").show();
+            return false;
+        }
+        else
+        {
+            $("#doc_title_hint").hide();
+            return true;
+        }
+    }
+</script>
+<div class="homepageRightBanner mb5" style="margin-bottom:5px;">
+  <div class="NewsBannerName">编辑文章</div>
+</div>
+<div class="cl"></div>
+<div>
+  <div class="resources" nhname="new_topic_form">
+    <%= form_tag url_for(:controller => 'org_document_comments',:action => 'update', :id => @org_document.id, :flag => @flag, :org_subfield_id => params[:org_subfield_id]),:method => 'put', :id => 'new_org_document_form' do |f| %>
+        <div>
+          <input class="postDetailInput fl mr15" style="margin-bottom:15px;" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" onblur="check_org_title();" value="<%= @org_document.title %>" />
+        </div>
+        <div id="doc_title_hint"></div>
+        <div class="cl"></div>
+        <div>
+          <div class="mt10">
+            <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='description_textarea' name="org_document_comment[content]"><%=@org_document.content.html_safe %></textarea>
+            <%#= 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>
+          <p id="e_tip" class="c_grey"></p>
+          <p id="e_tips" class="c_grey"></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" id="new_topic_submit_btn">确定</a>
+            <span class="fr mr10 mt3">或</span>
+            <a href="javascript:void(0);" id="new_topic_cancel_btn" onclick="location=document.referrer;" class="fr mr10 mt3">取消</a>
+            <div class="cl"></div>
+          </div>
+        </div>
+    <% end %>
+  </div>
+</div>

app/views/sub_document_comments/index.html.erb

@@ -0,0 +1,20 @@
+<% if @organization.switch_type %>
+    <% unless @documents.nil? %>
+        <%= render :partial => 'sub_document_comments/show_sub_document_newstyle', :locals => {:documents => @documents} %>
+    <% end %>
+<% else %>
+    <%= content_for(:header_tags) do %>
+        <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+    <% end %>
+    <%= render :partial => 'new' %>
+    <% unless @documents.nil? %>
+        <% @documents.each do |document| %>
+            <script>
+                        $(function() {
+                            sd_create_editor_from_data(<%= OrgActivity.where("org_act_type='SubDocumentComment'and org_act_id=?", document.id).first.id %>, null, "100%", "OrgActivity");
+                        });
+            </script>
+            <%= render :partial => 'sub_document_comments/show_sub_document', :locals => {:document => document, :act => OrgActivity.where("org_act_type='SubDocumentComment'and org_act_id=?", document.id).first, :flag => 0} %>
+        <% end %>
+    <% end %>
+<% end %>

app/views/sub_document_comments/new.html.erb

@@ -0,0 +1,71 @@
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+    <%= javascript_include_tag "des_kindEditor"  %>
+<% end %>
+
+<script>
+    $(function(){
+        init_des_data(150);
+    });
+    function check_org_title()
+    {
+        if($("#document_title").val().trim() == "")
+        {
+            $("#doc_title_hint").html("<span class='c_red'>标题不能为空</span>").show();
+            return false;
+        }
+        else
+        {
+            $("#doc_title_hint").hide();
+            return true;
+        }
+    }
+    function create_org_document()
+    {
+        if(check_org_title() == true)
+        {
+            org_document_description_editor.sync();
+            $('#new_sub_document_form').submit();
+        }
+    }
+    function cancel_create_org_document(){
+        location.href = document.referrer;
+    }
+</script>
+<div class="homepageRightBanner" style="margin-top:<%= User.current.logged? ? '0px':'10px' %>; margin-bottom:10px;">
+  <div class="NewsBannerName"><%= OrgSubfield.try(:find, params[:field_id]).try(:name) %></div>
+</div>
+<div class="resources" nhname="new_topic_form" >
+  <%= form_tag org_subfield_sub_domain_sub_document_comment_path(:org_subfield_id => @org_subfield.id, :sub_domain_id => @subdomain.id), :id => 'new_sub_document_form' do |f| %>
+      <div>
+        <input class="postDetailInput fl mr15"  name="sub_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#sub_document_editor').show();" placeholder="请输入文章标题"></input>
+      </div>
+      <div id="doc_title_hint">
+      </div>
+      <div class="cl"></div>
+      <div class="" >
+        <div class="mt10">
+          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='description_textarea' name="org_document_comment[content]"></textarea>
+          <%#= 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>
+        <p id="e_tip" class="c_grey"></p>
+        <p id="e_tips" class="c_grey"></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" id="new_topic_submit_btn">确定</a>
+          <span class="fr mr10 mt3">或</span>
+          <a href="javascript:void(0);" onclick="cancel_create_org_document();" id="new_topic_cancel_btn" class="fr mr10 mt3">取消</a>
+          <div class="cl"></div>
+        </div>
+      </div>
+  <% end %>
+</div>

app/views/sub_document_comments/show.html.erb

@@ -0,0 +1,182 @@
+<% if @organization.switch_type %>
+    <%= render :partial => 'sub_document_comments/show_newstyle', :locals => {:document => @document} %>
+<% else %>
+    <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"create_kindeditor",'blog' %>
+    <script>
+        $(function() {
+            sd_create_editor_from_data(<%= @document.id%>,null,"100%", "<%=@document.class.to_s%>");
+            showNormalImage('message_description_<%= @document.id %>');
+        });
+    </script>
+    <div class="resources" id="organization_document_<%= @document.id %>">
+      <div class="homepagePostBrief">
+        <div class="homepagePostPortrait">
+          <%= link_to image_tag(url_to_avatar(User.find(@document.creator_id)), :width => 45, :heigth => 45), user_url_in_org(@document.creator_id) %>
+        </div>
+        <div class="homepagePostDes">
+          <div class="homepagePostTo">
+            <%= link_to User.find(@document.creator_id), user_url_in_org(@document.creator_id), :class => "newsBlue mr15" %>
+            TO&nbsp;&nbsp;<%= link_to @organization.name, organization_path(@organization), :class => "newsBlue" %>
+            |
+            <%# if @organization.home_id == @document.id %>
+                <!--<span style="color:#269ac9;">首页</span>-->
+            <%# else %>
+                <!--<span style="color:#269ac9;">组织文章</span>-->
+            <%# end %>
+          </div>
+          <div class="homepagePostTitle postGrey"><%= link_to @document.title %></div>
+          <div class="homepagePostDate">
+            发布时间：<%= format_activity_day(@document.created_at) %> <%= format_time(@document.created_at, false) %></div>
+          <% unless @document.content.blank? %>
+              <div class="homepagePostIntro" style="width:640px;" id="intro_content_<%= @document.id%>">
+                <%= @document.content.html_safe %>
+              </div>
+          <% end %>
+          <div class=" fl">
+            <%#= render :partial=>"attachments/activity_attach", :locals=>{:activity => @document} %>
+            <%#= link_to_attachments_course @document, :author => false %>
+          </div>
+          <!--    <%# if defined?(home_id) %>
+        <div style="float:right;">最后编辑：<%#= User.find() %></div>
+    <%# end %>-->
+          <% if User.current.admin? || User.current.admin_of_org?(@organization) || User.current.id == @document.creator_id %>
+              <div class="homepagePostSetting">
+                <ul>
+                  <li class="homepagePostSettingIcon">
+                    <ul class="homepagePostSettiongText">
+                      <li>
+                        <%= form_for('new_form', :url => {:controller => 'organizations', :action => 'set_homepage', :id => @organization.id, :home_id => @document.id}, :method => "put", :remote => true) do |f| %>
+                            <a href="javascript:void(0);" class="postOptionLink" onclick="$(this).parent().submit();">设为首页</a>
+                        <% end %>
+                      </li>
+                      <li>
+                        <%#= link_to "编辑文章", edit_org_document_comment_path(:id => @document.id, :organization_id => @organization.id, :flag => 1), :class => "postOptionLink" %>
+                      </li>
+                      <li>
+                        <%#= link_to "删除文章", org_document_comment_path(:id => @document.id, :organization_id => @organization.id, :detail_page => 1), :method => 'delete',
+                                    :data => {:confirm => l(:text_are_you_sure)},
+                                    :remote => true, :class => 'postOptionLink' %>
+                      </li>
+                    </ul>
+                  </li>
+                </ul>
+              </div>
+              <div class="cl"></div>
+          <% end %>
+        </div>
+      </div>
+      <% comments_for_doc = @document.children.reorder("created_at desc") %>
+      <% count = @document.children.count() %>
+
+      <div class="homepagePostReply fl" style="background-color: #f1f1f1;" id="<%= @document.id %>">
+        <%# if count > 0 %>
+        <div class="homepagePostReplyBanner">
+          <div class="homepagePostReplyBannerCount">回复
+            <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
+            <!--<span id="praise_count_<%#=@document.id %>">-->
+            <%# if @document.creator_id.to_i == User.current.id.to_i %>
+                <!--<span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%#= get_praise_num(@document) > 0 ? "（#{get_praise_num(@document)}）" : "" %></span></span>-->
+            <%# else %>
+                <%#=render :partial=> "praise_tread/praise", :locals => {:activity=>@document, :user_activity_id=>@document.id,:type=>"activity"}%>
+            <%# end %>
+            <!--</span>-->
+          </div>
+          <% if count > 3 %>
+              <div class="homepagePostReplyBannerMore">
+                <a id="reply_btn_<%= document.id %>" onclick="expand_reply('#reply_div_<%= document.id %> li','#reply_btn_<%=document.id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
+                  展开更多
+                </a>
+              </div>
+          <% end %>
+        </div>
+        <div class="" id="reply_div_<%=  @document.id %>">
+          <% comments_for_doc.each_with_index  do |reply,i| %>
+              <script type="text/javascript">
+                  $(function(){
+                      showNormalImage('reply_message_description_<%= reply.id %>');
+                  });
+              </script>
+              <% user = User.find(reply.creator_id) %>
+              <div class="homepagePostReplyContainer" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id %>').hide();">
+                <div class="homepagePostReplyPortrait">
+                  <%= link_to image_tag(url_to_avatar(user), :width => 33,:height => 33), user_url_in_org(user.id) %>
+                </div>
+                <div class="homepagePostReplyDes">
+                  <%= link_to User.find(reply.creator_id).realname, user_url_in_org(reply.creator_id), :class => "newsBlue mr10 f14" %>
+                  <div class="homepagePostReplyContent upload_img break_word" id="reply_message_description_<%= reply.id %>">
+                    <%= reply.content.html_safe unless reply.content.nil? %>
+                  </div>
+                  <div style="margin-top: -7px; margin-bottom: 5px">
+                    <%= format_time(reply.created_at) %>
+                    <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
+                      <%#= link_to(
+                                  l(:button_reply),
+                                  {:controller => 'org_document_comments',:action => 'quote',:user_id=>reply.creator_id, :id => reply.id},
+                                  :remote => true,
+                                  :method => 'get',
+                                  :class => 'fr newsBlue mr10',
+                                  :title => l(:button_reply)) if User.current.logged? %>
+                      <%#= link_to(
+                                  l(:button_delete),
+                                  {:controller => 'org_document_comments',:action => 'delete_reply', :id => reply.id},
+                                  :method => :delete,
+                                  :class => 'fr newsGrey mr10',
+                                  :data => {:confirm => l(:text_are_you_sure)},
+                                  :title => l(:button_delete)
+                          ) if reply.creator_id == User.current.id %>
+                    </div>
+                  </div>
+                  <p id="reply_message_<%= reply.id %>"></p>
+                </div>
+                <div class="cl"></div>
+              </div>
+          <% end %>
+        </div>
+        <div class="cl"></div>
+        <%# end %>
+        <% if User.current.logged?%>
+            <div class="talkWrapMsg" nhname="about_talk_reply">
+              <em class="talkWrapArrow"></em>
+              <div class="cl"></div>
+              <div class="talkConIpt ml5 mb10" id="reply<%= @document.id %>">
+                <%= form_for :org_comment, :url => {:action => 'add_reply_in_doc', :controller => 'sub_document_comments', :id => @document.id}, :html => {:multipart => true, :id => 'message_form'} do |f| %>
+                    <%= f.kindeditor :sub_content,:width=>'99%',:height => '100px;',:editor_id=>'message_content_editor' %>
+                    <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'message_content_editor.html("");', :class => " grey_btn fr c_white mt10 mr5" %>
+                    <%= link_to l(:button_reply), "javascript:void(0)", :onclick => "message_content_editor.sync();$('#message_form').submit();", :class => "blue_btn fr c_white mt10 mb10", :style => "margin-right: 5px;" %>
+                <% end %>
+                <div class="cl"></div>
+              </div>
+            </div>
+        <% end %>
+      </div>
+    </div>
+
+    <script type="text/javascript">
+        $(function(){
+            $("#intro_content_<%= @document.id%> p,#intro_content_<%= @document.id%> span,#intro_content_<%= @document.id%> em").each(function(){
+                var postContent = $(this).html();
+                postContent = postContent.replace(/&nbsp;/g," ");
+                postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+                postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+                postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+                $(this).html(postContent);
+            });
+        });
+        function expand_reply(container, btnid) {
+            var target = $(container);
+            var btn = $(btnid);
+            if (btn.data('init') == '0') {
+                btn.data('init', 1);
+                btn.html('收起回复');
+                target.show();
+            } else {
+                btn.data('init', 0);
+                btn.html('展开更多');
+                target.hide();
+                target.eq(0).show();
+                target.eq(1).show();
+                target.eq(2).show();
+            }
+        }
+    </script>
+<% end %>

app/views/sub_domains/_new.html.erb

@@ -0,0 +1,27 @@
+<div class="org-popup-wrap sn-w300"> <a href="javascript:void(0);" class="org-popup-close"></a>
+  <div class="f16 fb fontBlue mb10">添加二级目录</div>
+  <%= form_tag url_for(:controller => 'sub_domains', :action => 'create', :org_subfield_id => field.id), :id=> 'add_subfield_form_subdomain',:remote => true do %>
+      <span class="fontGrey3 fb mb5 mr10">二级栏目名称</span>
+      <input type="text" id="subfield_name_subdomain" name="name" placeholder="栏目名称" class="orgAddSearch mb10" />
+      <ul class="orgAddRole mb10">
+        <li class="fontGrey3 fb ml24 mr10 fl">栏目类型</li>
+        <li class="fl mr15">
+          <input type="radio" id="orgMng" value="Post" name="field_type" checked="checked"/>
+          <label for="orgMng">帖子</label>
+        </li>
+        <!--<li class="fl mr15">-->
+          <!--<input type="radio" id="orgMeb" value="Resource" name="field_type" />-->
+          <!--<label for="orgMeb">资源</label>-->
+        <!--</li>-->
+        <li class="cl"></li>
+      </ul>
+      <div class="courseSendSubmit mr15"><a href="javascript:void(0);" class="sendSourceText" onclick="add_org_subfield_subdomain();hideModal()">确定</a></div>
+      <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal()">取消</a></div>
+  <% end %>
+  <div class="cl"></div>
+</div>
+
+
+<script type="javascript">
+
+</script>

app/views/sub_domains/create.js.erb

@@ -0,0 +1,8 @@
+<% if @res %>
+$("#org_subfield_list").html("");
+$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list', :locals => {:subfields => @organization.org_subfields.order("priority") }) %>");
+$("#sub_field_left_lists").html("");
+$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
+<% end %>
+$("#subfield_name").val("");
+$("#sub_dir").val("");

app/views/sub_domains/destroy.js.erb

@@ -0,0 +1,4 @@
+$("#org_subfield_list").html("");
+$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list', :locals => {:subfields => @organization.org_subfields.order("priority") }) %>");
+$("#sub_field_left_lists").html("");
+$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");

app/views/sub_domains/domain_update_priority.js.erb

@@ -0,0 +1,2 @@
+$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list',:locals => {:subfields => @organization.org_subfields.order("priority")}) %>");
+$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");

app/views/sub_domains/hide_sub_domain.js.erb

@@ -0,0 +1,3 @@
+$("#hide_<%= @subdomain.id %>").text("可见");
+$("#sub_domain_hide_<%= @subdomain.id %>").css("display", "none");
+$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");

app/views/sub_domains/new.js.erb

@@ -0,0 +1,6 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'sub_domains/new',:locals => {:field => @org_subfield}) %>');
+showModal('ajax-modal', '513px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+$('#ajax-modal').parent().css("top","40%").css("left","50%").css("border","3px solid #269ac9");
+$('#ajax-modal').parent().addClass("popbox_polls");

app/views/sub_domains/show.html.erb

@@ -0,0 +1,141 @@
+<div class="sn-inner-body">
+  <div class="sn-innner-content">
+    <div class="sn-row sn-bg-white">
+      <div class="sn-content-position sn-hidden">
+        您的位置：<%= link_to "首页", organizations_path(@organization), :class => "sn-link-grey2" %> > 数据资源 > 仿真数据
+      </div>
+    </div>
+    <div class="sn-inner-newslist">
+      <h2 class="sn-inner-newsh2">最新资讯</h2>
+      <ul>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研迎湖南省省直机关领导调研参观迎湖南省省直机关领导调研参观迎湖南省省直机关领导调研参观迎湖南省省直机关领导调研参观参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+      </ul>
+    </div>
+    <ul class="sn-inner-pages">
+      <li><a href="javascript:void(0);" class="sn-inner-pages-big" >上一页</a></li>
+      <li><a href="javascript:void(0);" class="sn-pages-active " >1</a></li>
+      <li><a href="javascript:void(0);" >2</a></li>
+      <li><a href="javascript:void(0);" >3</a></li>
+      <li><a href="javascript:void(0);" >...</a></li>
+      <li><a href="javascript:void(0);" >31</a></li>
+      <li><a href="javascript:void(0);" class="sn-inner-pages-big" >下一页</a></li>
+      <div class="cl"></div>
+    </ul>
+  </div>
+
+  <footer>
+    <!--footer-->
+    <div class="sn-row sn-bg-grey2">
+      <div class="sn-footer">
+        <ul class="sn-footer-link">
+          <li class="sn-mr50"><a href="javascript:void(0);" class="sn-link-white sn-f18">关于我们</a></li>
+          <li class="sn-mr50"><a href="javascript:void(0);" class="sn-link-white sn-f18">服务协议</a></li>
+          <li class="sn-mr50"><a href="javascript:void(0);" class="sn-link-white sn-f18">帮助中心</a></li>
+          <li><a href="javascript:void(0);" class="sn-link-white sn-f18">在线报名</a></li>
+        </ul>
+        <div class="sn-contact">联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org</div>
+        <div class="sn-address">地 址：湖南省长沙市开福区东风路89号观园大厦23层<br />
+          卫星导航仿真与测试开放实验室</div>
+      </div>
+    </div>
+  </footer>
+</div>

app/views/sub_domains/show_sub_domain.js.erb

@@ -0,0 +1,3 @@
+$("#hide_<%= @subdomain.id %>").text("隐藏");
+$("#sub_domain_hide_<%= @subdomain.id %>").css("display", "block");
+$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");

app/views/sub_domains/update.js.erb

@@ -0,0 +1,3 @@
+$("#subsubdomain_show_<%= @subdomain.id %>").html("<%= @subdomain.name %>");
+$("#sub_field_left_lists").html("");
+$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");

config/routes.rb

@@ -121,6 +121,32 @@ RedmineApp::Application.routes.draw do
         match "quote_resource_show_org_subfield", :via => [:get]
       end
     end
+
+    resources :sub_domains, :only => [:index, :new, :create, :show, :update, :destroy] do
+      resources :sub_document_comments, :only => [:index, :new, :create, :show, :update, :destroy] do
+        member do
+          post 'add_reply'
+          get 'quote'
+          post 'reply'
+          post 'add_reply_in_doc'
+          delete 'delete_reply'
+          get 'edit'
+        end
+        collection do
+        end
+      end
+
+      collection do
+      end
+      member do
+        match 'domain_update_sub_dir', :via => [:put]
+        match 'domain_update_priority', :via => [:put]
+        match 'domain_update_status', :via => [:post]
+        post 'hide_sub_domain'
+        post 'show_sub_domain'
+      end
+    end
+
     member do
       match 'update_sub_dir', :via => [:put]
       match 'update_priority', :via => [:put]

db/migrate/20160427070237_create_sub_domains.rb

@@ -0,0 +1,14 @@
+class CreateSubDomains < ActiveRecord::Migration
+  def change
+    create_table :sub_domains do |t|
+      t.integer :org_subfield_id
+      t.integer :priority, :default => false
+      t.string :name
+      t.string :field_type
+      t.integer :hide, :default => false
+      t.integer :status, :default => false
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20160428065243_create_sub_document_comments.rb

@@ -0,0 +1,17 @@
+class CreateSubDocumentComments < ActiveRecord::Migration
+  def change
+    create_table :sub_document_comments do |t|
+      t.text :content
+      t.text :title
+      t.integer :sub_domain_id
+      t.integer :creator_id
+      t.integer :parent_id
+      t.integer :reply_id
+      t.integer :locked
+      t.integer :sticky
+      t.integer :org_subfield_id
+
+      t.timestamps
+    end
+  end
+end

public/stylesheets/new_user.css

@@ -75,6 +75,7 @@ a.linkGrey6:hover {color:#ffffff !important;}
 .ml10{ margin-left:10px;}
 .ml15{ margin-left:15px;}
 .ml20{ margin-left:20px;}
+.ml24{margin-left:24px;}
 .ml36{ margin-left:36px; }
 .ml40{ margin-left:40px;}
 .ml45{ margin-left:45px;}

public/stylesheets/org.css

@@ -16,13 +16,15 @@
 .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 {padding:2px 10px; background-color:#269ac9; color:#ffffff;}
 a.saveBtn:hover {background-color:#297fb8;}
 .orgMemberList {width:480px; float:left;}
-.orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px;}
-.orgListUser {width:85px; float:left;}
+.orgColumnList {width:688px; float:left;}
+.orgListUser {width:120px; float:left;}
 .orgListRole {width:180px; float:left;}
-.orgOrder {width:30px; float:left;margin-right:10px;text-align:center;}
+.orgOrder {width:70px; float:left; text-align:center;}
+.orgSubNum {width:30px; float:left; text-align:center;}
+.subNumBlock {cursor:pointer;background-color:#fffce6;color: #0d90c3;  width:30px; height:17px; line-height:17px; margin:7px 0; vertical-align:middle;}
 .orgMemContainer {width:208px;}
 .orgMemberAdd {float:right;}
 .orgAddSearch {border:1px solid #dddddd; outline:none; width:180px; height:22px; color:#9b9b9b;}
@@ -67,7 +69,9 @@ a.org-cancel-btn:hover {background-color:#717171; color:#ffffff;}
 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;}
+.orgListRow {border-bottom:1px solid #e4e4e4; padding:5px 0; color:#555555; line-height:21px;}
+.orgSubList {height:31px; line-height:31px; vertical-align:middle; color:#555555;}
+.orgListBg {background-color:#eaebec;}
 .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;
@@ -75,8 +79,15 @@ a.linkGrey8:hover {color:#585858;}
 #orgUserName {display:inline-block;}
 .org_login_list a {color:#269ac9;}
 
-.orgListStatus {width:40px; float:left;}
-.orgListStatusList {width:58px; float:left;}
+.orgListStatus, .orgSubStatus {width:55px; float:left;}
+.orgListStatusList, .orgSubOrder {width:90px; float:left;}
+.orgListType, .orgSubType {width:55px; float:left;}
+.orgListCatalog, .orgSubCatalog {width:75px; float:left;}
+.orgListOperation, .orgSubOperation {width:223px; float:left; text-align:right;}
+.orgSubTree {width:20px; height:31px; background:url(/images/org_tree.png) 0 0 no-repeat; float:left; margin-left:30px;}
+.orgSubTree2 {width:20px; height:31px; background:url(/images/org_tree.png) 0 -45px no-repeat; float:left; margin-left:30px;}
+.orgSubColumn {width:100px; float:left;}
+.subColumnControl {width:90px; max-width:90px; margin-right:10px; float:left; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}
 .personalUrl {border:1px solid #dddddd; width:75px; outline:none; white-space:nowrap; padding-left:2px;}
 .reCon{ margin:5px; width:710px;}
 .retop{width:710px; height:40px; background:#eaeaea; padding:5px;}

public/stylesheets/org2.css

@@ -61,19 +61,23 @@ a.sn-link-select {color:#809df9;}
 .sn-bg-blue {background-color:#24366e;}
 .sn-login {width:1200px; height:45px; line-height:45px; margin:0 auto; font-size:14px; color:#24366e; vertical-align:middle; text-align:right;}
 .sn-login2 {width:1200px; height:54px; line-height:54px; margin:0 auto; font-size:14px; color:#24366e; vertical-align:middle; text-align:right;}
-.sn-logo {width:1200px; height:90px; line-height:90px; margin:0 auto; vertical-align:middle;}
+.sn-logo {width:1200px; height:90px; line-height:90px; margin:0 auto; vertical-align:middle;position:relative;}
+.sn-logo-add{ display:block;  top:10px; left:0px; position:absolute;  width:20px; height:20px;background:url(../images/default_blank/icons-add.png) -0px -3px no-repeat;}
 .sn-search-input {width:328px; height:40px; font-size:16px; color:#ccc; padding-left:10px; border:1px solid #ccc; border-right:none; float:right; background-color:#fff; outline:none;}
 a.sn-search-button {width:53px; height:40px; border:1px solid #ccc; border-left:none; float:right; outline:none; background:url(../images/sn_search_icon.jpg) 0 3px no-repeat;}
-.sn-nav {width:1200px; height:55px; margin:0 auto; font-size:16px; position:relative; line-height:1;}
-.sn-nav li {float:left; padding-top:11px; padding-bottom:12px; margin-right:50px;}
-.sn-nav li a {display:inline-block; padding:8px 6px; border-radius:5px;}
-.sn-nav li a:hover {background-color:#809df9;}
+.sn-nav {width:1200px; height:55px; margin:0 auto; font-size:16px; position:relative; line-height:1; overflow:hidden;}
+.nav-element-default, .nav-element {float:left; padding-top:11px; padding-bottom:12px; margin-right:50px;}
+.nav-element-default a, .nav-element a  {display:inline-block; padding:8px 6px; border-radius:5px;}
+.nav-element-default a:hover, .nav-element a:hover {background-color:#809df9;}
+.sn-subnav-position {position:fixed; left:0; top:203px; z-index:99;}
 .sn-sub-nav {width:1200px; margin:0 auto; font-size:14px; position:relative; line-height:1;}
 .sn-sub-nav li {color:#999; float:left;}
 .sn-sub-nav li a {height:40px; line-height:40px; vertical-align:middle; margin:0 5px; padding:0 5px; display:inline-block;}
 .sn-sub-nav li a:hover {border-bottom:3px solid #ffbd18; height:37px;}
 .sn-subnav-slice {margin:12px 5px;}
 .sn-banner {width:1200px; height:210px; margin:0 auto;}
+.sn-logo-add{ display:block;  top:5px; left:0px; position:absolute;  width:20px; height:20px;background:url(../images/default_blank/icons-add.png) 0px -3px no-repeat;}
+.sn-banner-add{ display:block; position:absolute; top:10px; left:10px;width:27px; height:27px; background:url(../images/default_blank/icons-add.png) -32px -0px no-repeat;}
 .sn-content-position {width:1200px; height:50px; line-height:50px; vertical-align:middle; font-size:14px; color:#888; margin:0 auto;}
 /*footer样式*/
 .sn-footer {width:1200px; height:220px; margin:0 auto; text-align:center; font-size:14px; color:#fff; line-height:normal;}
@@ -119,12 +123,15 @@ a.sn-search-button {width:53px; height:40px; border:1px solid #ccc; border-left:
 .h2-title a:hover.more{ color:#24366e;}
 .sn-news-bigbox{ padding:0px 26px 0px 18px; margin:18px 0 26px; border-right:1px solid #ebebeb;}
 .sn-news-bigbox a.h3-title{ font-size:18px; width:380px; display:block;overflow:hidden;white-space:nowrap; text-overflow:ellipsis;}
-.sn-news-bigbox .sn-news-txt{ width:380px; color:#666;}
+.sn-news-bigbox .sn-news-txt{ width:380px; height:182px; color:#666; overflow:hidden;}
+.sn-news-txt img {width:100%;}
 .sn-news-bigbox .sn-news-bigimg{ width:380px; height:165px;}
 .txt-grey{ color:#999;}
 .sn-news-smallbox{padding:0px 18px 0px 26px; margin:18px 0 26px; width:350px; }
 .sn-news-smallbox .sn-news-smallimg{ width:85px; height:85px; margin-right:10px;}
-.sn-news-smallbox a.h4-title{ font-size:14px; width:255px; float:left;}
+.sn-title-wrap {width:250px; height:62px; line-height: 26px; font-size:14px; overflow:hidden; position: relative;}
+.sn-news-smallbox a.h4-title{}
+.title-ellipsis {width:15px; display:block; bottom:0; right:-4px; position:absolute;}
 /* index-resources */
 .sn-index-resourcescon{ padding-top:12px;background:#f2f2f2;}
 .sn-index-resourcesbox{ padding:10px; background:#f2f2f2; width:185px; float:left;}
@@ -136,10 +143,9 @@ a.sn-search-button {width:53px; height:40px; border:1px solid #ccc; border-left:
 .resources-tagbox img {max-width: 100%;}
 a.more-btn{ display:block; width:185px; height:30px; text-align:center; background:#ccc; color:#666; line-height:30px;}
 /* index-partner */
-.sn-index-partnerbox{ padding:25px 30px; }
-.sn-index-partnerbox{ width:775px;}
+.sn-index-partnerbox{width:760px; padding:25px 30px;}
 .sn-index-partnerbox ul li{ height:55px;}
-.sn-index-partnerbox ul li a.partnerimg{ display:block; margin:0 10px 10px 0; border:1px solid #ccc; width:370px; height:43px; float:left;}
+.sn-index-partnerbox ul li a.partnerimg{ display:block; margin:0 10px 10px 0; border:1px solid #ccc; width:368px; height:43px; float:left;}
 .partner-btnbox{ width:90px; margin:0 auto;}
 .partner-btn{ width:35px; height:22px; background-color:#999; line-height:1.0; font-size:18px; color:#fff; text-align: center; margin-right:5px; cursor:pointer;}
 .partner-btn:hover{ background-color:#172b65;}
@@ -151,7 +157,7 @@ a.more-btn{ display:block; width:185px; height:30px; text-align:center; backgrou
 /* index-wx*/
 .sn-index-wxbox{margin-bottom:20px; background:#fff;}
 .sn-index-wximg{ margin:15px; margin-right:5px;}
-.sn-index-txt{ font-size:16px; line-height:2.0; margin-top:30px;}
+.sn-index-txt{ font-size:16px; line-height:2.0; margin-top:30px; max-height:64px; overflow:hidden;}
 .sn-index-smallbanner img{ display:block; width:369px; height:169px; }
 
 /* 内页新闻列表 */
@@ -164,14 +170,10 @@ a.more-btn{ display:block; width:185px; height:30px; text-align:center; backgrou
 .sn-inner-newslist a:hover{ color:#24366e;}
 a.sn-newslist-titile{ font-size:15px;width:840px; display:block;overflow:hidden;white-space:nowrap; text-overflow:ellipsis;}
 a:hover.sn-newslist-reply,a:hover.sn-newslist-zan{ color:#379be9;}
-.sn-inner-pages a{ display:block; font-size:12px; border:1px solid #d1d1d1; color:#999; float:left; width:30px; text-align:center; padding:3px 0; line-height:1.9; margin-right:5px; -webkit-border-radius:3px; -moz-border-radius:3px; -o-border-radius:3px; border-radius:3px; }
-.sn-inner-pages a:hover{  background-color:#24366e; color:#fff;}
-a.sn-inner-pages-big{ width:50px;}
-a.sn-pages-active{  background-color:#24366e; color:#fff;}
-.sn-inner-pages{width:330px; margin:40px auto 100px;}
+
 /* 内页新闻展示 */
 .sn-inner-newscon{ width:1200px; padding:5px 0 50px; border-bottom:1px solid #e8e8e8; margin-bottom:30px; color:#999; font-size:14px; }
-.sn-inner-pcon{text-indent:2em;}
+.sn-inner-pcon{text-indent:2em; overflow:hidden;}
 .sn-inner-newscon img{ display:block; width:830px; margin:25px auto 5px;}
 .sn-inner-psmall{ color:#999; font-size:12px; margin-bottom:15px;}
 .sn-inner-imgp{ color:#000;   text-align:center; margin-bottom:30px;}
@@ -207,14 +209,28 @@ a.sn-reply-username { color:#24366e; margin-right:15px; }
 .user-img img{border:2px solid #e6473b; }
 .user-img img:hover{border:2px solid #29156f;}
 
+/*组织弹窗*/
+.sn-w300 {width:300px;}
+.org-popup-wrap {border:3px solid #269ac9; padding:15px; background-color:#ffffff; position:relative; z-index:1000;}
+.org-popup-close {background:url(../images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:block; position: absolute; z-index: 1000; right:10px; top:5px;}
 
+/****翻页***/
+/*ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }*/
+/*ul.wlist li{float: left;}*/
+/*ul.wlist li a{ border:1px solid #15bccf; padding: 1px 4px 1px 4px; margin-left:3px;}*/
+/*ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}*/
+/*.wlist_select {display:block; font-size:12px; border:1px solid #d1d1d1; color:#24366e; float:left; width:50px; text-align:center; padding:3px 0; line-height:1.9; margin-right:5px; -webkit-border-radius:3px; -moz-border-radius:3px; -o-border-radius:3px; border-radius:3px; }*/
+.wlist_select a{background-color: #24366e;cursor: default;width: 30px;}
 
+.sn-inner-pages a{ display:block; font-size:12px; border:1px solid #d1d1d1; color:#999; float:left; width:50px; text-align:center; padding:3px 0; line-height:1.9; margin-right:5px; -webkit-border-radius:3px; -moz-border-radius:3px; -o-border-radius:3px; border-radius:3px; }
+.sn-inner-pages a:hover{  background-color:#24366e; color:#fff;}
+a.sn-inner-pages-big{ width:50px;}
+a.sn-pages-active{  background-color:#24366e; color:#fff;}
+.sn-inner-pages{width:330px; margin:40px auto 100px;}
 
-
-
-
-
-
-
-
-
+ul.sn-inner-pages{ float:right; border-bottom:none; height:30px; margin-top:20px; }
+ul.sn-inner-pages li{float: left;}
+ul.sn-inner-pages li a{border: 1px solid #d1d1d1;padding: 1px 4px 1px 4px;margin-left: 3px;}
+ul.sn-inner-pages li a:hover{ background-color:#24366e; color:#fff; text-decoration:none;}
+.sn-inner-pages_select { background-color:#24366e; color:#fff; padding: 1px 5px 0px 5px; margin-left:3px;margin-top: -2px; border:1px solid #64bdd9;}
+.sn-inner-pages_select a{background-color: #24366e; color: #fff;cursor: default;}

spec/controllers/sub_document_comments_controller_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe SubDocumentCommentsController, :type => :controller do
+
+end

spec/controllers/sub_domains_controller_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe SubDomainsController, :type => :controller do
+
+end

spec/factories/sub_document_comments.rb

@@ -0,0 +1,14 @@
+FactoryGirl.define do
+  factory :sub_document_comment do
+    content "MyText"
+title "MyText"
+sub_domain_id 1
+creator_id 1
+parent_id 1
+reply_id 1
+locked 1
+sticky 1
+org_subfield_id 1
+  end
+
+end

spec/factories/sub_domains.rb

@@ -0,0 +1,11 @@
+FactoryGirl.define do
+  factory :sub_domain do
+    org_subfield_id 1
+priority 1
+name "MyString"
+field_type "MyString"
+hide 1
+status 1
+  end
+
+end

spec/models/sub_document_comment_spec.rb

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

spec/models/sub_domain_spec.rb

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