From e5bf355a1718c042f4bd793e8b02e737034558ad Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 29 Aug 2015 11:28:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81enter=E9=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_logined_header.html.erb | 13 +++++++++++--
 app/views/layouts/_unlogin_header.html.erb | 13 +++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index e48864305..56e4bef5f 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -19,7 +19,7 @@
   </div>
   <script>
       <% type = type%>
-      $(document).ready(function (){
+      $(function (){
           if('<%= type %>' != null && '<%= type %>' == 'courses' ){
               $('input:radio[value="courses"]').attr('checked','checked');
           }
@@ -30,13 +30,22 @@
               $('input:radio[value="users"]').attr('checked','checked');
           }
       });
+
+      $(function(){
+          $("#navHomepageSearchInput").keypress(function(e){
+              if (e.keyCode == '13') {
+                  $('#type').val($('input[type=radio]:checked').val());
+                  $(this).parent().submit();
+              }
+          })
+      });
   </script>
   <div class="fl" id="navHomepageSearch">
     <!--<form class="navHomepageSearchBox">-->
     <% name = name%>
 
     <%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>
-      <input type="text" name="q" value="<%= name.nil? ? "" : name%>" class="navHomepageSearchInput" placeholder="请输入关键词进行搜索" />
+      <input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput" class="navHomepageSearchInput" placeholder="请输入关键词进行搜索"/>
         <input type="hidden" name="search_type" id="type" value=""/>
         <a href="javascript:void(0);" class="homepageSearchIcon" onclick="$('#type').val($('input[type=radio]:checked').val());$(this).parent().submit();"></a>
      <% end %>
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index d11fdbfb2..d6c6fbc51 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -19,7 +19,7 @@
          $(doc).parent().submit();
      }
      <% type = type%>
-     $(document).ready(function (){
+     $(function (){
          if('<%= type %>' != null && '<%= type %>' == 'courses' ){
              $('input:radio[value="courses"]').attr('checked','checked');
          }
@@ -30,13 +30,22 @@
              $('input:radio[value="users"]').attr('checked','checked');
          }
      });
+
+     $(function(){
+         $("#navHomepageSearchInput").keypress(function(e){
+             if (e.keyCode == '13') {
+                 $('#type').val($('input[type=radio]:checked').val());
+                 $(this).parent().submit();
+             }
+         })
+     });
  </script>
   <div class="fl" id="navHomepageSearch">
     <!--<form class="navHomepageSearchBox">-->
     <% name = name%>
 
     <%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>
-      <input type="text" name="q" value="<%= name.nil? ? "" : name%>" class="navHomepageSearchInput" placeholder="请输入关键词进行搜索" />
+      <input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput"  class="navHomepageSearchInput" placeholder="请输入关键词进行搜索" />
       <input type="hidden" name="search_type" id="type" value=""/>
       <a href="javascript:void(0);" class="homepageSearchIcon" onclick="$('#type').val($('input[type=radio]:checked').val());$(this).parent().submit();"></a>
     <% end %>