From 8b87c141cc2a9db518b665400e9e1cc1228486a6 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 1 Jul 2016 17:47:35 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_copy_course.html.erb      | 2 +-
 app/views/courses/new.html.erb               | 2 +-
 app/views/projects/_new_join.html.erb        | 4 ++--
 app/views/users/_user_syllabus_list.html.erb | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/courses/_copy_course.html.erb b/app/views/courses/_copy_course.html.erb
index 139fa81f1..cc7f2fb53 100644
--- a/app/views/courses/_copy_course.html.erb
+++ b/app/views/courses/_copy_course.html.erb
@@ -78,7 +78,7 @@
       <label><span class="c_red">*</span>&nbsp;结束学期&nbsp;&nbsp;：</label>
       <%= select_tag :end_time,options_for_select(course_time_option(@new_course.end_time),@new_course.end_time), {:id=>"new_end_time"}  %>
       <%= select_tag :end_term,options_for_select(course_term_option,@new_course.end_term || cur_course_term),{:id=>"new_end_term"}  %>
-      <span class="mr15 c_red">仅针对跨越多个学期的班级，否则不用修改。</span>
+      <span class="mr15 c_red">仅针对跨越多个学期的班级，否则与开始学期保持一致。</span>
     </li>
     <div class="cl"></div>
     <!--<li class="ml45 mb10">
diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb
index 9012daaab..f8db461a6 100644
--- a/app/views/courses/new.html.erb
+++ b/app/views/courses/new.html.erb
@@ -38,7 +38,7 @@
           <label><span class="c_red">*</span>&nbsp;结束学期&nbsp;&nbsp;：</label>
           <%= select_tag :end_time,options_for_select(course_time_option(@course.end_time),@course.end_time), {:id=>"new_end_time"}  %>
           <%= select_tag :end_term,options_for_select(course_term_option,@course.end_term || cur_course_term),{:id=>"new_end_term"}  %>
-          <span class="mr15 c_red">仅针对跨越多个学期的班级，否则不用修改。</span>
+          <span class="mr15 c_red">仅针对跨越多个学期的班级，否则与开始学期保持一致。</span>
         </li>
         <div class="cl"></div>
         <!--<li class="ml45 mb10">
diff --git a/app/views/projects/_new_join.html.erb b/app/views/projects/_new_join.html.erb
index c823f5ed0..1708d0a33 100644
--- a/app/views/projects/_new_join.html.erb
+++ b/app/views/projects/_new_join.html.erb
@@ -30,8 +30,8 @@
                  :remote => true,
                  :method => :post,
                  :id => 'new_join_course') do %>
-        <label>请输入课程密码:</label>
-        <%= text_field_tag 'course_password', nil, :style=>'width:300px;'%>
+        <label>请输入班级邀请码:</label>
+        <%= text_field_tag 'invite_code', nil, :style=>'width:300px;'%>
         <div class="ni_btn">
           <a href="javascript:" class="tijiao" onclick="$('#new_join_course').submit();" >
             确&nbsp;&nbsp;定
diff --git a/app/views/users/_user_syllabus_list.html.erb b/app/views/users/_user_syllabus_list.html.erb
index a24dd9d7c..7a44a6ec0 100644
--- a/app/views/users/_user_syllabus_list.html.erb
+++ b/app/views/users/_user_syllabus_list.html.erb
@@ -23,7 +23,7 @@
             <% courses = @courses.where("syllabus_id = #{syllabus.id}").select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS time").order("time desc") %>
             <div class="syllabus_courses_list">
               <div class="<%=index == 0 ? 'sy_courses_open' : 'sy_courses_close' %>">
-                <span class="<%=index == 0 ? 'icons_sy_open' : 'icons_sy_close' %> fl mr5"></span>
+                <span class="<%=index == 0 && !courses.empty? ? 'icons_sy_open' : 'icons_sy_close' %> fl mr5"></span>
                 <h3 class="syllabus_courses_title fl"><%=syllabus.title %></h3>
               </div>
               <p class="fl sy_p_grey">更新时间：<%=format_date syllabus.updated_at %>