Merge branch 'dev_hjq' into develop

app/assets/javascripts/org_subfields.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/org_subfields.css.scss

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

app/controllers/messages_controller.rb

@@ -169,6 +169,11 @@ class MessagesController < ApplicationController
       course_activity.updated_at = Time.now
       course_activity.save
     end
+    forge_activity = ForgeActivity.where("forge_act_type='Message' and forge_act_id=#{@topic.id}").first
+    if forge_activity
+      forge_activity.updated_at = Time.now
+      forge_activity.save
+    end
     user_activity = UserActivity.where("act_type='Message' and act_id =#{@topic.id}").first
     if user_activity
       user_activity.updated_at = Time.now

app/controllers/org_document_comments_controller.rb

@@ -13,7 +13,7 @@ class OrgDocumentCommentsController < ApplicationController
     @org_document_comment.content = params[:org_document_comment][:content]
     if @org_document_comment.save
       flash.keep[:notice] = l(:notice_successful_create)
-      OrgActivity
+      EditorOfDocument.create(:editor_id => User.current.id, :org_document_comment_id => @org_document_comment.id, :created_at => @org_document_comment.updated_at)
       redirect_to organization_org_document_comments_path(@organization)
     else
       redirect_to new_org_document_comment_path(:organization_id => @organization.id)
@@ -36,13 +36,18 @@ class OrgDocumentCommentsController < ApplicationController
     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)
+          end
         end
       }
     end
@@ -81,10 +86,10 @@ class OrgDocumentCommentsController < ApplicationController
   def destroy
     @org_document_comment = OrgDocumentComment.find(params[:id])
     org = @org_document_comment.organization
-    if @org_document_comment.destroy
+    if @org_document_comment.id == org.home_id
-      if @org_document_comment.id == org.id
+      org.update_attributes(:home_id => nil)
-        org.home_id == nil
     end
+    if @org_document_comment.destroy
     end
     respond_to do |format|
       format.js

app/controllers/org_subfields_controller.rb

@@ -0,0 +1,20 @@
+class OrgSubfieldsController < ApplicationController
+  def create
+    @subfield = OrgSubfield.create(:name => params[:name])
+    @organization = Organization.find(params[:organization_id])
+    @organization.org_subfields << @subfield
+    @subfield.update_attributes(:priority => @subfield.id)
+  end
+
+  def destroy
+    @subfield = OrgSubfield.find(params[:id])
+    @organization = Organization.find(@subfield.organization_id)
+    @subfield.destroy
+  end
+
+  def update
+    @subfield = OrgSubfield.find(params[:id])
+    @organization = Organization.find(@subfield.organization_id)
+    @subfield.update_attributes(:name => params[:name])
+  end
+end

app/controllers/organizations_controller.rb

@@ -37,6 +37,19 @@ class OrganizationsController < ApplicationController
     @organization = Organization.new
     render :layout => 'new_base'
   end
+
+  def edit
+    @organization = Organization.find(params[:id])
+  end
+
+  def destroy
+    @organization = Organization.find(params[:id])
+    @organization.destroy
+    respond_to do |format|
+      format.html{ redirect_to admin_organization_path }
+    end
+  end
+
   def create
     @organization = Organization.new
     @organization.name = params[:organization][:name]
@@ -81,7 +94,11 @@ class OrganizationsController < ApplicationController
       end
       @page = params[:page]
       respond_to do |format|
-        format.html
+        format.html {
+          if !params[:show_homepage].nil?
+            render :layout => 'base_organization'
+          end
+        }
         format.js
       end
     else
@@ -89,6 +106,13 @@ class OrganizationsController < ApplicationController
     end
   end
 
+  def homepage
+    @organization = Organization.find(params[:id])
+    respond_to do |format|
+      format.html {render :layout =>  'base_organization'}
+    end
+  end
+
   def update
     @organization = Organization.find(params[:id])
     @organization.name = params[:organization][:name]
@@ -142,6 +166,12 @@ class OrganizationsController < ApplicationController
     # end
   end
 
+  def cancel_homepage
+    @org = Organization.find(params[:id])
+    @org.home_id = nil
+    @org.save
+  end
+
   def autocomplete_search
     @project = Project.find(params[:project_id])
     #@flag = params[:flag] || false

app/controllers/projects_controller.rb

@@ -320,9 +320,20 @@ class ProjectsController < ApplicationController
     @activity.scope_select {|t| !has["show_#{t}"].nil?}
 =end
 
+    @page = params[:page] ? params[:page].to_i + 1 : 0
     # 根据私密性，取出符合条件的所有数据
     if User.current.member_of?(@project) || User.current.admin?
