From a9c7c252e5b61f673a01dd208d5013a24daf745e Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 24 Aug 2015 16:16:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BDjs=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E7=B1=BB=E5=9E=8B=E7=9A=84=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_logined_header.html.erb | 25 +++++++++++-
 app/views/layouts/_unlogin_header.html.erb | 47 ++++++++++------------
 app/views/layouts/new_base_user.html.erb   |  2 +-
 public/javascripts/new_user.js             | 10 +++++
 public/stylesheets/new_public.css          |  1 +
 5 files changed, 58 insertions(+), 27 deletions(-)

diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index d45adecf6..ee3f2f0ab 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -18,11 +18,34 @@
     </ul>
   </div>
 
-  <div class="navHomepageSearchBoxcontainer fl">
+  <div class="fl" id="navHomepageSearch">
     <form class="navHomepageSearchBox">
       <input type="text" name="navHomepageSearch" class="navHomepageSearchInput" />
       <a href="javascript:void(0);" class="homepageSearchIcon"></a>
     </form>
+
+    <div class="navSearchTypeBox" id="navHomepageSearchType">
+      <div class="fl mr15">
+        <div class="fl mt5">
+          <input type="radio" value="课程" name="navSearchType" checked/>
+        </div>
+        课程
+      </div>
+      <div class="fl mr15">
+        <div class="fl mt5">
+          <input type="radio" value="项目" name="navSearchType" />
+        </div>
+        项目
+      </div>
+      <div class="fl mr15">
+        <div class="fl mt5">
+          <input type="radio" value="用户" name="navSearchType" />
+        </div>
+        用户</div>
+      <div id="navSearchAlert" class="fr mr10">
+        <span class="c_red">请选择搜索类型</span>
+      </div>
+    </div>
   </div>
 
   <div class="navHomepageProfile">
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index e91cf9ddb..b4423a713 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -1,8 +1,6 @@
 <div class="navHomepage">
   <div class="navHomepageLogo fl">
-    <a href="javascript:void(0);">
-      <img src="images/nav_logo.png" width="51" height="45" alt="确实Trustie" class="mt3" />
-    </a>
+    <%=link_to image_tag("../images/logo.png",width:"51px", height: "45px",class: "mt3"), "javascript:void(0);"%>
   </div>
   <div class="fl">
     <ul>
@@ -11,34 +9,33 @@
       </li>
     </ul>
   </div>
-  <div class="navHomepageSearchBoxcontainer fl">
+
+  <div class="fl" id="navHomepageSearch">
     <form class="navHomepageSearchBox">
-      <input type="text" name="navHomepageSearch" class="navHomepageSearchInput" />
+      <input type="text" name="navHomepageSearch" class="navHomepageSearchInput"/>
       <a href="javascript:void(0);" class="homepageSearchIcon"></a>
     </form>
-    <div class="navSearchTypeBox">
-      <form class="mt8">
-        <div class="fl mr15">
-          <div class="fl mt5">
-            <input type="radio" value="课程" name="navSearchType" />
-          </div>
-          课程
+    <div class="navSearchTypeBox" id="navHomepageSearchType">
+      <div class="fl mr15">
+        <div class="fl mt5">
+          <input type="radio" value="课程" name="navSearchType" checked/>
         </div>
-        <div class="fl mr15">
-          <div class="fl mt5">
-            <input type="radio" value="项目" name="navSearchType" />
-          </div>
-          项目
+        课程
+      </div>
+      <div class="fl mr15">
+        <div class="fl mt5">
+          <input type="radio" value="项目" name="navSearchType" />
         </div>
-        <div class="fl mr15">
-          <div class="fl mt5">
-            <input type="radio" value="用户" name="navSearchType" />
-          </div>
-          用户</div>
-        <div id="navSearchAlert" class="fr mr10">
-          <span class="c_red">请选择搜索类型</span>
+        项目
+      </div>
+      <div class="fl mr15">
+        <div class="fl mt5">
+          <input type="radio" value="用户" name="navSearchType" />
         </div>
-      </form>
+        用户</div>
+      <div id="navSearchAlert" class="fr mr10">
+        <span class="c_red">请选择搜索类型</span>
+      </div>
     </div>
   </div>
   <div id="loginInButton" class="fr ml20">
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 4d85ef1b3..6f3ed0c67 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -131,7 +131,7 @@
         </div>
       </div>
     </div>
-    <div class="homepageRight">
+    <div class="homepageRight" id="RSide">
       <%= yield %>
     </div>
   </div>
diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index e89b7374b..97894bd45 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -1,4 +1,7 @@
 $(function(){
+    //右侧最小高度 = 左侧高度 - 15px   保证两边高度基本一样，页面美观
+    $("#RSide").css("min-height",$("#LSide").height()-15);
+
     //头像相关
     $("#homepage_portrait_image").live("mouseover",function(){
         $("#edit_user_file_btn").show();
@@ -7,6 +10,13 @@ $(function(){
         $("#edit_user_file_btn").hide();
         $("#watch_user_btn").hide();
     });
+
+    //搜索相关
+    $("#navHomepageSearch").mouseover(function(){
+        $("#navHomepageSearchType").show();
+    }).mouseout(function(){
+        $("#navHomepageSearchType").hide();
+    });
 });
 
 //编辑个人简介
diff --git a/public/stylesheets/new_public.css b/public/stylesheets/new_public.css
index b26f39ae2..aae981e1b 100644
--- a/public/stylesheets/new_public.css
+++ b/public/stylesheets/new_public.css
@@ -9,6 +9,7 @@ a:link,a:visited{color:#7f7f7f;text-decoration:none;}
 a:hover,a:active{color:#000;}
 
 /*常用*/
+#RSide{ background:#fff;}
 .hidden{overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .none{display: none;}
 .rside_back{ width:670px;  margin-left:10px;  background:#fff;  margin-bottom:10px;}