From e0376b5176ffc0c09907765f312e42fb465ad2cd Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sun, 6 Sep 2015 16:46:03 +0800
Subject: [PATCH] =?UTF-8?q?tag=E7=9A=84=E5=AF=BC=E8=88=AA=E6=A0=8F?=
=?UTF-8?q?=E5=92=8C=E5=BA=95=E9=83=A8=E5=AF=BC=E8=88=AA=E6=A0=8F=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/layouts/base_tags.html.erb | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/app/views/layouts/base_tags.html.erb b/app/views/layouts/base_tags.html.erb
index 6a5b490d1..3fd00e042 100644
--- a/app/views/layouts/base_tags.html.erb
+++ b/app/views/layouts/base_tags.html.erb
@@ -19,12 +19,23 @@
<%= 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',:locals=>{:name=>@name,:type=>@type} %>
+ <% else%>
+ <%= render :partial => 'layouts/unlogin_header',:locals=>{:name=>@name,:type=>@type} %>
+ <% end%>
+
+
+
-<%= render :partial => 'layouts/base_header'%>
- <%= render :partial => 'layouts/base_footer'%>
@@ -47,6 +57,11 @@
+
+
+<%= render :partial => 'layouts/footer' %>
+
+
<%= call_hook :view_layouts_base_body_bottom %>