From 216537a8440e9a9f85b74625abb14c5a2ec5c76d Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 21 Oct 2014 14:21:33 +0800
Subject: [PATCH] =?UTF-8?q?#1278=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=AD=E5=8D=95=E4=BD=8D=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E4=B8=BA=E5=BC=80=E8=AE=BE=E8=AF=BE=E7=A8=8B=E7=9A=84=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_course.html.erb | 14 +++++---------
 app/views/courses/index.html.erb   |  6 ------
 config/locales/zh.yml              |  1 +
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/app/views/courses/_course.html.erb b/app/views/courses/_course.html.erb
index 239f2da26..5d5064be0 100644
--- a/app/views/courses/_course.html.erb
+++ b/app/views/courses/_course.html.erb
@@ -11,7 +11,9 @@
 	<p >
 		<%= content_tag('span',"#{l(:label_bid_show_course_name)}:", :class => "course-font")%>
         <% unless @course.is_public == 1 %>
-            <span class='private_project'><%= l(:label_private) %></span>
+            <span class='private_project'>
+              <%= l(:label_private) %>
+            </span>
         <% end %>
 		<%= content_tag('span', link_to("#{@course.name}", course_path(@course), :class => "info"))%>
 	</p>
@@ -19,9 +21,8 @@
 		<%= content_tag('span', "#{l(:label_institution_name)}:", :class => "course-font")%>
 		<% @admin = @course.course_infos%>
 		<%if @admin&&@admin.first&&@admin.first.user&&@admin.first.user.user_extensions%>
-		   <!-- <%#= @admin.first.user.user_extensions.occupation %> -->
 		   <% unless @course.teacher.user_extensions.school.nil? %>
-		   <%= link_to @course.teacher.user_extensions.school.try(:name), school_course_list_path(@course.teacher.user_extensions.school) %>
+		    <%= link_to(@course.school.try(:name), school_course_list_path(@course.school)) if @course.school %>
 		   <% end %>
 		<% end %>
 	</p>
@@ -52,7 +53,6 @@
 	
 	<!--gcm-->
 	<p class="stats">
-
 		<%= content_tag('span',  link_to("#{@course_activity_count[@course.id]}", course_path(@course)), :class => "info") %>
 		<%= content_tag('span',  l(:label_x_activity, :count => @course_activity_count[@course.id])) %>
 	</p>
@@ -62,7 +62,7 @@
 		<span class="info"></span>
       <% if(course_endTime_timeout? @course) %>
 		<span class="font_lighter">
-			课程学期已结束
+			<%= l(:lable_course_end)  %>
 		</span>
       <% else %>
           <%= join_in_course_for_list(@course, User.current,['regular'])%>
@@ -80,10 +80,6 @@
 
 <div class="add-info" style="margin-left: 30px; margin-top: -20px">
 	<%= content_tag "span", "#{l(:label_course_brief_introduction)}:", :class => "course-font" %>
-    <%# desc =  course.short_description.nil? ? "" : course.short_description%>
-    <!--<#div class="brief_introduction" title="<%#= desc.html_safe%>">
-      <%#= desc.html_safe%>
-    </div>-->
 	<%= content_tag "div", course.short_description, :class => "brief_introduction", :title => course.short_description %>
 </div>
 
diff --git a/app/views/courses/index.html.erb b/app/views/courses/index.html.erb
index 907be64a4..f781ab5c4 100644
--- a/app/views/courses/index.html.erb
+++ b/app/views/courses/index.html.erb
@@ -39,8 +39,6 @@
 <div id="courses-index">
   <%if @courses%>
       <%= render_course_hierarchy(@courses)%>
-      <%#= render :partial => 'course', :locals => {:course => @courses.first}%>
-      <%#= "<a herf = 'aaa'>hello</a>".html_safe  %>
   <%end%>
 </div>
 
@@ -56,10 +54,6 @@
     </p>
 <% end %>
 
-<%# other_formats_links do |f| %>
-    <%#= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
-<%# end %>
-
 <% content_for :sidebar do %>
     <%= form_tag({}, :method => :get) do %>
         <h3><%= l(:label_project_plural) %></h3>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 21b7514be..43bb6812a 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2162,3 +2162,4 @@ zh:
   lable_teacher_evaluation_no: 老师还未进行评价
   lable_teacher_evaluation: 作业综评
   lable_course_teacher: 主讲老师
+  lable_course_end: 课程学期已结束