From 9699ad29ef381e90a8d8e1755040dc8088830a01 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 13 Jul 2021 14:12:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E6=95=B0=E6=8D=AE=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E9=A1=B6=E9=83=A8=E5=AF=BC=E8=88=AA=E6=A0=8F=E8=B0=83=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 | 50 +++++++++++-----------
 app/views/layouts/_unlogin_header.html.erb | 40 ++++++++---------
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 455876d1..0fdb12e6 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -1,37 +1,37 @@
-<%= link_to image_tag("/images/educoder/headNavLogo_keda.png", alt:"高校智能化教学与实训平台", class:"logoimg fl mr30 ml25 mt10", style: "width:130px"), home_path %>
+<%= link_to image_tag("/images/educoder/headNavLogo_keda.png", alt:"大数据工程教研支撑环境", class:"logoimg fl mr30 ml25 mt10", style: "width:130px"), home_path %>
 <div class="educontents fl">
 
   <div class="head-nav pr">
     <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="<%= subjects_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "大数据实验教学资源", "/classrooms" %></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>
+      <li class="pr <%= shixuns_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "数据科学支撑工具集和实训", "/shixuns" %></li>
+      <li class="<%= course_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "大数据工程教研", "/moop_cases" %></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;">
-          <p>职业路径</p>
-          <ul class="edu-menu-list edu-menu-listnew" style="top:60px">
-            <% careers.each do |career| %>
-              <li><a href="<%= introduction_career_path(career) %>"><%= career.name %></a></li>
-            <% end %>
-          </ul>
-        </li>
-      <% end %>
-      <li class="<%= params[:controller] == "competitions" ? " active" : "" %>">
-        <%= link_to "在线竞赛", competitions_path %>
+      <%# 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;">-->
+<!--          <p>职业路径</p>-->
+<!--          <ul class="edu-menu-list edu-menu-listnew" style="top:60px">-->
+            <%# careers.each do |career| %>
+<!--              <li><a href="<%#= introduction_career_path(career) %>"><%#= career.name %></a></li>-->
+            <%# end %>
+<!--          </ul>-->
+<!--        </li>-->
+      <%# end %>
+<!--      <li class="<%#= params[:controller] == "competitions" ? " active" : "" %>">-->
+        <%#= link_to "在线竞赛", competitions_path %>
         <!-- <img class="roundedRectangles" src="/images/educoder/roundedRectangle.png"/>-->
-      </li>
-      <li class="<%= params[:controller] == "libraries" ? " active" : "" %>"><%= link_to "教学案例", libraries_path %></li>
+<!--      </li>-->
+<!--      <li class="<%#= params[:controller] == "libraries" ? " active" : "" %>"><%#= link_to "教学案例", libraries_path %></li>-->
 <!--      <li class="<%#= params[:controller] == "project_packages" ? " active" : "" %>"><%#= link_to "众包创新", project_packages_path %></li>-->
-      <li class="<%= params[:controller] == "forums" ? " active" : "" %>"><%= link_to "交流问答", forums_path %></li>
-      <% if User.current.ec_school.present? %>
-        <li class="<%= ecs_controller.include?(params[:controller]) ? " active" : "" %>" id="ec_banner">
-          <%= link_to "工程认证", department_ecs_path(:school_id => User.current.ec_school) %>
-        </li>
-      <% end %>
+<!--      <li class="<%#= params[:controller] == "forums" ? " active" : "" %>"><%#= link_to "交流问答", forums_path %></li>-->
+      <%# if User.current.ec_school.present? %>
+<!--        <li class="<%#= ecs_controller.include?(params[:controller]) ? " active" : "" %>" id="ec_banner">-->
+          <%#= link_to "工程认证", department_ecs_path(:school_id => User.current.ec_school) %>
+<!--        </li>-->
+      <%# end %>
     </ul>
 
   </div>
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index 09254022..53f14332 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -1,33 +1,33 @@
 
-<%= link_to image_tag("/images/educoder/headNavLogo_keda.png", alt:"高校智能化教学与实训平台", class:"logoimg fl mr30 ml25 mt10", style: "width:130px"), home_path %>
+<%= link_to image_tag("/images/educoder/headNavLogo_keda.png", alt:"大数据工程教研支撑环境", class:"logoimg fl mr30 ml25 mt10", style: "width:130px"), home_path %>
 
 <div class="educontents fl">
 
   <div class="head-nav pr">
     <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 "教学课堂", "/classrooms" %></li>
-      <li class="pr <%= shixuns_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "实践项目", shixuns_path %></li>
+      <li class="<%= subjects_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "大数据实验教学资源", "/classrooms" %></li>
+      <li class="<%= course_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "数据科学支撑工具集和实训", "/shixuns" %></li>
+      <li class="pr <%= shixuns_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "大数据工程教研", "/moop_cases" %></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;">
-          <p>职业路径</p>
-          <ul class="edu-menu-list edu-menu-listnew" style="top:60px">
-            <% careers.each do |career| %>
-              <li><a href="<%= introduction_career_path(career) %>"><%= career.name %></a></li>
-            <% end %>
-          </ul>
-        </li>
-      <% end %>
-      <li class="<%= params[:controller] == "competitions" ? " active" : "" %>">
-        <%= link_to "在线竞赛", competitions_path %>
+      <%# 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;">-->
+<!--          <p>职业路径</p>-->
+<!--          <ul class="edu-menu-list edu-menu-listnew" style="top:60px">-->
+            <%# careers.each do |career| %>
+<!--              <li><a href="<%#= introduction_career_path(career) %>"><%#= career.name %></a></li>-->
+            <%# end %>
+<!--          </ul>-->
+<!--        </li>-->
+      <%# end %>
+<!--      <li class="<%#= params[:controller] == "competitions" ? " active" : "" %>">-->
+        <%#= link_to "在线竞赛", competitions_path %>
         <!-- <img class="roundedRectangles" src="/images/educoder/roundedRectangle.png"/>-->
-      </li>
-      <li class="<%= params[:controller] == "libraries" ? " active" : "" %>"><%= link_to "教学案例", libraries_path %></li>
+<!--      </li>-->
+<!--      <li class="<%#= params[:controller] == "libraries" ? " active" : "" %>"><%#= link_to "教学案例", libraries_path %></li>-->
 <!--      <li class="<%#= params[:controller] == "project_packages" ? " active" : "" %>"><%#= link_to "众包创新", project_packages_path %></li>-->
-      <li class="<%= params[:controller] == "forums" ? " active" : "" %>"><%= link_to "交流问答", forums_path %></li>
+<!--      <li class="<%#= params[:controller] == "forums" ? " active" : "" %>"><%#= link_to "交流问答", forums_path %></li>-->
       <!--<li><%#= link_to "活动竞赛", competitions_path %></li>-->
     </ul>