From 3465a39285618f787c5c4db8a90966192e95eb22 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 31 Mar 2016 13:07:12 +0800
Subject: [PATCH 01/27] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE=20?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org_newstyle.html.erb | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/views/layouts/base_org_newstyle.html.erb b/app/views/layouts/base_org_newstyle.html.erb
index e344e64dd..ff94326a0 100644
--- a/app/views/layouts/base_org_newstyle.html.erb
+++ b/app/views/layouts/base_org_newstyle.html.erb
@@ -77,7 +77,7 @@
       <% @subfield_content.each do |field| %>
           <% if is_default_field?(field) %>
               <% case field.name %>
-      <% when 'activity' %>
+              <% when 'activity' %>
                   <%= link_to "首页", organization_path(@organization), :class => "fl navact" %>
               <% when 'course' %>
                   <a href="#course_<%= field.id %>" class="fl"> 课程动态</a>
@@ -92,6 +92,9 @@
               <% end %>
           <% end %>
       <% end %>
+      <% if User.current.admin_of_org?(@organization) %>
+          <a href="<%= setting_organization_path(@organization) %>" class="fl">配置</a>
+      <% end %>
     </div>
   </div><!--nav end-->
 
@@ -109,7 +112,7 @@
           <% when 'course' %>
               <div class="box1 bg-grey">
                 <div class="content">
-                  <div class="box-top" id="course_<%= field.id %>"><h2 class="box-title">课程动态</h2><p class="box-title-p">course activities</p></div>
+                  <div class="box-top" style="display:<%= field.hide == 0?'block':'none' %>;" id="course_<%= field.id %>"><h2 class="box-title">课程动态</h2><p class="box-title-p">course activities</p></div>
                   <div class="course-list">
                     <ul class="clearfix">
                       <% unless @course_acts_homework.nil? %>
@@ -136,14 +139,12 @@
                       <div class="cl"></div>
                     </ul>
                   </div>
-
-
                 </div><!--content end-->
               </div><!--box1 end-->
           <% when 'project' %>
               <div class="box1">
                 <div class="content">
-                  <div class="box-top" id="project_<%= field.id %>"><h2 class="box-title">项目动态</h2><p class="box-title-p">project activities</p></div>
+                  <div class="box-top" style="display:<%= field.hide == 0?'block':'none' %>;" id="project_<%= field.id %>"><h2 class="box-title">项目动态</h2><p class="box-title-p">project activities</p></div>
                   <div class="row">
                     <% unless @project_message_acts.nil? %>
                     <div class="row-l fl">
@@ -177,7 +178,7 @@
               <% ids = field.org_document_comments.map{|o| o.id}.join(",") %>
               <div class="box1 bg-grey" style="display:<%= field.hide == 0?'block':'none' %>;" id="org_subfield_<%= field.id %>">
                 <div class="content">
-                  <div class="box-top" id="message_<%= field.id %>"><h2 class="box-title"><%= field.name %><%= field.id %></h2><p class="box-title-p">discussion zone</p></div>
+                  <div class="box-top" id="message_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2><p class="box-title-p">discussion zone</p></div>
                   <div class="row">
                     <div class="con-left fl">
                       <% message_ats.each do |act| %>
@@ -206,7 +207,7 @@
               <% org_attachs = get_attach_org2(field) %>
               <div class="box1" style="display:<%= field.hide == 0?'block':'none' %>;" id="org_subfield_<%= field.id %>">
                 <div class="content">
-                  <div class="box-top" id="resource_<%= field.id %>"><h2 class="box-title"><%= field.name %><%= field.id %></h2><p class="box-title-p">resource dwonload</p></div>
+                  <div class="box-top" id="resource_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2><p class="box-title-p">resource dwonload</p></div>
                   <div class="row">
                     <%= render :partial => 'organizations/org_new_resource', :locals => {:org_attachs => org_attachs} %>
                     <!--row-ziyuan end-->

From 20ea251cabb4b4b4277883ee8e72faa9e373bc9d Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 31 Mar 2016 14:01:09 +0800
Subject: [PATCH 02/27] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/migrate/20160331060004_add_type_to_organization.rb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 db/migrate/20160331060004_add_type_to_organization.rb

diff --git a/db/migrate/20160331060004_add_type_to_organization.rb b/db/migrate/20160331060004_add_type_to_organization.rb
new file mode 100644
index 000000000..e9313433b
--- /dev/null
+++ b/db/migrate/20160331060004_add_type_to_organization.rb
@@ -0,0 +1,5 @@
+class AddTypeToOrganization < ActiveRecord::Migration
+  def change
+    add_column :organizations, :type, :integer, :default => true
+  end
+end

From cf946687d0a8f7c1f6892b15929c35b3cc2956b3 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 31 Mar 2016 14:02:35 +0800
Subject: [PATCH 03/27] =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/_subfield_list.html.erb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb
index d907ac33e..e86ef5dae 100644
--- a/app/views/organizations/_subfield_list.html.erb
+++ b/app/views/organizations/_subfield_list.html.erb
@@ -2,6 +2,7 @@
   <li class="orgOrder fb">顺序</li>
   <li class="orgListUser fb">已有栏目</li>
   <li class="orgListStatus fb">状态</li>
+  <li class="orgListStatus fb">排列</li>
   <li class="orgListStatus fb">类型</li>
   <li class="orgListUser fb">域名目录</li>
   <div class="cl"></div>
@@ -21,6 +22,9 @@
           </li>
           <li class="orgListUser"><%= name %></li>
           <li class="orgListStatus">默认</li>
+          <li class="orgListStatus">
+            相关
+          </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>
           <div class="cl"></div>
@@ -42,6 +46,10 @@
             </div>
           </li>
           <li class="orgListStatus">新增</li>
+          <li class="orgListStatus">
+
+            相关
+          </li>
           <li class="orgListStatus"><%= field.field_type == "Post" ? "帖子" : "资源" %></li>
           <li class="orgListUser hidden">
             <% if Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 %>

From 893fad2b4856614b05ed34515ee8bebc69bb3fa2 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 31 Mar 2016 15:21:40 +0800
Subject: [PATCH 04/27] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=87=8C=E7=9A=84=E6=A0=8F=E7=9B=AE=20=E2=80=9C=E6=8E=92?=
 =?UTF-8?q?=E5=88=97=E5=81=9A=E6=88=90=E5=8F=AF=E7=BC=96=E8=BE=91=E7=9A=84?=
 =?UTF-8?q?=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/org_subfields_controller.rb   |  6 +++
 app/helpers/organizations_helper.rb           | 14 ++++++
 app/views/org_subfields/update_status.js.erb  |  3 ++
 .../organizations/_subfield_list.html.erb     | 47 +++++++++++++++++--
 config/routes.rb                              |  1 +
 ...20160331060004_add_type_to_organization.rb |  5 --
 ...60331063938_add_status_to_org_subfields.rb |  5 ++
 db/schema.rb                                  |  3 +-
 8 files changed, 75 insertions(+), 9 deletions(-)
 create mode 100644 app/views/org_subfields/update_status.js.erb
 delete mode 100644 db/migrate/20160331060004_add_type_to_organization.rb
 create mode 100644 db/migrate/20160331063938_add_status_to_org_subfields.rb

diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb
index bc339319b..661073cdc 100644
--- a/app/controllers/org_subfields_controller.rb
+++ b/app/controllers/org_subfields_controller.rb
@@ -130,6 +130,12 @@ class OrgSubfieldsController < ApplicationController
     @organization = @org_subfield.organization
   end
 
+  def update_status
+    @subfield = OrgSubfield.find(params[:id])
+    @organization = Organization.find(@subfield.organization_id)
+    @subfield.update_attributes(:status => params[:status])
+  end
+
   def show_attachments obj
     @attachments = []
     obj.each do |container|
diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index c2ba5b03b..bc9a2fc87 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -59,4 +59,18 @@ module OrganizationsHelper
     end
   end
 
+  #排列下拉框
+  def subfield_status_option
+    type = []
+    option1 = []
+    option1 << 0
+    option1 << 0
+    type << option1
+    option2 = []
+    option2 << 1
+    option2 << 1
+    type << option2
+    type
+  end
+
 end
diff --git a/app/views/org_subfields/update_status.js.erb b/app/views/org_subfields/update_status.js.erb
new file mode 100644
index 000000000..06982ccfc
--- /dev/null
+++ b/app/views/org_subfields/update_status.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}) %>");
\ No newline at end of file
diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb
index e86ef5dae..6a405e73a 100644
--- a/app/views/organizations/_subfield_list.html.erb
+++ b/app/views/organizations/_subfield_list.html.erb
@@ -23,7 +23,14 @@
           <li class="orgListUser"><%= name %></li>
           <li class="orgListStatus">默认</li>
           <li class="orgListStatus">
-            相关
+            <%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %>
+                <div class="update_status_class"><span style="width: 35px; text-align: center; float: left;" class="hidden"><%=field.status %></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},
+                            {:onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:30px;"}) %>
+            <% 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>
@@ -47,8 +54,14 @@
           </li>
           <li class="orgListStatus">新增</li>
           <li class="orgListStatus">
-
-            相关
+            <%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %>
+                <div class="update_status_class"><span style="width: 35px; text-align: center; float: left;" class="hidden"><%=field.status %></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},
+                            {:onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:30px;"}) %>
+            <% end %>
           </li>
           <li class="orgListStatus"><%= field.field_type == "Post" ? "帖子" : "资源" %></li>
           <li class="orgListUser hidden">
@@ -76,6 +89,34 @@
 <% end %>
 
 <script>
+    $(document).ready(function(){
+        $(".pic_edit2").click(function(){
+            $(this).parent().hide();
+            $(this).parent().next().show();
+        });
+        $(".class-edit").blur(function(){
+            $(this).hide();
+            $(this).prev().show();
+            var editValue = $(this).children("option:selected").text();
+            $(this).prev().children(":first").text(editValue);
+        });
+        function stopPropagation(e) {
+            if (e.stopPropagation)
+                e.stopPropagation();
+            else
+                e.cancelBubble = true;
+        };
+        $(document).bind('click',function(){
+            $('.class-edit').css('display','none');
+            $('.update_status_class').show();
+        });
+        $('.class-edit,.pic_edit2').bind('click',function(e){
+            stopPropagation(e);
+        });
+    });
+    function update_status(id){
+        $(id).submit();
+    }
     function edit(show_id, edit_id) {
         $(show_id).toggle();
         $(edit_id).toggle();
diff --git a/config/routes.rb b/config/routes.rb
index 9b83c779a..56194bd20 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -112,6 +112,7 @@ RedmineApp::Application.routes.draw do
     member do
       match 'update_sub_dir', :via => [:put]
       match 'update_priority', :via => [:put]
+      match 'update_status', :via => [:post]
     end
     resource :boards
   end
diff --git a/db/migrate/20160331060004_add_type_to_organization.rb b/db/migrate/20160331060004_add_type_to_organization.rb
deleted file mode 100644
index e9313433b..000000000
--- a/db/migrate/20160331060004_add_type_to_organization.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddTypeToOrganization < ActiveRecord::Migration
-  def change
-    add_column :organizations, :type, :integer, :default => true
-  end
-end
diff --git a/db/migrate/20160331063938_add_status_to_org_subfields.rb b/db/migrate/20160331063938_add_status_to_org_subfields.rb
new file mode 100644
index 000000000..70ce25e0c
--- /dev/null
+++ b/db/migrate/20160331063938_add_status_to_org_subfields.rb
@@ -0,0 +1,5 @@
+class AddStatusToOrgSubfields < ActiveRecord::Migration
+  def change
+    add_column :org_subfields, :status, :integer, :default => true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 8041b347b..a3fb50eca 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160328022623) do
+ActiveRecord::Schema.define(:version => 20160331063938) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1289,6 +1289,7 @@ ActiveRecord::Schema.define(:version => 20160328022623) do
     t.datetime "updated_at",                     :null => false
     t.string   "field_type"
     t.integer  "hide",            :default => 0
+    t.integer  "status",          :default => 1
   end
 
   create_table "organizations", :force => true do |t|

From c6f6030e10bdddf424730120d4be01374c71d705 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 31 Mar 2016 15:25:02 +0800
Subject: [PATCH 05/27] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=96=B0=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb   |  31 ++++-
 app/helpers/organizations_helper.rb           |   2 +-
 app/views/layouts/base_org_newstyle.html.erb  | 116 ++++++++++--------
 .../_org_new_course_act_list.html.erb         |  48 ++++++++
 .../_org_new_forum_list.html.erb              |  14 +++
 .../organizations/_org_new_forum_pic.html.erb |  24 ++++
 .../_org_new_project_act_list.html.erb        |  49 ++++++++
 .../_org_new_project_pic.html.erb             |  77 ++++++++++++
 ...20160331060004_add_type_to_organization.rb |   5 -
 db/schema.rb                                  |   3 +-
 10 files changed, 306 insertions(+), 63 deletions(-)
 create mode 100644 app/views/organizations/_org_new_course_act_list.html.erb
 create mode 100644 app/views/organizations/_org_new_forum_list.html.erb
 create mode 100644 app/views/organizations/_org_new_forum_pic.html.erb
 create mode 100644 app/views/organizations/_org_new_project_act_list.html.erb
 create mode 100644 app/views/organizations/_org_new_project_pic.html.erb
 delete mode 100644 db/migrate/20160331060004_add_type_to_organization.rb

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index e1ea6935a..281f779d7 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -34,6 +34,7 @@ class OrganizationsController < ApplicationController
 
   end
 
+
   def new
     @organization = Organization.new
     render :layout => 'new_base'
@@ -74,10 +75,12 @@ class OrganizationsController < ApplicationController
       if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
         @subfield_content = @organization.org_subfields.order("priority")
         # 项目两种动态
+        @project_acts = get_project_activities_org @organization
         @project_issue_acts = get_project_issue_activities_org @organization
         @project_message_acts = get_project_message_activities_org @organization
         # 磕碜动态
         #@project_acts_issues = get_project_activities_org @organization
+        @course_acts = get_course_activities_org @organization
         @course_acts_homework = get_course_homework_activities_org @organization
         @course_acts_message = get_course_message_activities_org @organization
         @course_acts_news = get_course_news_activities_org @organization
@@ -153,6 +156,29 @@ class OrganizationsController < ApplicationController
     #project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{project_ids}) and container_type = 'project' and org_act_type = 'issue' order by updated_at desc limit 4;")
   end
 
+  # 获取整过项目的动态
+  def get_project_activities_org org
+    project_ids = org.projects.map{|project| project.id}.join(",")
+    unless project_ids.blank?
+      project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{project_ids}) and container_type = 'project'  order by updated_at desc limit 3;")
+    else
+      project_acts = nil
+    end
+    #project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{project_ids}) and container_type = 'project' and org_act_type = 'issue' order by updated_at desc limit 4;")
+  end
+
+  # 获取整过课程的动态
+  def get_course_activities_org org
+    course_ids = org.courses.map{|course| course.id}.join(",")
+    unless course_ids.blank?
+      project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{course_ids}) and container_type = 'course' order by updated_at desc limit 6;")
+    else
+      project_acts = nil
+    end
+    #project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{course_ids}) and container_type = 'course' order by updated_at desc limit 5;")
+    #project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{course_ids}) and container_type = 'course' and org_act_type = 'HomeworkCommon' order by updated_at desc limit 1;")
+  end
+
   def get_course_homework_activities_org org
     course_ids = org.courses.map{|course| course.id}.join(",")
     unless course_ids.blank?