-      @events_pages = ForgeActivity.where("project_id = ? and forge_act_type != ?",@project, "Document" ).order("created_at desc").page(params['page'|| 1]).per(20);
+      case params[:type]
+        when nil
+          @events_pages = ForgeActivity.where("project_id = ? and forge_act_type in ('Issue', 'Message','News', 'ProjectCreateInfo')",@project).order("updated_at desc").limit(10).offset(@page * 10)
+        when 'issue'
+          @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'Issue'",@project).order("updated_at desc").limit(10).offset(@page * 10)
+        when 'news'
+          @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'News'",@project).order("updated_at desc").limit(10).offset(@page * 10)
+        when 'message'
+          @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'Message'",@project).order("updated_at desc").limit(10).offset(@page * 10)
+      end
+
       #events = @activity.events(@date_from, @date_to)
     else
       @events_pages = ForgeActivity.includes(:project).where("forge_activities.project_id = ? and projects.is_public

app/helpers/org_subfields_helper.rb

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

app/models/course.rb

@@ -32,7 +32,7 @@ class Course < ActiveRecord::Base
            :conditions => "#{Principal.table_name}.type='Group' OR (#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{Principal::STATUS_ACTIVE})"
   has_many :principals, :through => :member_principals, :source => :principal
   has_many :users, :through => :members
-  has_many :org_courses
+  has_many :org_courses, :dependent => :destroy
   has_many :organizations, :through => :org_courses
   # has_many :homeworks, :through => :homework_for_courses, :source => :bid, :dependent => :destroy
   has_many :journals_for_messages, :as => :jour, :dependent => :destroy

app/models/editor_of_document.rb

@@ -0,0 +1,4 @@
+class EditorOfDocument < ActiveRecord::Base
+  belongs_to :user, :class_name => 'User', :foreign_key => 'editor_id'
+  belongs_to :org_document_comment
+end

app/models/forge_activity.rb

@@ -48,8 +48,10 @@ class ForgeActivity < ActiveRecord::Base
   def add_org_activity
     if self.forge_act_type == 'Message' && !self.forge_act.parent_id.nil?
       org_activity = OrgActivity.where("org_act_type = 'Message' and org_act_id = #{self.forge_act.parent.id}").first
+      if org_activity
         org_activity.created_at = self.created_at
         org_activity.save
+      end
     else
       OrgActivity.create(:user_id => self.user_id,
                        :org_act_id => self.forge_act_id,

app/models/org_document_comment.rb

@@ -3,7 +3,7 @@ class OrgDocumentComment < ActiveRecord::Base
   include Redmine::SafeAttributes
   belongs_to :organization
   belongs_to :creator, :class_name => 'User', :foreign_key => 'creator_id'
-
+  has_many :editor_of_documents, :dependent => :destroy
   acts_as_tree :order => "#{OrgDocumentComment.table_name}.sticky asc, #{OrgDocumentComment.table_name}.created_at desc"
   has_many :org_acts, :class_name => 'OrgActivity',:as =>:org_act ,:dependent => :destroy
   after_create :document_save_as_org_activity

app/models/org_subfield.rb

@@ -0,0 +1,3 @@
+class OrgSubfield < ActiveRecord::Base
+  belongs_to :organization, :foreign_key => :organization_id
+end

app/models/organization.rb

@@ -5,7 +5,8 @@ class Organization < ActiveRecord::Base
   has_many :projects,:through => :org_projects
   has_many :courses, :through => :org_courses
   has_many :org_document_comments, :dependent => :destroy
-  has_many :org_courses
+  has_many :org_courses, :dependent => :destroy
+  has_many :org_subfields, :dependent => :destroy
   has_many :users, :through => :org_members
   validates_uniqueness_of :name
   after_create :save_as_org_activity

app/views/comments/create.js.erb

@@ -1,3 +1,6 @@
+<% if @course %>
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
-
+<% else %>
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'projects/project_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
+<% end %>
 init_activity_KindEditor_data('<%= @user_activity_id%>',"","87%");

app/views/layouts/base_org.html.erb

@@ -81,59 +81,8 @@
             <%= link_to '成员', members_organization_path(@organization.id) %>&nbsp;（<%= link_to @organization.org_members.count, members_organization_path(@organization.id), :id => 'org_members_count_id', :class => "linkBlue" %>）
           </div>
         </div>
-        <div class="homepageLeftMenuContainer">
+        <div class="homepageLeftMenuContainer" id="sub_field_left_lists">
-          <div class="homepageLeftMenuBlock">
+            <%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %>
-            <%= link_to "动态",organization_path(@organization), :class => "homepageMenuText" %>
-          </div>
-          <div class="homepageLeftMenuBlock">
-            <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuProjects').slideToggle();">项目</a>
-            <%=link_to "", join_project_menu_organization_path(@organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联项目"%>
-            <!--<div class="courseMenu" id="projectMenu">-->
-              <!--<ul>-->
-                <!--<li class="courseMenuIcon" id="projectMenuIcon">-->
-                  <!--<ul class="topnav_course_menu" id="topnav_project_menu" style="line-height:1;">-->
-                    <!--&lt;!&ndash;<li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>&ndash;&gt;-->
-                    <!--<li>-->
-                      <!--<%#= link_to "关联项目",join_project_menu_organization_path(@organization),:remote => true,:class => "menuGrey",:method => "post"%>-->
-                    <!--</li>-->
-                  <!--</ul>-->
-                <!--</li>-->
-              <!--</ul>-->
-            <!--</div>-->
-          <!--<a href="javascript:void(0);" class="homepageMenuSetting fr" title="关联您的已有项目"></a>-->
-        </div>
-          <div class="homepageLeftMenuCourses borderBottomNone" id="homepageLeftMenuProjects">
-            <ul >
-              <%= render :partial => 'layouts/org_projects',:locals=>{:projects=>@organization.projects.reorder('created_at').uniq.limit(5),:org_id=>@organization.id,:page=>1}%>
-              <!--<%#= @organization.org_projects.each do |p|%>-->
-              <!--<li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey"><%#= p.name%></a></li>-->
-              <!--<%# end %>-->
-              <!--<li class="homepageLeftMenuMore"><a href="javascript:void(0);" class="homepageLeftMenuMoreIcon"></a></li>-->
-            </ul>
-          </div>
-          <div class="homepageLeftMenuBlock">
-            <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses').slideToggle();">课程</a>
-            <%=link_to "", join_course_menu_organization_path(@organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联课程"%>
-            <%#= link_to "关联课程",join_course_menu_organization_path(@organization),:remote => true,:class => "menuGrey",:method => "post"%>
-            <!--<div class="courseMenu" id="courseMenu">-->
-              <!--<ul>-->
-              <!--<li class="courseMenuIcon" id="courseMenuIcon">-->
-                <!--<ul class="topnav_course_menu" id="topnav_course_menu" style="line-height:1;">-->
-                  <!--&lt;!&ndash;<li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>&ndash;&gt;-->
-                  <!--<li>-->
-                    <!--<%#= link_to "关联课程",join_course_menu_organization_path(@organization),:remote => true,:class => "menuGrey",:method => "post"%>-->
-                  <!--</li>-->
-                <!--</ul>-->
-              <!--</li>-->
-            <!--</ul>-->
-            <!--</div>-->
-            <!--<a href="javascript:void(0);" class="homepageMenuSetting fr" title="关联您的已有项目"></a>-->
-          </div>
-          <div class="homepageLeftMenuCourses borderBottomNone" id="homepageLeftMenuCourses">
-            <ul >
-              <%= render :partial => 'layouts/org_courses',:locals=>{:courses=>@organization.courses.reorder('created_at').uniq.limit(5),:org_id=>@organization.id,:page=>1}%>
-            </ul>
-          </div>
         </div>
       </div>
       <div class="homepageRight">

app/views/layouts/base_organization.html.erb

@@ -0,0 +1,113 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<%= stylesheet_link_tag  'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','org' %>
+<%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','org'%>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title>组织主页</title>
+  <link href="css/public.css" rel="stylesheet"   type="text/css" />
+  <link href="css/leftside.css" rel="stylesheet"   type="text/css" />
+  <link href="css/org.css" rel="stylesheet"   type="text/css" />
+  <script src="js/jquery-1.3.2.js" type="text/javascript"></script>
+  <script type="text/javascript" src="js/bootstrap.js"></script>
+  <script>
+      $(document).ready(function(){
+          h1 = $(".homepageLeft").height();
+          if ($("#orgMain").height()< h1) {$("#orgMain").height(h1-42);}
+      })
+  </script>
+</head>
+
+<body>
+<div class="orgContainer">
+  <div class="orgNav">
+    <div class="navOrgLogo fl"><a href="javascript:void(0);"><img src="/images/home_logo.png" width="21" height="19" alt="确实Trustie" class="mt3" /></a></div>
+    <ul>
+      <li class="navOrgMenu fl"><a href="javascript:void(0);" class="linkGrey8 f14">首页</a></li>
+      <li class="navOrgMenu fr"><a href="javascript:void(0);" class="linkGrey8 f14">登录</a></li>
+      <li class="navOrgMenu fr"><a href="javascript:void(0);" class="linkGrey8 f14 mr15">注册</a></li>
+    </ul>
+    <!--<div class="navHomepageProfile">
+      <ul>
+        <li class="homepageProfileMenuIcon"><a href="javascript:void(0);">
+          <div class="mt5 mb8"><img src="images/homepageProfileImage.png" width="40" height="40" /></div>
+          </a>
+          <ul class="topnav_login_list" style="display:none;">
+            <li><a href="javascript:void(0);" class="menuGrey">修改资料</a> </li>
+            <li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>
+            <li><a href="javascript:void(0);" class="menuGrey">退出</a></li>
+          </ul>
+        </li>
+      </ul>
+    </div>-->
+  </div>
+</div>
+<div class="homepageContentContainer">
+  <div class="homepageContent">
+    <div class="homepageLeft">
+      <div class="homepagePortraitContainer">
+        <!--<div class="pr_info_logo fl mr10 mb5">-->
+
+        <div class="pr_info_logo fl fl mr10 mb5" id="homepage_portrait_image">
+          <%= image_tag(url_to_avatar(@organization),width:"60", height: "60", :id=>'nh_user_tx') %>
+          <% if User.current.logged?%>
+              <% if User.current.id == @organization.creator_id %>
+                  <div id="edit_org_file_btn" class="none">
+                    <div class="homepageEditProfile">
+                      <a href="<%= clear_org_avatar_temp_organization_path(@organization) %>" data-remote="true" class="homepageEditProfileIcon"></a>
+                    </div>
+                  </div>
+              <% end %>
+          <% end%>
+        </div>
+        <div class="orgName fl mb5 f14">
+          <%= link_to @organization.name, organization_path(@organization.id), :class=>"pr_info_name fl c_dark fb break_word" %>
+          <% if @organization.is_public? %>
+              <span class="img_private"><%= l(:label_public)%></span>
+          <% else %>
+              <span class="img_private"><%= l(:label_private)%></span>
+          <% end %>
+        </div>
+
+        <% if User.current.admin_of_org?(@organization) and params[:show_homepage].nil? %>
+            <a href="<%= setting_organization_path(@organization) %>" class="pr_join_a c_white"><span class="pr_setting"></span>配置</a>
+        <% end %>
+
+        <div class="cl"></div>
+        <div class="f12 fontGrey3">
+          <%= link_to '文章', organization_org_document_comments_path(@organization) %>&nbsp;(
+          <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %>
+          )&nbsp;|&nbsp;
+          <%= link_to '成员', members_organization_path(@organization.id) %>&nbsp;（<%= link_to @organization.org_members.count, members_organization_path(@organization.id), :id => 'org_members_count_id', :class => "linkBlue" %>）
+        </div>
+      </div>
+      <div class="homepageLeftMenuContainer" id="sub_field_left_lists">
+        <%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %>
+      </div>
+    </div>
+    <div class="homepageRight" style="margin-top:0px;">
+      <%= render_flash_messages %>
+      <%= yield %>
+      <%= call_hook :view_layouts_base_content %>
+      <div style="clear:both;"></div>
+    </div>
+  </div>
+</div>
+<div class="cl"></div>
+<div id="Footer">
+  <div class="footerAboutContainer">
+    <ul class="footerAbout">
+      <li class="fl"><a href="javascript:void:(0);" class=" f_grey mw20" target="_blank">关于我们</a>|</li>
+      <li class="fl"><a href="javascript:void:(0);" class=" f_grey mw20" target="_blank">服务协议</a>|</li>
+      <li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank">帮助中心</a>|</li>
+      <li class="fl"><a href="javascript:void:(0);" class=" f_grey mw20" target="_blank">贴吧交流</a></li>
+    </ul>
+  </div>
+  <div class="cl"></div>
+  <ul class="copyright mt10">
+    <li class="fl mr30">Copyright&nbsp;&copy;&nbsp;2007-2015,&nbsp;All Rights Riserved</li>
+    <li>ICP备09019772</li>
+  </ul>
+</div>
+</body>
+</html>

app/views/layouts/base_projects.html.erb

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

app/views/org_document_comments/add_reply.js.erb

@@ -1,3 +1,3 @@
 
-$("#organization_document_<%= @act.id %>").replaceWith("<%= escape_javascript(render :partial => 'organizations/show_org_document', :locals => {:document => @document, :act => @act}) %>");
+$("#organization_document_<%= @act.id %>").replaceWith("<%= escape_javascript(render :partial => 'organizations/show_org_document', :locals => {:document => @document,:flag => params[:flag], :act => @act}) %>");
 init_activity_KindEditor_data(<%= @act.id %>,"","87%");

app/views/org_document_comments/index.html.erb

@@ -19,6 +19,6 @@
                 init_activity_KindEditor_data(<%= OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id=?", document.id).first.id %>, null, "87%");
             });
         </script>
-          <%= render :partial => 'organizations/show_org_document', :locals => {:document => document, :act => OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id=?", document.id).first} %>
+          <%= render :partial => 'organizations/show_org_document', :locals => {:document => document, :act => OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id=?", document.id).first, :flag => 0} %>
     <% end %>
 <% end %>

app/views/org_document_comments/show.html.erb

@@ -25,7 +25,7 @@
       <div class="homepagePostDate">
         发布时间：<%= format_activity_day(@document.created_at) %> <%= format_time(@document.created_at, false) %></div>
       <% unless @document.content.blank? %>
-          <div class="homepagePostIntro">
+          <div class="homepagePostIntro" style="width:640px;">
             <%= @document.content.html_safe %>
           </div>
       <% end %>

app/views/org_subfields/create.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 }) %>");
+$("#sub_field_left_lists").html("");
+$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");

app/views/org_subfields/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 }) %>");
+$("#sub_field_left_lists").html("");
+$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");

app/views/org_subfields/update.js.erb

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

app/views/organizations/_join_course_menu.html.erb

@@ -13,6 +13,7 @@
 
 
           $(".resourcePopupClose").click(function(){
+              location.reload();
               $(".resourceSharePopup").css("display","none");
           });
       });

