Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

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| %>
-
+                  <li class='<%= cycle("odd", "even") %>' title=<%= course.description.to_s.gsub(/<\/?.*?>/,"") %>>
-          <% find_all_new_hot_course(9, @school_id).map do |course| %>
+                    <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 %>