@@ -228,11 +254,6 @@ class OrganizationsController < ApplicationController
     end
   end
 
-
-  def clear_org_avatar_temp
-
-  end
-
   def set_homepage
     @org = Organization.find(params[:id])
     @org.home_id = params[:home_id]
diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index c2ba5b03b..3cbdcafaa 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -30,7 +30,7 @@ module OrganizationsHelper
   end
 
   def get_message_org(org_id, field_id)
-    OrgDocumentComment.find_by_sql("SELECT * FROM org_document_comments where organization_id = #{org_id} and org_subfield_id = #{field_id} and parent_id is null order by updated_at desc limit 2;")
+    OrgDocumentComment.find_by_sql("SELECT * FROM org_document_comments where organization_id = #{org_id} and org_subfield_id = #{field_id} and parent_id is null order by updated_at desc limit 3;")
   end
 
   def get_message_reply_org(org_id, ids)
diff --git a/app/views/layouts/base_org_newstyle.html.erb b/app/views/layouts/base_org_newstyle.html.erb
index ff94326a0..7b3bdb754 100644
--- a/app/views/layouts/base_org_newstyle.html.erb
+++ b/app/views/layouts/base_org_newstyle.html.erb
@@ -110,9 +110,10 @@
       <% if is_default_field?(field) %>
           <% case field.name %>
           <% when 'course' %>
-              <div class="box1 bg-grey">
+              <div class="box1" style="display:<%= field.hide == 0?'block':'none' %>;">
+               <% if false %>
                 <div class="content">
-                  <div class="box-top" style="display:<%= field.hide == 0?'block':'none' %>;" id="course_<%= field.id %>"><h2 class="box-title">课程动态</h2><p class="box-title-p">course activities</p></div>
+                  <div class="box-top"  id="course_<%= field.id %>"><h2 class="box-title">课程动态</h2><p class="box-title-p">course activities</p></div>
                   <div class="course-list">
                     <ul class="clearfix">
                       <% unless @course_acts_homework.nil? %>
@@ -140,68 +141,81 @@
                     </ul>
                   </div>
                 </div><!--content end-->
+               <% else %>
+                    <div class="content">
+                      <div class="box-top"  id="course_<%= field.id %>"><h2 class="box-title">课程动态</h2></div>
+                      <div class="row">
+                            <%= render :partial => 'organizations/org_new_course_act_list', :locals =>{:activities => @course_acts, :field => field, :organization => @organization} %>
+                        <!--row-ziyuan end-->
+                      </div>
+                      <div class="cl"></div>
+                      <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                      <div class="cl"></div>
+                    </div><!--row end-->
+               <% end %>
               </div><!--box1 end-->
           <% when 'project' %>
-              <div class="box1">
+            <% if true %>
                 <div class="content">
-                  <div class="box-top" style="display:<%= field.hide == 0?'block':'none' %>;" id="project_<%= field.id %>"><h2 class="box-title">项目动态</h2><p class="box-title-p">project activities</p></div>
+                  <div class="box-top"  id="course_<%= field.id %>"><h2 class="box-title">项目动态</h2><p class="box-title-p"></p></div>
+                  <div class="course-list">
+                    <ul class="clearfix">
+                      <% unless @project_acts.nil? %>
+
+                                <%= render :partial => 'organizations/org_new_project_pic', :locals => {:activities => @project_acts} %>
+
+                      <% end %>
+                      <div class="cl"></div>
+                    </ul>
+                  </div>
+                </div><!--content end-->
+            <% else %>
+                <div class="content">
+                  <div class="box-top" id="resource_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2></div>
                   <div class="row">
-                    <% unless @project_message_acts.nil? %>
-                    <div class="row-l fl">
-                      <!-- text -->
-                      <% @project_message_acts.each do |act| %>
-                          <%= render :partial => 'organizations/org_new_project_message', :locals => {:activity => Message.find(act.org_act_id)} %>
-                      <% end %>
-                      <%= link_to "More", organization_path(@organization, :type => 1), :class => "more-btn mt30 fr", :target => "_blank" %>
-                      <div class="cl"></div>
-                    </div>
-                    <% end %>
-                    <!-- row-l end -->
-                    <% unless @project_issue_acts.nil? %>
-                    <div class="row-r fr">
-                      <% @project_issue_acts.each do |act| %>
-                          <%= render :partial => 'organizations/org_new_project_issues', :locals => {:activity => Issue.find(act.org_act_id)} %>
-                      <% end %>
-                      <%= link_to "More", organization_path(@organization, :type => 1), :class => "more-btn mt30 fr", :target => "_blank" %>
-                      <div class="cl"></div>
-                    </div>
-                    <% end %>
-                    <!-- article-rwrap end -->
+                    <%= render :partial => 'organizations/org_new_project_act_list', :locals =>{:activities => @project_acts, :field => field, :organization => @organization} %>
+                    <!--row-ziyuan end-->
                   </div>
                   <div class="cl"></div>
-                </div><!--content end-->
-              </div><!--box2 end-->
+                  <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                  <div class="cl"></div>
+                </div><!--row end-->
+            <% end %>
+
           <% end %>
       <% else %>
           <% if field.field_type == "Post" %> <%# 讨论类型 %>
               <% message_ats = get_message_org(@organization.id, field.id) %>
               <% ids = field.org_document_comments.map{|o| o.id}.join(",") %>
               <div class="box1 bg-grey" style="display:<%= field.hide == 0?'block':'none' %>;" id="org_subfield_<%= field.id %>">
-                <div class="content">
-                  <div class="box-top" id="message_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2><p class="box-title-p">discussion zone</p></div>
-                  <div class="row">
-                    <div class="con-left fl">
-                      <% message_ats.each do |act| %>
-                          <%= render :partial => 'organizations/org_new_forum', :locals => {:activity => act, :field => field, :organization => @organization} %>
-                      <% end %>
-                      <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn mt30 fr", :target => "_blank" %>
-                      <div class="cl"></div>
-                    </div><!--con-left end-->
-                    <% unless ids.blank? %>
-                        <% message_reply_ats = get_message_reply_org(@organization.id, ids) %>
-                        <div class="con-right fr">
-                          <% message_reply_ats.each do |act| %>
-                              <%= render :partial => 'organizations/org_new_forum_reply', :locals => {:activity => act, :field => field, :organization => @organization} %>
-                          <% end %>
-                          <div class="cl"></div>
-                        </div><!--con-right end--->
+                <% if false %>
+                    <div class="content">
+                      <div class="box-top" id="message_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2></div>
+                      <div class="course-list">
+                        <ul class="clearfix">
 
-                    <% end %>
-                  </div>
-                </div><!-content end-->
-                <div class="cl"></div>
-                <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
-                <div class="cl"></div>
+                                <% message_ats.each do |act| %>
+                                    <%= render :partial => 'organizations/org_new_forum_pic', :locals => {:activity => act, :field => field, :organization => @organization} %>
+                                <% end %>
+                  <div class="cl"></div>
+                        </ul>
+                      </div>
+                    </div><!--content end-->
+                <% else %>
+                    <div class="content">
+                      <div class="box-top" id="resource_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2></div>
+                      <div class="row">
+                        <% message_ats.each do |act| %>
+                        <%= render :partial => 'organizations/org_new_forum_list', :locals => {:activity => act, :field => field, :organization => @organization} %>
+                        <% end %>
+                        <!--row-ziyuan end-->
+                      </div>
+                      <div class="cl"></div>
+                      <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                      <div class="cl"></div>
+                    </div><!--row end-->
+                    <div class="cl"></div>
+                <% end %>
               </div><!--box1 end-->
           <% elsif field.field_type == "Resource" %>
               <% org_attachs = get_attach_org2(field) %>
diff --git a/app/views/organizations/_org_new_course_act_list.html.erb b/app/views/organizations/_org_new_course_act_list.html.erb
new file mode 100644
index 000000000..18a1e6662
--- /dev/null
+++ b/app/views/organizations/_org_new_course_act_list.html.erb
@@ -0,0 +1,48 @@
+<% activities.each do |act| %>
+    <% if act.org_act_type == "HomeworkCommon" %>
+        <% activity = HomeworkCommon.find(act.org_act_id) %>
+        <div class="row-ziyuan fl">
+          <%= link_to image_tag(url_to_avatar(activity.user),:width => "40", :height => "40"), user_path(activity.user), :class => "fl user-img" %>
+          <!--<a href="#" class="fl user-img" ><img src="images/detailimg4.jpg" /></a>-->
+          <div class="ziyuan-box fl">
+            <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "fl ziyuan-title" %>
+            <%#= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "fl ziyuan-title" %>
+            <p class="fl"><span >发布时间：<%= format_date activity.updated_at %></span>
+              <span> 作者：<%= activity.try(:user).try(:realname).nil? ? activity.try(:user).try(:login) : activity.try(:user).try(:realname) %></span>
+              <span class="fr right-info2"> <%= activity.journals_for_messages.count %></span> </p>
+          </div>
+
+        </div><!--row-ziyuan end-->
+    <% elsif act.org_act_type == "Message" %>
+        <% activity = Message.find(act.org_act_id) %>
+        <div class="row-ziyuan fl">
+          <%= link_to image_tag(url_to_avatar(activity.author),:width => "40", :height => "40"), user_path(activity.author), :class => "fl user-img" %>
+          <!--<a href="#" class="fl user-img" ><img src="images/detailimg4.jpg" /></a>-->
+          <div class="ziyuan-box fl">
+            <% 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 => "fl ziyuan-title" %>
+            <% else %>
+                <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "fl ziyuan-title" %>
+            <% end %>
+            <%#= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "fl ziyuan-title" %>
+            <p class="fl"><span >发布时间：<%= format_date activity.updated_on %></span>
+              <span> 作者：<%= activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname) %></span>
+              <span class="fr right-info2"> <%= activity.children.count %></span> </p>
+          </div>
+
+        </div><!--row-ziyuan end-->
+    <% elsif act.org_act_type == "News" %>
+        <% activity = News.find(act.org_act_id) %>
+        <div class="row-ziyuan fl">
+          <%= link_to image_tag(url_to_avatar(activity.creator),:width => "40", :height => "40"), user_path(activity.creator), :class => "fl user-img" %>
+          <!--<a href="#" class="fl user-img" ><img src="images/detailimg4.jpg" /></a>-->
+          <div class="ziyuan-box fl">
+            <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "fl ziyuan-title" %>
+            <p class="fl"><span >发布时间：<%= format_date activity.updated_at %></span>
+              <span> 作者：<%= activity.try(:creator).try(:realname).nil? ? activity.try(:creator).try(:login) : activity.try(:creator).try(:realname) %></span>
+              <span class="fr right-info2"> <%= activity.children.count %></span> </p>
+          </div>
+        </div><!--row-ziyuan end-->
+    <% end %>
+
+<% end %>
\ No newline at end of file
diff --git a/app/views/organizations/_org_new_forum_list.html.erb b/app/views/organizations/_org_new_forum_list.html.erb
new file mode 100644
index 000000000..a8e531b50
--- /dev/null
+++ b/app/views/organizations/_org_new_forum_list.html.erb
@@ -0,0 +1,14 @@
+
+    <div class="row-ziyuan fl">
+      <%= link_to image_tag(url_to_avatar(activity.creator),:width => "40", :height => "40"), user_path(activity.creator), :class => "fl user-img" %>
+      <!--<a href="#" class="fl user-img" ><img src="images/detailimg4.jpg" /></a>-->
+      <div class="ziyuan-box fl">
+        <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "fl ziyuan-title" %>
+        <p class="fl"><span >发布时间：<%= format_date activity.updated_at %></span>
+          <span> 作者：<%= activity.try(:creator).try(:realname).nil? ? activity.try(:creator).try(:login) : activity.try(:creator).try(:realname) %></span>
+          <span class="fr right-info2"> <%= activity.children.count %></span> </p>
+      </div>
+
+    </div><!--row-ziyuan end-->
+
+
diff --git a/app/views/organizations/_org_new_forum_pic.html.erb b/app/views/organizations/_org_new_forum_pic.html.erb
new file mode 100644
index 000000000..c4fd061a5
--- /dev/null
+++ b/app/views/organizations/_org_new_forum_pic.html.erb
@@ -0,0 +1,24 @@
+<li>
+  <a href="/#" title="" >
+    <div class="course-list-img">
+      <% iamge_path = get_image_path_from_content(activity.content) %>
+      <% if iamge_path.nil? %>
+          <img width="370" height="220" alt="#" src="/images/org_new_style/default-img.jpg">
+      <% else %>
+          <img width="370" height="220" src="/files/uploads/image<%= iamge_path %>" alt="" />
+      <% end %>
+    </div>
+    <h5>
+      <span><%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank' %></span>
+    </h5>
+    <div class="item-btm clearfix">
+      <a class="publisher-name fl" href="#" target="_blank"><%= activity.try(:creator).try(:realname).nil? ? activity.try(:creator).try(:login) : activity.try(:creator).try(:realname) %></a>
+      <p class="pass-time fl"><span><%= format_date activity.created_at %></span></p>
+      <div class="fr right-info"> <span> <%= activity.children.count %></span></div>
+    </div>
+  </a>
+</li>
+
+
+
+
diff --git a/app/views/organizations/_org_new_project_act_list.html.erb b/app/views/organizations/_org_new_project_act_list.html.erb
new file mode 100644
index 000000000..b3754024f
--- /dev/null
+++ b/app/views/organizations/_org_new_project_act_list.html.erb
@@ -0,0 +1,49 @@
+<% activities.each do |act| %>
+    <% if act.org_act_type == "Issue" %>
+        <% activity = Issue.find(act.org_act_id) %>
+        <div class="row-ziyuan fl">
+          <%= link_to image_tag(url_to_avatar(activity.author),:width => "40", :height => "40"), user_path(activity.author), :class => "fl user-img" %>
+          <!--<a href="#" class="fl user-img" ><img src="images/detailimg4.jpg" /></a>-->
+          <div class="ziyuan-box fl">
+            <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "fl ziyuan-title" %>
+            <%#= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "fl ziyuan-title" %>
+            <%#= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "fl ziyuan-title" %>
+            <p class="fl"><span >发布时间：<%= format_date activity.updated_on %></span>
+              <span> 作者：<%= activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname) %></span>
+              <span class="fr right-info2"> <%= activity.journals.count %></span> </p>
+          </div>
+
+        </div><!--row-ziyuan end-->
+    <% elsif act.org_act_type == "Message" %>
+        <% activity = Message.find(act.org_act_id) %>
+        <div class="row-ziyuan fl">
+          <%= link_to image_tag(url_to_avatar(activity.author),:width => "40", :height => "40"), user_path(activity.author), :class => "fl user-img" %>
+          <!--<a href="#" class="fl user-img" ><img src="images/detailimg4.jpg" /></a>-->
+          <div class="ziyuan-box fl">
+            <% 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 => "fl ziyuan-title" %>
+            <% else %>
+                <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "fl ziyuan-title" %>
+            <% end %>
+            <%#= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "fl ziyuan-title" %>
+            <p class="fl"><span >发布时间：<%= format_date activity.updated_on %></span>
+              <span> 作者：<%= activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname) %></span>
+              <span class="fr right-info2"> <%= activity.children.count %></span> </p>
+          </div>
+
+        </div><!--row-ziyuan end-->
+    <% elsif act.org_act_type == "News" %>
+        <% activity = News.find(act.org_act_id) %>
+        <div class="row-ziyuan fl">
+          <%= link_to image_tag(url_to_avatar(activity.creator),:width => "40", :height => "40"), user_path(activity.creator), :class => "fl user-img" %>
+          <!--<a href="#" class="fl user-img" ><img src="images/detailimg4.jpg" /></a>-->
+          <div class="ziyuan-box fl">
+            <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "fl ziyuan-title" %>
+            <p class="fl"><span >发布时间：<%= format_date activity.updated_at %></span>
+              <span> 作者：<%= activity.try(:creator).try(:realname).nil? ? activity.try(:creator).try(:login) : activity.try(:creator).try(:realname) %></span>
+              <span class="fr right-info2"> <%= activity.children.count %></span> </p>
+          </div>
+        </div><!--row-ziyuan end-->
+    <% end %>
+
+<% end %>
\ No newline at end of file
diff --git a/app/views/organizations/_org_new_project_pic.html.erb b/app/views/organizations/_org_new_project_pic.html.erb
new file mode 100644
index 000000000..aa91659ce
--- /dev/null
+++ b/app/views/organizations/_org_new_project_pic.html.erb
@@ -0,0 +1,77 @@
+
+  <% activities.each do |act| %>
+      <% if act.org_act_type == "Issue" %>
+          <% activity = Issue.find(act.org_act_id) %>
+          <li>
+          <a href="/#" title="">
+            <div class="course-list-img">
+              <% iamge_path = get_image_path_from_content(activity.description) %>
+              <% if iamge_path.nil? %>
+                  <img width="370" height="220" alt="#" src="/images/org_new_style/default-img.jpg">
+              <% else %>
+                  <img width="370" height="220" src="/files/uploads/image<%= iamge_path %>" alt="" />
+              <% end %>
+            </div>
+            <h5>
+              <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank' %>
+            </h5>
+            <div class="item-btm clearfix">
+              <a class="publisher-name fl" href="#" target="_blank"><%= activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname) %></a>
+              <p class="pass-time fl"><span><%= format_date activity.updated_on %></span></p>
+              <div class="fr right-info"> <span> <%= activity.journals.count %></span></div>
+            </div>
+          </a>
+          </li>
+      <% elsif act.org_act_type == "Message" %>
+          <% activity = Message.find(act.org_act_id) %>
+          <li>
+          <a href="/#" title="">
+            <div class="course-list-img">
+              <% iamge_path = get_image_path_from_content(activity.content) %>
+              <% if iamge_path.nil? %>
+                  <img width="370" height="220" alt="#" src="/images/org_new_style/default-img.jpg">
+              <% else %>
+                  <img width="370" height="220" src="/files/uploads/image<%= iamge_path %>" alt="" />
+              <% end %>
+            </div>
+            <h5>
+              <% 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' %>
+              <% else %>
+                  <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank' %>
+              <% end %>
+            </h5>
+            <div class="item-btm clearfix">
+              <a class="publisher-name fl" href="#" target="_blank"><%= activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname) %></a>
+              <p class="pass-time fl"><span><%= format_date activity.updated_on %></span></p>
+              <div class="fr right-info"> <span> <%= activity.children.count %></span></div>
+            </div>
+          </a>
+          </li>
+      <% elsif act.org_act_type == "News" %>
+          <% activity = News.find(act.org_act_id) %>
+          <li>
+            <a href="/#" title="">
+              <div class="course-list-img">
+                <% iamge_path = get_image_path_from_content(activity.description) %>
+                <% if iamge_path.nil? %>
+                    <img width="370" height="220" alt="#" src="/images/org_new_style/default-img.jpg">
+                <% else %>
+                    <img width="370" height="220" src="/files/uploads/image<%= iamge_path %>" alt="" />
+                <% end %>
+              </div>
+              <h5>
+                <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank' %>
+              </h5>
+              <div class="item-btm clearfix">
+                <a class="publisher-name fl" href="#" target="_blank"><%= activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname) %></a>
+                <p class="pass-time fl"><span><%= format_date activity.created_on %></span></p>
+                <div class="fr right-info"> <span> <%= activity.comments.count %></span></div>
+              </div>
+            </a>
+          </li>
+
+      <% end %>
+
+  <% end %>
+
diff --git a/db/migrate/20160331060004_add_type_to_organization.rb b/db/migrate/20160331060004_add_type_to_organization.rb
deleted file mode 100644
index e9313433b..000000000
--- a/db/migrate/20160331060004_add_type_to_organization.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddTypeToOrganization < ActiveRecord::Migration
-  def change
-    add_column :organizations, :type, :integer, :default => true
-  end
-end
diff --git a/db/schema.rb b/db/schema.rb
index 8041b347b..732a42c6f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160328022623) do
+ActiveRecord::Schema.define(:version => 20160331060004) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1302,6 +1302,7 @@ ActiveRecord::Schema.define(:version => 20160328022623) do
     t.boolean  "allow_guest_download", :default => true
     t.integer  "visits",               :default => 0
     t.integer  "show_mode",            :default => 0