app/views/organizations/_join_project_menu.html.erb

@@ -13,6 +13,7 @@
 
 
           $(".resourcePopupClose").click(function(){
+              location.reload();
               $(".resourceSharePopup").css("display","none");
           });
       });

app/views/organizations/_org_activities.html.erb

@@ -22,7 +22,7 @@
                 </div>
             <% end %>
             <% if act.org_act_type == 'OrgDocumentComment' && act.org_act_id != @organization.home_id %>
-                <%= render :partial => 'show_org_document', :locals => {:document => act.org_act, :act => act} %>
+                <%= render :partial => 'show_org_document', :locals => {:document => act.org_act, :act => act, :flag => 2} %>
             <% end %>
         <% end %>
         <% if act.container_type == 'Project' %>

app/views/organizations/_org_left_subfield_list.html.erb

@@ -0,0 +1,32 @@
+<div class="homepageLeftMenuBlock">
+  <%= link_to "组织首页",organization_path(@organization, :show_homepage => 1), :class => 'homepageMenuText', :target => '_blank' %>
+</div>
+<div class="homepageLeftMenuBlock">
+  <%= link_to "动态",organization_path(organization), :class => "homepageMenuText" %>
+</div>
+<div class="homepageLeftMenuBlock">
+  <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuProjects').slideToggle();">项目</a>
+  <%=link_to "", join_project_menu_organization_path(organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联项目"%>
+</div>
+<div class="homepageLeftMenuCourses" id="homepageLeftMenuProjects">
+  <ul >
+    <%= render :partial => 'layouts/org_projects',:locals=>{:projects=>organization.projects.reorder('created_at').uniq.limit(5),:org_id=>organization.id,:page=>1}%>
+  </ul>
+</div>
+<div class="homepageLeftMenuBlock">
+  <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses').slideToggle();">课程</a>
+  <%=link_to "", join_course_menu_organization_path(organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联课程"%>
+</div>
+<div class="homepageLeftMenuCourses" id="homepageLeftMenuCourses" style="display:<%= organization.courses.count == 0 ?'none':'' %>">
+  <ul >
+    <%= render :partial => 'layouts/org_courses',:locals=>{:courses=>organization.courses.reorder('created_at').uniq.limit(5),:org_id=>organization.id,:page=>1}%>
+  </ul>
+</div>
+<% organization.org_subfields.each do |field| %>
+    <div class="homepageLeftMenuBlock">
+      <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses_#{field.id}').slideToggle();"><%= field.name %></a>
+      <%=link_to "", :title => "关联#{field.name}"%>
+    </div>
+    <div class="homepageLeftMenuCourses" id="homepageLeftMenuField_<%= field.id %>" style="display:none;">
+    </div>
+<% end %>

app/views/organizations/_show_home_page.html.erb

@@ -0,0 +1,69 @@
+<div class="resources mt10" id="organization_document_<%= document.id %>">
+  <div class="homepagePostBrief">
+
+    <div class="homepagePostDes" style="width:690px;">
+
+      <div class="homepagePostTitle postGrey"><%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id) %></div>
+
+      <% unless document.content.blank? %>
+          <div class="homepagePostIntro" >
+            <%= document.content.html_safe %>
+          </div>
+      <% end %>
+      <div class="homepagePostDate" style="float:right;">
+        发布时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %>
+      </div>
+      <div class="cl"></div>
+      <div class="homepagePostDate" style="float:right;">
+        最后编辑：<%= User.find(EditorOfDocument.where("org_document_comment_id =?", document.id).order("created_at desc").first.editor_id).realname %>
+      </div>
+      <!--    <%# if defined?(home_id) %>
+        <div style="float:right;">最后编辑：<%#= User.find() %></div>
+    <%# end %>-->
+      <% if User.current.admin? || User.current.admin_of_org?(Organization.find(document.organization_id)) || User.current.id == document.creator_id %>
+          <div class="homepagePostSetting">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <li>
+                    <%= form_for('new_form', :url => {:controller => 'organizations', :action => 'cancel_homepage', :id => document.organization_id, :home_id => document.id}, :method => "put", :remote => true) do |f| %>
+                        <a href="javascript:void(0);" class="postOptionLink" onclick="$(this).parent().submit();">取消首页</a>
+                    <% end %>
+                  </li>
+                  <li>
+                    <%= link_to "编辑首页", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id, :flag => 2), :class => "postOptionLink" %>
+                  </li>
+                  <li>
+                    <%= link_to "删除首页", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :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>
+
+</div>
+
+<script type="text/javascript">
+    function expand_reply(container, btnid) {
+        var target = $(container);
+        var btn = $(btnid);
+        if (btn.data('init') == '0') {
+            btn.data('init', 1);
+            btn.html('收起回复');
+            target.show();
+        } else {
+            btn.data('init', 0);
+            btn.html('展开更多');
+            target.hide();
+            target.eq(0).show();
+            target.eq(1).show();
+            target.eq(2).show();
+        }
+    }
+</script>

