From 5b0bdb5069f7f5c4faae4853187890ae1545da5c Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 4 Dec 2015 18:19:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87=E6=A0=8F?=
 =?UTF-8?q?=E7=9B=AE=E7=9A=84=E5=86=85=E5=AE=B9=E5=8F=8A=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizations/_org_left_subfield_list.html.erb    |  4 ++--
 app/views/organizations/_subfield_list.html.erb       | 11 ++++++++---
 app/views/organizations/setting.html.erb              |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
index 7c30aa600..52201fd52 100644
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@@ -45,7 +45,7 @@
   <!--</div>-->
   <!--<a href="javascript:void(0);" class="homepageMenuSetting fr" title="关联您的已有项目"></a>-->
 </div>
-<div class="homepageLeftMenuCourses" id="homepageLeftMenuCourses">
+<div class="homepageLeftMenuCourses" id="homepageLeftMenuCourses" style="display:<%= organization.courses.count == 0 ?'none':'' %>">
   <ul >
     <%= render :partial => 'layouts/org_courses',:locals=>{:courses=>organization.courses.reorder('created_at').uniq.limit(5),:org_id=>organization.id,:page=>1}%>
   </ul>
@@ -55,6 +55,6 @@
       <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses_#{field.id}').slideToggle();"><%= field.name %></a>
       <%=link_to "", :title => "关联#{field.name}"%>
     </div>
-    <div class="homepageLeftMenuCourses" id="homepageLeftMenuField_<%= field.id %>">
+    <div class="homepageLeftMenuCourses" id="homepageLeftMenuField_<%= field.id %>" style="display:none;">
     </div>
 <% end %>
\ 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 f148fc561..6ba60245a 100644
--- a/app/views/organizations/_subfield_list.html.erb
+++ b/app/views/organizations/_subfield_list.html.erb
@@ -34,7 +34,12 @@
     function edit(show_id, edit_id){
         $(show_id).toggle();
         $(edit_id).toggle();
-        $(edit_id).focus();
+        $(edit_id).find('input').focus();
+        $(edit_id).find('input').on('keypress',function(e){
+            if(e.keyCode == 13){
+                this.blur();
+            }
+        })
     }
     function update_subfield(show_id, edit_id, field_id, input_value) {
         if ($(show_id).html().trim() != input_value.trim()) {
@@ -44,8 +49,8 @@
                     type :'put'
                 });
         }
-       $(show_id).show();
-       $(edit_id).hide();
+        $(show_id).show();
+        $(edit_id).hide();
 //       $(edit_id).focus();
    }
   </script>
\ No newline at end of file
diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index 138a7993a..e0f262b99 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -34,7 +34,7 @@
       <ul class="mb10">
         <li class="orgSettingOp orgOpActive" id="orgSetting_1" onclick="HoverLi(1);">信息</li>
         <li class="orgSettingOp" id="orgSetting_2" onclick="HoverLi(2);">成员</li>
-        <li class="orgSettingOp" id="orgSetting_3" onclick="HoverLi(3);">分栏</li>
+        <li class="orgSettingOp" id="orgSetting_3" onclick="HoverLi(3);">栏目</li>
         <li class="orgBorder"></li>
         <div class="cl"></div>
       </ul>