From 0be3ef0a65cbf3d8f6356ad2a5856a6130896642 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 25 Aug 2015 18:26:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/account/login.html.erb | 2 +- app/views/layouts/_unlogin_header.html.erb | 29 ++++++++++++++++------ app/views/layouts/course_base.html.erb | 20 ++++++++++++--- 3 files changed, 39 insertions(+), 12 deletions(-) diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb index deec186c8..f2ac18084 100644 --- a/app/views/account/login.html.erb +++ b/app/views/account/login.html.erb @@ -16,7 +16,7 @@ $(document).ready(function(){ $(".homepageSearchIcon").click(function(){ - var val=$('input:radio[name="navSearchType"]:checked').val(); + var val=$('input:radio[name="search_type"]:checked').val(); if(val==null){ $("#navSearchAlert").css({display:"block"}); } diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb index 4151493fc..446b4876c 100644 --- a/app/views/layouts/_unlogin_header.html.erb +++ b/app/views/layouts/_unlogin_header.html.erb @@ -9,29 +9,41 @@ - +
登录 @@ -48,4 +60,5 @@ }).mouseout(function(){ $("#navHomepageSearchType").hide(); }); + diff --git a/app/views/layouts/course_base.html.erb b/app/views/layouts/course_base.html.erb index bad051fc5..16c26f2c7 100644 --- a/app/views/layouts/course_base.html.erb +++ b/app/views/layouts/course_base.html.erb @@ -21,19 +21,29 @@ <%= call_hook :view_layouts_base_html_head %> <%= yield :header_tags -%> + <%= stylesheet_link_tag 'base','header', :media => 'all'%> +
+
+ <% if User.current.logged? %> + <%= render :partial => 'layouts/logined_header' %> + <% else%> + <%= render :partial => 'layouts/unlogin_header' %> + <% end%> +
+
- <%=render :partial => 'layouts/base_header'%> + <%#=render :partial => 'layouts/base_header'%>
<%= render_flash_messages %> <%= yield %> <%= call_hook :view_layouts_base_content %> -
- <%=render :partial => 'layouts/base_footer'%> + +
@@ -45,6 +55,10 @@
+
+<%= render :partial => 'layouts/footer' %> +
+ <%= call_hook :view_layouts_base_body_bottom %>