diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb
index bd4537e70..2d29f258f 100644
--- a/app/views/organizations/_subfield_list.html.erb
+++ b/app/views/organizations/_subfield_list.html.erb
@@ -102,120 +102,120 @@
<%= link_to("添加二级目录", new_org_subfield_sub_domain_path(:org_subfield_id => field.id, :field => field), :class => "linkGrey fr mr5", :remote => true) %>
-
-
-
- -
-
- <%= field.priority %>
-
-
-
-
-
- -
-
<%= field.name %>
-
-
-
-
- - 新增
- -
- <% 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 %>
-
<%= subfield_list_type(field.status) %>
-
-
- <%= 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 %>
+
+
+ -
+
+ <%= field.priority %>
+
+
+
+
+
+ -
+
<%= field.name %>
+
+
+
+
+ - 新增
+ -
+ <% 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 %>
+
<%= subfield_list_type(field.status) %>
+
+
+ <%= 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 %>
-
- - <%= field.field_type == "Post" ? "帖子" : "资源" %>
- -
- <% if Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 %>
-
- <%= field.subfield_subdomain_dir.nil? ? '未设置': field.subfield_subdomain_dir.name %>
-
- <% else %>
-
- <%= field.subfield_subdomain_dir.nil? ? '未设置': field.subfield_subdomain_dir.name %>
-
- <% end %>
-
-
-
-
- <%#= link_to "隐藏", hide_org_subfield_organizations_path(field), :method => 'post', :remote => true, :id => "hide_#{field.id}", :class => "linkBlue fr mr5" %>
- -
- <%= field.hide==0?"隐藏":"可见" %>
- |
- <%= link_to "删除", org_subfield_path(field), :method => 'delete', :remote => true, :confirm => "您确定删除吗?", :class => "linkGrey fr ml5 mr5" %>
- |
- 编辑
-
-
-
-
-
- -
-
- <%= field.priority %>
-
-
-
-
-
- -
-
<%= field.name %>
-
-
-
-
- - 新增
- -
- <% 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 %>
-
<%= subfield_list_type(field.status) %>
-
-
- <%= 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 %>
+
+ - <%= field.field_type == "Post" ? "帖子" : "资源" %>
+ -
+ <% if Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 %>
+
+ <%= field.subfield_subdomain_dir.nil? ? '未设置': field.subfield_subdomain_dir.name %>
+
+ <% else %>
+
+ <%= field.subfield_subdomain_dir.nil? ? '未设置': field.subfield_subdomain_dir.name %>
+
+ <% end %>
+
+
+
+
+ <%#= link_to "隐藏", hide_org_subfield_organizations_path(field), :method => 'post', :remote => true, :id => "hide_#{field.id}", :class => "linkBlue fr mr5" %>
+ -
+ <%= field.hide==0?"隐藏":"可见" %>
+ |
+ <%= link_to "删除", org_subfield_path(field), :method => 'delete', :remote => true, :confirm => "您确定删除吗?", :class => "linkGrey fr ml5 mr5" %>
+ |
+ 编辑
+
+
+
+
+
+ -
+
+ <%= field.priority %>
+
+
+
+
+
+ -
+
<%= field.name %>
+
+
+
+
+ - 新增
+ -
+ <% 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 %>
+
<%= subfield_list_type(field.status) %>
+
+
+ <%= 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 %>
-
- - <%= field.field_type == "Post" ? "帖子" : "资源" %>
- -
- <% if Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 %>
-
- <%= field.subfield_subdomain_dir.nil? ? '未设置': field.subfield_subdomain_dir.name %>
-
- <% else %>
-
- <%= field.subfield_subdomain_dir.nil? ? '未设置': field.subfield_subdomain_dir.name %>
-
- <% end %>
-
-
-
-
- <%#= link_to "隐藏", hide_org_subfield_organizations_path(field), :method => 'post', :remote => true, :id => "hide_#{field.id}", :class => "linkBlue fr mr5" %>
- -
- <%= field.hide==0?"隐藏":"可见" %>
- |
- <%= link_to "删除", org_subfield_path(field), :method => 'delete', :remote => true, :confirm => "您确定删除吗?", :class => "linkGrey fr ml5 mr5" %>
- |
- 编辑
-
-
+ <% end %>
+
+ - <%= field.field_type == "Post" ? "帖子" : "资源" %>
+ -
+ <% if Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 %>
+
+ <%= field.subfield_subdomain_dir.nil? ? '未设置': field.subfield_subdomain_dir.name %>
+
+ <% else %>
+
+ <%= field.subfield_subdomain_dir.nil? ? '未设置': field.subfield_subdomain_dir.name %>
+
+ <% end %>
+
+
+
+
+ <%#= link_to "隐藏", hide_org_subfield_organizations_path(field), :method => 'post', :remote => true, :id => "hide_#{field.id}", :class => "linkBlue fr mr5" %>
+ -
+ <%= field.hide==0?"隐藏":"可见" %>
+ |
+ <%= link_to "删除", org_subfield_path(field), :method => 'delete', :remote => true, :confirm => "您确定删除吗?", :class => "linkGrey fr ml5 mr5" %>
+ |
+ 编辑
+
+
+
<% end %>
<% end %>
@@ -229,6 +229,12 @@
}
);
}
+ //二级子目录样式处理
+ $(".orgListRow").each(function(){
+ $(this).children(".orgSubList:first").css({"border-top":"1px solid #e4e4e4","marginTop":"5px"});
+ $(this).children(".orgSubList:last").css("marginBottom","-5px");
+ $(this).children(".orgSubList:last").children("li:first").addClass("orgSubTree2");
+ });
$(document).ready(function(){
$(".pic_edit2").click(function(){
diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index 59ea2ea24..cfee8e0c2 100644
--- a/public/stylesheets/org.css
+++ b/public/stylesheets/org.css
@@ -69,8 +69,8 @@ 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:5px 0; color:#555555; height:21px;}
-.orgSubList {height:31px; line-height:31px; vertical-align:middle; color:#555555; border-bottom:1px solid #e4e4e4;}
+.orgListRow {border-bottom:1px solid #e4e4e4; padding:5px 0; color:#555555; line-height:21px;}
+.orgSubList {height:31px; line-height:31px; vertical-align:middle; color:#555555;}
.orgListBg {background-color:#eaebec;}
.orgMenuArrow {background:url(../images/nav_icon.png) -10px -165px no-repeat; position:relative; display:inline-block; width:20px; height:30px;}
.orgMenuArrow2 {background:url(../images/nav_icon.png) -10px -132px no-repeat; position:relative; display:inline-block; width:20px; height:30px;}