app/views/organizations/_show_org_document.html.erb

@@ -8,24 +8,20 @@
         <%= link_to User.find(document.creator_id), user_path(document.creator.id), :class => "newsBlue mr15" %>
         TO&nbsp;&nbsp;<%= link_to document.organization.name, organization_path(document.organization), :class => "newsBlue" %>
         |
-        <% if document.organization.home_id == document.id %>
-            <span style="color:#269ac9;">首页</span>
-        <% else %>
             <span style="color:#269ac9;">组织文章</span>
-        <% end %>
       </div>
       <div class="homepagePostTitle postGrey"><%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id) %></div>
       <div class="homepagePostDate">
         发布时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %></div>
       <% unless document.content.blank? %>
-          <div class="homepagePostIntro">
+          <div class="homepagePostIntro" style="width:640px;">
             <%= document.content.html_safe %>
           </div>
       <% end %>
       <!--    <%# if defined?(home_id) %>
         <div style="float:right;">最后编辑：<%#= User.find() %></div>
     <%# end %>-->
-      <% if User.current.admin? || User.current.admin_of_org?(Organization.find(document.organization_id) || User.current.id == document.creator_id) %>
+      <% if User.current.admin? || User.current.admin_of_org?(Organization.find(document.organization_id)) || User.current.id == document.creator_id %>
           <div class="homepagePostSetting">
             <ul>
               <li class="homepagePostSettingIcon">
@@ -36,7 +32,7 @@
                     <% end %>
                   </li>
                   <li>
-                    <%= link_to "编辑文章", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id, :flag => 0), :class => "postOptionLink" %>
+                    <%= link_to "编辑文章", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id, :flag => flag), :class => "postOptionLink" %>
                   </li>
                   <li>
                     <%= link_to "删除文章", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete',
@@ -92,7 +88,7 @@
       </div>
       <div class="homepagePostReplyInputContainer">
         <div nhname='new_message_<%= act.id %>' style="display:none;">
