From 0b0b6c9b6ed15a069f71696ce5e60ecae3b494f6 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Mon, 19 Jan 2015 11:01:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=8A=E6=89=98=E7=AE=A1?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=B8=AD=E7=82=B9=E5=87=BB=E6=9F=90=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E8=BF=9B=E5=85=A5=E8=AF=A5=E9=A1=B9=E7=9B=AE=E4=B8=BB?=
 =?UTF-8?q?=E9=A1=B5=EF=BC=8C=E5=8F=B3=E4=B8=8A=E8=A7=92=E7=9A=84=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=A4=84=E4=B8=8D=E8=BE=93=E5=85=A5=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=90=9C=E7=B4=A2=E6=8C=89=E9=92=AE=EF=BC=8C?=
 =?UTF-8?q?=E7=BB=99=E5=87=BA=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=90=88=E7=90=86=E3=80=8B=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E3=80=8A=E8=AF=BE=E7=A8=8B=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5=E6=9F=90=E4=B8=80=E8=AF=BE=E7=A8=8B=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E9=A3=8E=E6=A0=BC=E4=BF=9D=E6=8C=81=E4=B8=8E=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=8F=8A=E7=AB=9E=E8=B5=9B=E7=9A=84=E4=B8=80=E8=87=B4?=
 =?UTF-8?q?=E3=80=8B=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/layouts/base_courses.html.erb    | 26 +++++++++++++++++++++-
 app/views/layouts/base_newcontest.html.erb |  2 +-
 app/views/layouts/base_projects.html.erb   |  2 +-
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 387a0e4cf..f0204f7ee 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -47,12 +47,36 @@
       </td>
       <td rowspan="2" width="250px">
         <div class="top-content-search">
+          <script type="text/javascript">
+              function regexName()
+              {
+                  var name = $.trim($("#name").val());
+                  if(name.length == 0)
+                  {
+                      $("#project_name_span").text("<%= l(:label_search_conditions_not_null) %>");
+                      $("#project_name_span").css('color','#ff0000');
+                      $("#project_name_span").focus();
+                      return false;
+                  }
+                  else
+                  {
+                      $("#project_name_span").text("");
+                      return true;
+                  }
+              }
 
+              function submitSerch()
+              {
+                  if(regexName()){$("#course_search_form").submit();}
+              }
+          </script>
           <%= form_tag({:controller => 'courses', :action => 'search'},:id => "course_search_form", :method => :get) do %>
               <%= text_field_tag 'name', params[:name], :size => 20, :style => "float:left" %>
-              <a href="#" onclick="$('#course_search_form').submit();" class="ButtonColor m3p10"  style="float:left;padding-top: 3px; margin: 0px;padding-bottom:0px;" >
+              <a href="#" onclick="submitSerch();" class="ButtonColor m3p10"  style="float:left;padding-top: 3px; margin: 0px;padding-bottom:0px;" >
                 <%= l(:label_search)%>
               </a>
+              <br />
+              <span id="project_name_span" style="float: left"></span>
               <%#= submit_tag l(:label_search), :class => "ButtonColor m3p10", :name => nil, :style => "float:left;padding-top: 3px; margin: 0px;padding-bottom:0px;" %>
           <% end %>
         </div>
diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb
index 8cae51063..0d234a69c 100644
--- a/app/views/layouts/base_newcontest.html.erb
+++ b/app/views/layouts/base_newcontest.html.erb
@@ -70,7 +70,7 @@
                                                 <%= l(:label_search)%>
                                               </a>
                                                 <br />
-                                              <span id="contest_name_span_head"></span>
+                                              <span id="contest_name_span_head" style="float: left"></span>
                                             <% end %>
                                         </div>
                                     </td>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 3937c1822..67e4da0f4 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -71,7 +71,7 @@
                                                     <%= l(:label_search)%>
                                                 </a>
                                                 <br />
-                                                <span id="project_name_span"></span>
+                                                <span id="project_name_span" style="float: left"></span>
 											<% end %>
 										</div>
 									</td>