1、个人主页新建课程、新建项目、加入课程功能添加

2、新建课程时导航栏的修改
10 years ago · 01c8ee3898
parent dafc128f34
commit 01c8ee3898
2 changed files with 27 additions and 5 deletions
--- 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" %>
  <!-- page specific tags -->
  <%= yield :header_tags -%>
 </head>
 <!--add by huang-->
 <body>
+
+<div class="navContainer mb10">
+  <% if User.current.logged? %>
+      <%= render :partial => 'layouts/logined_header' %>
+  <% else%>
+      <%= render :partial => 'layouts/unlogin_header' %>
+  <% end%>
+</div>
+<div class="cl"></div>
+
 <div id="Container">
-  <%= render :partial => 'layouts/new_header' %>
+  <%#= render :partial => 'layouts/new_header' %>
  <div class="cl"></div>

  <div id="content02" >
@ -31,9 +41,12 @@
  </div><!--Content end-->
  <div class="cl"></div>

-  <%= render :partial => 'layouts/new_footer' %>
+  <%#= render :partial => 'layouts/new_footer' %>
  <div class="cl"></div>
 </div><!--Container end-->
+<div class="cl"></div>
+<%= render :partial => 'layouts/footer' %>
+<div class="cl"></div>
 <%= render :partial => 'layouts/new_feedback' %>
 <div id="ajax-indicator" style="display:none;">
  <span><%= l(:label_loading) %></span>
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@ -95,7 +95,13 @@
        </div>
        <div class="homepageLeftMenuBlock">
          <a href="javascript:void(0);" class="homepageMenuText">课程</a>
-          <%=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%>
        </div>
        <div class="homepageLeftMenuCourses">
          <ul>
@ -105,7 +111,10 @@
        </div>
        <div class="homepageLeftMenuBlock">
          <a href="javascript:void(0);" class="homepageMenuText">项目</a>
-          <%=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%>
        </div>
        <div class="homepageLeftMenuCourses">
          <ul>