-          <%= form_for('new_form', :url => add_reply_org_document_comment_path(:id => document.id, :act_id => act.id), :method => "post", :remote => true) do |f| %>
+          <%= form_for('new_form', :url => add_reply_org_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 %>"/>
               <textarea placeholder="有问题或建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= act.id %>' name="org_content"></textarea>
 

app/views/organizations/_subfield_list.html.erb

@@ -0,0 +1,56 @@
+
+  <ul class="orgListRow">
+    <li class="orgListUser fb">已有栏目</li>
+    <li class="orgListRole fb">状态</li>
+    <div class="cl"></div>
+  </ul>
+  <ul class="orgListRow">
+    <li class="orgListUser">动态</li>
+    <li class="orgListUser">默认</li>
+    <div class="cl"></div>
+  </ul>
+  <ul class="orgListRow">
+    <li class="orgListUser">项目</li>
+    <li class="orgListUser">默认</li>
+    <div class="cl"></div>
+  </ul>
+  <ul class="orgListRow">
+    <li class="orgListUser">课程</li>
+    <li class="orgListUser">默认</li>
+    <div class="cl"></div>
+  </ul>
+  <% subfields.each do |field| %>
+    <ul class="orgListRow">
+        <li class="orgListUser"><div id="subfield_show_<%= field.id %>"><%= field.name %></div><div id="subfield_edit_<%= field.id %>" style="display:none;">
+          <input type="text" name="name" onblur="update_subfield('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>','<%= field.id %>',$(this).val());" value="<%= field.name %>" style="width:70px;" /></div></li>
+        <li class="orgListUser">新增</li>
+        <%= link_to "删除",org_subfield_path(field), :method => 'delete',:remote => true, :confirm => "您确定删除吗？", :class => "linkBlue fr mr5" %>
+        <a href="javascript:void(0);" class="linkBlue fr mr10" onclick="edit('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>');">编辑</a>
+        <div class="cl"></div>
+    </ul>
+  <% end %>
+
+  <script>
+    function edit(show_id, edit_id){
+        $(show_id).toggle();
+        $(edit_id).toggle();
+        $(edit_id).find('input').focus();
+        $(edit_id).find('input').on('keypress',function(e){
+            if(e.keyCode == 13){
+                this.blur();
+            }
+        })
+    }
+    function update_subfield(show_id, edit_id, field_id, input_value) {
+        if ($(show_id).html().trim() != input_value.trim()) {
+            if (confirm('确定修改为' + input_value + "?"))
+                $.ajax({
+                    url :"/org_subfields/" + field_id + "?name=" + input_value,
+                    type :'put'
+                });
+        }
+        $(show_id).show();
+        $(edit_id).hide();
+//       $(edit_id).focus();
+   }
+  </script>

app/views/organizations/cancel_homepage.js.erb

@@ -0,0 +1 @@
+window.location.href = "<%= organization_path(@org) %>";

app/views/organizations/edit.html.erb

@@ -0,0 +1,108 @@
+
+<% @nav_dispaly_organization_label = 1
+   @nav_dispaly_forum_label = 1 %>
+<%= error_messages_for 'organization' %>
+<div class="organization_r_h02">
+  <h2 class="organization_h2">编辑组织</h2>
+</div>
+<div class="ml15 mr15" id="orgContent_1">
+  <!--<div class="orgLogo mb10"><a href="javascript:void(0);"><img src="images/0" width="55" height="55" alt="组织logo" class="mr10 logoBorder fl ml10" /></a>-->
+  <!--<a href="javascript:void(0);" class="logoEnter fl linkGrey4">上传图片</a>-->
+  <%#= form_for( @organization,{:controller => 'organizations',:action => 'update',:id=>@organization,:html=>{:id=>'update_org_form',:method=>'put'}}) do %>
+  <%= labelled_form_for @organization, :html => {:id => "edit_organization_#{@organization.id}"} do |f|%>
+      <%= render :partial=>"new_org_avatar_form",:locals=> {source:@organization} %>
+      <!--<div class="cl"></div>-->
+      <!--</div>-->
+      <div class="orgRow mb10"><span class="c_red">*&nbsp;</span>组织名称：<input type="text" name="organization[name]" id="organization_name" maxlength="100" onblur="check_uniq(<%=@organization.id %>);" onfocus="$('#check_name_hint').hide()" class="orgNameInput"  value="<%= @organization.name%>" />
+        <div class="cl"></div>
+      </div>
+      <div style="margin-left: 80px " id="check_name_hint"></div>
+      <div class="orgRow mb10"><span class="ml10">组织描述：</span><textarea type="text" name="organization[description]" class="orgDes" id="org_desc"  placeholder="最多3000个汉字（或6000个英文字符）"><%= @organization.description%></textarea>
+        <div class="cl"></div>
+      </div>
+      <div style="margin-left: 80px " id="check_desc_hint"></div>
+      <!--<div class="orgRow mb10"><span class="ml10">组织URL：</span>-->
+      <!--<div class="w607 fr">https：//-->
+      <!--<input type="text" name="organization[domain]" value="<%= @organization.domain%>" class="orgUrlInput" />-->
+      <!--.trustie.net<a href="javascript:void(0);" class="linkBlue ml15" style="text-decoration:underline;">申请</a>-->
+      <!--<p id="apply_hint"></p></div>-->
+      <!--&lt;!&ndash;class="c_green f12" 您的申请已提交，系统会以消息的形式通知您结果 &ndash;&gt;-->
+      <!--</div>-->
+      <!--<div class="cl"></div>-->
+      <div class="orgRow mb10 mt5"><span style="margin-left:38px;" >公开&nbsp;: </span>
+        <input type="checkbox" name="organization[is_public]" <%= @organization.is_public ? 'checked': ''%> class="ml3" />
+      </div>
+      <a href="javascript:void(0);" class="saveBtn ml80 db fl" onclick="update_org(<%=@organization.id %>);">保存</a>
+  <% end %>
+</div>
+<div class="cl"></div>
+
+<% html_title(l(:label_organization_new)) -%>
+
+<script>
+    function update_org(id){
+        check_uniq(id);
+        if( $checkName){
+            $("#edit_organization_"+id).submit();
+        }
+    }
+    //新建组织
+    //验证组织名称
+    function regex_organization_name()
+    {
+        var name = $.trim($("#organization_name").val());
+        if(name.length == 0)
+        {
+            $("#organization_name_notice").html('<span class="c_red">名字不能为空<span>').show();
+            return false;
+        }
+        else
+        {
+            $("#organization_name_notice").html('').hide();
+            return true;
+        }
+    }
+
+    var $checkName = false;
+
+    function check_uniq(dom){
+        if($("#organization_name").val().trim() == ""){
+            $("#organization_name_notice").html('<span class="c_red">名字不能为空<span>').show();
+            return;
+        }
+        $.get(
+                '<%=  check_uniq_organizations_path%>'+'?org_name='+$("#organization_name").val().trim()
+        )
+    }
+
+    //提交新建项目
+    function submit_new_organization()
+    {
+        $.get(
+                '<%=  check_uniq_organizations_path%>'+'?org_name='+$("#organization_name").val().trim()
+        )
+        if(regex_organization_name() && $checkName)
+        {
+            $("#new_organization").submit();
+        }
+    }
+
+    $(function(){
+        $('#organization_new_type').change(function(){
+            var type = $('#organization_new_type').val();
+            if(type == '1'){
+                $(this).next().html("<%= l(:label_type_des_development)%>");
+            }
+            else if(type == '2'){
+                $(this).next().html("<%= l(:label_type_des_research)%>");
+            }
+            else if(type == '3'){
+                $(this).next().html("<%= l(:label_type_des_friend)%>");
+            }
+//            var p1=$(this).children('option:selected').val("研讨模式：面向小组研究，支持任务分工、论坛交流、资源分享等。");//这就是selected的值
+//            var p2=$('#param2').val();//获取本页面其他标签的值
+        })
+
+    })
+</script>
+

app/views/organizations/setting.html.erb

@@ -2,7 +2,7 @@
     function g(o){return document.getElementById(o);}
     function HoverLi(n){
 //如果有N个标签,就将i<=N;
-        for(var i=1;i<=2;i++){
+        for(var i=1;i<=3;i++){
             g('orgSetting_'+i).className='orgSettingOp';
             g('orgContent_'+i).className='undis';}
             g('orgContent_'+n).className='dis ml15 mr15';
@@ -34,6 +34,7 @@
       <ul class="mb10">
         <li class="orgSettingOp orgOpActive" id="orgSetting_1" onclick="HoverLi(1);">信息</li>
         <li class="orgSettingOp" id="orgSetting_2" onclick="HoverLi(2);">成员</li>
+        <li class="orgSettingOp" id="orgSetting_3" onclick="HoverLi(3);">栏目</li>
         <li class="orgBorder"></li>
         <div class="cl"></div>
       </ul>
@@ -45,13 +46,11 @@
         <%= render :partial=>"new_org_avatar_form",:locals=> {source:@organization} %>
           <!--<div class="cl"></div>-->
         <!--</div>-->
-        <div class="orgRow mb10"><span class="c_red">*&nbsp;</span>组织名称：
+        <div class="orgRow mb10"><span class="c_red">*&nbsp;</span>组织名称：<input type="text" name="organization[name]" id="organization_name" maxlength="100" onblur="check_uniq(<%=@organization.id %>);" onfocus="$('#check_name_hint').hide()" class="orgNameInput"  value="<%= @organization.name%>" />
-          <input type="text" name="organization[name]" id="organization_name" maxlength="100" onblur="check_uniq(<%=@organization.id %>);" onfocus="$('#check_name_hint').hide()" class="orgNameInput"  value="<%= @organization.name%>" />
           <div class="cl"></div>
         </div>
             <div style="margin-left: 80px " id="check_name_hint"></div>
-        <div class="orgRow mb10"><span class="ml10">组织描述：</span>
+        <div class="orgRow mb10"><span class="ml10">组织描述：</span><textarea type="text" name="organization[description]" class="orgDes" id="org_desc"  placeholder="最多3000个汉字（或6000个英文字符）"><%= @organization.description%></textarea>
-          <textarea type="text" name="organization[description]" class="orgDes" id="org_desc"  placeholder="最多3000个汉字（或6000个英文字符）"><%= @organization.description%></textarea>
           <div class="cl"></div>
         </div>
             <div style="margin-left: 80px " id="check_desc_hint"></div>
@@ -106,4 +105,26 @@
         </div>
         <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 } %>
         </div>
+        <div class="fr orgMemContainer">
+          <div class="orgMemberAdd">
+            <p class="fontBlue fb mb5">新增栏目</p>
+            <%= form_tag url_for(:controller => 'org_subfields', :action => 'create', :organization_id => @organization.id), :id=> 'add_subfield_form',:remote => true do %>
+            <input type="text" id="subfield_name" name="name" placeholder="栏目名称" class="orgAddSearch mb20" />
+                <div class="cl"></div>
+            <a href="javascript:void(0);" class="saveBtn db fl mt10" onclick="add_org_subfield();">确定</a>
+            <% end %>
+          </div>
+        </div>
+        <div class="cl"></div>
+    </div>
+</div>
+<script>
+  function add_org_subfield(){
+      if ($("#subfield_name").val().trim() != "")
+        $("#add_subfield_form").submit();
+  }
+</script>

app/views/organizations/show.html.erb

@@ -12,6 +12,7 @@
     .homepagePostReplyInputContainer .ke-inline-block {display: none;}
     .homepagePostReplyInputContainer .ke-container {float: left;}
 </style>
+<% if params[:show_homepage].nil? %>
 <div class="homepageRightBanner">
   <div class="NewsBannerName">最新动态</div>
   <ul class="resourcesSelect">
@@ -49,9 +50,8 @@
       </ul>
     </li>
   </ul>
-
 </div>
-
+<% end %>
 <% if !@organization.home_id.nil? and OrgDocumentComment.where("id = ?", @organization.home_id).count > 0 %>
     <script>
         $(function() {
@@ -59,7 +59,7 @@
         });
     </script>
     <% act = OrgActivity.where("org_act_type = 'OrgDocumentComment' and org_act_id =?", @organization.home_id).first %>
-        <%= render :partial => 'show_org_document', :locals => {:document => OrgDocumentComment.find(@organization.home_id), :home_id => @organization.home_id, :act => act} %>
+        <%= render :partial => 'show_home_page', :locals => {:document => OrgDocumentComment.find(@organization.home_id), :home_id => @organization.home_id, :act => act} %>
 <% end  %>
 <% if @org_activities %>
     <%= render :partial =>  'organizations/org_activities',

app/views/projects/_attachment_acts.html.erb

@@ -0,0 +1,35 @@
+<div class="resources mt10" id="user_activity_<%= user_activity_id %>">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait">
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
+    </div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo break_word mt-4">
+        <% if activity.try(:author).try(:realname) == ' ' %>
+            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% else %>
+            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% end %> TO
+        <%= link_to activity.project.name.to_s+" | 项目附件", project_news_index_path(activity.project), :class => "newsBlue ml15" %>
+      </div>
+      <div class="homepagePostTitle break_word hidden fl m_w600">
+        <%= link_to format_activity_title("#{l(:label_attachment)}: #{activity.filename}"), {:controller => 'attachments', :action => 'show', :id => activity.id}, :class => "problem_tit fl fb" %>
+        <%#= link_to activity.title.to_s, news_path(activity), :class => "postGrey" %>
+      </div>
+      <div class="cl"></div>
+      <div class="homepagePostDate">
+        发布时间：<%= format_time(activity.created_on) %>
+      </div>
+      <p class="mt5 break_word"><%= textAreailizable act, :description %><br/></p>
+      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id %>">
+        <div id="intro_content_<%= user_activity_id %>">
+          <%#= activity.description.html_safe %>
+        </div>
+      </div>
+      <div class="cl"></div>
+
+    </div>
+    <div class="cl"></div>
+  </div>
+
+</div>

app/views/projects/_project_activities.html.erb

@@ -0,0 +1,102 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor", '/assets/kindeditor/pasteimg', "init_activity_KindEditor" %>
+<style type="text/css">
+    /*回复框*/
+    div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
+    span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
+    span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
+    div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
+    span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
+    span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
+    div.ke-toolbar .ke-outline{border:none;}
+    .ke-inline-block{display: none;}
+    div.ke-container{float:left;}
+</style>
+<% unless forge_acts.empty? %>
+    <% forge_acts.each do |activity| -%>
+        <script>
+            function expand_reply(container, btnid) {
+                var target = $(container);
+                var btn = $(btnid);
+                if (btn.data('init') == '0') {
+                    btn.data('init', 1);
+                    btn.html('收起回复');
+                    target.show();
+                } else {
+                    btn.data('init', 0);
+                    btn.html('展开更多');
+                    target.hide();
+                    target.eq(0).show();
+                    target.eq(1).show();
+                    target.eq(2).show();
+                }
+            }
+
+            $(function () {
+                init_activity_KindEditor_data(<%= activity.id%>, null, "87%");
+                showNormalImage('activity_description_<%= activity.id %>');
+                if ($("#intro_content_<%= activity.id %>").height() > 360) {
+                    $("#intro_content_show_<%= activity.id %>").show();
+                }
+                $("#intro_content_show_<%= activity.id %>").click(function () {
+                    $("#activity_description_<%= activity.id %>").toggleClass("maxh360");
+                    $("#activity_description_<%= activity.id%>").toggleClass("lh18");
+                    $("#intro_content_show_<%= activity.id %>").hide();
+                    $("#intro_content_hide_<%= activity.id %>").show();
+                });
+                $("#intro_content_hide_<%= activity.id %>").click(function () {
+                    $("#activity_description_<%= activity.id %>").toggleClass("maxh360");
+                    $("#activity_description_<%= activity.id%>").toggleClass("lh18");
+                    $("#intro_content_hide_<%= activity.id %>").hide();
+                    $("#intro_content_show_<%= activity.id %>").show();
+                });
+            });
+        </script>
+        <!--创建-->
+        <% case activity.forge_act_type %>
+        <% when "ProjectCreateInfo" %>
+            <%= render :partial => 'projects/project_create', :locals => {:activity => activity, :user_activity_id => activity.id} %>
+            <!--缺陷动态-->
+        <% when "Issue" %>
+            <%= render :partial => 'users/project_issue', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id} %>
+
+            <!--message    -->
+        <% when "Message" %>
+            <%= render :partial => 'users/project_message', :locals => {:activity => activity.forge_act,:user_activity_id =>activity.id} %>
+            <!--new 新闻-->
+        <% when "News" %>
+            <% if !activity.forge_act.nil? and activity.forge_act.project %>
+                <%= render :partial => 'projects/project_news', :locals => {:activity=>activity.forge_act, :user_activity_id=>activity.id} %>
+            <% end %>
+            <!--Attachment   -->
+        <% when "Attachment" %>
+            <%= render :partial => 'projects/attachment_acts', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id } %>
+            <!--<div class="problem_main">-->
+              <!--<a class="problem_pic fl"><%#= image_tag(url_to_avatar(activity.user), :width => "42", :height => "42") %></a>-->
+
+              <!--<div class="problem_txt fl mt5 break_word">-->
+                <!--<a class="problem_name fl ">-->
+                  <!--<%#= h(e.project) if @project.nil? || @project.id != e.project_id %>-->
+                  <!--<%#= link_to h(activity.user), user_path(activity.user_id), :class => "problem_name c_orange fl" %></a><span class="fl"> <%#= l(:label_new_activity) %>-->
+                <!--：</span>-->
+                <%#= link_to format_activity_title("#{l(:label_attachment)}: #{act.filename}"), {:controller => 'attachments', :action => 'show', :id => act.id}, :class => "problem_tit fl fb" %>
+                <!--<br/>-->
+
+                <!--<p class="mt5 break_word"><#%= textAreailizable act, :description %><br/>-->
+                  <!--<%#= l :label_create_time %>-->
+                  <!--：<%#= format_activity_day(act.created_on) %> <%#= format_time(act.created_on, false) %></p>-->
+              <!--</div>-->
+              <!--<div class="cl"></div>-->
+            <!--</div>-->
+        <% end %>
+    <% end %>
+<% end %>
+
+<% if forge_acts.count == 10 %>
+    <div id="show_more_forge_activities" class="loadMore mt10 f_grey">展开更多<%= link_to "", project_path(@project.id, :type => type, :page => page), :id => "more_forge_activities_link", :remote => "true", :class => "none" %></div>
+<% end %>
+
+<script type="text/javascript">
+    $("#show_more_forge_activities").mouseover(function () {
+        $("#more_forge_activities_link").click();
+    });
+</script>

