Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou

app/views/organizations/_org_subfield_rightD.html.erb

@@ -10,7 +10,7 @@
         <% org_acts = get_subfield_acts field %>
         <% unless org_acts.blank? %>
             <% activity = org_acts.first %>
-            <div class="sn-index-smallbanner" style="display:<%= field.hide == 0?'block':'none' %>;">
+            <div class="sn-index-smallbanner sn-mb20" style="display:<%= field.hide == 0?'block':'none' %>;">
               <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
                   <% document = activity.org_act %>
                   <% org_subfield_id = params[:org_subfield_id] %>
@@ -52,13 +52,13 @@
               <% end %>
             </div>
         <% else %>
-            <div class="sn-index-smallbanner" style="display:<%= field.hide == 0?'block':'none' %>;">
+            <div class="sn-index-smallbanner sn-mb20" style="display:<%= field.hide == 0?'block':'none' %>;">
               <a href="javascript:void(0);" target="_blank" ><img  src="/images/default_blank/right-03.jpg" width="369" height="169" alt=""/></a>
             </div>
         <% end %>
     <% elsif field.field_type == "Resource" %>
         <% org_attachs = get_attach_org2(field) %>
-        <div class="sn-index-smallbanner" style="display:<%= field.hide == 0?'block':'none' %>;">
+        <div class="sn-index-smallbanner sn-mb20" style="display:<%= field.hide == 0?'block':'none' %>;">
           <% if !field.subfield_subdomain_dir.nil? %>
               <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %>
                   <%= link_to image_tag("/images/default_blank/right-03.jpg", :width => "369", :height => "169"), show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %>

app/views/organizations/_org_subfield_rightM2.html.erb

@@ -11,16 +11,20 @@
           <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>博客 <%= teacher.my_blogs_count %></span>
+              <span class="sn-mr20">博客 <%= teacher.my_blogs_count %></span>
           <% end %>
           <% unless teacher.courses.count == 0 %>
-              <span class="sn-ml20">课程 <%= teacher.courses.count %></span>
+              <span class="sn-mr20">课程 <%= teacher.courses.count %></span>
           <% end %>
           <% unless teacher.my_students == 0 %>
-              <span class="sn-ml20">学生 <%= teacher.my_students %></span>
+              <span>学生 <%= teacher.my_students %></span>
           <% end %>
         </div>
         <div class="sn-cl"></div>
       </div>
   <% end %>
-</div>
+</div>
+
+<script>
+  $(".sn-teacher-list:last").addClass("sn-border-none");
+</script>

app/views/organizations/teachers.html.erb

@@ -3,7 +3,7 @@
     <%= form_tag( url_for(:controller => 'organizations', :action => 'teachers'),
                   :remote => true , :method => 'get', :id => 'resource_search_form') do %>
         <input type="text" name="search" placeholder="输入教师名进行搜索" class="teacher-list-search fl" />
-        <%= submit_tag '', :class => 'homepageSearchIcon', :onfocus => 'this.blur();', :style => 'border-style:none', :class => "teacher-search-icon fl" %>
+        <%= submit_tag '', :class => 'homepageSearchIcon', :onfocus => 'this.blur();', :class => "teacher-search-icon fl" %>
         <!--<a href="javascript:void(0);" onclick='this.parent.submit();return false;' class="searchIcon"></a>-->
     <% end %>
     <!--<a href="javascript:" class="f_l" onclick="$('#search_student').submit();">搜索</a>-->

public/stylesheets/org.css

@@ -164,7 +164,7 @@ a.blue-btn {
 /*名师榜20160505*/
 .function-row {border-bottom:1px dashed #b2b2b2; padding-bottom:16px;}
 .teacher-list-search {width:310px; height:23px; border:1px solid #ccc; border-right:none; outline:none;}
-.teacher-search-icon {background:url(../images/search.png) 0 3px no-repeat; width:25px; height:23px; border:1px solid #ccc; border-left:none;}
+.teacher-search-icon {background:url(../images/search.png) 0 3px no-repeat; width:25px; height:25px; border:1px solid #ccc; border-left:none; cursor:pointer;}
 .teacher-search-type {width:84px; height:23px; border:1px solid #ccc; outline:none;}
 .teacher-list-row {border-bottom:1px dashed #b2b2b2; padding:18px 0;}
 .teacher-avatar {float:left;}

public/stylesheets/org2.css

@@ -48,6 +48,7 @@ a.sn-link-select {color:#809df9;}
 .sn-mt13 {margin-top:13px;}
 .sn-mt15 {margin-top:15px;}
 .sn-mt28 {margin-top:28px;}
+.sn-mb20 {margin-bottom:20px;}
 .sn-mb40 {margin-bottom:40px;}
 .sn-ml15 {margin-left:15px;}
 .sn-ml20 {margin-left:20px;}