From fe09b38e24a853e9d1944cb2a685bd54a68a1d01 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Mon, 1 Jul 2019 11:12:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?banner=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 10 +++++----- app/views/layouts/_logined_header.html.erb | 8 ++++---- app/views/layouts/_unlogin_header.html.erb | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 672b3c66..b65a2fa8 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -3015,9 +3015,9 @@ module ApplicationHelper elsif params[:controller] == "courses" && params[:action] == "index" title << ("翻转课堂") elsif params[:controller] == "competitions" && params[:action] == "index" - title << ("竞赛") + title << ("在线竞赛") elsif @competition - title << (@competition.name.nil? ? "竞赛" : @competition.name) + title << (@competition.name.nil? ? "在线竞赛" : @competition.name) elsif @contest title << (@contest.name.nil? ? "创新源于实践" : @contest.name) elsif @shixun @@ -3027,13 +3027,13 @@ module ApplicationHelper elsif params[:controller] == "shixuns" && params[:action] == "index" title << ("开发社区") elsif @subject - title << (@subject.name.nil? ? "实训课程" : @subject.name) + title << (@subject.name.nil? ? "实践课程" : @subject.name) elsif params[:controller] == "subjects" && params[:action] == "index" - title << ("实训课程") + title << ("实践课程") elsif @organization title << (@organization.name.nil? ? "创新源于实践" : @organization.name) elsif @forum || params[:controller] == "forums" - title << "讨论区" + title << "交流问答" elsif @my_syllabuses title << "我的课堂" elsif params[:controller] == 'ecs' diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index 30ef0658..11a2d93d 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -2,7 +2,7 @@ <%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg"), home_path %>
<% end %> -
  • "><%= link_to "竞赛", competitions_path %>
    • -
  • "><%= link_to "问答", forums_path %>
    • +
  • "><%= link_to "在线竞赛", competitions_path %>
    • +
  • "><%= link_to "交流问答", forums_path %>
    • <% if User.current.ec_school.present? %>
  • " id="ec_banner"> - <%= link_to "认证", department_ecs_path(:school_id => User.current.ec_school) %> + <%= link_to "工程认证", department_ecs_path(:school_id => User.current.ec_school) %>
    • <% end %> diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb index f38a1dce..e787e012 100644 --- a/app/views/layouts/_unlogin_header.html.erb +++ b/app/views/layouts/_unlogin_header.html.erb @@ -3,7 +3,7 @@
    <% end %> -
  • "><%= link_to "竞赛", competitions_path %>
    • -
  • "><%= link_to "问答", forums_path %>
    • +
  • "><%= link_to "在线竞赛", competitions_path %>
    • +
  • "><%= link_to "交流问答", forums_path %>