app/views/projects/_project_create.html.erb

@@ -0,0 +1,38 @@
+<% project = Project.find(activity.project_id) %>
+<% user = User.find(project.user_id)%>
+<div class="resources mt10">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait">
+      <%= link_to image_tag(url_to_avatar(user), :width => "50", :height => "50"), user_path(user), :alt => "用户头像" %>
+    </div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo break_word mt-4">
+        <% if user.try(:realname) == ' ' %>
+            <%= link_to user, user_path(user), :class => "newsBlue mr15" %>
+        <% else %>
+            <%= link_to user.try(:realname), user_path(user), :class => "newsBlue mr15" %>
+        <% end %>
+        TO
+        <%= link_to project.to_s+" | 项目", project_path(project.id,:host=>Setting.host_course), :class => "newsBlue ml15" %>
+      </div>
+      <div class="homepagePostTitle break_word" >
+        <%= link_to project.name, project_path(project.id,:host=>Setting.host_course), :class => "postGrey" %>
+      </div>
+      <div class="homepagePostDate">
+        创建时间：<%= format_time(project.created_on) %>
+      </div>
+      <div class="homepagePostSetting" id="act-<%= user_activity_id %>" style="visibility: hidden">
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <ul class="homepagePostSettiongText">
+              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div>

app/views/projects/_project_news.html.erb