+    t.integer  "type",                 :default => 1
   end
 
   create_table "phone_app_versions", :force => true do |t|

From c4316583339226461569c98689cc48424d3882ab Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 31 Mar 2016 16:19:59 +0800
Subject: [PATCH 06/27] =?UTF-8?q?setting=E4=B8=AD=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/organizations_helper.rb           |   8 +-
 app/views/layouts/base_org_newstyle.html.erb  | 203 +++++++++++-------
 .../organizations/_subfield_list.html.erb     |  23 +-
 .../organizations/hide_org_subfield.js.erb    |   2 +-
 .../organizations/show_org_subfield.js.erb    |   2 +-
 db/schema.rb                                  |   4 +-
 public/stylesheets/org.css                    |   7 +-
 public/stylesheets/org_new_style.css          |   2 +
 8 files changed, 152 insertions(+), 99 deletions(-)

diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index 59f32bda0..84b38e628 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -63,12 +63,12 @@ module OrganizationsHelper
   def subfield_status_option
     type = []
     option1 = []
-    option1 << 0
-    option1 << 0
+    option1 << "列表"
+    option1 << "1"
     type << option1
     option2 = []
-    option2 << 1
-    option2 << 1
+    option2 << "图片"
+    option2 << "0"
     type << option2
     type
   end
diff --git a/app/views/layouts/base_org_newstyle.html.erb b/app/views/layouts/base_org_newstyle.html.erb
index 7b3bdb754..f2210ae3a 100644
--- a/app/views/layouts/base_org_newstyle.html.erb
+++ b/app/views/layouts/base_org_newstyle.html.erb
@@ -110,75 +110,103 @@
       <% if is_default_field?(field) %>
           <% case field.name %>
           <% when 'course' %>
+
+
+
               <div class="box1" style="display:<%= field.hide == 0?'block':'none' %>;">
-               <% if false %>
+               <% if field.status == 0 %>
                 <div class="content">
                   <div class="box-top"  id="course_<%= field.id %>"><h2 class="box-title">课程动态</h2><p class="box-title-p">course activities</p></div>
-                  <div class="course-list">
-                    <ul class="clearfix">
-                      <% unless @course_acts_homework.nil? %>
-                      <li >
-                        <% @course_acts_homework.each do |act| %>
-                            <%= render :partial => 'org_new_course_homework', :locals => {:activity => HomeworkCommon.find(act.org_act_id),:user_activity_id =>act.id, :course_activity => 0} %>
-                        <% end %>
-                      </li>
-                      <% end %>
+                  <% if @course_acts.nil? %>
+                      <p class="nocontent">暂无内容，敬请期待！</p>
+                  <% else %>
+                      <div class="course-list">
+                        <ul class="clearfix">
+                          <% unless @course_acts_homework.nil? %>
+                              <li >
+                                <% @course_acts_homework.each do |act| %>
+                                    <%= render :partial => 'org_new_course_homework', :locals => {:activity => HomeworkCommon.find(act.org_act_id),:user_activity_id =>act.id, :course_activity => 0} %>
+                                <% end %>
+                              </li>
+                          <% end %>
                           <% unless @course_acts_message.nil? %>
-                      <li >
-                        <% @course_acts_message.each do |act| %>
-                            <%= render :partial => 'org_new_course_message', :locals => {:activity => Message.find(act.org_act_id), :user_activity_id =>act.id} %>
-                        <% end %>
-                      </li>
-                      <% end %>
-                              <% unless @course_acts_news.nil? %>
-                      <li >
-                        <% @course_acts_news.each do |act| %>
-                            <%= render :partial => 'org_new_course_news', :locals => {:activity => News.find(act.org_act_id), :user_activity_id =>act.id} %>
-                        <% end %>
-                      </li>
-                      <% end %>
+                              <li >
+                                <% @course_acts_message.each do |act| %>
+                                    <%= render :partial => 'org_new_course_message', :locals => {:activity => Message.find(act.org_act_id), :user_activity_id =>act.id} %>
+                                <% end %>
+                              </li>
+                          <% end %>
+                          <% unless @course_acts_news.nil? %>
+                              <li >
+                                <% @course_acts_news.each do |act| %>
+                                    <%= render :partial => 'org_new_course_news', :locals => {:activity => News.find(act.org_act_id), :user_activity_id =>act.id} %>
+                                <% end %>
+                              </li>
+                          <% end %>
+                          <div class="cl"></div>
+                        </ul>
+                      </div>
                       <div class="cl"></div>
-                    </ul>
-                  </div>
+                      <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                      <div class="cl"></div>
+                  <% end %>
+
+
                 </div><!--content end-->
                <% else %>
                     <div class="content">
                       <div class="box-top"  id="course_<%= field.id %>"><h2 class="box-title">课程动态</h2></div>
-                      <div class="row">
+                      <% if @course_acts.nil? %>
+                          <p class="nocontent">暂无内容，敬请期待！</p>
+                      <% else %>
+                          <div class="row">
                             <%= render :partial => 'organizations/org_new_course_act_list', :locals =>{:activities => @course_acts, :field => field, :organization => @organization} %>
+                            <!--row-ziyuan end-->
+                          </div>
+                          <div class="cl"></div>
+                          <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                          <div class="cl"></div>
+                      <% end %>
+
+
+                    </div><!--row end-->
+               <% end %>
+              </div><!--box1 end-->
+          <% when 'project' %>
+            <% if field.status == 0 %>
+                <div class="content">
+                  <div class="box-top"  id="course_<%= field.id %>"><h2 class="box-title">项目动态</h2><p class="box-title-p"></p></div>
+                  <% if @project_acts.nil? %>
+                      <p class="nocontent">暂无内容，敬请期待！</p>
+                  <% else %>
+                      <div class="course-list">
+                        <ul class="clearfix">
+                          <% unless @project_acts.nil? %>
+                              <%= render :partial => 'organizations/org_new_project_pic', :locals => {:activities => @project_acts} %>
+                          <% end %>
+                          <div class="cl"></div>
+                          <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                          <div class="cl"></div>
+                        </ul>
+                      </div>
+                  <% end %>
+
+                </div><!--content end-->
+            <% else %>
+                <div class="content">
+                  <div class="box-top" id="resource_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2></div>
+                  <% if @project_acts.nil? %>
+                      <p class="nocontent">暂无内容，敬请期待！</p>
+                  <% else %>
+                      <div class="row">
+                        <%= render :partial => 'organizations/org_new_project_act_list', :locals =>{:activities => @project_acts, :field => field, :organization => @organization} %>
                         <!--row-ziyuan end-->
                       </div>
                       <div class="cl"></div>
                       <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
                       <div class="cl"></div>
-                    </div><!--row end-->
-               <% end %>
-              </div><!--box1 end-->
-          <% when 'project' %>
-            <% if true %>
-                <div class="content">
-                  <div class="box-top"  id="course_<%= field.id %>"><h2 class="box-title">项目动态</h2><p class="box-title-p"></p></div>
-                  <div class="course-list">
-                    <ul class="clearfix">
-                      <% unless @project_acts.nil? %>
+                  <% end %>
 
-                                <%= render :partial => 'organizations/org_new_project_pic', :locals => {:activities => @project_acts} %>
-
-                      <% end %>
-                      <div class="cl"></div>
-                    </ul>
-                  </div>
-                </div><!--content end-->
-            <% else %>
-                <div class="content">
-                  <div class="box-top" id="resource_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2></div>
-                  <div class="row">
-                    <%= render :partial => 'organizations/org_new_project_act_list', :locals =>{:activities => @project_acts, :field => field, :organization => @organization} %>
-                    <!--row-ziyuan end-->
-                  </div>
-                  <div class="cl"></div>
-                  <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
-                  <div class="cl"></div>
                 </div><!--row end-->
             <% end %>
 
@@ -188,31 +216,43 @@
               <% message_ats = get_message_org(@organization.id, field.id) %>
               <% ids = field.org_document_comments.map{|o| o.id}.join(",") %>
               <div class="box1 bg-grey" style="display:<%= field.hide == 0?'block':'none' %>;" id="org_subfield_<%= field.id %>">
-                <% if false %>
+                <% if field.status == 0 %>
                     <div class="content">
                       <div class="box-top" id="message_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2></div>
-                      <div class="course-list">
-                        <ul class="clearfix">
+                      <% if message_ats.nil? %>
+                          <p class="nocontent">暂无内容，敬请期待！</p>
+                      <% else %>
+                          <div class="course-list">
+                            <ul class="clearfix">
+
+                              <% message_ats.each do |act| %>
+                                  <%= render :partial => 'organizations/org_new_forum_pic', :locals => {:activity => act, :field => field, :organization => @organization} %>
+                              <% end %>
+                              <div class="cl"></div>
+                            </ul>
+                            <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                            <div class="cl"></div>
+                          </div>
+                      <% end %>
 
-                                <% message_ats.each do |act| %>
-                                    <%= render :partial => 'organizations/org_new_forum_pic', :locals => {:activity => act, :field => field, :organization => @organization} %>
-                                <% end %>
-                  <div class="cl"></div>
-                        </ul>
-                      </div>
                     </div><!--content end-->
                 <% else %>
                     <div class="content">
                       <div class="box-top" id="resource_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2></div>
