From 6888e2bf01ca2acc2fcfd1f27a4e7e5eacb7900a Mon Sep 17 00:00:00 2001 From: xianbo Date: Wed, 2 Apr 2014 10:59:32 +0800 Subject: [PATCH] fix --- app/views/layouts/_base_header.html.erb | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb index 95edbfa8b..8a066d4f8 100644 --- a/app/views/layouts/_base_header.html.erb +++ b/app/views/layouts/_base_header.html.erb @@ -5,20 +5,13 @@ @nav_dispaly_home_path_label = 1 @nav_dispaly_main_course_label = 1 @nav_dispaly_main_project_label = 1 - elsif (realUrl.match(/project\/course/)) - @nav_dispaly_course_label = 1 - elsif (realUrl.match(/projects/)) - @nav_dispaly_project_label = 1 elsif (realUrl.match(/contest/)) @nav_dispaly_contest_label = 1 elsif (realUrl.match(/calls/)) + @nav_dispaly_home_path_label = 1 @nav_dispaly_bid_label = 1 elsif (realUrl.match(/forums/)) @nav_dispaly_forum_label = 1 - elsif (realUrl.match(/[^forge]\/course[^\.]/)) - @nav_dispaly_course_label = 1 - @nav_dispaly_project_label = 1 - @nav_dispaly_contest_label = 1 elsif (realUrl.match(/forge\.trustie\.net\/*/)) @nav_dispaly_project_label = 1 @nav_dispaly_forum_label = 1 @@ -31,9 +24,11 @@ @nav_dispaly_main_course_label = 1 @nav_dispaly_main_project_label = 1 else - @nav_dispaly_home_path_label = 1 - @nav_dispaly_main_course_label = 1 - @nav_dispaly_main_project_label = 1 + @nav_dispaly_course_all_label = 1 + @nav_dispaly_forum_label = 1 + @nav_dispaly_bid_label = 1 + @nav_dispaly_contest_label = 1 + @nav_dispaly_store_all_label = 1 end %>