From e3aa145dfe4aad2d05878c0c7010376eaf92f4ce Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Tue, 3 Mar 2020 20:03:57 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_logined_header.html.erb | 5 +++--
 app/views/layouts/_unlogin_header.html.erb | 7 +++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 1133f2e5..72e6e400 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -5,9 +5,10 @@
     <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="<%= course_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "翻转课堂", courses_path %></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 "教学课堂", courses_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>
+
 
       <% careers = Career.published.order("created_at asc") %>
       <% if careers.present? %>
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index 6ee75008..38c27dfc 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -7,9 +7,8 @@
     <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="<%= course_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "翻转课堂", courses_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 "教学课堂", courses_path %></li>
 
       <% careers = Career.published.order("created_at asc") %>
       <% if careers.present? %>
@@ -76,7 +75,7 @@
           <li><%= link_to "新建开发项目", signin_path %></li>
         </ul>
         <ul class="fl with50 edu-txt-center">
-          <li><%= link_to "加入翻转课堂", signin_path %></li>
+          <li><%= link_to "加入教学课堂", signin_path %></li>
           <li><%= link_to "加入开发项目", signin_path %></li>
         </ul>
       </div>

From 44e09d51d0a6a16f876d04dd183b724cbd73494e Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Wed, 11 Mar 2020 23:35:20 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=AF=BE=E5=A0=82=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/routes.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/routes.rb b/config/routes.rb
index ef6d561c..5a728909 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2443,7 +2443,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'

From 956c4487a8d5ce084445aa44825e87206363d144 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 17 Mar 2020 15:30:20 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_logined_header.html.erb | 12 ++++++------
 app/views/layouts/_unlogin_header.html.erb |  7 +++----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 1133f2e5..659aaadd 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -5,9 +5,9 @@
     <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="<%= course_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "翻转课堂", courses_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") %>
       <% if careers.present? %>
@@ -49,7 +49,7 @@ display: none; right:110px;">
       </ul>
     </div>
     <div class="seperateLine"></div>
-    <input type="text" class="search-input fl" id="search-input" name="search_keyword" placeholder="实践课程/翻转课堂/实训项目/交流问答"/>
+    <input type="text" class="search-input fl" id="search-input" name="search_keyword" placeholder="实践课程/教学课堂/实训项目/交流问答"/>
     <a href="javascript:void(0)" class="search-icon fl" id="header_keyword_search">
       <i class="iconfont icon-sousuo color-blue mt14 fl"></i>
     </a>
@@ -59,7 +59,7 @@ display: none; right:110px;">
   <%= link_to (image_tag(url_to_avatar(User.current), :width =>"34", :height => "34", :class => "radius mt13", :nhname => "avatar_image", :alt=>"头像", :id => "nh_user_logo")), user_path(User.current),:class => "fl" %>
   <ul class="edu-menu-list" style="top:60px;">
     <span class="bor-bottom-greyE currentName task-hide"><%= User.current.show_name %></span>
-    <li><%= link_to '我的翻转课堂', user_path(User.current) %></li>
+    <li><%= link_to '我的教学课堂', user_path(User.current) %></li>
     <li><%= link_to '我的实训项目', user_path(User.current, :type => 'a_shixun') %></li>
     <li><%= link_to '我的实践课程', user_path(User.current, :type => 'a_path') %></li>
     <li><%= link_to '我的开发项目', user_path(User.current, :type => 'a_project') %></li>
@@ -83,7 +83,7 @@ display: none; right:110px;">
       <div class="overPart"></div>
       <ul class="fl with50 edu-txt-center pr ul-leftline">
         <% unless User.current.identity == "学生" %>
-          <li><%= link_to '新建翻转课堂', new_course_path() %></li>
+          <li><%= link_to '新建教学课堂', "/classrooms" %></li>
         <% end %>
         <li><%= link_to '新建实训项目', new_shixun_path() %></li>
         <li><%= link_to '新建实践课程', new_subject_path() %></li>
@@ -91,10 +91,10 @@ display: none; right:110px;">
       </ul>
       <ul class="fl with50 edu-txt-center">
         <% if User.current.profile_completed? %>
-          <li><%= link_to "加入翻转课堂", join_private_courses_path, :remote => true %></li>
+          <li><%= link_to "加入教学课堂", join_private_courses_path, :remote => true %></li>
           <li><%= link_to "加入开发项目", applied_join_project_path, :remote => true %></li>
         <% else %>
-          <li><%= link_to "加入翻转课堂", 'javascript:void(0)', onclick: 'showUserProfileModal()' %></li>
+          <li><%= link_to "加入教学课堂", 'javascript:void(0)', onclick: 'showUserProfileModal()' %></li>
           <li><%= link_to "加入开发项目", 'javascript:void(0)', onclick: 'showUserProfileModal()' %></li>
         <% end %>
       </ul>
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index 6ee75008..c96c7790 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -7,9 +7,8 @@
     <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="<%= course_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "翻转课堂", courses_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") %>
       <% if careers.present? %>
@@ -47,7 +46,7 @@
       </ul>
     </div>
     <div class="seperateLine"></div>
-    <input type="text" class="search-input fl" id="search-input" name="search_keyword" placeholder="实践课程/翻转课堂/实训项目/交流问答"/>
+    <input type="text" class="search-input fl" id="search-input" name="search_keyword" placeholder="实践课程/教学课堂/实训项目/交流问答"/>
     <a href="javascript:void(0)" class="search-icon fl" id="header_keyword_search">
       <!--<svg class="icon fl mt23" width="20px" height="20px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#333333" d="M463.9 804.4c-194.7 0-353.1-158.4-353.1-353.1S269.2 98.2 463.9 98.2 817 256.6 817 451.3 658.6 804.4 463.9 804.4z m0-651.9c-164.8 0-298.8 134-298.8 298.8s134 298.8 298.8 298.8 298.8-134 298.8-298.8-134-298.8-298.8-298.8zM884.9 926.6c-7.2 0-14.4-2.9-19.8-8.6l-198-210.6c-10.3-10.9-9.7-28.1 1.2-38.4 10.9-10.3 28.1-9.8 38.4 1.2l198 210.6c10.3 10.9 9.7 28.1-1.2 38.4-5.2 5-11.9 7.4-18.6 7.4z" /></svg>-->
       <i class="iconfont icon-sousuo color-blue mt14 fl"></i>
@@ -76,7 +75,7 @@
           <li><%= link_to "新建开发项目", signin_path %></li>
         </ul>
         <ul class="fl with50 edu-txt-center">
-          <li><%= link_to "加入翻转课堂", signin_path %></li>
+          <li><%= link_to "加入教学课堂", signin_path %></li>
           <li><%= link_to "加入开发项目", signin_path %></li>
         </ul>
       </div>