From e3ab21e4095fa40d9b4be816bed6de11f9def637 Mon Sep 17 00:00:00 2001
From: chenmin <19763783@qq.com>
Date: Mon, 11 Aug 2014 09:19:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E7=99=BB=E9=99=86?=
 =?UTF-8?q?=E7=9A=84=E7=94=A8=E6=88=B7=E7=9A=84=E5=AD=A6=E6=A0=A1=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E8=AF=BE=E7=A8=8B=E6=97=B6=E7=9A=84=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/welcome/course.html.erb | 34 ++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index 7cab331b6..c33f846e7 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -99,9 +99,36 @@
                 该学校未开设任何课程，您可以查看其他学校课程
               </p>
               <h1></h1>
-          <% end %>
-
-          <% find_all_new_hot_course(9, @school_id).map do |course| %>
+              <% find_all_new_hot_course(9, @school_id).map do |course| %>
+                  <li class='<%= cycle("odd", "even") %>' title=<%= course.description.to_s.gsub(/<\/?.*?>/,"") %>>
+                    <div class='avatar'>
+                      <%= image_tag(get_course_avatar(course), :class => "avatar-4") %>
+                    </div>
+                    <!-- 上左下右 -->
+                    <div class='desc_item'>
+                    <span class=''>
+                      <% if (course.school == nil) %>
+                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                        <% else %>
+                        <%= link_to course.school.name.try(:gsub, /(.+)$/, '\1:'), options={:action => 'course', :school_id => course.school.id}, html_options={:method => 'get'} %>
+                        <% end %>
+                    </span>
+                    <span class='font_bolder'>
+                        <%= link_to(course.try(:teacher).try(:realname), user_path(course.teacher)) %>
+                      <%#=course.try(:teacher).try(:name)%>
+                    </span>
+                    </div>
+                    <div class='desc_item text_nowrap'>
+                      [<%= get_course_term course %>]
+                      <%= link_to(course.name.truncate(30, omission: '...'), course_path(course.id), :class => "d-g-blue d-p-project-name", :title => "#{course.name}") %>
+                      (<%= "#{memberCount(course)}人" %>)
+                      <% files_count = course.attachments.count.to_s %>
+                      (<%= link_to "#{files_count}份", course_files_path(course) %>资料)
+                    </div>
+                  </li>
+              <% end %>
+          <% else %>
+            <% find_all_new_hot_course(10, @school_id).map do |course| %>
               <li class='<%= cycle("odd", "even") %>' title=<%= course.description.to_s.gsub(/<\/?.*?>/,"") %>>
                 <div class='avatar'>
                   <%= image_tag(get_course_avatar(course), :class => "avatar-4") %>
@@ -129,6 +156,7 @@
                 </div>
               </li>
           <% end %>
+          <% end %>
         </ul>
       </div>
   <% else %>