@@ -0,0 +1,106 @@
+<div class="resources mt10" id="user_activity_<%= user_activity_id %>">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait">
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
+    </div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo break_word mt-4">
+        <% if activity.try(:author).try(:realname) == ' ' %>
+            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% else %>
+            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% end %> TO
+        <%= link_to activity.project.name.to_s+" | 项目新闻", project_news_index_path(activity.project), :class => "newsBlue ml15" %>
+      </div>
+      <div class="homepagePostTitle break_word hidden fl m_w600"> <!--+"(通知标题)"-->
+        <%= link_to activity.title.to_s, news_path(activity), :class => "postGrey" %>
+      </div>
+      <% if activity.sticky == 1%>
+          <span class="sticky_btn_cir ml10">置顶</span>
+      <% end%>
+      <div class="cl"></div>
+      <div class="homepagePostDate">
+        发布时间：<%= format_time(activity.created_on) %>
+      </div>
+      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id %>">
+        <div id="intro_content_<%= user_activity_id %>">
+          <%= activity.description.html_safe %>
+        </div>
+      </div>
+      <div class="cl"></div>
+      <div id="intro_content_show_<%= user_activity_id %>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
+      <div id="intro_content_hide_<%= user_activity_id %>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
+      <div class="cl"></div>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <% count=activity.comments.count %>
+  <div class="homepagePostReply">
+    <div class="topBorder" style="display: <%= count>0 ? 'none': '' %>"></div>
+    <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
+      <div class="homepagePostReplyBannerCount" onclick="expand_reply_input('#reply_input_<%= user_activity_id %>');">
+        回复（<%= count %>）
+      </div>
+      <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
+      <%if count>3 %>
+          <div class="homepagePostReplyBannerMore">
+            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+              展开更多
+            </a>
+          </div>
+      <% end %>
+    </div>
+
+    <% replies_all_i = 0 %>
+    <% if count > 0 %>
+        <div class="" id="reply_div_<%= user_activity_id %>">
+          <ul>
+            <% activity.comments.reorder("created_on desc").each do |comment| %>
+                <script type="text/javascript">
+                    $(function(){
+                        showNormalImage('reply_content_<%= comment.id %>');
+                    });
+                </script>
+                <% replies_all_i = replies_all_i + 1 %>
+                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i > 3 ? 'none' : '' %>">
+                  <div class="homepagePostReplyPortrait">
+                    <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_path(comment.author_id), :alt => "用户头像" %>
+                  </div>
+                  <div class="homepagePostReplyDes">
+                    <div class="homepagePostReplyPublisher mt-4">
+                      <% if comment.try(:author).try(:realname) == ' ' %>
+                          <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
+                      <% else %>
+                          <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
+                      <% end %>
+                      <%= format_time(comment.created_on) %>
+                    </div>
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
+                      <%= comment.comments.html_safe %></div>
+                  </div>
+                  <div class="cl"></div>
+                </li>
+            <% end %>
+          </ul>
+        </div>
+    <% end %>
+
+    <div class="homepagePostReplyContainer borderBottomNone minHeight48">
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
+      <div class="homepagePostReplyInputContainer mb10">
+        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+          <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
+              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment[comments]"></textarea>
+              <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px; margin-left: 5px;"></div>
+              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+              <div class="cl"></div>
+              <p nhname='contentmsg_<%= user_activity_id%>'></p>
+          <% end%>
+        </div>
+        <div class="cl"></div>
+      </div>
+      <div class="cl"></div>
+    </div>
+  </div>
+</div>

app/views/projects/show.html.erb

@@ -1,114 +1,33 @@
-<%= javascript_include_tag "jquery.infinitescroll.js" %>
+<%#= stylesheet_link_tag 'courses' %>
-<div class="project_r_h">
+<script type="text/javascript">
-  <h2 class="project_h2"><%= l(:label_activity) %></h2>
+    $(function () {
-</div>
+        $("#RSide").removeAttr("id");
+        $("#Container").css("width", "1000px");
+    });
+</script>
+<input type="hidden" value="<%= @type %>" name="type" id="user_activities_type">
+<div class="homepageRight mt0 ml10">
+  <div class="homepageRightBanner">
+    <div class="NewsBannerName">项目动态</div>
+    <ul class="resourcesSelect" class="resourcesSelect">
+      <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
+        <ul class="homepagePostType">
+          <li>
+            <ul class="homepagePostTypeHomework fl">
+              <li><%= link_to "全部动态", {:controller => "projects", :action => "show", :type => nil}, :class => "homepagePostTypeAll postTypeGrey" %></li>
+              <li><%= link_to "问题动态", {:controller => "projects", :action => "show", :type => "issue"}, :class => "homepagePostTypeMessage postTypeGrey" %></li>
+              <!--<li><%#= link_to "作业动态", {:controller => "courses", :action => "show", :type => "homework"}, :class => "homepagePostTypeAssignment postTypeGrey" %></li>-->
+              <li><%= link_to "新闻动态", {:controller => "projects", :action => "show", :type => "news"}, :class => "homepagePostTypeNotice postTypeGrey" %></li>
+              <!--<li><%#= link_to "资源库动态", {:controller => "projects", :action => "show", :type => "attachment"}, :class => "homepagePostTypeResource resourcesGrey" %></li>-->
+              <li><%= link_to "讨论区动态", {:controller => "projects", :action => "show", :type => "message"}, :class => "homepagePostTypeForum postTypeGrey" %></li>
+              <!--<li><%#= link_to "问卷动态", {:controller => "courses", :action => "show", :type => "poll"}, :class => "homepagePostTypeQuiz postTypeGrey" %></li>-->
+            </ul>
+          </li>
+        </ul>
+      </li>
+    </ul>
     <!--CONTENT LIST-->
