From ebe6004833f84aff9dab1490c0932542b553f081 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 29 Apr 2016 10:53:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BA=8C=E7=BA=A7=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E6=B7=BB=E5=8A=A0=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizations/_subfield_list.html.erb     | 150 ++++++++++++++++--
 app/views/organizations/setting.html.erb      |  87 ++++------
 public/images/org_tree.png                    | Bin 0 -> 1103 bytes
 public/stylesheets/new_user.css               |   1 +
 public/stylesheets/org.css                    |  24 ++-
 5 files changed, 186 insertions(+), 76 deletions(-)
 create mode 100644 public/images/org_tree.png

diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb
index 7db41cba5..9d8f6f586 100644
--- a/app/views/organizations/_subfield_list.html.erb
+++ b/app/views/organizations/_subfield_list.html.erb
@@ -1,10 +1,11 @@
-<ul class="orgListRow">
+<ul class="orgListRow borderBottomNone orgListBg">
   <li class="orgOrder fb">顺序</li>
   <li class="orgListUser fb">已有栏目</li>
   <li class="orgListStatus fb">状态</li>
   <li class="orgListStatusList fb fb">排列</li>
-  <li class="orgListStatus fb">类型</li>
-  <li class="orgListUser fb">域名目录</li>
+  <li class="orgListType fb">类型</li>
+  <li class="orgListCatalog fb">域名目录</li>
+  <li class="orgListOperation fb"><span class="mr10">操作</span></li>
   <div class="cl"></div>
 </ul>
 
@@ -13,10 +14,10 @@
         <% name = get_default_name(field) %>
         <ul class="orgListRow">
           <li class="orgOrder">
-            <div id="show_priority_<%= field.id %>" ondblclick="edit_priority('#show_priority_<%= field.id %>','#edit_priority_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3;" title="双击可编辑">
+            <div id="show_priority_<%= field.id %>" ondblclick="edit_priority('#show_priority_<%= field.id %>','#edit_priority_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3; width:30px; margin-left:20px;" title="双击可编辑">
               <%= field.priority %>
             </div>
-            <div id="edit_priority_<%= field.id %>" style="display:none;width:30px;">
+            <div id="edit_priority_<%= field.id %>" style="display:none; width:30px; margin-left:20px;">
               <input type="text" onblur="update_priority('#show_priority_<%= field.id %>','#edit_priority_<%= field.id %>','<%= field.id %>',$(this).val());" style="width:20px;" value="<%= field.priority %>"/>
             </div>
           </li>
@@ -37,17 +38,17 @@
             <% end %>
 
           </li>
-          <li class="orgListStatus">默认</li>
-          <a href="javascript:void(0);" class="linkBlue fr mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"隐藏":"可见" %></a>
+          <li class="orgListType">默认</li>
+          <a href="javascript:void(0);" class="linkGrey fr mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"隐藏":"可见" %></a>
           <div class="cl"></div>
         </ul>
     <% else %>
         <ul class="orgListRow">
           <li class="orgOrder">
-            <div id="show_priority_<%= field.id %>" ondblclick="edit_priority('#show_priority_<%= field.id %>','#edit_priority_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3;" title="双击可编辑">
+            <div id="show_priority_<%= field.id %>" ondblclick="edit_priority('#show_priority_<%= field.id %>','#edit_priority_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3; width:30px; margin-left:20px;" title="双击可编辑">
               <%= field.priority %>
             </div>
-            <div id="edit_priority_<%= field.id %>" style="display:none;width:30px;">
+            <div id="edit_priority_<%= field.id %>" style="display:none; width:30px; margin-left:20px;">
               <input type="text" onblur="update_priority('#show_priority_<%= field.id %>','#edit_priority_<%= field.id %>','<%= field.id %>',$(this).val());" style="width:20px;" value="<%= field.priority %>"/>
             </div>
           </li>
@@ -73,10 +74,10 @@
 
            <% end %>
           </li>
