From 467ee6065772ae1131057e6ed1dafb7f8f304fbc Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 13 May 2016 15:37:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8D=E5=B8=88=E9=BB=98=E8=AE=A4=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA5=E4=B8=AA=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=88=99?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/organizations_helper.rb           |  2 +-
 .../_org_subfield_rightM2.html.erb            | 61 ++++++++++---------
 2 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index 6463bf854..882892822 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -183,7 +183,7 @@ module OrganizationsHelper
   end
 
   def excellent_teachers
-    User.where("excellent_teacher =?",true)
+    User.where("excellent_teacher =?",true).first(5)
   end
 
 end
diff --git a/app/views/organizations/_org_subfield_rightM2.html.erb b/app/views/organizations/_org_subfield_rightM2.html.erb
index 86b69ac05..7a2003629 100644
--- a/app/views/organizations/_org_subfield_rightM2.html.erb
+++ b/app/views/organizations/_org_subfield_rightM2.html.erb
@@ -1,30 +1,33 @@
-<div class="sn-teacher-wrap" style="display:<%= field.hide == 0?'block':'none' %>;">
-  <h2 class="h2-title sn-mb5"><%= field.name %>
-    <%= link_to "更多", teachers_organization_path(@organization, :type => "famous"), :target => "_blank", :class => "more" %>
-  </h2>
-  <% excellent_teachers.each do |teacher| %>
-      <div class="sn-teacher-list">
-        <%= link_to image_tag(url_to_avatar(teacher), :width => "60", :height => "60", :class => "sn-fl", :style => "display:block;"), user_path(teacher), :alt => "用户头像", :target => '_blank'  %>
-        <!--<a href="javascript:void(0);" target="_blank"><img src="images/avatar_default.png" width="60" height="60" style="display:block;" class="sn-fl" /></a>-->
-        <div class="sn-teacher-info">
-          <%=link_to teacher.try(:realname) ? teacher.try(:realname) :teacher.try(:login), user_path(teacher), :class => "sn-teacher-name sn-hidden", :title => '', :target => '_blank' %></a>
-          <span class="sn-teacher-unit sn-hidden" title="<%= teacher.my_workplace %>"><%= teacher.my_workplace %></span> </div>
-        <div class="sn-teacher-social">
-          <% unless teacher.my_blogs_count == 0 %>
-              <span class="sn-mr20">博客 <%= teacher.my_blogs_count %></span>
-          <% end %>
-          <% unless teacher.courses.count == 0 %>
-              <span class="sn-mr20">课程 <%= teacher.courses.count %></span>
-          <% end %>
-          <% unless teacher.my_students == 0 %>
-              <span>学生 <%= teacher.my_students %></span>
-          <% end %>
-        </div>
-        <div class="sn-cl"></div>
-      </div>
-  <% end %>
-</div>
+<% unless excellent_teachers.count == 0 %>
+    <div class="sn-teacher-wrap" style="display:<%= field.hide == 0?'block':'none' %>;">
+      <h2 class="h2-title sn-mb5"><%= field.name %>
+        <%= link_to "更多", teachers_organization_path(@organization, :type => "famous"), :target => "_blank", :class => "more" %>
+      </h2>
+      <% excellent_teachers.each do |teacher| %>
+          <div class="sn-teacher-list">
+            <%= link_to image_tag(url_to_avatar(teacher), :width => "60", :height => "60", :class => "sn-fl", :style => "display:block;"), user_path(teacher), :alt => "用户头像", :target => '_blank'  %>
+            <!--<a href="javascript:void(0);" target="_blank"><img src="images/avatar_default.png" width="60" height="60" style="display:block;" class="sn-fl" /></a>-->
+            <div class="sn-teacher-info">
+              <%=link_to teacher.try(:realname) ? teacher.try(:realname) :teacher.try(:login), user_path(teacher), :class => "sn-teacher-name sn-hidden", :title => '', :target => '_blank' %></a>
+              <span class="sn-teacher-unit sn-hidden" title="<%= teacher.my_workplace %>"><%= teacher.my_workplace %></span> </div>
+            <div class="sn-teacher-social">
+              <% unless teacher.my_blogs_count == 0 %>
+                  <span class="sn-mr20">博客 <%= teacher.my_blogs_count %></span>
+              <% end %>
+              <% unless teacher.courses.count == 0 %>
+                  <span class="sn-mr20">课程 <%= teacher.courses.count %></span>
+              <% end %>
+              <% unless teacher.my_students == 0 %>
+                  <span>学生 <%= teacher.my_students %></span>
+              <% end %>
+            </div>
+            <div class="sn-cl"></div>
+          </div>
+      <% end %>
+    </div>
+
+    <script>
+        $(".sn-teacher-list:last").addClass("sn-border-none");
+    </script>
+<% end  %>
 
-<script>
-  $(".sn-teacher-list:last").addClass("sn-border-none");
-</script>