From d6d7331ec60d9dff7a089ed6a35cc73facf23d62 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 19 Dec 2014 14:45:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=9E=E8=B5=9B=E4=B8=AD?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=EF=BC=8C=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=B8=BA=E7=A9=BA=EF=BC=8C=E4=B8=94=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E6=97=B6=E6=90=9C=E5=87=BA=E6=89=80=E6=9C=89=E7=AB=9E?=
 =?UTF-8?q?=E8=B5=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/contests/index.html.erb          |  2 +-
 app/views/layouts/base_newcontest.html.erb | 33 ++++++++++++++++++++--
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/app/views/contests/index.html.erb b/app/views/contests/index.html.erb
index 8c8ee3d4f..5867d7fcd 100644
--- a/app/views/contests/index.html.erb
+++ b/app/views/contests/index.html.erb
@@ -46,7 +46,7 @@
               <%= text_field_tag 'name', params[:name], :size => 30, :onkeyup => 'regexName();' %>
               <%= hidden_field_tag 'project_type', params[:project_type] %>
               <%#= submit_tag l(:label_search), :class => "enterprise", :name => "contests_search" %>
-              <a href="#" onclick="submitSerch();" class="ButtonColor m3p10">
+              <a href="#" onclick="submitSerch();" class="ButtonColor m3p10" style="padding-top: 7px !important;">
                 <%= l(:label_search)%>
               </a>
               <br />
diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb
index c118078d0..7d25cb80b 100644
--- a/app/views/layouts/base_newcontest.html.erb
+++ b/app/views/layouts/base_newcontest.html.erb
@@ -36,11 +36,38 @@
                                       <strong><%= l(:label_user_location) %> : </strong>
                                     </td>
                                     <td rowspan="2" width="250px">
+                                        <script type="text/javascript">
+                                          function regexName()
+                                          {
+                                              var name = $.trim($("#name").val());
+                                              if(name.length == 0)
+                                              {
+                                                  $("#contest_name_span").text("<%= l(:label_search_conditions_not_null) %>");
+                                                  $("#contest_name_span").css('color','#ff0000');
+                                                  $("#contest_name_span").focus();
+                                                  return false;
+                                              }
+                                              else
+                                              {
+                                                  $("#contest_name_span").text("");
+                                                  return true;
+                                              }
+                                          }
+
+                                          function submitSerch()
+                                          {
+                                              if(regexName()){$("#contst_search_form").submit();}
+                                          }
+                                        </script>
                                         <div class="project-search">
-                                            <%= form_tag({controller: 'contests', action: 'index'}, method: :get) do %>
-                                                <%= text_field_tag 'name', params[:name], :size => 20 %>
+                                            <%= form_tag({controller: 'contests', action: 'index'}, method: :get, :id => "contst_search_form") do %>
+                                                <%= text_field_tag 'name', params[:name], :size => 20, :onkeyup => 'regexName();' %>
                                                 <%= hidden_field_tag 'project_type', params[:project_type] %>
-                                                <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
+                                                <%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
+                                                <a href="#" onclick="submitSerch();" class="ButtonColor m3p10" style="padding-top: 7px !important;">
+                                                    <%= l(:label_search)%>
+                                                </a>
+                                                <span id="contest_name_span"></span>
                                             <% end %>
                                         </div>
                                     </td>