From 0d85fb3c5f7fb91c9edaecc7a0457f617a67cf7b Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Sat, 10 Oct 2015 11:07:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=E5=9C=A8=E5=8F=98=E8=89=B2=E8=8C=83=E5=9B=B4=E5=86=85=E9=83=BD?=
 =?UTF-8?q?=E5=8F=AF=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_logined_header.html.erb |   8 +-
 app/views/layouts/_unlogin_header.html.erb | 190 ++++++++++-----------
 public/stylesheets/header.css              |   2 +-
 public/stylesheets/new_user.css            |   2 +-
 4 files changed, 101 insertions(+), 101 deletions(-)

diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index fbbe40a93..c750ff3b5 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -5,15 +5,15 @@
   <div class="fl">
     <ul>
       <li class="navHomepageMenu fl">
-        <%= link_to "首页",user_activities_path(User.current.id), :class => "c_white f16 db"%>
+        <%= link_to "首页",user_activities_path(User.current.id), :class => "c_white f16 db p10"%>
       </li>
       <li class="navHomepageMenu fl">
-        <a href="<%=url_for(:controller => 'users', :action => 'user_resource',:id=>User.current.id,:type=>1)%>" class="c_white f16 db">资源库</a></li>
+        <a href="<%=url_for(:controller => 'users', :action => 'user_resource',:id=>User.current.id,:type=>1)%>" class="c_white f16 db p10">资源库</a></li>
       <li class="navHomepageMenu fl">
-        <%= link_to "作业",  user_homeworks_user_path(User.current.id), :class => "c_white f16 db"%>
+        <%= link_to "作业",  user_homeworks_user_path(User.current.id), :class => "c_white f16 db p10"%>
       </li>
       <li class="navHomepageMenu fl mr30">
-        <a href="http://forge.trustie.net/forums/1/memos/1168" class="c_white f16 db">帮助中心</a>
+        <a href="http://forge.trustie.net/forums/1/memos/1168" class="c_white f16 db p10">帮助中心</a>
       </li>
     </ul>
   </div>
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index 1665a2493..e674a769f 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -1,95 +1,95 @@
-<div class="navHomepage">
-  <div class="navHomepageLogo fl">
-    <%=link_to image_tag("../images/nav_logo.png",width:"51px", height: "45px",class: "mt3"), signin_path%>
-  </div>
-  <div class="fl">
-    <ul>
-      <li class="navHomepageMenu fl mr40">
-        <a href="http://forge.trustie.net/forums/1/memos/1168" class="c_white f16">帮助中心</a>
-      </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');
-          }
-      });
-
-      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_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="请输入关键词进行搜索" onkeypress="search_in_header_I(event,$(this));"/>
-        <input type="hidden" name="search_type" id="type" value=""/>
-        <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/>
-        课程
-      </div>
-      <div class="fl mr15 mt8">
-        <input type="radio" value="projects" name="search_type" />
-        项目
-      </div>
-      <div class="fl mr15 mt8">
-        <input type="radio" value="users" name="search_type" />
-        用户
-      </div>
-      <div id="navSearchAlert" class="fr mr10">
-        <span class="c_red">请选择搜索类型</span>
-      </div>
-    </div>
-
-  </div>
-  <div id="loginInButton" class="fr ml20">
-    <a href="<%= signin_path(:login=>true) %>" class="c_white db">登录</a>
-  </div>
-  <div id="loginSignButton" class="fr">
-    <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>
+<div class="navHomepage">
+  <div class="navHomepageLogo fl">
+    <%=link_to image_tag("../images/nav_logo.png",width:"51px", height: "45px",class: "mt3"), signin_path%>
+  </div>
+  <div class="fl">
+    <ul>
+      <li class="navHomepageMenu fl mr40">
+        <a href="http://forge.trustie.net/forums/1/memos/1168" class="c_white f16 p10">帮助中心</a>
+      </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');
+          }
+      });
+
+      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_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="请输入关键词进行搜索" onkeypress="search_in_header_I(event,$(this));"/>
+        <input type="hidden" name="search_type" id="type" value=""/>
+        <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/>
+        课程
+      </div>
+      <div class="fl mr15 mt8">
+        <input type="radio" value="projects" name="search_type" />
+        项目
+      </div>
+      <div class="fl mr15 mt8">
+        <input type="radio" value="users" name="search_type" />
+        用户
+      </div>
+      <div id="navSearchAlert" class="fr mr10">
+        <span class="c_red">请选择搜索类型</span>
+      </div>
+    </div>
+
+  </div>
+  <div id="loginInButton" class="fr ml20">
+    <a href="<%= signin_path(:login=>true) %>" class="c_white db">登录</a>
+  </div>
+  <div id="loginSignButton" class="fr">
+    <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/public/stylesheets/header.css b/public/stylesheets/header.css
index 36dcf1d81..096dd7e57 100644
--- a/public/stylesheets/header.css
+++ b/public/stylesheets/header.css
@@ -4,7 +4,7 @@
 .homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;}
 .navHomepage {width:1000px; height:54px; background-color:#269ac9; margin:0 auto;}
 .navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:30px;}
-.navHomepageMenu {margin-right:20px;display:inline-block;height:54px; line-height:54px; vertical-align:middle; padding:0px 10px;}
+.navHomepageMenu {margin-right:20px;display:inline-block;height:54px; line-height:54px; vertical-align:middle;}
 .navHomepageMenu:hover {background-color:#297fb8;}
 .navHomepageSearchBoxcontainer {margin-top:11px; }
 .navHomepageSearchBox {width:380px; border:none; outline:none; height:32px;  margin-top:11px; background-color:#ffffff;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 4d8623fd6..5b187fa2d 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -518,7 +518,7 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat;
 .homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;}
 .navHomepage {width:1000px; height:54px; background-color:#269ac9; margin:0 auto;}
 .navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:30px;}
-.navHomepageMenu {margin-right:20px;display:inline-block;height:54px; line-height:54px; vertical-align:middle; padding:0px 10px;}
+.navHomepageMenu {margin-right:20px;display:inline-block;height:54px; line-height:54px; vertical-align:middle;}
 .navHomepageMenu:hover {background-color:#297fb8;}
 /*.navHomepageMenu:hover {background-color:#0ea6b7;}*/
 .navHomepageSearchBoxcontainer {margin-top:11px; }