From cc2bd5f7b10637e7fbfa6adcaa0acca640914472 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 13 Jun 2015 10:55:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E6=94=B6?=
 =?UTF-8?q?=E7=B4=A2=E6=97=B6=EF=BC=8C=E6=94=B6=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=9C=A8=E8=AF=BE=E7=A8=8B=E6=94=B6=E7=B4=A2?=
 =?UTF-8?q?=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb   | 3 +++
 app/views/courses/_set_join.js.erb      | 2 +-
 app/views/layouts/base_courses.html.erb | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 518cc01c4..f58d6ea24 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -94,6 +94,9 @@ class CoursesController < ApplicationController
 
   def new_join
     @course = Course.find(params[:object_id])
+    respond_to do |format|
+      format.js
+    end
   end
 
   # 课程搜索
diff --git a/app/views/courses/_set_join.js.erb b/app/views/courses/_set_join.js.erb
index d1828bbdb..1dc20f046 100644
--- a/app/views/courses/_set_join.js.erb
+++ b/app/views/courses/_set_join.js.erb
@@ -4,7 +4,7 @@
 <% if @state %>
 	<% if @state == 0 %>
 		alert("加入成功");
-            hideModal($("#popbox"));
+        hideModal($("#popbox"));
 	<% elsif @state == 1 %>
 		alert("密码错误");
 	<% elsif @state == 2 %>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 382bcf590..7a32cb67d 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -48,7 +48,7 @@
     </div>
     <div class="search fl">
       <%= form_tag({:controller => 'courses', :action => 'search'},:id => "course_search_form", :method => :get, :class => "search_form") do %>
-          <%= text_field_tag 'name', params[:name], :placeholder => l(:label_course_name), :class => "search_text fl", :onkeyup => "regexName('#{l(:label_search_conditions_not_null)}');" %>
+          <input class="search_text fl" id="name" name="name" onkeyup="regexName('搜索条件不能为空');" placeholder="课程名称" type="text">
           <a href="javascript:void(0)" onclick="submitSerch('<%= l(:label_search_conditions_not_null) %>');" class="search_btn fl f14 c_white" >
             <%= l(:label_search)%>
           </a>