From 04af1c658288436daf89cfa6c85e96f9e796bee1 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 8 Sep 2017 20:45:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E7=BC=BA=E9=99=B7?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/messages/_form_course.html.erb | 2 +-
 app/views/shixuns/propaedeutics.html.erb | 2 +-
 app/views/stages/destroy.js.erb          | 1 +
 app/views/subjects/show.html.erb         | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/messages/_form_course.html.erb b/app/views/messages/_form_course.html.erb
index a8f006124..17e64b4f4 100644
--- a/app/views/messages/_form_course.html.erb
+++ b/app/views/messages/_form_course.html.erb
@@ -8,7 +8,7 @@
       <label class="fl panel-form-label"><span class="color-red mr5">*</span>标题：</label>
       <input type="text" class="panel-form-width-690 panel-form-height-30 fl panel-box-sizing" value="<%= @message.subject %>" name="message[subject]" id="course_message_subject" maxlength="100" onkeyup="regexSubject();" placeholder="字数100以内"/>
       <div class="cl"></div>
-      <span class="color-orange fl none" id="new_course_message_notice" style="margin-left:10%;"><i class="fa fa-exclamation-circle mr5" ></i>课程名称不能为空</span>
+      <span class="color-orange fl none" id="new_course_message_notice" style="margin-left:10%;"><i class="fa fa-exclamation-circle mr5" ></i>帖子名称不能为空</span>
     </li>
     <% if User.current.admin? || User.current.allowed_to?(:as_teacher, @course) %>
         <li class="clearfix">
diff --git a/app/views/shixuns/propaedeutics.html.erb b/app/views/shixuns/propaedeutics.html.erb
index fd53b5546..540f7ea84 100644
--- a/app/views/shixuns/propaedeutics.html.erb
+++ b/app/views/shixuns/propaedeutics.html.erb
@@ -33,7 +33,7 @@
       </ul>
     </div>
     <div id="no_data">
-      <% if  @shixun.propaedeutics.nil? %>
+      <% if  @shixun.propaedeutics.blank? %>
           <%= render :partial => "welcome/no_data" %>
       <% else %>
           <div class="task-paner-con break_full_word new_li" id="challenge_editorMd_propaedeutics">
diff --git a/app/views/stages/destroy.js.erb b/app/views/stages/destroy.js.erb
index a111c8e88..8a44a953f 100644
--- a/app/views/stages/destroy.js.erb
+++ b/app/views/stages/destroy.js.erb
@@ -2,6 +2,7 @@
 $("#stage_div_<%= @stage.id %>").remove();
 <% @subject.stages.each do |stage| %>
     $("#stage_div_<%= stage.id %>").find(".subject_stage_index").html("<%= stage.position %>");
+    $("#stage_div_<%= stage.id %>").find(".subject_stage_shixun_index").html("<%= stage.position %>");
 <% end %>
 $("#subject_top").html("<%= j(render :partial => 'subjects/subject_top') %>");
 <% else %>
diff --git a/app/views/subjects/show.html.erb b/app/views/subjects/show.html.erb
index 03974ad90..7573904ed 100644
--- a/app/views/subjects/show.html.erb
+++ b/app/views/subjects/show.html.erb
@@ -36,7 +36,7 @@
                      style="<%= allow_shixun_exec(shixun) ? "" : "cursor: pointer" %>;" onclick="<%= allow_shixun_exec(shixun) ? "" :  (shixun.status < 2 && !User.current.manager_of_shixun?(shixun) ? "" : "shixun_link('#{shixun.identifier}')") %>">
                   <li class="fl li-width63">
                     <i class="fa fa-sort-up color-grey-c fl transform90 font-18 icon-set mr5"></i>
-                    <span class="color-grey3 paragraph_name"><%= s_index + 1 %>-<%= index + 1 %>&nbsp;&nbsp;<%= shixun.name %></span>
+                    <span class="color-grey3 paragraph_name"><span class="subject_stage_shixun_index"><%= s_index + 1 %></span>-<%= index + 1 %>&nbsp;&nbsp;<%= shixun.name %></span>
                   </li>
                   <li class="fr status_li">
                     <% if @subject.status < 2 %>

From c4f90858f41b69ab2b18a4ac3b483bb6395ecc0a Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 8 Sep 2017 20:49:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_course_index_search.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/courses/_course_index_search.html.erb b/app/views/courses/_course_index_search.html.erb
index 7a8c2bdce..59c43ebf4 100644
--- a/app/views/courses/_course_index_search.html.erb
+++ b/app/views/courses/_course_index_search.html.erb
@@ -1,7 +1,7 @@
 <form action="<%= courses_path(:select => @select) %>" data-remote="true" class="fr ml15" id="search_syllabuses_name" >
   <div class="searchFor fr" style="margin-top: -3px">
     <div class="searchCon">
-      <input type="text" class="searchinput" name="search" value="<%= @search %>" placeholder="请输入实训名称的关键字进行搜索" style="background: none;"/>
+      <input type="text" class="searchinput" name="search" value="<%= @search %>" placeholder="请输入课堂名称的关键字进行搜索" style="background: none;"/>
       <i class="fa fa-close mr5 color-dark-grey" onclick="colse_searchbox();" title="搜索"></i>
     </div>
     <i class="fa fa-search mr5 color-dark-grey search_icon" onclick="$('#search_syllabuses_name').submit();" style="margin:10px" data-tip-down="搜索"></i>