From e69de3d59b3fb2dafb3dcf14c85c2a61c2f9ac2a Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Wed, 13 Mar 2019 09:10:34 +0800
Subject: [PATCH] =?UTF-8?q?2.=E2=80=9C=E8=AF=BE=E5=A0=82=E2=80=9D=E2=86=92?=
 =?UTF-8?q?=E2=80=9C=E7=BF=BB=E8=BD=AC=E8=AF=BE=E5=A0=82=E2=80=9D=203.?=
 =?UTF-8?q?=E2=80=9C=E7=B2=BE=E9=80=89=E5=AE=9E=E8=AE=AD=E2=80=9D=E2=86=92?=
 =?UTF-8?q?=E2=80=9C=E5=BC=80=E5=8F=91=E7=A4=BE=E5=8C=BA=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb          | 6 +++---
 app/views/layouts/_logined_header.html.erb | 6 ++++--
 app/views/layouts/_unlogin_header.html.erb | 7 ++++---
 public/react/src/modules/tpm/NewHeader.js  | 8 +++++---
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 8b58703a..2e6c2865 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2968,7 +2968,7 @@ module ApplicationHelper
           title << ("关于我们")
         end
       elsif params[:controller] == "courses" && params[:action] == "index"
-        title << ("课堂")
+        title << ("翻转课堂")
       elsif params[:controller] == "competitions" && params[:action] == "index"
         title << ("竞赛")
       elsif @competition
@@ -2976,11 +2976,11 @@ module ApplicationHelper
       elsif @contest
         title << (@contest.name.nil? ? "创新源于实践" : @contest.name)
       elsif @shixun
-        title << (@shixun.name.nil? ? "精选实训" : @shixun.name)
+        title << (@shixun.name.nil? ? "开发社区" : @shixun.name)
       elsif @my_shixun
         title << ("我的实训")
       elsif params[:controller] == "shixuns" && params[:action] == "index"
-        title << ("精选实训")
+        title << ("开发社区")
       elsif @subject
         title << (@subject.name.nil? ? "实训课程" : @subject.name)
       elsif params[:controller] == "subjects" && params[:action] == "index"
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index b4e2999d..570d9f55 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -2,8 +2,11 @@
   <%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg"), home_path %>
   <div class="head-nav pr">
     <ul id="header-nav">
-      <li class="pr<%= params[:action] == "index" && params[:controller] == "shixuns" ? " active" : "" %>"><%= link_to "精选实训", shixuns_path %><img src="/images/educoder/hot-h.png" class="nav-img" /></li>
       <li class="<%= params[:action] == "index" && params[:controller] == "subjects" ? " active" : "" %>"><%= link_to "实训课程", subjects_path %></li>
+      <li class="<%= params[:action] == "index" && params[:controller] == "courses" ? " active" : "" %>"><%= link_to "翻转课堂", courses_path %></li>
+      <!-- 精选实训 -->
+      <li class="pr<%= params[:action] == "index" && params[:controller] == "shixuns" ? " 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? %>
         <li class="fl edu-menu-panel headIcon careershover <%= params[:action] == "index" && params[:controller] == "careers" ? " active" : "" %>" style="cursor: auto;">
@@ -15,7 +18,6 @@
           </ul>
         </li>
       <% end %>
-      <li class="<%= params[:action] == "index" && params[:controller] == "courses" ? " active" : "" %>"><%= link_to "课堂", courses_path %></li>
       <li class="<%= params[:action] == "index" && params[:controller] == "competitions" ? " active" : "" %>"><%= link_to "竞赛", competitions_path %></li>
       <li class="<%= params[:action] == "index" && params[:controller] == "forums" ? " active" : "" %>"><%= link_to "问答", forums_path %></li>
       <% if User.current.ec_school.present? %>
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index d1fe87db..16ec6ed6 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -3,11 +3,13 @@
   <div class="head-nav pr">
     <ul id="header-nav">
       <li class="active" style="display: none"><%= link_to "首页", home_path %></li>
+      <li><%= link_to "实训课程", subjects_path %></li>
+      <li><%= link_to "翻转课堂", courses_path %></li>
+
       <li class="pr">
-        <%= link_to "精选实训", shixuns_path %>
+        <%= link_to "开发社区", shixuns_path %>
         <img src="/images/educoder/hot-h.png" class="nav-img" />
       </li>
-      <li><%= link_to "实训课程", subjects_path %></li>
       <% careers = Career.published.order("created_at asc") %>
       <% if careers.present? %>
         <li class="fl edu-menu-panel headIcon careershover" style="cursor: auto;">
@@ -19,7 +21,6 @@
           </ul>
         </li>
       <% end %>
-      <li><%= link_to "课堂", courses_path %></li>
       <li><%= link_to "竞赛", competitions_path %></li>
       <li><%= link_to "问答", forums_path %></li>
       <!--<li><%#= link_to "活动竞赛", competitions_path %></li>-->
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index f076e2fa..cdcdf2fe 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -269,12 +269,15 @@ class NewHeader extends Component {
 
                     <ul id="header-nav">
                         {/*<li className={`${activeIndex === true ? 'active' : ''}`}><a href="/">首页</a></li>*/}
+                        <li><a href="/paths">实训课程</a></li>
+                        <li><a href="/courses">翻转课堂</a></li>
+
                         <li className={`${activeShixuns === true ? 'pr active' : 'pr'}`}>
-                            <a href="/shixuns">精选实训</a>
+                            {/* 精选实训 */}
+                            <a href="/shixuns">开发社区</a>
                             <img src="/images/educoder/hot-h.png" className="nav-img">
                             </img>
                         </li>
-                        <li><a href="/paths">实训课程</a></li>
                         <li className={"fl edu-menu-panel  careershover"+' '+`${activeCareers === true ? 'active' : ''}`} style={{display:careerslist.length>0?'block':'none'}}>
                             <a>职业路径</a>
                             <div style={{display:careerslist.length>0?'block':'none'}}>
@@ -288,7 +291,6 @@ class NewHeader extends Component {
                                 </ul>
                             </div>
                         </li>
-                        <li><a href="/courses">课堂</a></li>
                         <li><a href="/competitions">竞赛</a></li>
                         <li className={`${activeForums === true ? 'active' : ''}`}><a href="/forums">问答</a></li>
                         <li className={`${activeCourses === true ? 'active' : ''}`} style={{display:ecUrl===null?'none':'block'}}><a href={ecUrl}>{ecUrl===null?'':'认证'}</a></li>