-                      <div class="row">
-                        <% message_ats.each do |act| %>
-                        <%= render :partial => 'organizations/org_new_forum_list', :locals => {:activity => act, :field => field, :organization => @organization} %>
-                        <% end %>
-                        <!--row-ziyuan end-->
-                      </div>
-                      <div class="cl"></div>
-                      <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
-                      <div class="cl"></div>
+                      <% if message_ats.nil? %>
+                          <p class="nocontent">暂无内容，敬请期待！</p>
+                      <% else %>
+                          <div class="row">
+                            <% message_ats.each do |act| %>
+                                <%= render :partial => 'organizations/org_new_forum_list', :locals => {:activity => act, :field => field, :organization => @organization} %>
+                            <% end %>
+                            <!--row-ziyuan end-->
+                          </div>
+                          <div class="cl"></div>
+                          <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                          <div class="cl"></div>
+                      <% end %>
+
                     </div><!--row end-->
                     <div class="cl"></div>
                 <% end %>
@@ -221,15 +261,20 @@
               <% org_attachs = get_attach_org2(field) %>
               <div class="box1" style="display:<%= field.hide == 0?'block':'none' %>;" id="org_subfield_<%= field.id %>">
                 <div class="content">
-                  <div class="box-top" id="resource_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2><p class="box-title-p">resource dwonload</p></div>
-                  <div class="row">
-                    <%= render :partial => 'organizations/org_new_resource', :locals => {:org_attachs => org_attachs} %>
-                    <!--row-ziyuan end-->
-                  </div>
+                  <div class="box-top" id="resource_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2></div>
+                  <% if org_attachs.nil? %>
+                      <p class="nocontent">暂无内容，敬请期待！</p>
+                  <% else %>
+                      <div class="row">
+                        <%= render :partial => 'organizations/org_new_resource', :locals => {:org_attachs => org_attachs} %>
+                        <!--row-ziyuan end-->
+                      </div>
+
+                      <div class="cl"></div>
+                      <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                      <div class="cl"></div>
+                  <% end %>
 
-                  <div class="cl"></div>
-                  <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
-                  <div class="cl"></div>
                 </div><!--row end-->
                 <div class="cl"></div>
               </div><!--box1 end-->
diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb
index 6a405e73a..e16e91486 100644
--- a/app/views/organizations/_subfield_list.html.erb
+++ b/app/views/organizations/_subfield_list.html.erb
@@ -2,7 +2,7 @@
   <li class="orgOrder fb">顺序</li>
   <li class="orgListUser fb">已有栏目</li>
   <li class="orgListStatus fb">状态</li>
-  <li class="orgListStatus fb">排列</li>
+  <li class="orgListStatusList fb fb">排列</li>
   <li class="orgListStatus fb">类型</li>
   <li class="orgListUser fb">域名目录</li>
   <div class="cl"></div>
@@ -22,9 +22,9 @@
           </li>
           <li class="orgListUser"><%= name %></li>
           <li class="orgListStatus">默认</li>
-          <li class="orgListStatus">
+          <li class="orgListStatusList">
             <%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %>
-                <div class="update_status_class"><span style="width: 35px; text-align: center; float: left;" class="hidden"><%=field.status %></span>
+                <div class="update_status_class"><span style="width: 35px; text-align: center; float: left;" 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,
@@ -33,7 +33,7 @@
             <% 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>
+          <a href="javascript:void(0);" class="linkBlue fr mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"隐藏":"可见" %></a>
           <div class="cl"></div>
         </ul>
     <% else %>
@@ -53,15 +53,20 @@
             </div>
           </li>
           <li class="orgListStatus">新增</li>
-          <li class="orgListStatus">
+          <li class="orgListStatusList">
+            <% if field.field_type == "Resource" %>
+            列表
+            <% else %>
             <%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %>
