解决冲突

app/views/layouts/_logined_header.html.erb

@@ -5,8 +5,7 @@
     <ul id="header-nav">
 <!--      <li class="<%#= params[:controller] == "welcome" ? 'active' : '' %>"><%#= link_to "首页", home_path %></li>-->
       <li class="<%= subjects_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "实践课程", subjects_path %></li>
-      <!-- 精选实训 -->
+      <li class="pr <%= shixuns_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "实训项目", shixuns_path %></li>
-      <li class="pr <%= shixuns_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "实训项目", shixuns_path %><img src="/images/educoder/hot-h.png" class="nav-img" /></li>
       <li class="<%= course_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "教学课堂", "/classrooms" %></li>
 
       <% careers = Career.published.order("created_at asc") %>

app/views/layouts/_unlogin_header.html.erb

@@ -7,7 +7,7 @@
     <ul id="header-nav">
 <!--      <li class="<%#= params[:controller] == "welcome" ? 'active' : '' %>"><%#= link_to "首页", home_path %></li>-->
       <li class="<%= subjects_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "实践课程", subjects_path %></li>
-      <li class="pr <%= shixuns_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "实训项目", shixuns_path %><img src="/images/educoder/hot-h.png" class="nav-img" /></li>
+      <li class="pr <%= shixuns_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "实训项目", shixuns_path %></li>
       <li class="<%= course_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "教学课堂", "/classrooms" %></li>
 
       <% careers = Career.published.order("created_at asc") %>

config/routes.rb

@@ -2444,7 +2444,7 @@ RedmineApp::Application.routes.draw do ## oauth相关
 
   # add by nwb
   # 课程路由设置
-  resources :courses do
+  resources :courses, :path => "classrooms" do
     member do
       get 'settings', :action => 'settings', :as => 'settings'
       get 'teachers'