From 1c30b8c81cbf06a8eb12524f78bc76a66d8819df Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 18 Mar 2015 16:34:25 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=9F=90=E4=B8=AA=E8=AF=BE=E7=A8=8B=E5=8A=A8=E6=80=81=E6=95=B0?=
 =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95=202=E3=80=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=85=8D=E7=BD=AE=E3=80=81=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E3=80=81=E5=A4=8D=E5=88=B6=E8=AF=BE=E7=A8=8B=E7=AD=89=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/courses_helper.rb           |  7 +++++++
 app/views/layouts/base_courses.html.erb | 17 ++++++-----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index f9ac89692..1a9b3922c 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -658,4 +658,11 @@ module CoursesHelper
     return activities
   end
 
+  #获取某个课程的动态数
+  def course_activity_count course
+    course_activity_count=Hash.new
+    course_activity_count[course.id]=0
+    count = get_course_activity([course],course_activity_count)[course.id]
+    count.nil? ? 0 : count
+  end
 end
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index a9f5b8dd7..642fb6852 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -72,17 +72,12 @@
           ID:<%= @course.id%>
         </div>
         <div class="pr_info_join fl">
-          <a href="#" target="_blank" class="b_blue pr_info_join_a c_white">
-            +配置
-          </a>
-          <a href="#" target="_blank" class="b_blue pr_info_join_a c_white">
-            +关闭
-          </a>
-          <a href="#" target="_blank" class="b_blue pr_info_join_a c_white">
-            +复制
-          </a>
+          <a href="#" class="pr_join_a " ><span class="pr_setting"></span>配置</a>
+          <a href="#" class="pr_join_a" ><span class="pr_close"></span> 关闭</a>
+          <a href="#" class="pr_join_a" ><em class="pr_copy"></em>复制</a>
         </div>
         <div class="cl"></div>
+
         <div >
           <a class="pr_info_name fl c_dark" href="courses/<%= @course.id%>" target="_blank">
             <%= @course.name %>
@@ -106,7 +101,7 @@
         <ul>
           <li><%= l(:label_main_teacher)%> :&nbsp;&nbsp;<%= link_to(@course.teacher.lastname+@course.teacher.firstname, user_path(@course.teacher), :class => 'c_dblue') %></li>
           <li><%= l(:label_class_period)%> :&nbsp;&nbsp;<span ><%= @course.class_period %> <%= l(:label_class_hour) %></span></li>
-          <li><%= l(:label_main_term)%> :&nbsp;&nbsp;<span><%= @course.time %> <%= get_course_term_locales @course %></span></li>
+          <li><%= l(:label_main_term)%> :&nbsp;&nbsp;<span><%= @course.time %> <%= @course.try(:term).to_s %></span></li>
           <li><%= l(:label_course_organizers)%> :&nbsp;&nbsp;<a href="http://<%= Setting.host_course%>/?school_id=<%= @course.school.id%>" target="_blank" class="c_dblue"><%= @course.school%></a></li>
         </ul>
       </div>
@@ -115,7 +110,7 @@
         <div class="subNav">
           <%= link_to l(:label_activity), course_path(@course), :class => "f14 c_blue02" %>
           <!--暂时不显示课程动态数，优化后在显示-->
-          <!--<a href="courses_news.html" class="subnav_num c_orange">(5)</a>-->
+          <%= link_to "(#{course_activity_count @course})", course_path(@course), :class => "subnav_num c_orange"%>
         </div>
         <div class="subNav">
           <%= link_to l(:label_homework), homework_course_path(@course), :class => "f14 c_blue02"%>