From 01c8ee38987a8f5a25c136e4d6e4a342e459c043 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 26 Aug 2015 17:54:41 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E6=96=B0=E5=BB=BA=E8=AF=BE=E7=A8=8B=E3=80=81=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E3=80=81=E5=8A=A0=E5=85=A5=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0=202=E3=80=81=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E8=AF=BE=E7=A8=8B=E6=97=B6=E5=AF=BC=E8=88=AA=E6=A0=8F?= =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/new_base.html.erb | 19 ++++++++++++++++--- app/views/layouts/new_base_user.html.erb | 13 +++++++++++-- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/app/views/layouts/new_base.html.erb b/app/views/layouts/new_base.html.erb index a270243b6..db93ee495 100644 --- a/app/views/layouts/new_base.html.erb +++ b/app/views/layouts/new_base.html.erb @@ -13,15 +13,25 @@ <%= javascript_heads %> <%= heads_for_theme %> <%= call_hook :view_layouts_base_html_head %> - <%= stylesheet_link_tag 'public', 'leftside', 'courses'%> + <%= stylesheet_link_tag 'public', 'leftside', 'courses','header'%> <%= javascript_include_tag "course","header" %> <%= yield :header_tags -%> + +
+ <% if User.current.logged? %> + <%= render :partial => 'layouts/logined_header' %> + <% else%> + <%= render :partial => 'layouts/unlogin_header' %> + <% end%> +
+
+
- <%= render :partial => 'layouts/new_header' %> + <%#= render :partial => 'layouts/new_header' %>
@@ -31,9 +41,12 @@
- <%= render :partial => 'layouts/new_footer' %> + <%#= render :partial => 'layouts/new_footer' %>
+
+<%= render :partial => 'layouts/footer' %> +
<%= render :partial => 'layouts/new_feedback' %>
课程 - <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting"), "javascript:void(0);"%> + <% if is_current_user%> + <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%> + <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting"), new_course_path%> + <% else%> + <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting"), join_private_courses_courses_path ,:remote => true%> + <% end%> + <% end%>
项目 - <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting"), "javascript:void(0);"%> + + <% if is_current_user%> + <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting"), new_project_path%> + <% end%>