From c8c4f572f7428aee5d9889e623976fbec4e89ca2 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Wed, 17 Jul 2019 19:47:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=97=E5=8C=85=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_logined_header.html.erb | 1 + app/views/layouts/_unlogin_header.html.erb | 1 + 2 files changed, 2 insertions(+) diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index f88931d3..986e3351 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -22,6 +22,7 @@ <%= link_to "在线竞赛", competitions_path %> +
  • "><%= link_to "众包", project_packages_path %>
  • "><%= link_to "教学案例", libraries_path %>
  • "><%= link_to "交流问答", forums_path %>
    • <% 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 f6d5150a..84052d14 100644 --- a/app/views/layouts/_unlogin_header.html.erb +++ b/app/views/layouts/_unlogin_header.html.erb @@ -23,6 +23,7 @@ <%= link_to "在线竞赛", competitions_path %> +
  • "><%= link_to "众包", project_packages_path %>
  • "><%= link_to "教学案例", libraries_path %>
  • "><%= link_to "交流问答", forums_path %>
    • From 48f1f9fd4b9695bee003e44d73af9385c040573e Mon Sep 17 00:00:00 2001 From: p31729568 Date: Wed, 17 Jul 2019 19:51:54 +0800 Subject: [PATCH 2/4] fix library tag class --- app/helpers/libraries_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/libraries_helper.rb b/app/helpers/libraries_helper.rb index 14c6ce37..844d6124 100644 --- a/app/helpers/libraries_helper.rb +++ b/app/helpers/libraries_helper.rb @@ -11,7 +11,7 @@ module LibrariesHelper def library_tag_class(tag) case tag.name - when '优秀案例' then 'edu-activity-red' + when '获奖案例' then 'edu-activity-red' when '入库案例' then 'edu-activity-blue' end end From 654ffd2106bf7e8b3921b7dc5dc9e5ade9040858 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Wed, 17 Jul 2019 19:53:18 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=97=E5=8C=85=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/ecs_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/ecs_controller.rb b/app/controllers/ecs_controller.rb index f31bea88..12b6b5d9 100644 --- a/app/controllers/ecs_controller.rb +++ b/app/controllers/ecs_controller.rb @@ -60,7 +60,7 @@ class EcsController < ApplicationController def get_navigation_url ec_user = EcSchoolUser.where(:user_id => User.current.id).first ec_url = "#{department_ecs_path(:school_id => ec_user.school_id)}" if ec_user - render :json => {ec_url: ec_url} + render :json => {ec_url: ec_url, project_packages_url: "/crowdsourcing" } end From da5a8e6e51d01b38a71d84309caf48dfef809d59 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Wed, 17 Jul 2019 19:58:05 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_logined_header.html.erb | 2 +- app/views/layouts/_unlogin_header.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index 986e3351..3998a9a5 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -22,8 +22,8 @@ <%= link_to "在线竞赛", competitions_path %> -
  • "><%= link_to "众包", project_packages_path %>
  • "><%= link_to "教学案例", libraries_path %>
    • +
  • "><%= link_to "众包", project_packages_path %>
  • "><%= link_to "交流问答", forums_path %>
    • <% if User.current.ec_school.present? %>
  • " id="ec_banner"> diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb index 84052d14..8263b5cd 100644 --- a/app/views/layouts/_unlogin_header.html.erb +++ b/app/views/layouts/_unlogin_header.html.erb @@ -23,8 +23,8 @@ <%= link_to "在线竞赛", competitions_path %>
    • -
  • "><%= link_to "众包", project_packages_path %>
  • "><%= link_to "教学案例", libraries_path %>
    • +
  • "><%= link_to "众包", project_packages_path %>
  • "><%= link_to "交流问答", forums_path %>