From 1e9f5cebd2da1833b3740ec7873de3c3139bc967 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 29 Aug 2015 17:04:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=9F=A5=E8=AF=A2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_logined_header.html.erb |  6 +-
 app/views/layouts/_unlogin_header.html.erb | 98 +++++++++++-----------
 app/views/layouts/login.html.erb           |  9 --
 3 files changed, 52 insertions(+), 61 deletions(-)

diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index ab3a58369..ace881194 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -41,11 +41,11 @@
           })
       });
 
-      function search_in_header(){
+      function search_in_header(obj){
           var name = $.trim($('#navHomepageSearchInput').val());
           if (name != "" &&  name.length != 0) {
               $('#type').val($('input[type=radio]:checked').val());
-              $(this).parent().submit();
+              obj.parent().submit();
           }
       }
   </script>
@@ -57,7 +57,7 @@
       <input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput" class="navHomepageSearchInput" placeholder="请输入关键词进行搜索"/>
       <input type="hidden" name="search_type" id="type" value=""/>
       <input type="text" class="none"/>
-      <a href="javascript:void(0);" class="homepageSearchIcon" onclick="search_in_header();"></a>
+      <a href="javascript:void(0);" class="homepageSearchIcon" onclick="search_in_header($(this));"></a>
     <% end %>
     <div class="navSearchTypeBox" id="navHomepageSearchType">
       <div class="fl mr15 mt8">
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index 9636332dd..1665a2493 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -9,64 +9,54 @@
       </li>
     </ul>
   </div>
- <script>
-     function search(doc){
-         //alert(1)
-        // val = $('input:radio[name="search_type"]:checked').val();
-        // alert(2)
-        // $("#search_type").val(val);
-       //  alert(3)
-         $(doc).parent().submit();
-     }
-     <% type = type%>
-     $(function (){
-         if('<%= type %>' != null && '<%= type %>' == 'courses' ){
-             $('input:radio[value="courses"]').attr('checked','checked');
-         }
-         if('<%= type %>' != null && '<%= type %>' == 'projects' ){
-             $('input:radio[value="projects"]').attr('checked','checked');
-         }
-         if('<%= type %>' != null && '<%= type %>' == 'users' ){
-             $('input:radio[value="users"]').attr('checked','checked');
-         }
-     });
+  <script>
+      function search(doc){
+          //alert(1)
+          // val = $('input:radio[name="search_type"]:checked').val();
+          // alert(2)
+          // $("#search_type").val(val);
+          //  alert(3)
+          $(doc).parent().submit();
+      }
+      <% type = type%>
+      $(function (){
+          if('<%= type %>' != null && '<%= type %>' == 'courses' ){
+              $('input:radio[value="courses"]').attr('checked','checked');
+          }
+          if('<%= type %>' != null && '<%= type %>' == 'projects' ){
+              $('input:radio[value="projects"]').attr('checked','checked');
+          }
+          if('<%= type %>' != null && '<%= type %>' == 'users' ){
+              $('input:radio[value="users"]').attr('checked','checked');
+          }
+      });
 
-     $(function(){
-         $("#navHomepageSearchInput").keypress(function(e){
-             var name = $.trim($('#navHomepageSearchInput').val());
-             if (e.keyCode == '13' && name != "" &&  name.length != 0) {
-                 $('#type').val($('input[type=radio]:checked').val());
-                 $(this).parent().submit();
-             }
-         })
-     });
+      function search_in_header(obj){
+          var name = $.trim($('#navHomepageSearchInput').val());
+          if (name != "" &&  name.length != 0) {
+              $('#type').val($('input[type=radio]:checked').val());
+              obj.parent().submit();
+          }
+      }
 
-     function search_in_header(){
-         var name = $.trim($('#navHomepageSearchInput').val());
-         if (name != "" &&  name.length != 0) {
-             $('#type').val($('input[type=radio]:checked').val());
-             $(this).parent().submit();
-         }
-     }
-
-     //搜索相关
-     $("#navHomepageSearch").mouseover(function(){
-         $("#navHomepageSearchType").show();
-     }).mouseout(function(){
-         $("#navHomepageSearchType").hide();
-     });
- </script>
+          function search_in_header_I(e,obj){
+              var name = $.trim($('#navHomepageSearchInput').val());
+              if (e.keyCode == '13' && name != "" &&  name.length != 0) {
+                  $('#type').val($('input[type=radio]:checked').val());
+                  obj.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%>" id="navHomepageSearchInput" class="navHomepageSearchInput" placeholder="请输入关键词进行搜索"/>
+        <input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput"  class="navHomepageSearchInput" placeholder="请输入关键词进行搜索" onkeypress="search_in_header_I(event,$(this));"/>
         <input type="hidden" name="search_type" id="type" value=""/>
-        <input type="text" class="none"/>
-        <a href="javascript:void(0);" class="homepageSearchIcon" onclick="search_in_header();"></a>
+        <input type="text" style="display: none;"/>
+        <a href="javascript:void(0);" class="homepageSearchIcon" onclick="search_in_header($(this));"></a>
     <% end %>
-
     <div class="navSearchTypeBox" id="navHomepageSearchType">
       <div class="fl mr15 mt8">
         <input type="radio" value="courses" name="search_type"  checked/>
@@ -93,3 +83,13 @@
     <a href="<%= signin_path(:login=>false) %>" class="c_white db">注册</a>
   </div>
 </div>
+
+<script type="text/javascript">
+    //搜索相关
+    $("#navHomepageSearch").mouseover(function(){
+        $("#navHomepageSearchType").show();
+    }).mouseout(function(){
+        $("#navHomepageSearchType").hide();
+    });
+
+</script>
diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb
index 350365b26..18fbcfcd5 100644
--- a/app/views/layouts/login.html.erb
+++ b/app/views/layouts/login.html.erb
@@ -15,15 +15,6 @@
   <%= call_hook :view_layouts_base_html_head %>
   <%= yield :header_tags -%>
 </head>
-<script type="text/javascript" charset="utf-8">
-    function search_in_header(){
-        var name = $.trim($('#navHomepageSearchInput').val());
-        if (name != "" &&  name.length != 0) {
-            $('#type').val($('input[type=radio]:checked').val());
-            $(this).parent().submit();
-        }
-    }
-</script>
 <div class="navContainer">
     <% is_current_user = User.current.logged? && User.current == @user%>
     <% if User.current.logged? %>