From c3514f5b6aed49f65eda626b76b014490c581d5c Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Thu, 5 May 2016 09:28:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E6=A0=8F=E7=9B=AE=E5=90=8D?=
 =?UTF-8?q?=E9=95=BF=E5=BA=A6=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/_subfield_sub_domains_list.html.erb | 2 +-
 public/stylesheets/org.css                                  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/organizations/_subfield_sub_domains_list.html.erb b/app/views/organizations/_subfield_sub_domains_list.html.erb
index 20bd31ede..f68d06c1e 100644
--- a/app/views/organizations/_subfield_sub_domains_list.html.erb
+++ b/app/views/organizations/_subfield_sub_domains_list.html.erb
@@ -12,7 +12,7 @@
             </div>
           </li>
           <li class="orgSubColumn">
-            <div id="subsubdomain_show_<%= subdomain.id %>"><%= subdomain.name %></div>
+            <div id="subsubdomain_show_<%= subdomain.id %>" class="subColumnControl"><%= subdomain.name %></div>
             <div id="subsubdomain_edit_<%= subdomain.id %>" style="display:none;">
               <input type="text" name="name" onblur="update_subsubdomain('#subsubdomain_show_<%= subdomain.id %>','#subsubdomain_edit_<%= subdomain.id %>','<%= subdomain.id %>',$(this).val());" value="<%= subdomain.name %>" style="width:70px;"/>
             </div>
diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index cfee8e0c2..34025aa73 100644
--- a/public/stylesheets/org.css
+++ b/public/stylesheets/org.css
@@ -87,6 +87,7 @@ a.linkGrey8:hover {color:#585858;}
 .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;}
+.subColumnControl {width:90px; max-width:90px; margin-right:10px; float:left; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}
 .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;}