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 -%> + + +
+
- <%= 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%>