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>
+                      <%= 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="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>
+                            <!--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 true %>
+            <% 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="course-list">
-                    <ul class="clearfix">
-                      <% unless @project_acts.nil? %>
-
-                                <%= render :partial => 'organizations/org_new_project_pic', :locals => {:activities => @project_acts} %>
+                  <% 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 %>
 
-                      <% 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>
+                  <% 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>
+                  <% end %>
+
                 </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;}
+