-          <li class="orgListStatus"><%= field.field_type == "Post" ? "帖子" : "资源" %></li>
-          <li class="orgListUser hidden">
+          <li class="orgListType"><%= field.field_type == "Post" ? "帖子" : "资源" %></li>
+          <li class="orgListCatalog hidden">
             <% if Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 %>
-                <div id="sub_dir_show_<%= field.id %>" ondblclick="edit_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3;" title="双击可编辑">
+                <div id="sub_dir_show_<%= field.id %>" ondblclick="edit_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3;  width:30px; margin-left:20px;" title="双击可编辑">
                   <%= field.subfield_subdomain_dir.nil? ?  '未设置': field.subfield_subdomain_dir.name  %>
                 </div>
             <% else %>
@@ -89,10 +90,129 @@
             </div>
           </li>
           <%#= link_to "隐藏", hide_org_subfield_organizations_path(field), :method => 'post', :remote => true, :id => "hide_#{field.id}", :class => "linkBlue fr mr5" %>
-          <a href="javascript:void(0);" class="linkBlue fr mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"隐藏":"可见" %></a>
-          <%= link_to "删除", org_subfield_path(field), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkBlue fr mr10" %>
-          <a href="javascript:void(0);" class="linkBlue fr mr10" onclick="edit('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>');">编辑</a>
+          <li class="orgListOperation">
+            <a href="javascript:void(0);" class="linkGrey fr ml5 mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"隐藏":"可见" %></a>
+            <span class="fr">|</span>
+            <%= link_to "删除", org_subfield_path(field), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkGrey fr ml5 mr5" %>
+            <span class="fr">|</span>
+            <a href="javascript:void(0);" class="linkGrey fr ml5 mr5" onclick="edit('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>');">编辑</a>
+            <span class="fr">|</span>
+            <a href="javascript:void(0);" class="linkGrey fr mr5">添加二级目录</a>
+          </li>
+          <div class="cl"></div>
+        </ul>
+        <ul class="orgSubList borderBottomNone">
+          <li class="orgSubTree"></li>
+          <li class="orgSubNum ml5 mr5">
+            <div id="show_priority_<%= field.id %>" ondblclick="edit_priority('#show_priority_<%= field.id %>','#edit_priority_<%= field.id %>');"  class="subNumBlock" title="双击可编辑">
+              <%= field.priority %>
+            </div>
+            <div id="edit_priority_<%= field.id %>" style="display:none; width:30px;">
+              <input type="text" onblur="update_priority('#show_priority_<%= field.id %>','#edit_priority_<%= field.id %>','<%= field.id %>',$(this).val());" style="width:20px;" value="<%= field.priority %>"/>
+            </div>
+          </li>
+          <li class="orgSubColumn">
+            <div id="subfield_show_<%= field.id %>"><%= field.name %></div>
+            <div id="subfield_edit_<%= field.id %>" style="display:none;">
+              <input type="text" name="name" onblur="update_subfield('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>','<%= field.id %>',$(this).val());" value="<%= field.name %>" style="width:70px;"/>
+            </div>
+          </li>
+          <li class="orgSubStatus">新增</li>
+          <li class="orgSubOrder">
+            <% 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 class="hidden"><%= subfield_list_type(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:56px;"}) %>
+                <% end %>
 
+            <% end %>
+          </li>
+          <li class="orgSubType"><%= field.field_type == "Post" ? "帖子" : "资源" %></li>
+          <li class="orgSubCatalog hidden">
+            <% if Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 %>
+                <div id="sub_dir_show_<%= field.id %>" ondblclick="edit_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>');" class="subNumBlock" title="双击可编辑">
+                  <%= field.subfield_subdomain_dir.nil? ?  '未设置': field.subfield_subdomain_dir.name  %>
+                </div>
+            <% else %>
+                <div id="sub_dir_show_<%= field.id %>" >
+                  <%= field.subfield_subdomain_dir.nil? ?  '未设置': field.subfield_subdomain_dir.name  %>
+                </div>
+            <% end %>
+            <div id="sub_dir_edit_<%= field.id %>" style="display:none;">
+              <input type="text" name="name" onfocus="observe_input_to_lowercase($(this));" onblur="update_sub_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>','<%= field.id %>',$(this).val().toLowerCase());" value="<%= field.subfield_subdomain_dir.nil? ?  '': field.subfield_subdomain_dir.name %>" style="width:70px;"/>
+            </div>
+          </li>
+          <%#= link_to "隐藏", hide_org_subfield_organizations_path(field), :method => 'post', :remote => true, :id => "hide_#{field.id}", :class => "linkBlue fr mr5" %>
+          <li class="orgSubOperation">
+            <a href="javascript:void(0);" class="linkGrey fr ml5 mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"隐藏":"可见" %></a>
+            <span class="fr">|</span>
+            <%= link_to "删除", org_subfield_path(field), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkGrey fr ml5 mr5" %>
+            <span class="fr">|</span>
+            <a href="javascript:void(0);" class="linkGrey fr ml5 mr5" onclick="edit('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>');">编辑</a>
+          </li>
+          <div class="cl"></div>
+        </ul>
+        <ul class="orgSubList">
+          <li class="orgSubTree2"></li>
+          <li class="orgSubNum ml5 mr5">
+            <div id="show_priority_<%= field.id %>" ondblclick="edit_priority('#show_priority_<%= field.id %>','#edit_priority_<%= field.id %>');"  class="subNumBlock" title="双击可编辑">
+              <%= field.priority %>
+            </div>
+            <div id="edit_priority_<%= field.id %>" style="display:none; width:30px;">
+              <input type="text" onblur="update_priority('#show_priority_<%= field.id %>','#edit_priority_<%= field.id %>','<%= field.id %>',$(this).val());" style="width:20px;" value="<%= field.priority %>"/>
+            </div>
+          </li>
+          <li class="orgSubColumn">
+            <div id="subfield_show_<%= field.id %>"><%= field.name %></div>
+            <div id="subfield_edit_<%= field.id %>" style="display:none;">
+              <input type="text" name="name" onblur="update_subfield('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>','<%= field.id %>',$(this).val());" value="<%= field.name %>" style="width:70px;"/>
+            </div>
+          </li>
+          <li class="orgSubStatus">新增</li>
+          <li class="orgSubOrder">
+            <% 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 class="hidden"><%= subfield_list_type(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:56px;"}) %>
+                <% end %>
+
+            <% end %>
+          </li>
+          <li class="orgSubType"><%= field.field_type == "Post" ? "帖子" : "资源" %></li>
+          <li class="orgSubCatalog hidden">
+            <% if Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 %>
+                <div id="sub_dir_show_<%= field.id %>" ondblclick="edit_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>');"  class="subNumBlock" title="双击可编辑">
+                  <%= field.subfield_subdomain_dir.nil? ?  '未设置': field.subfield_subdomain_dir.name  %>
+                </div>
+            <% else %>
+                <div id="sub_dir_show_<%= field.id %>" >
+                  <%= field.subfield_subdomain_dir.nil? ?  '未设置': field.subfield_subdomain_dir.name  %>
+                </div>
+            <% end %>
+            <div id="sub_dir_edit_<%= field.id %>" style="display:none;">
+              <input type="text" name="name" onfocus="observe_input_to_lowercase($(this));" onblur="update_sub_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>','<%= field.id %>',$(this).val().toLowerCase());" value="<%= field.subfield_subdomain_dir.nil? ?  '': field.subfield_subdomain_dir.name %>" style="width:70px;"/>
+            </div>
+          </li>
+          <%#= link_to "隐藏", hide_org_subfield_organizations_path(field), :method => 'post', :remote => true, :id => "hide_#{field.id}", :class => "linkBlue fr mr5" %>
+          <li class="orgSubOperation">
+            <a href="javascript:void(0);" class="linkGrey fr ml5 mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"隐藏":"可见" %></a>
+            <span class="fr">|</span>
+            <%= link_to "删除", org_subfield_path(field), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkGrey fr ml5 mr5" %>
+            <span class="fr">|</span>
+            <a href="javascript:void(0);" class="linkGrey fr ml5 mr5" onclick="edit('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>');">编辑</a>
+          </li>
           <div class="cl"></div>
         </ul>
     <% end %>
diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index 0d8fa6be8..edba129e4 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -129,63 +129,42 @@
       </div>
       <div class="undis ml15 mr15" id="orgContent_3">
 <!--新增二级栏目-->
-        <div class="orgMemberList" id="org_subfield_list">
-          <p>
-            <%= form_tag url_for(:controller => 'sub_domains', :action => 'create', :org_subfield_id => 458), :id=> 'add_subfield_form_subdomain',:remote => true do %>
-                <input type="text" id="subfield_name_subdomain" name="name" placeholder="二级栏目名称" class="orgAddSearch mb10" />
-                <ul class="orgAddRole">
-                  <li class="fontGrey3 fb mb10">栏目类型</li>
-                  <li class="fl mr15">
-                    <input type="radio" id="orgMng" value="Post" name="field_type" checked="checked"/>
-                    <label for="orgMng">帖子</label>
-                  </li>
-                  <li class="fl">
-                    <input type="radio" id="orgMeb" value="Resource" name="field_type" />
-                    <label for="orgMeb">资源</label>
-                  </li>
-                  <li class="cl"></li>
-                </ul>
-                <div class="cl"></div>
-                <a href="javascript:void(0);" class="saveBtn db fl mt10" onclick="add_org_subfield_subdomain();">确定</a>
-            <% end %>
-          </p>
-        </div>
+      <div>
+        <%= form_tag url_for(:controller => 'org_subfields', :action => 'create', :organization_id => @organization.id), :id=> 'add_subfield_form',:remote => true do %>
+        <span class="fontGrey3 fb mb5 mr10">新增一级栏目</span>
+            <input type="text" id="subfield_name" name="name" placeholder="栏目名称" class="orgAddSearch mb10" />
+            <div class="mb10">
+              <span class="fontGrey3 fb mr10 ml24">域名目录</span>
+              <% if domain %>
+                  <span><%= domain.subname %>.trustie.net/</span><input id="sub_dir" class="fl personalUrl ml3" type="text" name="sub_dir" onfocus="observe_input_to_lowercase($(this));">
+              <% else %>
+                  <span class="fontGrey2">(用户自定义url，可选) 您还没有子域名，请先在左侧信息栏申请子域名</span>
+              <% end %>
+              <div class="cl"></div>
+            </div>
+            <ul class="orgAddRole mb10">
+              <li class="fontGrey3 fb ml24 mr10 fl">栏目类型</li>
+              <li class="fl mr15">
+                <input type="radio" id="orgMng" value="Post" name="field_type" checked="checked"/>
+                <label for="orgMng">帖子</label>
+              </li>
+              <li class="fl mr15">
+                <input type="radio" id="orgMeb" value="Resource" name="field_type" />
+                <label for="orgMeb">资源</label>
+              </li>
+              <li class="fl">
+                <input type="radio" id="orgMeb" value="Resource" name="field_type" />
+                <label for="orgMeb">综合</label>
+              </li>
+              <li class="fr"><a href="javascript:void(0);" class="saveBtn db" onclick="add_org_subfield();">新增</a></li>
+              <li class="cl"></li>
+            </ul>
+        <% end %>
+      </div>
 <!--over-->
-        <div class="orgMemberList" id="org_subfield_list">
+        <div class="orgColumnList" id="org_subfield_list">
           <%= render :partial => 'organizations/subfield_list', :locals => {:subfields => @organization.org_subfields.order("priority")} %>
         </div>
-        <div class="fr orgMemContainer">
-          <div class="fr">
-            <p class="fontBlue fb mb5">新增栏目</p>
-            <%= form_tag url_for(:controller => 'org_subfields', :action => 'create', :organization_id => @organization.id), :id=> 'add_subfield_form',:remote => true do %>
-                <input type="text" id="subfield_name" name="name" placeholder="栏目名称" class="orgAddSearch mb10" />
-                <div class="mb5">
-                  <p class="fontGrey3"><span class="fb">域名目录</span>（用户自定义url，可选）</p>
-                  <% if domain %>
-                    <span class="fl"><%= domain.subname %>.trustie.net/</span><input id="sub_dir" class="fl personalUrl ml3" type="text" name="sub_dir" onfocus="observe_input_to_lowercase($(this));">
-                  <% else %>
-                      <span class="fl" style="width:195px;">您还没有子域名，请先在左侧信息栏申请子域名</span>
-                  <% end %>
-                  <div class="cl"></div>
-                </div>
-                <ul class="orgAddRole">
-                  <li class="fontGrey3 fb mb10">栏目类型</li>
-                  <li class="fl mr15">
-                    <input type="radio" id="orgMng" value="Post" name="field_type" checked="checked"/>
-                    <label for="orgMng">帖子</label>
-                  </li>
-                  <li class="fl">
-                    <input type="radio" id="orgMeb" value="Resource" name="field_type" />
-                    <label for="orgMeb">资源</label>
-                  </li>
-                  <li class="cl"></li>
-                </ul>
-                <div class="cl"></div>
-                <a href="javascript:void(0);" class="saveBtn db fl mt10" onclick="add_org_subfield();">确定</a>
-            <% end %>
-          </div>
-        </div>
-        <div class="cl"></div>
     </div>
 </div>
 <script>
diff --git a/public/images/org_tree.png b/public/images/org_tree.png
new file mode 100644
index 0000000000000000000000000000000000000000..03b1e8cc9082636f1d32083a81947e3a577fd8b1
GIT binary patch
literal 1103
zcmaJ=U1-x#6wam_V{G6Aahp@FQNf9A{+hH2t6S2vTDQ*8RyKSPv*dOQTXJJ^YrDNn
zMFc?v-+d5N5Cwfu1oc7j!Jik|KoooveH8W}2r@-)wzdk6g(UayeBXD@x#wIO8$I0F
z-rG)5RA=^xo+sm0@}=5Z$^UBK@fI@l;PeD8pc1YaKBQC&O+t`$j47ChhBbHk4IH4T
zO(nZHfhTe!iiw=45!ytnjz`cGH85E9408rzFbSt@H%Tu)eMSS@O48$Ej?H-~IBg%9
z_hDgvv}n%Hn6gC=9s&bZg%CIp8=&gUx`9$n(yP1*nTOj94OUI?Op;!6Y9coVQpkru
zj0zEx<v1WoQ7$G*5_b^rEXOk}d8G&!Q$$JO<DmA?M9sHKN?y;@w8$z+Ph;#U3{$C8
zq7@;E{3(W$WjW;F`3SLy1amGnsu4HXQ)kd&VEVR)ZRCQG(U?SKoTQ1TYauvZF4rJ-
zgIc0U%9yI*F<g{o94Cxx)jGg=_}7hft%Ks62bnw!P}w)heU$dp!6bJZ3x$Tn8|9d9
zlS?sXb!3(u=;ExNq{&ItvMoi|GLjJ2goMVbX^G=hR+cq3A&IOes%b4&=U5Lbt884=
z;|W$*RgOzbT0)dGEg@&Ln2=F5zK+eh0XAF{)^%;7Tf@dT#40Ht8W{OSgl6j%FgA@a
z3Z{_<QUwX@AGci#Rf7KTde)-Vp>LmoR>nsTSk13uucI#rY)lqo4gG|s#$}05@j`|b
z`M65gu+};`t6>{)|A%FWGfY?<{}fAoi&S7ZZInJ)G@1vxq+@*28mXt+ebQD7SzRqw
zKYsndwLb?PEsNb<+m{z^jhuXyD;#JWy%p)9e-5>F?XrICy?N*1llOO4R)&S1ZP!2V
zE<HN;vimJ~ur$9cja^=9J=*{4;)|V4cXfTZ|J{ij*S__Ye=i*T(glXjUK{#U_L`bE
rzizp(uX)Rr-ahf<m0s)nrNw>EDRrjf@s7d%+hL1m)1&%5?bP`{YLZ;Y

literal 0
HcmV?d00001

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 9906b55fc..583e68033 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -75,6 +75,7 @@ a.linkGrey6:hover {color:#ffffff !important;}
 .ml10{ margin-left:10px;}
 .ml15{ margin-left:15px;}
 .ml20{ margin-left:20px;}
+.ml24{margin-left:24px;}
 .ml36{ margin-left:36px; }
 .ml40{ margin-left:40px;}
 .ml45{ margin-left:45px;}
diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index 3a203c10d..59ea2ea24 100644
--- a/public/stylesheets/org.css
+++ b/public/stylesheets/org.css
@@ -16,13 +16,15 @@
 .orgDes {width:600px; height:150px; outline:none; border:1px solid #eaeaea; float:right; resize:none;}
 .w607 {width:607px;}
 .orgUrlInput {width:200px; outline:none; border:1px solid #eaeaea; height:22px;}
-a.saveBtn {padding:3px 5px; background-color:#269ac9; color:#ffffff;}
+a.saveBtn {padding:2px 10px; background-color:#269ac9; color:#ffffff;}
 a.saveBtn:hover {background-color:#297fb8;}
 .orgMemberList {width:480px; float:left;}
-.orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px;}
-.orgListUser {width:85px; float:left;}
+.orgColumnList {width:688px; float:left;}
+.orgListUser {width:120px; float:left;}
 .orgListRole {width:180px; float:left;}
-.orgOrder {width:30px; float:left;margin-right:10px;text-align:center;}
+.orgOrder {width:70px; float:left; text-align:center;}
+.orgSubNum {width:30px; float:left; text-align:center;}
+.subNumBlock {cursor:pointer;background-color:#fffce6;color: #0d90c3;  width:30px; height:17px; line-height:17px; margin:7px 0; vertical-align:middle;}
 .orgMemContainer {width:208px;}
 .orgMemberAdd {float:right;}
 .orgAddSearch {border:1px solid #dddddd; outline:none; width:180px; height:22px; color:#9b9b9b;}
@@ -67,7 +69,9 @@ a.org-cancel-btn:hover {background-color:#717171; color:#ffffff;}
 a.linkGrey8 {color:#888888;}
 a.linkGrey8:hover {color:#585858;}
 .orgBorder {width:583px; height:21px; border-bottom:3px solid #e4e4e4; float:left;}
-.orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px; color:#555555;}
+.orgListRow {border-bottom:1px solid #e4e4e4; padding:5px 0; color:#555555; height:21px;}
+.orgSubList {height:31px; line-height:31px; vertical-align:middle; color:#555555; border-bottom:1px solid #e4e4e4;}
+.orgListBg {background-color:#eaebec;}
 .orgMenuArrow {background:url(../images/nav_icon.png) -10px -165px no-repeat; position:relative; display:inline-block; width:20px; height:30px;}
 .orgMenuArrow2 {background:url(../images/nav_icon.png) -10px -132px no-repeat; position:relative; display:inline-block; width:20px; height:30px;}
 .org_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-53px;
@@ -75,8 +79,14 @@ a.linkGrey8:hover {color:#585858;}
 #orgUserName {display:inline-block;}
 .org_login_list a {color:#269ac9;}
 
-.orgListStatus {width:40px; float:left;}
-.orgListStatusList {width:58px; float:left;}
+.orgListStatus, .orgSubStatus {width:55px; float:left;}
+.orgListStatusList, .orgSubOrder {width:90px; float:left;}
+.orgListType, .orgSubType {width:55px; float:left;}
+.orgListCatalog, .orgSubCatalog {width:75px; float:left;}
+.orgListOperation, .orgSubOperation {width:223px; float:left; text-align:right;}
+.orgSubTree {width:20px; height:31px; background:url(/images/org_tree.png) 0 0 no-repeat; float:left; margin-left:30px;}
+.orgSubTree2 {width:20px; height:31px; background:url(/images/org_tree.png) 0 -45px no-repeat; float:left; margin-left:30px;}
+.orgSubColumn {width:100px; float:left;}
 .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;}