From 0ff088f96d2e0239f0e52725efcd3b0f93e3e667 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 4 Jun 2015 10:49:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=90=9C=E7=B4=A2=E6=8C=89=E9=92=AE=EF=BC=8C=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E6=90=9C=E7=B4=A2=E6=A1=86=E6=89=8B=E5=9E=8B=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/index.html.erb | 1 +
 public/javascripts/course.js          | 4 ++++
 public/stylesheets/courses.css        | 2 +-
 public/stylesheets/public.css         | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index 9fa678bc4..1cd665569 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -36,6 +36,7 @@
       </span>
       <% if @show_all%>
         <input  type="text" value="<%= @name%>" placeholder="昵称、学号、姓名搜索" class="min_search ml10 fl" onkeypress="SearchByName($(this),'<%= student_work_index_path(:homework => @homework.id)%>',event);">
+        <a class="student_work_search fl" onclick="SearchByName($(this).prev(),'<%= student_work_index_path(:homework => @homework.id)%>');" href="javascript:void(0)">搜索</a>
       <% end%>
       <% if @is_teacher%>
           <div class="fr">
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index e35a49eed..0570ec437 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -793,6 +793,10 @@ function SearchByName(obj,url,event)
         location.href = url + "&name=" + obj.val();
     }
 }
+function SearchByName(obj,url)
+{
+    location.href = url + "&name=" + obj.val();
+}
 
 $(function(){
     $("#about_project label").eq(1).remove();
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 0663dc905..7cafd04cc 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -656,7 +656,6 @@ a:hover.ping_pic{border:1px solid #64bdd9;}
 a.down_btn{ border:1px solid #CCC; color:#999; padding:0px 5px; font-size:12px; text-align:center; display:block;}
 a:hover.down_btn{ background:#14ad5a; color:#fff; border:1px solid #14ad5a;}
 .fr{ float:right;}
-.min_search{ width:200px; height:20px; border:1px solid #d0d0d0; color:#666; background:url(../images/public_icon.png) 185px -193px no-repeat; cursor:pointer;}
 .li_min_search{ float:right; margin-right:-10px;}
 .info_ni{ width:100px; padding:5px;position: absolute;display:none;-moz-border-radius:3px;  -webkit-border-radius:3px;  border-radius:3px; box-shadow:0px 0px 5px #194a81; color:#666; background:#fff; text-align:left;}
 /*返回顶部*/
@@ -673,6 +672,7 @@ input#score{ width:40px;}
 .filename { background: url(../images/pic_file.png) 0 -25px no-repeat;color: #3ca5c6;max-width: 150px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px;}
 .evaluation{position: relative;}
 .evaluation_submit{position: absolute;right: 0px;bottom: 5px;}
+.student_work_search{background-color: #64bdd9;color: white !important;padding: 2px 7px;margin-left: 10px;cursor: pointer; }
 
 
 
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index d6e6907fa..d0f788495 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -18,7 +18,7 @@ table{ background:#fff;}
 .no_line{ border-bottom:none;}
 .line{border-bottom:1px dashed #d4d4d4; padding-bottom:10px; margin-bottom:10px;}
 .no_border{ border:none;}
-.min_search{ width:150px; height:20px; border:1px solid #d0d0d0; color:#666; background:url(../images/new_project/public_icon.png) 135px -193px no-repeat; cursor:pointer;}
+.min_search{ width:150px; height:20px; border:1px solid #d0d0d0; color:#666; background:url(../images/new_project/public_icon.png) 135px -193px no-repeat;}
 
 /* font & color */
 h2{ font-size:18px; color:#15bccf;}