From 1fbd2e95d477c1e57e5ae8ce0ebb95e8bdbf520c Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 18 Dec 2014 15:39:32 +0800
Subject: [PATCH] =?UTF-8?q?#1719=20=E4=BF=AE=E6=94=B9=E7=AB=9E=E8=B5=9B?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B9=8B=E5=90=8E=E6=A0=87=E9=A2=98=E6=A0=8F?=
 =?UTF-8?q?=E9=94=99=E4=BD=8D=E7=9A=84BUG=20=E4=BF=AE=E6=94=B9=E7=AB=9E?=
 =?UTF-8?q?=E8=B5=9B=E6=90=9C=E7=B4=A2=E4=B9=8B=E5=90=8E=EF=BC=8C=E7=BD=AE?=
 =?UTF-8?q?=E7=A9=BA=E5=86=8D=E6=90=9C=E7=B4=A2=E8=B7=B3=E8=BD=AC=E5=88=B0?=
 =?UTF-8?q?404?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/contests/index.html.erb | 44 +++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/app/views/contests/index.html.erb b/app/views/contests/index.html.erb
index f966f149d..78fadf2f3 100644
--- a/app/views/contests/index.html.erb
+++ b/app/views/contests/index.html.erb
@@ -1,5 +1,5 @@
 <div class="top-content">
-  <%= form_tag({:controller => 'contests', :action => 'index'}, :method => :get) do %>
+  <%= form_tag({:controller => 'contests', :action => 'index'}, :method => :get, :id => 'contests_serch') do %>
       <table width="940px">
         <tr>
           <td class="info_font" style="width: 220px; color: #15bccf" rowspan="2">
@@ -20,19 +20,41 @@
           </td>
           <td rowspan="2" >
             <div class="project-search" style="float: right">
-              <%= text_field_tag 'name', params[:name], :size => 30 %>
+              <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()){$("#contests_serch").submit();}
+                }
+              </script>
+              <%= text_field_tag 'name', params[:name], :size => 30, :onblur => 'regexName();' %>
               <%= hidden_field_tag 'project_type', params[:project_type] %>
-              <%= submit_tag l(:label_search), :class => "enterprise", :name => "contests_search" %>
+              <%#= submit_tag l(:label_search), :class => "enterprise", :name => "contests_search" %>
+              <a href="#" onclick="submitSerch();" class="ButtonColor m3p10">
+                <%= l(:label_search)%>
+              </a>
+              <br />
+              <span id="contest_name_span"></span>
             </div>
           </td>
         </tr>
         <tr>
-          <td style="padding-left: 8px">
-            <a>
-              <%= link_to request.host()+"/contests", contests_path %>
-              <!-- end longjun  -->
-            </a>
-          </td>
           <td >
             <%=link_to l(:field_homepage), home_path %> >
             <a><%= l(:label_contest_innovate) %></a>
@@ -43,14 +65,14 @@
   <% end %>
 </div>
 <% if @contests.size > 0%>
-    <%= sort_contest(@s_state)%>
+    <%#= sort_contest(@s_state)%>
     <div id="bid-show" class="projects-index">
       <%= render :partial => 'contest_list', :locals => {:contests => @contests, :contest_pages => @contest_pages} %>
     </div>
 <% elsif @is_search%>
     <%= render :partial => "layouts/no_content"%>
 <% else %>
-    <%= sort_contest(@s_state)%>
+    <%#= sort_contest(@s_state)%>
     <div id="bid-show" class="projects-index">
       <%= render :partial => 'contest_list', :locals => {:contests => @contests, :contest_pages => @contest_pages} %>
     </div>