-                <div class="update_status_class"><span style="width: 35px; text-align: center; float: left;" class="hidden"><%=field.status %></span>
+                <div class="update_status_class"><span style="width: 35px; text-align: center; float: left;" 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},
-                            {:onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:30px;"}) %>
+                            {:onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:40px;"}) %>
             <% end %>
+
+           <% end %>
           </li>
           <li class="orgListStatus"><%= field.field_type == "Post" ? "帖子" : "资源" %></li>
           <li class="orgListUser hidden">
@@ -79,7 +84,7 @@
             </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>
+          <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>
 
@@ -195,7 +200,7 @@
         $(edit_id).hide();
     }
     function hide(content, id){
-        if (content.text() == '设为隐藏')
+        if (content.text() == '隐藏')
             $.ajax({
                 url: "/organizations/hide_org_subfield?org_subfield_id=" + id,
                 type: "post"
diff --git a/app/views/organizations/hide_org_subfield.js.erb b/app/views/organizations/hide_org_subfield.js.erb
index 18241c269..4affb39fb 100644
--- a/app/views/organizations/hide_org_subfield.js.erb
+++ b/app/views/organizations/hide_org_subfield.js.erb
@@ -1,2 +1,2 @@
-$("#hide_<%= @org_subfield.id %>").text("设为可见");
+$("#hide_<%= @org_subfield.id %>").text("可见");
 $("#org_subfield_<%= @org_subfield.id %>").css("display", "none");
\ No newline at end of file
diff --git a/app/views/organizations/show_org_subfield.js.erb b/app/views/organizations/show_org_subfield.js.erb
index 165b07afd..78b404b6f 100644
--- a/app/views/organizations/show_org_subfield.js.erb
+++ b/app/views/organizations/show_org_subfield.js.erb
@@ -1,2 +1,2 @@
-$("#hide_<%= @org_subfield.id %>").text("设为隐藏");
+$("#hide_<%= @org_subfield.id %>").text("隐藏");
 $("#org_subfield_<%= @org_subfield.id %>").css("display", "block");
\ No newline at end of file
diff --git a/db/schema.rb b/db/schema.rb
index 732a42c6f..a3fb50eca 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160331060004) do
+ActiveRecord::Schema.define(:version => 20160331063938) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1289,6 +1289,7 @@ ActiveRecord::Schema.define(:version => 20160331060004) do
     t.datetime "updated_at",                     :null => false
     t.string   "field_type"
     t.integer  "hide",            :default => 0
+    t.integer  "status",          :default => 1
   end
 
   create_table "organizations", :force => true do |t|
@@ -1302,7 +1303,6 @@ ActiveRecord::Schema.define(:version => 20160331060004) do
     t.boolean  "allow_guest_download", :default => true
     t.integer  "visits",               :default => 0
     t.integer  "show_mode",            :default => 0
-    t.integer  "type",                 :default => 1
   end
 
   create_table "phone_app_versions", :force => true do |t|
diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index f2a3dd3c9..9dad153a3 100644
--- a/public/stylesheets/org.css
+++ b/public/stylesheets/org.css
@@ -18,12 +18,12 @@
 .orgUrlInput {width:200px; outline:none; border:1px solid #eaeaea; height:22px;}
 a.saveBtn {padding:3px 5px; background-color:#269ac9; color:#ffffff;}
 a.saveBtn:hover {background-color:#297fb8;}
-.orgMemberList {width:460px; float:left;}
+.orgMemberList {width:480px; float:left;}
 .orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px;}
 .orgListUser {width:85px; float:left;}
 .orgListRole {width:180px; float:left;}
 .orgOrder {width:30px; float:left;margin-right:10px;text-align:center;}
-.orgMemContainer {width:228px;}
+.orgMemContainer {width:208px;}
 .orgMemberAdd {float:right;}
 .orgAddSearch {border:1px solid #dddddd; outline:none; width:180px; height:22px; color:#9b9b9b;}
 .undis {display:none;}
@@ -75,7 +75,8 @@ a.linkGrey8:hover {color:#585858;}
 #orgUserName {display:inline-block;}
 .org_login_list a {color:#269ac9;}
 
-.orgListStatus {width:55px; float:left;}
+.orgListStatus {width:40px; float:left;}
+.orgListStatusList {width:55px; float:left;}
 .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;}
diff --git a/public/stylesheets/org_new_style.css b/public/stylesheets/org_new_style.css
index eb5a7c088..83fab83eb 100644
--- a/public/stylesheets/org_new_style.css
+++ b/public/stylesheets/org_new_style.css
@@ -182,6 +182,8 @@ a:hover.more-btn{ background:#29146f; color:#fff;}
 a:hover.more-btn-center{ background:#29146f; color:#fff;}
 .mt30{ margin-top:30px;}
 
+.nocontent{ font-size:30px; color:#888; margin:150px auto; text-align:center;}
+
 
 
 

From f662bfa40b4a74623ab5df1e288843ae18634d37 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 31 Mar 2016 17:06:00 +0800
Subject: [PATCH 07/27] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=A7=91=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb  |  4 +--
 app/helpers/organizations_helper.rb          |  2 +-
 app/views/layouts/base_org_newstyle.html.erb | 26 +++++++++-----------
 public/stylesheets/org_new_style.css         |  5 ++--
 4 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 281f779d7..1ea109ff1 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -160,7 +160,7 @@ class OrganizationsController < ApplicationController
   def get_project_activities_org org
     project_ids = org.projects.map{|project| project.id}.join(",")
     unless project_ids.blank?
-      project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{project_ids}) and container_type = 'project'  order by updated_at desc limit 3;")
+      project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{project_ids}) and container_type = 'project'  order by updated_at desc limit 8;")
     else
       project_acts = nil
     end
@@ -171,7 +171,7 @@ class OrganizationsController < ApplicationController
   def get_course_activities_org org
     course_ids = org.courses.map{|course| course.id}.join(",")
     unless course_ids.blank?
-      project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{course_ids}) and container_type = 'course' order by updated_at desc limit 6;")
+      project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{course_ids}) and container_type = 'course' order by updated_at desc limit 8;")
     else
       project_acts = nil
     end
diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index 84b38e628..4faa802a5 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -30,7 +30,7 @@ module OrganizationsHelper
   end
 
   def get_message_org(org_id, field_id)
-    OrgDocumentComment.find_by_sql("SELECT * FROM org_document_comments where organization_id = #{org_id} and org_subfield_id = #{field_id} and parent_id is null order by updated_at desc limit 3;")
+    OrgDocumentComment.find_by_sql("SELECT * FROM org_document_comments where organization_id = #{org_id} and org_subfield_id = #{field_id} and parent_id is null order by updated_at desc limit 8;")
   end
 
   def get_message_reply_org(org_id, ids)
diff --git a/app/views/layouts/base_org_newstyle.html.erb b/app/views/layouts/base_org_newstyle.html.erb
index f2210ae3a..442bb7b60 100644
--- a/app/views/layouts/base_org_newstyle.html.erb
+++ b/app/views/layouts/base_org_newstyle.html.erb
@@ -110,13 +110,10 @@
       <% if is_default_field?(field) %>
           <% case field.name %>
           <% when 'course' %>
-
-
-
-              <div class="box1" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <div class="box1 bg-grey" style="display:<%= field.hide == 0?'block':'none' %>;">
                <% if field.status == 0 %>
                 <div class="content">
-                  <div class="box-top"  id="course_<%= field.id %>"><h2 class="box-title">课程动态</h2><p class="box-title-p">course activities</p></div>
+                  <div class="box-top"  id="course_<%= field.id %>"><h2 class="box-title">课程动态</h2></div>
                   <% if @course_acts.nil? %>
                       <p class="nocontent">暂无内容，敬请期待！</p>
                   <% else %>
@@ -173,16 +170,17 @@
                <% end %>
               </div><!--box1 end-->
           <% when 'project' %>
+            <div class="box1" style="display:<%= field.hide == 0?'block':'none' %>;">
             <% if field.status == 0 %>
-                <div class="content">
-                  <div class="box-top"  id="course_<%= field.id %>"><h2 class="box-title">项目动态</h2><p class="box-title-p"></p></div>
+                <div class="content ">
+                  <div class="box-top"  id="project_<%= field.id %>"><h2 class="box-title">项目动态</h2><p class="box-title-p"></p></div>
                   <% if @project_acts.nil? %>
                       <p class="nocontent">暂无内容，敬请期待！</p>
                   <% else %>
                       <div class="course-list">
                         <ul class="clearfix">
                           <% unless @project_acts.nil? %>
-                              <%= render :partial => 'organizations/org_new_project_pic', :locals => {:activities => @project_acts} %>
+                              <%= render :partial => 'organizations/org_new_project_pic', :locals => {:activities => @project_acts.first(3)} %>
                           <% end %>
                           <div class="cl"></div>
                           <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
@@ -194,7 +192,7 @@
                 </div><!--content end-->
             <% else %>
                 <div class="content">
-                  <div class="box-top" id="resource_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2></div>
+                  <div class="box-top" style="display:<%= field.hide == 0?'block':'none' %>;"  id="project_<%= field.id %>"><h2 class="box-title">项目动态</h2><p class="box-title-p"></p></div>
                   <% if @project_acts.nil? %>
                       <p class="nocontent">暂无内容，敬请期待！</p>
                   <% else %>
@@ -209,7 +207,7 @@
 
                 </div><!--row end-->
             <% end %>
-
+            </div>
           <% end %>
       <% else %>
           <% if field.field_type == "Post" %> <%# 讨论类型 %>
@@ -219,13 +217,13 @@
                 <% if field.status == 0 %>
                     <div class="content">
                       <div class="box-top" id="message_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2></div>
-                      <% if message_ats.nil? %>
+                      <% if message_ats.blank? %>
                           <p class="nocontent">暂无内容，敬请期待！</p>
                       <% else %>
                           <div class="course-list">
                             <ul class="clearfix">
 
-                              <% message_ats.each do |act| %>
+                              <% message_ats.first(3).each do |act| %>
                                   <%= render :partial => 'organizations/org_new_forum_pic', :locals => {:activity => act, :field => field, :organization => @organization} %>
                               <% end %>
                               <div class="cl"></div>
@@ -239,7 +237,7 @@
                 <% else %>
                     <div class="content">
                       <div class="box-top" id="resource_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2></div>
-                      <% if message_ats.nil? %>
+                      <% if message_ats.blank? %>
                           <p class="nocontent">暂无内容，敬请期待！</p>
                       <% else %>
                           <div class="row">
@@ -262,7 +260,7 @@
               <div class="box1" style="display:<%= field.hide == 0?'block':'none' %>;" id="org_subfield_<%= field.id %>">
                 <div class="content">
                   <div class="box-top" id="resource_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2></div>
-                  <% if org_attachs.nil? %>
+                  <% if org_attachs.blank? %>
                       <p class="nocontent">暂无内容，敬请期待！</p>
                   <% else %>
                       <div class="row">
diff --git a/public/stylesheets/org_new_style.css b/public/stylesheets/org_new_style.css
index 83fab83eb..0562bc088 100644
--- a/public/stylesheets/org_new_style.css
+++ b/public/stylesheets/org_new_style.css
@@ -95,7 +95,7 @@ a.pre-back{ background:#888;}
 .footer-con ul{ display:block; width:430px; height:50px; margin:0 auto;  }
 .footer-con ul li a{font-size:18px; color:#fff; margin-right:35px; font-weight:bold;}
 /** download **/
-.row-ziyuan{ width:570px; border-bottom:1px solid #f0f0f0; padding:15px 0;margin: 0px 15px;}
+.row-ziyuan{ width:570px; border-bottom:1px solid #e6e6e6; padding:15px 0;margin: 0px 15px;}
 .ziyuan-box{  width:420px; margin-right:20px;}
 .ziyuan-box span{ margin-right:5px;}
 .ziyuan-title{ display:block; width:420px; font-size:16px;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}
@@ -177,7 +177,8 @@ a:hover.read-more{ text-decoration:underline;}
 
 
 a.more-btn{ display:block; background:#ccc; color:#fff; margin-top:10px;  width:100px; height:38px;font-size:14px; -webkit-border-radius: 5px;border-radius:5px;text-align:center; line-height:38px;}
-a.more-btn-center{ display:block; background:#ccc; color:#fff; margin-top:10px;  width:100px; height:38px;font-size:14px; -webkit-border-radius: 5px;border-radius:5px;text-align:center; line-height:38px;width:100px; margin:0px auto;margin-top: 15px;}
+a.more-btn{ display:block; border:1px solid #ccc; color:#000; margin-top:10px;  width:120px; height:38px;font-size:14px; -webkit-border-radius: 25px;border-radius:25px;text-align:center; line-height:38px; margin:0 auto; margin-top:30px;}
+a.more-btn-center{ display:block; border:1px solid #ccc; color:#000; margin-top:10px;  width:120px; height:38px;font-size:14px; -webkit-border-radius: 25px;border-radius:25px;text-align:center; line-height:38px; margin:0 auto; margin-top:30px;}
 a:hover.more-btn{ background:#29146f; color:#fff;}
 a:hover.more-btn-center{ background:#29146f; color:#fff;}
 .mt30{ margin-top:30px;}

From 45343a44b8d3980c9c08b11d0f4fb497c0fc261d Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 31 Mar 2016 17:13:40 +0800
Subject: [PATCH 08/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org_newstyle.html.erb | 4 ++--
 public/stylesheets/org_new_style.css         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/base_org_newstyle.html.erb b/app/views/layouts/base_org_newstyle.html.erb
index 442bb7b60..aeeba55e3 100644
--- a/app/views/layouts/base_org_newstyle.html.erb
+++ b/app/views/layouts/base_org_newstyle.html.erb
@@ -65,7 +65,7 @@
 <div class="container">
   <div class="header">
     <div class="header-con">
-      <a href="index.html" class="fl logo"><img src="/images/org_new_style/logo.jpg" alt=""/></a>
+      <a href="#" class="fl logo"><img src="/images/org_new_style/logo.jpg" alt=""/></a>
       <%# 登录 %>
       <%= render :partial => 'organizations/org_logined_header' %>
     </div>
@@ -236,7 +236,7 @@
                     </div><!--content end-->
                 <% else %>
                     <div class="content">
-                      <div class="box-top" id="resource_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2></div>
+                      <div class="box-top" id="message_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2></div>
                       <% if message_ats.blank? %>
                           <p class="nocontent">暂无内容，敬请期待！</p>
                       <% else %>
diff --git a/public/stylesheets/org_new_style.css b/public/stylesheets/org_new_style.css
index 0562bc088..ad0170ec1 100644
--- a/public/stylesheets/org_new_style.css
+++ b/public/stylesheets/org_new_style.css
@@ -154,7 +154,7 @@ a:hover.read-more{ text-decoration:underline;}
     overflow: hidden;
     text-indent: 100%;
     white-space: nowrap;
-    background: rgba(232, 98, 86, 0.8) url(../images/org_new_style/cd-top-arrow.svg) no-repeat center 50%;
+    background: rgba(108, 108, 108, 0.8) url(../images/org_new_style/cd-top-arrow.svg) no-repeat center 50%;
     visibility: hidden;
     opacity: 0;
     -webkit-transition: all 0.3s;

From 7490c7f90d3391b9cd0fe9c1bb4fb737bc140fef Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 31 Mar 2016 17:51:23 +0800
Subject: [PATCH 09/27] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E5=92=8C=E7=94=A8=E6=88=B7=E5=90=8D=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_org_new_course_homework.html.erb          |  8 +++++---
 .../_org_new_course_message.html.erb           |  6 +++---
 .../_org_new_course_news.html.erb              |  7 ++++---
 .../organizations/_org_new_forum_pic.html.erb  |  8 ++++----
 .../_org_new_project_pic.html.erb              | 18 +++++++++---------
 5 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/app/views/organizations/_org_new_course_homework.html.erb b/app/views/organizations/_org_new_course_homework.html.erb
index 3de4c0293..7d6a4ac5e 100644
--- a/app/views/organizations/_org_new_course_homework.html.erb
+++ b/app/views/organizations/_org_new_course_homework.html.erb
@@ -2,16 +2,18 @@
   <div class="course-list-img">
     <% iamge_path = get_image_path_from_content(activity.description) %>
     <% if iamge_path.nil? %>
-        <img width="370" height="220" alt="#" src="/images/org_new_style/default-img.jpg">
+        <%= link_to image_tag("/images/org_new_style/default-img.jpg", :width => "370", :height => "220"), student_work_index_url_in_org(activity.id), :target => "_blank" %>
+        <!--<img width="370" height="220" alt="#" src="/images/org_new_style/default-img.jpg">-->
     <% else %>
-        <img width="370" height="220" src="/files/uploads/image<%= iamge_path %>" alt="" />
+        <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), student_work_index_url_in_org(activity.id), :target => "_blank" %>
+        <!--<img width="370" height="220" src="/files/uploads/image<%#= iamge_path %>" alt="" />-->
     <% end %>
   </div>
   <h5>
     <span><%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank' %></span>
   </h5>
   <div class="item-btm clearfix">
-    <a class="publisher-name fl" href="#" target="_blank"><%= activity.user.realname.nil? ? activity.user : activity.user.realname %></a>
+  <%=link_to activity.try(:user).try(:realname).nil? ? activity.try(:user).try(:login) : activity.try(:user).try(:realname), user_path(activity.user), :class=>"publisher-name fl", :target => "_blank" %></a>
     <p class="pass-time fl"><span><%= format_date activity.updated_at %></span></p>
     <div class="fr right-info"> <span> <%= activity.journals_for_messages.count %></span></div>
   </div>
diff --git a/app/views/organizations/_org_new_course_message.html.erb b/app/views/organizations/_org_new_course_message.html.erb
index 3877276ce..5e586bb28 100644
--- a/app/views/organizations/_org_new_course_message.html.erb
+++ b/app/views/organizations/_org_new_course_message.html.erb
@@ -2,9 +2,9 @@
   <div class="course-list-img">
     <% iamge_path = get_image_path_from_content(activity.content) %>
     <% if iamge_path.nil? %>
-        <img width="370" height="220" alt="#" src="/images/org_new_style/default-img.jpg">
+        <%= link_to image_tag("/images/org_new_style/default-img.jpg", :width => "370", :height => "220"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank" %>
     <% else %>
-        <img width="370" height="220" src="/files/uploads/image<%= iamge_path %>" alt="" />
+        <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank" %>
     <% end %>
   </div>
   <h5>
@@ -15,7 +15,7 @@
     <% end %>
   </h5>
   <div class="item-btm clearfix">
-    <a class="publisher-name fl" href="#" target="_blank"><%= activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname) %></a>
+  <%=link_to activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname), user_path(activity.author), :class=>"publisher-name fl", :target => "_blank" %></a>
     <p class="pass-time fl"><span><%= format_date activity.updated_on %></span></p>
     <div class="fr right-info"> <span> <%= activity.children.count %></span></div>
   </div>
diff --git a/app/views/organizations/_org_new_course_news.html.erb b/app/views/organizations/_org_new_course_news.html.erb
index ae2d03cbf..72b147ac3 100644
--- a/app/views/organizations/_org_new_course_news.html.erb
+++ b/app/views/organizations/_org_new_course_news.html.erb
@@ -2,16 +2,17 @@
   <div class="course-list-img">
     <% iamge_path = get_image_path_from_content(activity.description) %>
     <% if iamge_path.nil? %>
-        <img width="370" height="220" alt="#" src="/images/org_new_style/default-img.jpg">
+        <%= link_to image_tag("/images/org_new_style/default-img.jpg", :width => "370", :height => "220"), news_url_in_org(activity.id), :target => "_blank" %>
+        <!--<img width="370" height="220" alt="#" src="/images/org_new_style/default-img.jpg">-->
     <% else %>
-        <img width="370" height="220" src="/files/uploads/image<%= iamge_path %>" alt="" />
+        <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), news_url_in_org(activity.id), :target => "_blank" %>
     <% end %>
   </div>
   <h5>
     <span><%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank' %></span>
   </h5>
   <div class="item-btm clearfix">
-    <a class="publisher-name fl" href="#" target="_blank"><%= activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname) %></a>
+  <%=link_to activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname), user_path(activity.author), :class=>"publisher-name fl", :target => "_blank" %></a>
     <p class="pass-time fl"><span><%= format_date activity.created_on %></span></p>
     <div class="fr right-info"> <span> <%= activity.comments.count %></span></div>
   </div>
diff --git a/app/views/organizations/_org_new_forum_pic.html.erb b/app/views/organizations/_org_new_forum_pic.html.erb
index c4fd061a5..b42c7e865 100644
--- a/app/views/organizations/_org_new_forum_pic.html.erb
+++ b/app/views/organizations/_org_new_forum_pic.html.erb
@@ -3,16 +3,16 @@
     <div class="course-list-img">
       <% iamge_path = get_image_path_from_content(activity.content) %>
       <% if iamge_path.nil? %>
-          <img width="370" height="220" alt="#" src="/images/org_new_style/default-img.jpg">
+          <%= link_to image_tag("/images/org_new_style/default-img.jpg", :width => "370", :height => "220"), organization_path(@organization, :org_subfield_id => field.id), :target => "_blank" %>
       <% else %>
-          <img width="370" height="220" src="/files/uploads/image<%= iamge_path %>" alt="" />
+          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), organization_path(@organization, :org_subfield_id => field.id), :target => "_blank" %>
       <% end %>
     </div>
     <h5>
-      <span><%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank' %></span>
+      <span><%= link_to activity.title.to_s, organization_path(@organization, :org_subfield_id => field.id), :target => '_blank' %></span>
     </h5>
     <div class="item-btm clearfix">
-      <a class="publisher-name fl" href="#" target="_blank"><%= activity.try(:creator).try(:realname).nil? ? activity.try(:creator).try(:login) : activity.try(:creator).try(:realname) %></a>
+    <%=link_to activity.try(:creator).try(:realname).nil? ? activity.try(:creator).try(:login) : activity.try(:creator).try(:realname), user_path(activity.creator), :class=>"publisher-name fl", :target => "_blank" %></a>
       <p class="pass-time fl"><span><%= format_date activity.created_at %></span></p>
       <div class="fr right-info"> <span> <%= activity.children.count %></span></div>
     </div>
diff --git a/app/views/organizations/_org_new_project_pic.html.erb b/app/views/organizations/_org_new_project_pic.html.erb
index aa91659ce..3adc77433 100644
--- a/app/views/organizations/_org_new_project_pic.html.erb
+++ b/app/views/organizations/_org_new_project_pic.html.erb
@@ -7,16 +7,16 @@
             <div class="course-list-img">
               <% iamge_path = get_image_path_from_content(activity.description) %>
               <% if iamge_path.nil? %>
-                  <img width="370" height="220" alt="#" src="/images/org_new_style/default-img.jpg">
+                  <%= link_to image_tag("/images/org_new_style/default-img.jpg", :width => "370", :height => "220"), issue_url_in_org(activity.id), :target => "_blank" %>
               <% else %>
-                  <img width="370" height="220" src="/files/uploads/image<%= iamge_path %>" alt="" />
+                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), issue_url_in_org(activity.id), :target => "_blank" %>
               <% end %>
             </div>
             <h5>
               <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank' %>
             </h5>
             <div class="item-btm clearfix">
-              <a class="publisher-name fl" href="#" target="_blank"><%= activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname) %></a>
+              <%=link_to activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname), user_path(activity.author), :class=>"publisher-name fl", :target => "_blank" %></a>
               <p class="pass-time fl"><span><%= format_date activity.updated_on %></span></p>
               <div class="fr right-info"> <span> <%= activity.journals.count %></span></div>
             </div>
@@ -29,9 +29,9 @@
             <div class="course-list-img">
               <% iamge_path = get_image_path_from_content(activity.content) %>
               <% if iamge_path.nil? %>
-                  <img width="370" height="220" alt="#" src="/images/org_new_style/default-img.jpg">
+                  <%= link_to image_tag("/images/org_new_style/default-img.jpg", :width => "370", :height => "220"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank" %>
               <% else %>
-                  <img width="370" height="220" src="/files/uploads/image<%= iamge_path %>" alt="" />
+                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank" %>
               <% end %>
             </div>
             <h5>
@@ -42,7 +42,7 @@
               <% end %>
             </h5>
             <div class="item-btm clearfix">
-              <a class="publisher-name fl" href="#" target="_blank"><%= activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname) %></a>
+            <%=link_to activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname), user_path(activity.author), :class=>"publisher-name fl", :target => "_blank" %></a>
               <p class="pass-time fl"><span><%= format_date activity.updated_on %></span></p>
               <div class="fr right-info"> <span> <%= activity.children.count %></span></div>
             </div>
@@ -55,16 +55,16 @@
               <div class="course-list-img">
                 <% iamge_path = get_image_path_from_content(activity.description) %>
                 <% if iamge_path.nil? %>
-                    <img width="370" height="220" alt="#" src="/images/org_new_style/default-img.jpg">
+                    <%= link_to image_tag("/images/org_new_style/default-img.jpg", :width => "370", :height => "220"), news_url_in_org(activity.id), :target => "_blank" %>
                 <% else %>
-                    <img width="370" height="220" src="/files/uploads/image<%= iamge_path %>" alt="" />
+                    <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), news_url_in_org(activity.id), :target => "_blank" %>
                 <% end %>
               </div>
               <h5>
                 <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank' %>
               </h5>
               <div class="item-btm clearfix">
-                <a class="publisher-name fl" href="#" target="_blank"><%= activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname) %></a>
+              <%=link_to activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname), user_path(activity.author), :class=>"publisher-name fl", :target => "_blank" %></a>
                 <p class="pass-time fl"><span><%= format_date activity.created_on %></span></p>
                 <div class="fr right-info"> <span> <%= activity.comments.count %></span></div>
               </div>

From 67d179816300d9192fa497d89509e84173e66e04 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 31 Mar 2016 18:11:29 +0800
Subject: [PATCH 10/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9news500=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/_org_new_course_act_list.html.erb | 8 ++++----
 .../organizations/_org_new_project_act_list.html.erb      | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/views/organizations/_org_new_course_act_list.html.erb b/app/views/organizations/_org_new_course_act_list.html.erb
index 18a1e6662..56202ee86 100644
--- a/app/views/organizations/_org_new_course_act_list.html.erb
+++ b/app/views/organizations/_org_new_course_act_list.html.erb
@@ -34,13 +34,13 @@
     <% elsif act.org_act_type == "News" %>
         <% activity = News.find(act.org_act_id) %>
         <div class="row-ziyuan fl">
-          <%= link_to image_tag(url_to_avatar(activity.creator),:width => "40", :height => "40"), user_path(activity.creator), :class => "fl user-img" %>
+          <%= link_to image_tag(url_to_avatar(activity.author),:width => "40", :height => "40"), user_path(activity.author), :class => "fl user-img" %>
           <!--<a href="#" class="fl user-img" ><img src="images/detailimg4.jpg" /></a>-->
           <div class="ziyuan-box fl">
             <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "fl ziyuan-title" %>
-            <p class="fl"><span >发布时间：<%= format_date activity.updated_at %></span>
-              <span> 作者：<%= activity.try(:creator).try(:realname).nil? ? activity.try(:creator).try(:login) : activity.try(:creator).try(:realname) %></span>
-              <span class="fr right-info2"> <%= activity.children.count %></span> </p>
+            <p class="fl"><span >发布时间：<%= format_date activity.created_on %></span>
+              <span> 作者：<%= activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname) %></span>
+              <span class="fr right-info2"> <%= activity.comments.count %></span> </p>
           </div>
         </div><!--row-ziyuan end-->
     <% end %>
diff --git a/app/views/organizations/_org_new_project_act_list.html.erb b/app/views/organizations/_org_new_project_act_list.html.erb
index b3754024f..407c8fa97 100644
--- a/app/views/organizations/_org_new_project_act_list.html.erb
+++ b/app/views/organizations/_org_new_project_act_list.html.erb
@@ -35,13 +35,13 @@
     <% elsif act.org_act_type == "News" %>
         <% activity = News.find(act.org_act_id) %>
         <div class="row-ziyuan fl">
-          <%= link_to image_tag(url_to_avatar(activity.creator),:width => "40", :height => "40"), user_path(activity.creator), :class => "fl user-img" %>
+          <%= link_to image_tag(url_to_avatar(activity.author),:width => "40", :height => "40"), user_path(activity.author), :class => "fl user-img" %>
           <!--<a href="#" class="fl user-img" ><img src="images/detailimg4.jpg" /></a>-->
           <div class="ziyuan-box fl">
             <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "fl ziyuan-title" %>
-            <p class="fl"><span >发布时间：<%= format_date activity.updated_at %></span>
-              <span> 作者：<%= activity.try(:creator).try(:realname).nil? ? activity.try(:creator).try(:login) : activity.try(:creator).try(:realname) %></span>
-              <span class="fr right-info2"> <%= activity.children.count %></span> </p>
+            <p class="fl"><span >发布时间：<%= format_date activity.created_on %></span>
+              <span> 作者：<%= activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname) %></span>
+              <span class="fr right-info2"> <%= activity.comments.count %></span> </p>
           </div>
         </div><!--row-ziyuan end-->
     <% end %>

From 756a2db4aafec6e7890585ed238d7a952dbc1943 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 31 Mar 2016 19:04:31 +0800
Subject: [PATCH 11/27] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98=20=E9=93=BE=E6=8E=A5more?=
 =?UTF-8?q?=E7=A9=BA=E7=99=BD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb     |  4 ++--
 app/views/layouts/base_org_newstyle.html.erb    | 11 +++++------
 app/views/organizations/_subfield_list.html.erb |  8 ++++----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 1ea109ff1..f84da0e56 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -71,7 +71,7 @@ class OrganizationsController < ApplicationController
 
   def show
     # 组织新类型 show_mode：判断标准 1为新类型，0为旧
-    if @organization.show_mode == 1 && params[:org_subfield_id].nil? && params[:type] .nil?
+    if @organization.show_mode == 1 && params[:org_subfield_id].nil? && params[:list] .nil?
       if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
         @subfield_content = @organization.org_subfields.order("priority")
         # 项目两种动态
@@ -108,7 +108,7 @@ class OrganizationsController < ApplicationController
               @org_activities  = OrgActivity.where("(container_id =? and container_type =?) " +
                                                        "or (container_type ='Project' and org_act_type in ('Issue','Message','ProjectCreateInfo') and container_id in (#{project_ids.join(',')})) "+
                                                        "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').page(params[:page] || 1).per(10)
+                                                       @organization.id, 'Organization').order('updated_at desc').page(params[:page] || 1).per(10)
             when 'project_issue'
               @org_activities = OrgActivity.where("container_type = 'Project' and org_act_type = 'Issue' and container_id in (#{project_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
             when 'project_message'
diff --git a/app/views/layouts/base_org_newstyle.html.erb b/app/views/layouts/base_org_newstyle.html.erb
index aeeba55e3..36e404a42 100644
--- a/app/views/layouts/base_org_newstyle.html.erb
+++ b/app/views/layouts/base_org_newstyle.html.erb
@@ -87,7 +87,7 @@
           <% else %>
               <% if field.field_type == "Post" && field.hide == 0 %>
                   <a href="#message_<%= field.id %>" class="fl"><%= field.name %></a>
-              <% elsif field.field_type == "Resource" && field.hide == 0%>
+              <% elsif field.field_type == "Resource" && field.hide == 0 %>
                   <a href="#resource_<%= field.id %>" class="fl"><%= field.name %></a>
               <% end %>
           <% end %>
@@ -100,7 +100,6 @@
 
   <div class="banner">
     <h2><%= @organization.name %></h2>
-    <p><span><%= @organization.description  %></span></p>
   </div>
 
   <div class="cl"></div>
@@ -144,7 +143,7 @@
                         </ul>
                       </div>
                       <div class="cl"></div>
-                      <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                      <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %>
                       <div class="cl"></div>
                   <% end %>
 
@@ -161,7 +160,7 @@
                             <!--row-ziyuan end-->
                           </div>
                           <div class="cl"></div>
-                          <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                          <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %>
                           <div class="cl"></div>
                       <% end %>
 
@@ -183,7 +182,7 @@
                               <%= render :partial => 'organizations/org_new_project_pic', :locals => {:activities => @project_acts.first(3)} %>
                           <% end %>
                           <div class="cl"></div>
-                          <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                          <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %>
                           <div class="cl"></div>
                         </ul>
                       </div>
@@ -201,7 +200,7 @@
                         <!--row-ziyuan end-->
                       </div>
                       <div class="cl"></div>
-                      <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                      <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %>
                       <div class="cl"></div>
                   <% end %>
 
diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb
index e16e91486..13c73c755 100644
--- a/app/views/organizations/_subfield_list.html.erb
+++ b/app/views/organizations/_subfield_list.html.erb
@@ -24,12 +24,12 @@
           <li class="orgListStatus">默认</li>
           <li class="orgListStatusList">
             <%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %>
-                <div class="update_status_class"><span style="width: 35px; text-align: center; float: left;" class="hidden"><%=field.status== 1 ? "列表" : "图片" %></span>
+                <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},
-                            {:onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:30px;"}) %>
+                            {:onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:52px;"}) %>
             <% end %>
           </li>
           <li class="orgListStatus">默认</li>
@@ -58,12 +58,12 @@
             列表
             <% else %>
             <%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %>
-                <div class="update_status_class"><span style="width: 35px; text-align: center; float: left;" class="hidden"><%=field.status== 1 ? "列表" : "图片" %></span>
+                <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},
-                            {:onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:40px;"}) %>
+                            {:onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:52px;"}) %>
             <% end %>
 
            <% end %>

From 4797cbe65d35b93df8ed0be4f72809a0edb57c7c Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 31 Mar 2016 19:09:11 +0800
Subject: [PATCH 12/27] =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E9=80=89=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index f84da0e56..67666a1ef 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -58,7 +58,7 @@ class OrganizationsController < ApplicationController
     @organization.description = params[:organization][:description]
     @organization.is_public = params[:organization][:is_public]
     @organization.allow_guest_download = params[:organization][:allow_guest_download] == '1' ? 1 : 0
-    @organization.show_mode = params[:show_mode]
+    @organization.show_mode = 0
     @organization.creator_id = User.current.id
     member = OrgMember.new(:user_id => User.current.id)
 

From ebb2f30f3b97b971d501b4e43c3a0500c3f4e805 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 31 Mar 2016 19:14:58 +0800
Subject: [PATCH 13/27] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=AE=8C=E7=82=B9?=
 =?UTF-8?q?=E7=A1=AE=E5=AE=9A=EF=BC=8C=E8=87=AA=E5=8A=A8=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 67666a1ef..280957449 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -220,7 +220,11 @@ class OrganizationsController < ApplicationController
     #@organization.name = params[:organization][:name]
     @organization.save
      respond_to do |format|
-       format.html { redirect_to setting_organization_path(@organization)}
+       if @organization.show_mode == 1
+         format.html { redirect_to organization_path(@organization)}
+       else
+         format.html { redirect_to setting_organization_path(@organization)}
+       end
      end
   end
 

From 1fdd562bd312a1c0e8eba8adc2793abab2f9100c Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 31 Mar 2016 19:33:43 +0800
Subject: [PATCH 14/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E4=B8=80=E4=BA=9B=E5=8A=9F=E8=83=BDjibug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org_newstyle.html.erb  | 55 ++++---------
 .../_org_new_course_pic.html.erb              | 78 +++++++++++++++++++
 2 files changed, 95 insertions(+), 38 deletions(-)
 create mode 100644 app/views/organizations/_org_new_course_pic.html.erb

diff --git a/app/views/layouts/base_org_newstyle.html.erb b/app/views/layouts/base_org_newstyle.html.erb
index 36e404a42..489f014b3 100644
--- a/app/views/layouts/base_org_newstyle.html.erb
+++ b/app/views/layouts/base_org_newstyle.html.erb
@@ -111,44 +111,23 @@
           <% when 'course' %>
               <div class="box1 bg-grey" style="display:<%= field.hide == 0?'block':'none' %>;">
                <% if field.status == 0 %>
-                <div class="content">
-                  <div class="box-top"  id="course_<%= field.id %>"><h2 class="box-title">课程动态</h2></div>
-                  <% if @course_acts.nil? %>
-                      <p class="nocontent">暂无内容，敬请期待！</p>
-                  <% else %>
-                      <div class="course-list">
-                        <ul class="clearfix">
-                          <% unless @course_acts_homework.nil? %>
-                              <li >
-                                <% @course_acts_homework.each do |act| %>
-                                    <%= render :partial => 'org_new_course_homework', :locals => {:activity => HomeworkCommon.find(act.org_act_id),:user_activity_id =>act.id, :course_activity => 0} %>
-                                <% end %>
-                              </li>
-                          <% end %>
-                          <% unless @course_acts_message.nil? %>
-                              <li >
-                                <% @course_acts_message.each do |act| %>
-                                    <%= render :partial => 'org_new_course_message', :locals => {:activity => Message.find(act.org_act_id), :user_activity_id =>act.id} %>
-                                <% end %>
-                              </li>
-                          <% end %>
-                          <% unless @course_acts_news.nil? %>
-                              <li >
-                                <% @course_acts_news.each do |act| %>
-                                    <%= render :partial => 'org_new_course_news', :locals => {:activity => News.find(act.org_act_id), :user_activity_id =>act.id} %>
-                                <% end %>
-                              </li>
-                          <% end %>
-                          <div class="cl"></div>
-                        </ul>
-                      </div>
-                      <div class="cl"></div>
-                      <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %>
-                      <div class="cl"></div>
-                  <% end %>
-
-
-                </div><!--content end-->
+                    <div class="content ">
+                      <div class="box-top"  id="course_<%= field.id %>"><h2 class="box-title">课程动态</h2></div>
+                      <% if @course_acts.nil? %>
+                          <p class="nocontent">暂无内容，敬请期待！</p>
+                      <% else %>
+                          <div class="course-list">
+                            <ul class="clearfix">
+                              <% unless @course_acts.nil? %>
+                                  <%= render :partial => 'organizations/org_new_course_pic', :locals => {:activities => @course_acts.first(3)} %>
+                              <% end %>
+                              <div class="cl"></div>
+                              <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %>
+                              <div class="cl"></div>
+                            </ul>
+                          </div>
+                      <% end %>
+                    </div><!--content end-->
                <% else %>
                     <div class="content">
                       <div class="box-top"  id="course_<%= field.id %>"><h2 class="box-title">课程动态</h2></div>
diff --git a/app/views/organizations/_org_new_course_pic.html.erb b/app/views/organizations/_org_new_course_pic.html.erb
new file mode 100644
index 000000000..26a5762bb
--- /dev/null
+++ b/app/views/organizations/_org_new_course_pic.html.erb
@@ -0,0 +1,78 @@
+<% activities.each do |act| %>
+    <% if act.org_act_type == "HomeworkCommon" %>
+        <% activity = HomeworkCommon.find(act.org_act_id) %>
+        <li>
+          <a href="/#" title="">
+            <div class="course-list-img">
+              <% iamge_path = get_image_path_from_content(activity.description) %>
+              <% if iamge_path.nil? %>
+                  <%= link_to image_tag("/images/org_new_style/default-img.jpg", :width => "370", :height => "220"), student_work_index_url_in_org(activity.id), :target => "_blank" %>
+                  <!--<img width="370" height="220" alt="#" src="/images/org_new_style/default-img.jpg">-->
+              <% else %>
+                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), student_work_index_url_in_org(activity.id), :target => "_blank" %>
+                  <!--<img width="370" height="220" src="/files/uploads/image<%#= iamge_path %>" alt="" />-->
+              <% end %>
+            </div>
+            <h5>
+              <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank' %>
+            </h5>
+            <div class="item-btm clearfix">
+            <%=link_to activity.try(:user).try(:realname).nil? ? activity.try(:user).try(:login) : activity.try(:user).try(:realname), user_path(activity.user), :class=>"publisher-name fl", :target => "_blank" %></a>
+          <p class="pass-time fl"><span><%= format_date activity.updated_at %></span></p>
+          <div class="fr right-info"> <span> <%= activity.journals_for_messages.count %></span></div>
+          </div>
+          </a>
+        </li>
+    <% elsif act.org_act_type == "Message" %>
+        <% activity = Message.find(act.org_act_id) %>
+        <li>
+          <a href="/#" title="">
+            <div class="course-list-img">
+              <% iamge_path = get_image_path_from_content(activity.content) %>
+              <% if iamge_path.nil? %>
+                  <%= link_to image_tag("/images/org_new_style/default-img.jpg", :width => "370", :height => "220"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank" %>
+              <% else %>
+                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank" %>
+              <% end %>
+            </div>
+            <h5>
+              <% 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' %>
+              <% else %>
+                  <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank' %>
+              <% end %>
+            </h5>
+            <div class="item-btm clearfix">
+            <%=link_to activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname), user_path(activity.author), :class=>"publisher-name fl", :target => "_blank" %></a>
+          <p class="pass-time fl"><span><%= format_date activity.updated_on %></span></p>
+          <div class="fr right-info"> <span> <%= activity.children.count %></span></div>
+          </div>
+          </a>
+        </li>
+    <% elsif act.org_act_type == "News" %>
+        <% activity = News.find(act.org_act_id) %>
+        <li>
+          <a href="/#" title="">
+            <div class="course-list-img">
+              <% iamge_path = get_image_path_from_content(activity.description) %>
+              <% if iamge_path.nil? %>
+                  <%= link_to image_tag("/images/org_new_style/default-img.jpg", :width => "370", :height => "220"), news_url_in_org(activity.id), :target => "_blank" %>
+              <% else %>
+                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), news_url_in_org(activity.id), :target => "_blank" %>
+              <% end %>
+            </div>
+            <h5>
+              <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank' %>
+            </h5>
+            <div class="item-btm clearfix">
+            <%=link_to activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname), user_path(activity.author), :class=>"publisher-name fl", :target => "_blank" %></a>
+          <p class="pass-time fl"><span><%= format_date activity.created_on %></span></p>
+          <div class="fr right-info"> <span> <%= activity.comments.count %></span></div>
+          </div>
+          </a>
+        </li>
+
+    <% end %>
+
+<% end %>
+

From 230dab6d9d33040ca5255aad553f082a9f5e7a82 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 31 Mar 2016 19:42:05 +0800
Subject: [PATCH 15/27] =?UTF-8?q?=E6=A0=8F=E7=9B=AE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/_subfield_list.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb
index 13c73c755..410edac51 100644
--- a/app/views/organizations/_subfield_list.html.erb
+++ b/app/views/organizations/_subfield_list.html.erb
@@ -29,7 +29,7 @@
                 </div>
                 <%= select( :name,:group_id, subfield_status_option,
                             { :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:52px;"}) %>
+                            {:onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:58px;"}) %>
             <% end %>
           </li>
           <li class="orgListStatus">默认</li>
@@ -63,7 +63,7 @@
                 </div>
                 <%= select( :name,:group_id, subfield_status_option,
                             { :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:52px;"}) %>
+                            {:onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:58px;"}) %>
             <% end %>
 
            <% end %>

From 865f274c61b71df90dc79c58551a4b916e8c9d11 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 31 Mar 2016 19:56:29 +0800
Subject: [PATCH 16/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/organizations/_org_logined_header.html.erb b/app/views/organizations/_org_logined_header.html.erb
index fa4c228a1..75ec7106a 100644
--- a/app/views/organizations/_org_logined_header.html.erb
+++ b/app/views/organizations/_org_logined_header.html.erb
@@ -24,7 +24,7 @@
     </div>
 <% else %>
     <div class="login fr" >
-      <a href="<%= signin_url_without_domain %>" class=" " >登陆&nbsp;&nbsp;|&nbsp;</a>
+      <a href="<%= signin_url_without_domain %>" class=" " >登录&nbsp;&nbsp;|&nbsp;</a>
       <a href="<%= register_url_without_domain %>" class=" " >退出</a>
     </div>
 <% end %>

From 5866dfb7ffb561ae2258f59c4bde2b222e9147cd Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 31 Mar 2016 20:12:20 +0800
Subject: [PATCH 17/27] =?UTF-8?q?=E7=99=BB=E5=BD=95=20=E6=B2=A1=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9more=20logo=E4=B8=8D=E5=8A=A0=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org_newstyle.html.erb  | 23 ++++++++++++++++++-
 .../organizations/_subfield_list.html.erb     |  4 ++--
 public/stylesheets/org.css                    |  2 +-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/base_org_newstyle.html.erb b/app/views/layouts/base_org_newstyle.html.erb
index 489f014b3..2a86f62b9 100644
--- a/app/views/layouts/base_org_newstyle.html.erb
+++ b/app/views/layouts/base_org_newstyle.html.erb
@@ -65,7 +65,7 @@
 <div class="container">
   <div class="header">
     <div class="header-con">
-      <a href="#" class="fl logo"><img src="/images/org_new_style/logo.jpg" alt=""/></a>
+      <span  class="fl logo"><img src="/images/org_new_style/logo.jpg" alt=""/></span>
       <%# 登录 %>
       <%= render :partial => 'organizations/org_logined_header' %>
     </div>
@@ -115,6 +115,9 @@
                       <div class="box-top"  id="course_<%= field.id %>"><h2 class="box-title">课程动态</h2></div>
                       <% if @course_acts.nil? %>
                           <p class="nocontent">暂无内容，敬请期待！</p>
+                          <div class="cl"></div>
+                          <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %>
+                          <div class="cl"></div>
                       <% else %>
                           <div class="course-list">
                             <ul class="clearfix">
@@ -133,6 +136,9 @@
                       <div class="box-top"  id="course_<%= field.id %>"><h2 class="box-title">课程动态</h2></div>
                       <% if @course_acts.nil? %>
                           <p class="nocontent">暂无内容，敬请期待！</p>
+                          <div class="cl"></div>
+                          <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %>
+                          <div class="cl"></div>
                       <% else %>
                           <div class="row">
                             <%= render :partial => 'organizations/org_new_course_act_list', :locals =>{:activities => @course_acts, :field => field, :organization => @organization} %>
@@ -154,6 +160,9 @@
                   <div class="box-top"  id="project_<%= field.id %>"><h2 class="box-title">项目动态</h2><p class="box-title-p"></p></div>
                   <% if @project_acts.nil? %>
                       <p class="nocontent">暂无内容，敬请期待！</p>
+                      <div class="cl"></div>
+                      <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %>
+                      <div class="cl"></div>
                   <% else %>
                       <div class="course-list">
                         <ul class="clearfix">
@@ -173,6 +182,9 @@
                   <div class="box-top" style="display:<%= field.hide == 0?'block':'none' %>;"  id="project_<%= field.id %>"><h2 class="box-title">项目动态</h2><p class="box-title-p"></p></div>
                   <% if @project_acts.nil? %>
                       <p class="nocontent">暂无内容，敬请期待！</p>
+                      <div class="cl"></div>
+                      <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %>
+                      <div class="cl"></div>
                   <% else %>
                       <div class="row">
                         <%= render :partial => 'organizations/org_new_project_act_list', :locals =>{:activities => @project_acts, :field => field, :organization => @organization} %>
@@ -197,6 +209,9 @@
                       <div class="box-top" id="message_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2></div>
                       <% if message_ats.blank? %>
                           <p class="nocontent">暂无内容，敬请期待！</p>
+                          <div class="cl"></div>
+                          <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                          <div class="cl"></div>
                       <% else %>
                           <div class="course-list">
                             <ul class="clearfix">
@@ -217,6 +232,9 @@
                       <div class="box-top" id="message_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2></div>
                       <% if message_ats.blank? %>
                           <p class="nocontent">暂无内容，敬请期待！</p>
+                          <div class="cl"></div>
+                          <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                          <div class="cl"></div>
                       <% else %>
                           <div class="row">
                             <% message_ats.each do |act| %>
@@ -240,6 +258,9 @@
                   <div class="box-top" id="resource_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2></div>
                   <% if org_attachs.blank? %>
                       <p class="nocontent">暂无内容，敬请期待！</p>
+                      <div class="cl"></div>
+                      <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                      <div class="cl"></div>
                   <% else %>
                       <div class="row">
                         <%= render :partial => 'organizations/org_new_resource', :locals => {:org_attachs => org_attachs} %>
diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb
index 410edac51..4fbeb971f 100644
--- a/app/views/organizations/_subfield_list.html.erb
+++ b/app/views/organizations/_subfield_list.html.erb
@@ -29,7 +29,7 @@
                 </div>
                 <%= select( :name,:group_id, subfield_status_option,
                             { :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:58px;"}) %>
+                            {:onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:56px;"}) %>
             <% end %>
           </li>
           <li class="orgListStatus">默认</li>
@@ -63,7 +63,7 @@
                 </div>
                 <%= select( :name,:group_id, subfield_status_option,
                             { :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:58px;"}) %>
+                            {:onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:56px;"}) %>
             <% end %>
 
            <% end %>
diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index 9dad153a3..3a203c10d 100644
--- a/public/stylesheets/org.css
+++ b/public/stylesheets/org.css
@@ -76,7 +76,7 @@ a.linkGrey8:hover {color:#585858;}
 .org_login_list a {color:#269ac9;}
 
 .orgListStatus {width:40px; float:left;}
-.orgListStatusList {width:55px; float:left;}
+.orgListStatusList {width:58px; float:left;}
 .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;}

From ba658e44c015532385be505865f785c49206f19d Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 31 Mar 2016 20:46:55 +0800
Subject: [PATCH 18/27] =?UTF-8?q?=E7=BB=84=E7=BB=87more=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org_newstyle.html.erb | 22 ++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/base_org_newstyle.html.erb b/app/views/layouts/base_org_newstyle.html.erb
index 2a86f62b9..b5dfe71ea 100644
--- a/app/views/layouts/base_org_newstyle.html.erb
+++ b/app/views/layouts/base_org_newstyle.html.erb
@@ -259,7 +259,16 @@
                   <% if org_attachs.blank? %>
                       <p class="nocontent">暂无内容，敬请期待！</p>
                       <div class="cl"></div>
-                      <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                      <% 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 "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank" %>
+                          <% else %>
+                              <%= link_to "More", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank"  %>
+                          <% end %>
+                      <% else %>
+                          <%= link_to "More", org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank"  %>
+                      <% end %>
+                      <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
                       <div class="cl"></div>
                   <% else %>
                       <div class="row">
@@ -268,7 +277,16 @@
                       </div>
 
                       <div class="cl"></div>
-                      <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                      <% 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 "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank" %>
+                          <% else %>
+                              <%= link_to "More", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank"  %>
+                          <% end %>
+                      <% else %>
+                          <%= link_to "More", org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank"  %>
+                      <% end %>
+                      <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
                       <div class="cl"></div>
                   <% end %>
 

From d71035159a2f3e11233724427f6722f0aaa7abcc Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 31 Mar 2016 20:54:01 +0800
Subject: [PATCH 19/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9more=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org_newstyle.html.erb | 47 +++++++++++++++++---
 1 file changed, 41 insertions(+), 6 deletions(-)

diff --git a/app/views/layouts/base_org_newstyle.html.erb b/app/views/layouts/base_org_newstyle.html.erb
index b5dfe71ea..d8ba49f31 100644
--- a/app/views/layouts/base_org_newstyle.html.erb
+++ b/app/views/layouts/base_org_newstyle.html.erb
@@ -210,7 +210,17 @@
                       <% if message_ats.blank? %>
                           <p class="nocontent">暂无内容，敬请期待！</p>
                           <div class="cl"></div>
-                          <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                          <% 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 "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank"  %>
+                              <% else %>
+                                  <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank"  %>
+                              <% end %>
+                          <% else %>
+                              <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank"  %>
+                          <% end %>
+
+                          <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
                           <div class="cl"></div>
                       <% else %>
                           <div class="course-list">
@@ -221,7 +231,16 @@
                               <% end %>
                               <div class="cl"></div>
                             </ul>
-                            <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                            <% 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 "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank"  %>
+                                <% else %>
+                                    <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank"  %>
+                                <% end %>
+                            <% else %>
+                                <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank"  %>
+                            <% end %>
+                            <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
                             <div class="cl"></div>
                           </div>
                       <% end %>
@@ -233,7 +252,15 @@
                       <% if message_ats.blank? %>
                           <p class="nocontent">暂无内容，敬请期待！</p>
                           <div class="cl"></div>
-                          <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                          <% 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 "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank"  %>
+                              <% else %>
+                                  <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank"  %>
+                              <% end %>
+                          <% else %>
+                              <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank"  %>
+                          <% end %>
                           <div class="cl"></div>
                       <% else %>
                           <div class="row">
@@ -243,7 +270,15 @@
                             <!--row-ziyuan end-->
                           </div>
                           <div class="cl"></div>
-                          <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                          <% 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 "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank"  %>
+                              <% else %>
+                                  <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank"  %>
+                              <% end %>
+                          <% else %>
+                              <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank"  %>
+                          <% end %>
                           <div class="cl"></div>
                       <% end %>
 
@@ -260,10 +295,10 @@
                       <p class="nocontent">暂无内容，敬请期待！</p>
                       <div class="cl"></div>
                       <% 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) %>
+                          <% 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 "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank" %>
                           <% else %>
-                              <%= link_to "More", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank"  %>
+                              <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank"  %>
                           <% end %>
                       <% else %>
                           <%= link_to "More", org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank"  %>

From 12c3de6dc98a81e63c97078b2b43917c88b5c8b8 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 31 Mar 2016 21:14:07 +0800
Subject: [PATCH 20/27] =?UTF-8?q?500=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org_newstyle.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/base_org_newstyle.html.erb b/app/views/layouts/base_org_newstyle.html.erb
index d8ba49f31..b1656cf37 100644
--- a/app/views/layouts/base_org_newstyle.html.erb
+++ b/app/views/layouts/base_org_newstyle.html.erb
@@ -313,10 +313,10 @@
 
                       <div class="cl"></div>
                       <% 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) %>
+                          <% 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 "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank" %>
                           <% else %>
-                              <%= link_to "More", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank"  %>
+                              <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank"  %>
                           <% end %>
                       <% else %>
                           <%= link_to "More", org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank"  %>

From 5ce14991cf18422f968fe7eb3baa6e30ec90e2b9 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 31 Mar 2016 21:32:19 +0800
Subject: [PATCH 21/27] =?UTF-8?q?=E6=96=B0=E9=97=BB=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/_org_new_forum_list.html.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/organizations/_org_new_forum_list.html.erb b/app/views/organizations/_org_new_forum_list.html.erb
index a8e531b50..b0346b9f7 100644
--- a/app/views/organizations/_org_new_forum_list.html.erb
+++ b/app/views/organizations/_org_new_forum_list.html.erb
@@ -3,7 +3,8 @@
       <%= link_to image_tag(url_to_avatar(activity.creator),:width => "40", :height => "40"), user_path(activity.creator), :class => "fl user-img" %>
       <!--<a href="#" class="fl user-img" ><img src="images/detailimg4.jpg" /></a>-->
       <div class="ziyuan-box fl">
-        <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "fl ziyuan-title" %>
+        <%= link_to activity.title.to_s, organization_path(@organization, :org_subfield_id => field.id), :target => '_blank', :class => "fl ziyuan-title" %>
+        <%#= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "fl ziyuan-title" %>
         <p class="fl"><span >发布时间：<%= format_date activity.updated_at %></span>
           <span> 作者：<%= activity.try(:creator).try(:realname).nil? ? activity.try(:creator).try(:login) : activity.try(:creator).try(:realname) %></span>
           <span class="fr right-info2"> <%= activity.children.count %></span> </p>

From 92a08dc606960674104bc199adb2ee910ab2231b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 1 Apr 2016 09:37:31 +0800
Subject: [PATCH 22/27] =?UTF-8?q?=E4=BD=9C=E4=B8=9A500=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20admin=E7=BB=84=E7=BB=87=E7=BC=96=E8=BE=91500=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb | 7 ++++++-
 app/views/admin/homework.html.erb           | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 280957449..920b9f2c4 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -41,7 +41,12 @@ class OrganizationsController < ApplicationController
   end
 
   def edit
-    @organization = Organization.find(params[:id])
+    # @organization = Organization.find(params[:id])
+    begin
+      @organization = Organization.where("id =?", params[:id])
+    ensure
+      render_404
+    end
   end
 
   def destroy
diff --git a/app/views/admin/homework.html.erb b/app/views/admin/homework.html.erb
index 4188fecea..09f42bb84 100644
--- a/app/views/admin/homework.html.erb
+++ b/app/views/admin/homework.html.erb
@@ -35,7 +35,7 @@
               <%=@count %>
             </td>
             <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=homework.name%>'>
-              <%=link_to(homework.name, student_work_index_path(:homework => homework.id))%>
+              <%=link_to(homework.try(:name), student_work_index_path(:homework => homework.id))%>
             </td>
             <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=homework.course.name%>'>
               <%= link_to(homework.course.name, course_path(homework.course.id)) %>

From 8f4ff2bf910e6095ecf17f04df4b9669705a7630 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 1 Apr 2016 10:20:31 +0800
Subject: [PATCH 23/27] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_org_new_course_act_list.html.erb              | 14 +++++++-------
 .../organizations/_org_new_forum_list.html.erb     |  4 ++--
 .../_org_new_project_act_list.html.erb             | 14 +++++++-------
 public/stylesheets/org_new_style.css               |  7 +++++++
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/app/views/organizations/_org_new_course_act_list.html.erb b/app/views/organizations/_org_new_course_act_list.html.erb
index 56202ee86..81f1b6410 100644
--- a/app/views/organizations/_org_new_course_act_list.html.erb
+++ b/app/views/organizations/_org_new_course_act_list.html.erb
@@ -4,8 +4,8 @@
         <div class="row-ziyuan fl">
           <%= link_to image_tag(url_to_avatar(activity.user),:width => "40", :height => "40"), user_path(activity.user), :class => "fl user-img" %>
           <!--<a href="#" class="fl user-img" ><img src="images/detailimg4.jpg" /></a>-->
-          <div class="ziyuan-box fl">
-            <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "fl ziyuan-title" %>
+          <div class="note-box fl">
+            <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "fl note-title" %>
             <%#= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "fl ziyuan-title" %>
             <p class="fl"><span >发布时间：<%= format_date activity.updated_at %></span>
               <span> 作者：<%= activity.try(:user).try(:realname).nil? ? activity.try(:user).try(:login) : activity.try(:user).try(:realname) %></span>
@@ -18,11 +18,11 @@
         <div class="row-ziyuan fl">
           <%= link_to image_tag(url_to_avatar(activity.author),:width => "40", :height => "40"), user_path(activity.author), :class => "fl user-img" %>
           <!--<a href="#" class="fl user-img" ><img src="images/detailimg4.jpg" /></a>-->
-          <div class="ziyuan-box fl">
+          <div class="note-box fl">
             <% 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 => "fl ziyuan-title" %>
+                <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "fl note-title" %>
             <% else %>
-                <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "fl ziyuan-title" %>
+                <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "fl note-title" %>
             <% end %>
             <%#= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "fl ziyuan-title" %>
             <p class="fl"><span >发布时间：<%= format_date activity.updated_on %></span>
@@ -36,8 +36,8 @@
         <div class="row-ziyuan fl">
           <%= link_to image_tag(url_to_avatar(activity.author),:width => "40", :height => "40"), user_path(activity.author), :class => "fl user-img" %>
           <!--<a href="#" class="fl user-img" ><img src="images/detailimg4.jpg" /></a>-->
-          <div class="ziyuan-box fl">
-            <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "fl ziyuan-title" %>
+          <div class="note-box fl">
+            <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "fl note-title" %>
             <p class="fl"><span >发布时间：<%= format_date activity.created_on %></span>
               <span> 作者：<%= activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname) %></span>
               <span class="fr right-info2"> <%= activity.comments.count %></span> </p>
diff --git a/app/views/organizations/_org_new_forum_list.html.erb b/app/views/organizations/_org_new_forum_list.html.erb
index b0346b9f7..bcd79c35f 100644
--- a/app/views/organizations/_org_new_forum_list.html.erb
+++ b/app/views/organizations/_org_new_forum_list.html.erb
@@ -2,8 +2,8 @@
     <div class="row-ziyuan fl">
       <%= link_to image_tag(url_to_avatar(activity.creator),:width => "40", :height => "40"), user_path(activity.creator), :class => "fl user-img" %>
       <!--<a href="#" class="fl user-img" ><img src="images/detailimg4.jpg" /></a>-->
-      <div class="ziyuan-box fl">
-        <%= link_to activity.title.to_s, organization_path(@organization, :org_subfield_id => field.id), :target => '_blank', :class => "fl ziyuan-title" %>
+      <div class="note-box fl">
+        <%= link_to activity.title.to_s, organization_path(@organization, :org_subfield_id => field.id), :target => '_blank', :class => "fl note-title" %>
         <%#= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "fl ziyuan-title" %>
         <p class="fl"><span >发布时间：<%= format_date activity.updated_at %></span>
           <span> 作者：<%= activity.try(:creator).try(:realname).nil? ? activity.try(:creator).try(:login) : activity.try(:creator).try(:realname) %></span>
diff --git a/app/views/organizations/_org_new_project_act_list.html.erb b/app/views/organizations/_org_new_project_act_list.html.erb
index 407c8fa97..278972b1a 100644
--- a/app/views/organizations/_org_new_project_act_list.html.erb
+++ b/app/views/organizations/_org_new_project_act_list.html.erb
@@ -4,8 +4,8 @@
         <div class="row-ziyuan fl">
           <%= link_to image_tag(url_to_avatar(activity.author),:width => "40", :height => "40"), user_path(activity.author), :class => "fl user-img" %>
           <!--<a href="#" class="fl user-img" ><img src="images/detailimg4.jpg" /></a>-->
-          <div class="ziyuan-box fl">
-            <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "fl ziyuan-title" %>
+          <div class="note-box fl">
+            <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "fl note-title" %>
             <%#= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "fl ziyuan-title" %>
             <%#= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "fl ziyuan-title" %>
             <p class="fl"><span >发布时间：<%= format_date activity.updated_on %></span>
@@ -19,11 +19,11 @@
         <div class="row-ziyuan fl">
           <%= link_to image_tag(url_to_avatar(activity.author),:width => "40", :height => "40"), user_path(activity.author), :class => "fl user-img" %>
           <!--<a href="#" class="fl user-img" ><img src="images/detailimg4.jpg" /></a>-->
-          <div class="ziyuan-box fl">
+          <div class="note-box fl">
             <% 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 => "fl ziyuan-title" %>
+                <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "fl note-title" %>
             <% else %>
-                <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "fl ziyuan-title" %>
+                <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "fl note-title" %>
             <% end %>
             <%#= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "fl ziyuan-title" %>
             <p class="fl"><span >发布时间：<%= format_date activity.updated_on %></span>
@@ -37,8 +37,8 @@
         <div class="row-ziyuan fl">
           <%= link_to image_tag(url_to_avatar(activity.author),:width => "40", :height => "40"), user_path(activity.author), :class => "fl user-img" %>
           <!--<a href="#" class="fl user-img" ><img src="images/detailimg4.jpg" /></a>-->
-          <div class="ziyuan-box fl">
-            <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "fl ziyuan-title" %>
+          <div class="note-box fl">
+            <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "fl note-title" %>
             <p class="fl"><span >发布时间：<%= format_date activity.created_on %></span>
               <span> 作者：<%= activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname) %></span>
               <span class="fr right-info2"> <%= activity.comments.count %></span> </p>
diff --git a/public/stylesheets/org_new_style.css b/public/stylesheets/org_new_style.css
index ad0170ec1..442ca9ce3 100644
--- a/public/stylesheets/org_new_style.css
+++ b/public/stylesheets/org_new_style.css
@@ -185,6 +185,13 @@ a:hover.more-btn-center{ background:#29146f; color:#fff;}
 
 .nocontent{ font-size:30px; color:#888; margin:150px auto; text-align:center;}
 
+/** 帖子列表模式 **/
+.note-box{  width:515px; }
+.note-box span{ margin-right:5px;}
+.note-title{ display:block; width:515px; font-size:16px;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}
+.note-box p{display:block; width:515px; color:#888; font-size:12px; line-height:2.5;}
+.right-info2{background:url(../images/org_new_style/icons.png) no-repeat -41px -540px ; width:15px; line-height:1.9; height:16px; padding-left:20px; color:#888; margin-top:5px;}
+
 
 
 

From 638280a07e32b0931a1e9ad7b64763c76ea4784d Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 1 Apr 2016 10:31:16 +0800
Subject: [PATCH 24/27] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizations/_subfield_list.html.erb     | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb
index 4fbeb971f..2c679eb3d 100644
--- a/app/views/organizations/_subfield_list.html.erb
+++ b/app/views/organizations/_subfield_list.html.erb
@@ -23,14 +23,19 @@
           <li class="orgListUser"><%= name %></li>
           <li class="orgListStatus">默认</li>
           <li class="orgListStatusList">
-            <%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %>
-                <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},
-                            {:onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:56px;"}) %>
+            <% if field.name == "activity" %>
+             默认
+            <% else %>
+                <%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %>
+                    <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},
+                                {: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>

From 25da9254970d8be5358157b2b1692245712f299a Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 1 Apr 2016 11:38:20 +0800
Subject: [PATCH 25/27] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb   |  3 +-
 .../_org_new_course_act_list.html.erb         | 32 +++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 920b9f2c4..2af1f1d9e 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -176,7 +176,8 @@ class OrganizationsController < ApplicationController
   def get_course_activities_org org
     course_ids = org.courses.map{|course| course.id}.join(",")
     unless course_ids.blank?
-      project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{course_ids}) and container_type = 'course' order by updated_at desc limit 8;")
+      project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{course_ids}) and container_type = 'course'
+                  and org_act_type in ('HomeworkCommon', 'Poll',  'Message', 'News', 'Course') order by updated_at desc limit 8;")
     else
       project_acts = nil
     end
diff --git a/app/views/organizations/_org_new_course_act_list.html.erb b/app/views/organizations/_org_new_course_act_list.html.erb
index 81f1b6410..8dceeb6cb 100644
--- a/app/views/organizations/_org_new_course_act_list.html.erb
+++ b/app/views/organizations/_org_new_course_act_list.html.erb
@@ -43,6 +43,38 @@
               <span class="fr right-info2"> <%= activity.comments.count %></span> </p>
           </div>
         </div><!--row-ziyuan end-->
+    <% elsif act.org_act_type == "Poll" %>
+        <% activity = Poll.find(act.org_act_id) %>
+        <% has_commit = has_commit_poll?(activity.id ,User.current)%>
+        <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
+        <% if ( activity.polls_status==2) %>
+        <div class="row-ziyuan fl">
+          <%= link_to image_tag(url_to_avatar(activity.user),:width => "40", :height => "40"), user_path(activity.user), :class => "fl user-img" %>
+          <!--<a href="#" class="fl user-img" ><img src="images/detailimg4.jpg" /></a>-->
+          <div class="note-box fl">
+            <% if has_commit %>
+                <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "fl note-title" %>
+            <% else %>
+                <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s, :target => '_blank', :class => "fl note-title" %>
+            <% end %>
+            <p class="fl"><span >发布时间：<%= format_date activity.published_at %></span>
+              <span> 作者：<%= activity.try(:user).try(:realname).nil? ? activity.try(:user) : activity.try(:user).try(:realname) %></span>
+              <span class="fr right-info2"> 0 </span> </p>
+          </div>
+        </div><!--row-ziyuan end-->
+        <% end %>
+    <% elsif act.org_act_type == "Course" %>
+        <% activity = Course.find(act.org_act_id) %>
+        <div class="row-ziyuan fl">
+          <%= link_to image_tag(url_to_avatar(activity.teacher),:width => "40", :height => "40"), user_path(activity.teacher), :class => "fl user-img" %>
+          <!--<a href="#" class="fl user-img" ><img src="images/detailimg4.jpg" /></a>-->
+          <div class="note-box fl">
+            <%= link_to activity.name.to_s, course_url_in_org(activity.id), :target => '_blank', :class => "fl note-title" %>
+            <p class="fl"><span >发布时间：<%= format_date activity.created_at %></span>
+              <span> 作者：<%= activity.try(:teacher).try(:realname).nil? ? activity.try(:teacher) : activity.try(:teacher).try(:realname) %></span>
+              <span class="fr right-info2"> 0</span> </p>
+          </div>
+        </div><!--row-ziyuan end-->
     <% end %>
 
 <% end %>
\ No newline at end of file

From aee695e94d79f455b173e27893916e814e393e31 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 1 Apr 2016 11:48:13 +0800
Subject: [PATCH 26/27] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0poll=E3=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_org_new_course_pic.html.erb              | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/app/views/organizations/_org_new_course_pic.html.erb b/app/views/organizations/_org_new_course_pic.html.erb
index 26a5762bb..15a9c4582 100644
--- a/app/views/organizations/_org_new_course_pic.html.erb
+++ b/app/views/organizations/_org_new_course_pic.html.erb
@@ -71,7 +71,36 @@
           </div>
           </a>
         </li>
-
+    <% elsif act.org_act_type == "Poll" %>
+        <% activity = Poll.find(act.org_act_id) %>
+        <% has_commit = has_commit_poll?(activity.id ,User.current)%>
+        <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
+        <% if ( activity.polls_status==2) %>
+        <li>
+          <a href="/#" title="">
+            <div class="course-list-img">
+              <% iamge_path = get_image_path_from_content(activity.polls_description) %>
+              <% if iamge_path.nil? %>
+                  <%= link_to image_tag("/images/org_new_style/default-img.jpg", :width => "370", :height => "220"), news_url_in_org(activity.id), :target => "_blank" %>
+              <% else %>
+                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), news_url_in_org(activity.id), :target => "_blank" %>
+              <% end %>
+            </div>
+            <h5>
+              <% if has_commit %>
+                  <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank' %>
+              <% else %>
+                  <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s, :target => '_blank' %>
+              <% end %>
+            </h5>
+            <div class="item-btm clearfix">
+            <%=link_to activity.try(:user).try(:realname).nil? ? activity.try(:user).try(:login) : activity.try(:user).try(:realname), user_path(activity.user), :class=>"publisher-name fl", :target => "_blank" %></a>
+          <p class="pass-time fl"><span><%= format_date activity.published_at %></span></p>
+          <div class="fr right-info"> <span> 0 </span></div>
+          </div>
+          </a>
+        </li>
+     <% end %>
     <% end %>
 
 <% end %>

From a9412b959e2b2279be969d268db0ca48758ca30f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 1 Apr 2016 11:54:58 +0800
Subject: [PATCH 27/27] =?UTF-8?q?=E5=8A=A8=E6=80=81=E4=B8=80=E8=87=B4?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 2af1f1d9e..2c43eec77 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -165,7 +165,8 @@ class OrganizationsController < ApplicationController
   def get_project_activities_org org
     project_ids = org.projects.map{|project| project.id}.join(",")
     unless project_ids.blank?
-      project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{project_ids}) and container_type = 'project'  order by updated_at desc limit 8;")
+      project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{project_ids}) and container_type = 'project'
+                  and org_act_type in ('Message', 'Issue') order by updated_at desc limit 8;")
     else
       project_acts = nil
     end