Merge branches 'dev_aliyun' and 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_aliyun

app/views/welcome/index.html.erb

@@ -77,105 +77,4 @@
       <%= render :partial => "shixuns/shixun_item", :locals => {:shixuns => @shixuns} %>
     </div>
   </div>
-
-  
-
-  <!--导师排行榜-->
-#   <div class="pt60 pb60 mb30 mentor-ranking">
-#     <div class="educontent">
-#       <div class="edu-txt-center">
-#         <p class="color-dark edu-txt-center font-24" style="line-height: 30px">导师排行榜</p>
-#         <p class="color-grey-cd font-12">MENTOR RANKING</p>
-#       </div>
-#       <div class="ranking clearfix">
-#         <ul class="grade color-dark">
-#           <% if @tea_users[1] %>
-#               <li class="mt35 pr">
-#                 <img src="/images/educoder/huangguan-two.png" class="huangguan"/>
-#                 <a href="/users/<%= (@tea_users[1].try(:login)) %>" class="color-dark"><%= image_tag(url_to_avatar(@tea_users[1])) %>
-#                   <span class="task-hide rankName"><%= @tea_users[1].try(:show_name) %></span>
-#                 </a>
-#               </li>
-#           <% end %>
-#           <% if @tea_users[0] %>
-#               <li class="pr">
-#                 <img src="/images/educoder/huangguan.png" class="huangguan"/>
-#                 <a href="/users/<%= (@tea_users[0].try(:login)) %>" class="color-dark"><%= image_tag(url_to_avatar(@tea_users[0])) %>
-#                   <span class="task-hide rankName"><%= @tea_users[0].try(:show_name) %></span>
-#                 </a>
-#               </li>
-#           <% end %>
-#           <% if @tea_users[2] %>
-#               <li class="mt35 pr">
-#                 <img src="/images/educoder/huangguan-three.png" class="huangguan"/>
-#                 <a href="/users/<%=(@tea_users[2].try(:login)) %>" class="color-dark"><%= image_tag(url_to_avatar(@tea_users[2])) %>
-#                   <span class="task-hide rankName"><%= @tea_users[2].try(:show_name) %></span>
-#                 </a>
-#               </li>
-#           <% end %>
-#         </ul>
-#         <br/>
-#         <ul class="grade mt30">
-#           <% if @tea_users.size > 3 %>
-#               <% @tea_users[3..@tea_users.size].each do |t_u| %>
-#                   <li>
-#                     <a href="/users/<%= t_u.try(:login) %>" class="color-dark"><%= image_tag(url_to_avatar(t_u)) %>
-#                       <span class="task-hide rankName"><%= t_u.try(:show_name) %></span>
-#                     </a>
-#                   </li>
-#               <% end %>
-#           <% end %>
-#         </ul>
-#       </div>
-#     </div>
-#   </div>
-  <!--程序员排行榜-->
-#   <div class="pt60 pb60 mb30 pro-ranking">
-#     <div class="educontent">
-#       <div class="edu-txt-center">
-#         <p class="color-dark edu-txt-center font-24" style="line-height: 30px">程序员排行榜</p>
-#         <p class="color-grey-cd font-12">PROGRAMMER RANKING</p>
-#       </div>
-#       <div class="ranking clearfix">
-#         <ul class="grade color-dark">
-#           <% if @stu_users[1] %>
-#               <li class="mt35 pr">
-#                 <img src="/images/educoder/huangguan-two.png" class="huangguan"/>
-#                 <a href="/users/<%= @stu_users[1].try(:login) %>" class="color-dark"><%= image_tag(url_to_avatar(@stu_users[1])) %>
-#                   <span class="task-hide rankName"><%= @stu_users[1].try(:show_name) %></span>
-#                 </a>
-#               </li>
-#           <% end %>
-#           <% if @stu_users[0] %>
-#               <li class="pr">
-#                 <img src="/images/educoder/huangguan.png" class="huangguan"/>
-#                 <a href="/users/<%= @stu_users[0].try(:login) %>" class="color-dark"><%= image_tag(url_to_avatar(@stu_users[0])) %>
-#                   <span class="task-hide rankName"><%= @stu_users[0].try(:show_name) %></span>
-#                 </a>
-#               </li>
-#           <% end %>
-#           <% if @stu_users[2] %>
-#               <li class="mt35 pr">
-#                 <img src="/images/educoder/huangguan-three.png" class="huangguan"/>
-#                 <a href="/users/<%= (@stu_users[2].try(:login)) %>" class="color-dark"><%= image_tag(url_to_avatar(@stu_users[2])) %>
-#                   <span class="task-hide rankName"><%= @stu_users[2].try(:show_name) %></span>
-#                 </a>
-#               </li>
-#           <% end %>
-#         </ul>
-#         <br/>
-#         <ul class="grade mt30">
-#           <% if @stu_users.size > 3 %>
-#               <% @stu_users[3..@stu_users.size].each do |e_u| %>
-#                   <li>
-#                     <a href="/users/<%= e_u.try(:login) %>" class="color-dark"><%= image_tag(url_to_avatar(e_u)) %>
-#                       <span class="task-hide rankName"><%= e_u.try(:show_name) %></span>
-#                     </a>
-#                   </li>
-#               <% end %>
-#           <% end %>
-#         </ul>
-#       </div>
-#     </div>
-#   </div>
 </div>