-<% unless @events_pages.empty? %>
-    <% @events_pages.each do |e| -%>
-        <!--创建-->
-        <% if e.forge_act_type == "ProjectCreateInfo"%>
-            <div class="problem_main">
-              <a  class="problem_pic fl"><%= image_tag(url_to_avatar(e.user),  :width => "42", :height => "42") %></a>
-                <div class="problem_txt fl mt5 break_word">
-                    <%= link_to e.user,  user_path(e.user), :class => "problem_name c_orange fl" %> <span class="fl"> <%= l(:label_project_create) %> ：</span>
-                    <%= link_to e.project.name,{} ,:class => "problem_tit fl fb" %></a><br />
-                    <p class="mt5"><br /> <%= l :label_create_time %> ：<%= format_time(e.project.created_on) %></p>
-                </div>
-                <div class="cl"></div>
-            </div>
-        <% end %>
-        <%  next if e.forge_act_type.safe_constantize.nil?
-            act = e.forge_act;
-            next if act.nil? %>
-        <!--缺陷动态-->
-        <% if e.forge_act_type == "Issue" %>
-            <div class="problem_main">
-              <a  class="problem_pic fl"><%= image_tag(url_to_avatar(act.author), :width => "42", :height => "42") %></a>
-              <div class="problem_txt fl mt5 break_word list_style">
-                <a class="problem_name fl ">
-                  <%= h(e.project) if @project.nil? || @project.id != e.project_id %>
-                  <%= link_to act.author, user_path(act.author), :class => "problem_name c_orange fl" %><span class="fl"> <%= l(:label_new_activity) %> ：</span>
-                  <%= link_to format_activity_title("#{act.source_from}##{act.project_issues_index} (#{act.status}): #{act.tracker.name} #{act.subject}"),
-                                {:controller => 'issues',
-                                 :action => 'show',
-                                 :id => act.id},
-                                 :class => "problem_tit fl fb " %>
-                </a><br />
-                <p class="mt5 break_word"><%= act.description.html_safe %><br />
-                  <%= l :label_activity_time %> ：<%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %>
-                </p>
-              </div>
-              <div class="cl"></div>
-            </div>
-        <!--缺陷 jou留言 -->
-        <% elsif e.forge_act_type == "Journal" %>
-            <div class="problem_main">
-              <a  class="problem_pic fl"><%= image_tag(url_to_avatar(e.user), :width => "42", :height => "42") %></a>
-              <div class="problem_txt fl mt5 break_word">
-                <a class="problem_name fl ">
-                  <%= h(e.project) if @project.nil? || @project.id != e.project_id %>
-                  <%= link_to h(e.user), user_path(e.user_id), :class => "problem_name c_orange fl" %><span class="fl"> <%= l(:label_new_activity) %> ：</span>
-                  <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.project_issues_index}: #{act.issue.subject}"),
-                              {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"}, :class => "problem_tit fl fb" %>
-                </a><br />
-                <p class="mt5 break_word"><%=  act.notes.html_safe %><br />
-                  <%= l :label_activity_time %> ：<%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %></p>
-              </div>
-              <div class="cl"></div>
-            </div>
-        <!--message    -->
-            <% elsif e.forge_act_type == "Message" %>
-            <div class="problem_main">
-              <a  class="problem_pic fl"><%= image_tag(url_to_avatar(e.user), :width => "42", :height => "42") %></a>
-              <div class="problem_txt fl mt5 break_word list_style">
-                <a class="problem_name fl ">
-                  <%= h(e.project) if @project.nil? || @project.id != e.project_id %>
-                  <%= link_to h(e.user), user_path(e.user_id), :class => "problem_name c_orange fl" %></a><span class="fl"> <%= l(:label_new_activity) %> ：</span>
 
-                  <%= link_to format_activity_title("#{act.board.name}: #{act.subject}"),
-                                project_boards_path(@project,:topic_id => act.id),
-                               :class => "problem_tit fl fb " %>
-                <br />
-                <p class="mt5 break_word"><%= textAreailizable act,:content %><br />
-                <div class="cl"></div>
-                  <%= l :label_create_time %> ：<%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %></p>
   </div>
-              <div class="cl"></div>
+  <%= render :partial => "project_activities", :locals => {:forge_acts => @events_pages, :page => 0, :type => @type} %>
 </div>
-        <!--new 新闻-->
-        <% elsif e.forge_act_type == "News" %>
-            <div class="problem_main">
-              <a  class="problem_pic fl"><%= image_tag(url_to_avatar(e.user), :width => "42", :height => "42") %></a>
-              <div class="problem_txt fl mt5 break_word list_style">
-                <a class="problem_name fl ">
-                  <%= h(e.project) if @project.nil? || @project.id != e.project_id %>
-                  <%= link_to h(e.user), user_path(e.user_id), :class => "problem_name c_orange fl" %></a><span class="fl"> <%= l(:label_new_activity) %> ：</span>
-                <a class="problem_tit fl fb">
-                  <% unless act.nil? %>
-                      <%= link_to format_activity_title("#{l(:label_news)}: #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id}, :class => "problem_tit fl fb " %>
-                  <% end %>
-                </a><br />
-                <p class="mt5 break_word"><%= textAreailizable act,:description %><br />
-                  <%= l :label_create_time %> ：<%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %></p>
-              </div>
-              <div class="cl"></div>
-            </div>
-
-        <!--Attachment   -->
-        <% elsif e.forge_act_type == "Attachment" %>
-            <div class="problem_main">
-              <a  class="problem_pic fl"><%= image_tag(url_to_avatar(e.user), :width => "42", :height => "42") %></a>
-              <div class="problem_txt fl mt5 break_word">
-                <a class="problem_name fl ">
-                  <%= h(e.project) if @project.nil? || @project.id != e.project_id %>
-                  <%= link_to h(e.user), user_path(e.user_id), :class => "problem_name c_orange fl" %></a><span class="fl"> <%= l(:label_new_activity) %> ：</span>
-                  <%= link_to format_activity_title("#{l(:label_attachment)}: #{act.filename}"), {:controller => 'attachments', :action => 'show', :id => act.id}, :class => "problem_tit fl fb" %></a><br />
-                <p class="mt5 break_word"><%= textAreailizable act,:description %><br />
-                  <%= l :label_create_time %> ：<%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %></p>
-              </div>
-              <div class="cl"></div>
-            </div>
-        <% end %>
-    <% end %>
-<% end %>
-<%= paginate @events_pages, :left => 3, :right => 3 %>

app/views/projects/show.js.erb

@@ -0,0 +1 @@
+$("#show_more_forge_activities").replaceWith("<%= escape_javascript( render :partial =>  'projects/project_activities',:locals => {:forge_acts => @events_pages, :page => @page,:type => @type} )%>");

config/routes.rb

@@ -36,6 +36,7 @@ RedmineApp::Application.routes.draw do
       get 'setting'#, :action => 'settings', :as => 'settings'
       get 'clear_org_avatar_temp'
       put 'set_homepage'
+      put 'cancel_homepage'
       get 'members'
       get 'more_org_projects'
       get 'more_org_courses'
@@ -69,6 +70,10 @@ RedmineApp::Application.routes.draw do
     end
   end
 
+  resources :org_subfields do
+
+  end
+
   resources :org_document_comments do
     member do
       post 'add_reply'

db/migrate/20151130032658_create_org_docume_editor.rb

@@ -0,0 +1,12 @@
+class CreateOrgDocumeEditor < ActiveRecord::Migration
+  def up
+    create_table :editor_of_documents do |t|
+      t.integer :editor_id
+      t.integer :org_document_comment_id
+      t.timestamp :created_at
+    end
+  end
+
+  def down
+  end
+end

db/migrate/20151130064556_copy_document_created_at_for_editor_of_document.rb

@@ -0,0 +1,12 @@
+class CopyDocumentCreatedAtForEditorOfDocument < ActiveRecord::Migration
+  def up
+    OrgDocumentComment.all.each do |doc|
+      if doc.parent.nil?
+        EditorOfDocument.create(:editor_id => doc.creator_id, :org_document_comment_id => doc.id, :created_at => doc.updated_at)
+      end
+    end
+  end
+
+  def down
+  end
+end

db/migrate/20151204030143_create_org_subfields.rb

@@ -0,0 +1,13 @@
+class CreateOrgSubfields < ActiveRecord::Migration
+  def up
+    create_table :org_subfields do |t|
+      t.integer :organization_id
+      t.integer :priority
+      t.string :name
+      t.timestamps
+    end
+  end
+
+  def down
+  end
+end

public/stylesheets/org.css

@@ -55,3 +55,13 @@ a.cancelBtn:hover {background-color:#717171; color:#ffffff;}
 /*关联项目弹窗*/
 .projectRelate {float:left; max-height:118px;margin-right:16px;margin-bottom:10px;    overflow:auto; overflow-x:hidden; width:288px;}
 .relateText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; display:inline-block; font-weight: bold;}
+
+/*组织首页新151204Tim*/
+.orgNav {width:1000px; height:30px; background-color:#cfcfcf; margin:0 auto;}
+.orgContainer {width:100%; margin:0 auto; background-color:#cfcfcf;}
+.navOrgLogo {width:21px; height:30px; margin-left:2px; margin-right:15px;}
+.navOrgMenu {display:inline-block;height:30px; line-height:30px; vertical-align:middle;}
+a.linkGrey8 {color:#888888;}
+a.linkGrey8:hover {color:#585858;}
+.orgBorder {width:583px; height:21px; border-bottom:3px solid #e4e4e4; float:left;}
+.orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px; color:#555555;}

spec/controllers/org_subfields_controller_spec.rb

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