From 6c092281392006e3608b64898cb2bc112204416f Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Mon, 22 Dec 2014 15:48:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=87=8C=E5=BD=AC=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E4=BF=AE=E6=94=B9=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=20Signed-off-by:=20alan=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_groups_name.html.erb |  3 +--
 app/views/courses/_member_list.html.erb | 12 +-----------
 app/views/courses/member.html.erb       | 14 +++++++++++++-
 config/locales/zh.yml                   |  3 +--
 public/stylesheets/course_group.css     |  2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/views/courses/_groups_name.html.erb b/app/views/courses/_groups_name.html.erb
index e1b138666..f02794648 100644
--- a/app/views/courses/_groups_name.html.erb
+++ b/app/views/courses/_groups_name.html.erb
@@ -1,6 +1,5 @@
 
-
-
+<div class="cl"></div>
     <ul>
       <li class="classbox" id = "group_name_0" name="check_group_name">
         <% course_member_count = l(:label_all) + " ( " + @membercount.to_s + "人)" %>
diff --git a/app/views/courses/_member_list.html.erb b/app/views/courses/_member_list.html.erb
index e2fe88d09..d9cc38f36 100644
--- a/app/views/courses/_member_list.html.erb
+++ b/app/views/courses/_member_list.html.erb
@@ -18,17 +18,7 @@
       <%= @group.name %>
     </span>
 <% end %>
-  <% if @subPage_title && @subPage_title == l(:label_student_list)%>
-      <%= form_tag( searchmembers_course_path(@course), method: 'get',:class => "f_l",:style => "margin-left: 5px; ",:remote=>true) do %>
-          <%= text_field_tag 'name', params[:name], name: "name", :class => 'f_1', :style => "height:15px"%>
-          <% if @group %>
-              <%= hidden_field "search_group_id", params[:search_group_id],:value => "#{@group.id}", name: 'search_group_id' %>
-             <%= submit_tag l(:label_search_member_in_group), :name => "ingroup",:class => "f_2"%>
-          <% end %>
-          <%= submit_tag l(:label_search_member_in_course), :name => 'incourse',:onclick => "checkclass('group_name_0')",:class => "f_2"%>
-          <%#= link_to l(:label_search),'' , :class => 'f_2' %>
-      <% end %>
-  <% end %>
+
 
 </div>
 <div class="cl"></div>
diff --git a/app/views/courses/member.html.erb b/app/views/courses/member.html.erb
index ab95f5fdc..5f612a0f2 100644
--- a/app/views/courses/member.html.erb
+++ b/app/views/courses/member.html.erb
@@ -57,9 +57,21 @@
 <%= stylesheet_link_tag  'course_group', :media => 'all' %>
 <script type="text/javascript" src="javascripts/jquery-1.8.3-ui-1.9.2-ujs-2.0.3.js"></script>
 <div class="st_list">
-  <div class="st_search">
+  <div class="st_search" style="margin-left: 14px">
     <span class="f_l"><%= @subPage_title %></span>
 
+      <% if @subPage_title && @subPage_title == l(:label_student_list)%>
+          <%= form_tag( searchmembers_course_path(@course), method: 'get',:class => "f_l",:style => "margin-left: 5px; ",:remote=>true) do %>
+              <%= text_field_tag 'name', params[:name], name: "name", :class => 'f_1', :style => "height:15px"%>
+              <% if @group %>
+                  <%= hidden_field "search_group_id", params[:search_group_id],:value => "#{@group.id}", name: 'search_group_id' %>
+                  <%= submit_tag l(:label_search_member), :name => "ingroup",:class => "f_2"%>
+              <% else %>
+                  <%= submit_tag l(:label_search_member), :name => 'incourse',:onclick => "checkclass('group_name_0')",:class => "f_2"%>
+              <% end %>
+          <% end %>
+      <% end %>
+
   </div>
   <div class="cl"></div>
   <% if @subPage_title == l(:label_student_list) %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 993988153..319453e95 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -570,8 +570,7 @@ zh:
   label_role_new: 新建角色
   label_role_and_permissions: 角色和权限
   label_member: 成员
-  label_search_member_in_group: 班内搜索
-  label_search_member_in_course: 课内搜索
+  label_search_member: 搜索
   label_search_member_count: 共搜索到
   label_member_people: 人
   label_delete_group: 确定删除分班？
diff --git a/public/stylesheets/course_group.css b/public/stylesheets/course_group.css
index 92cc5f08d..9bd56212c 100644
--- a/public/stylesheets/course_group.css
+++ b/public/stylesheets/course_group.css
@@ -40,7 +40,7 @@ input.f_2 {
 .st_list{ width:688px; padding-left:5px; height:800px;}
 .st_search{ margin:10px 0;}
 .st_search span{ font-size:14px; font-weight:bold; color:#606060; margin-right:35px;}
-.st_search input{ border:1px solid #1c9ec7; background:#fff; height:20px; color:#c4c4c4; width:200px;}
+.st_search input{ border:1px solid #1c9ec7;  height:20px;  width:200px;}
 .st_search a:hover{ background:#048fbb; text-decoration:none;}
 /*.st_search input.f_2{ background:#1c9ec7; padding: 3px; margin-left: 3px; color:#fff;border:1px solid #1c9ec7; text-align:center; display:block; width:45px; height:28px; font-size:12px; }*/