From d5e71e9803cfc86ed1482e36a299b90d2042a046 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 17 Apr 2015 16:38:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=BE=E7=A8=8B=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E6=94=B6=E7=B4=A2=E5=8A=9F=E8=83=BD=E5=90=8E=E3=80=81?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=BE=E7=A8=8B=E6=88=90=E5=91=98=EF=BC=8C?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E5=88=97=E8=A1=A8=E4=B8=8D=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_course_members.html.erb | 11 -----------
 app/views/courses/search_member.js.erb     |  2 +-
 app/views/courses/settings.html.erb        | 16 +++++++++++++++-
 app/views/members/create.js.erb            |  2 +-
 app/views/members/destroy.js.erb           |  2 +-
 app/views/members/update.js.erb            |  2 +-
 6 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/app/views/courses/_course_members.html.erb b/app/views/courses/_course_members.html.erb
index 6893c3f68..802a94bfb 100644
--- a/app/views/courses/_course_members.html.erb
+++ b/app/views/courses/_course_members.html.erb
@@ -1,14 +1,3 @@
-<div class="search_course fl">
-  <%= form_tag({:controller => 'courses', :action => 'search_member'},:id => "course_member_search_form", :method => :get, :class => "search_form_course",:remote => true) do %>
-      <!-- , :onkeyup => "regexQ('#{l(:label_search_conditions_not_null)}');" -->
-      <%= text_field_tag 'name', params[:name], :placeholder => "昵称、学号、姓名搜索", :class => "search_text fl" %>
-      <a href="javascript:void(0)" onclick="submitMemberSerch('<%= l(:label_search_conditions_not_null) %>');" class="search_btn fl f14 c_white ml10" >
-        <%= l(:label_search)%>
-      </a>
-      <br />
-      <span id="course_member_name_span" style="float: left"></span>
-  <% end %>
-</div>
 <div class="cl"></div>
 <div class="members_left">
   <ul style=" border-bottom:none;">
diff --git a/app/views/courses/search_member.js.erb b/app/views/courses/search_member.js.erb
index 2068363ea..c34a08aaf 100644
--- a/app/views/courses/search_member.js.erb
+++ b/app/views/courses/search_member.js.erb
@@ -1 +1 @@
-$('#tbc_02').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');
\ No newline at end of file
+$('#course_members_setting').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');
\ No newline at end of file
diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb
index 0e7e81274..69ce4f5dc 100644
--- a/app/views/courses/settings.html.erb
+++ b/app/views/courses/settings.html.erb
@@ -72,7 +72,21 @@
   </div>
 
   <div class="hwork_undis" id="tbc_02">
-    <%= render :partial => "course_members" %>
+    <div class="search_course fl">
+      <%= form_tag(search_member_course_path,:id => "course_member_search_form", :method => :get, :class => "search_form_course",:remote => true) do %>
+          <!-- , :onkeyup => "regexQ('#{l(:label_search_conditions_not_null)}');" -->
+          <%= text_field_tag 'name', params[:name], :placeholder => "昵称、学号、姓名搜索", :class => "search_text fl" %>
+          <a href="javascript:void(0)" onclick="submitMemberSerch('<%= l(:label_search_conditions_not_null) %>');" class="search_btn fl f14 c_white ml10" >
+            <%= l(:label_search)%>
+          </a>
+          <br />
+          <span id="course_member_name_span" style="float: left"></span>
+      <% end %>
+    </div>
+
+    <div id="course_members_setting">
+      <%= render :partial => "course_members" %>
+    </div>
   </div><!---成员结束-->
 </div><!--talknew end-->
 <div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/members/create.js.erb b/app/views/members/create.js.erb
index 61310b22e..976f5c724 100644
--- a/app/views/members/create.js.erb
+++ b/app/views/members/create.js.erb
@@ -10,7 +10,7 @@
     <% if @create_member_error_messages%>
         alert("<%= @create_member_error_messages%>");
     <% else%>
-        $('#tbc_02').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');
+        $('#course_members_setting').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');
         alert("添加成功");
     <% end%>
     hideOnLoad();
diff --git a/app/views/members/destroy.js.erb b/app/views/members/destroy.js.erb
index fcef883ff..b6f206e05 100644
--- a/app/views/members/destroy.js.erb
+++ b/app/views/members/destroy.js.erb
@@ -2,6 +2,6 @@
     $('#pro_st_tbc_03').html('<%= escape_javascript(render :partial => 'projects/settings/new_members') %>');
 //    $('#tab-content-members').html('<%#= escape_javascript(render :partial => 'projects/settings/members') %>');
   <%elsif @course%>
-    $('#tbc_02').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');
+    $('#course_members_setting').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');
   <%end%>
 hideOnLoad();
diff --git a/app/views/members/update.js.erb b/app/views/members/update.js.erb
index 2dd2ea9dd..c5ef983e7 100644
--- a/app/views/members/update.js.erb
+++ b/app/views/members/update.js.erb
@@ -1,7 +1,7 @@
 <%if @project%>
 $('#pro_st_tbc_03').html('<%= escape_javascript(render :partial => 'projects/settings/new_members') %>');
 <%elsif @course%>
-$('#tbc_02').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');
+$('#course_members_setting').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');
 <%end%>
 hideOnLoad();