From b1c1a3d3cc90de98f03482a4b41b39fe9a992cc6 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 20 Aug 2015 10:59:05 +0200 Subject: Refactor sidebar navigation for dashboard Signed-off-by: Dmitriy Zaporozhets --- app/helpers/tab_helper.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/helpers') diff --git a/app/helpers/tab_helper.rb b/app/helpers/tab_helper.rb index 77727337f07..9c99de1c3fa 100644 --- a/app/helpers/tab_helper.rb +++ b/app/helpers/tab_helper.rb @@ -67,6 +67,8 @@ module TabHelper path.any? do |single_path| current_path?(single_path) end + elsif page = options.delete(:page) + current_page?(page) else c = options.delete(:controller) a = options.delete(:action) -- cgit v1.2.3 From f82c14259b81d692b7f922b40895b60b2b240361 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 20 Aug 2015 11:59:14 +0200 Subject: Rebuild navigation for dashboard * projects from explore page are available from dashboard * use dashboard sidebar for both logged in and not users * move explroe projects under projects tab * move explore groups under groups tab * move public snippets under snippets tab Signed-off-by: Dmitriy Zaporozhets --- app/helpers/explore_helper.rb | 2 +- app/helpers/tab_helper.rb | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'app/helpers') diff --git a/app/helpers/explore_helper.rb b/app/helpers/explore_helper.rb index 7616fe6bad8..0d291f9a87e 100644 --- a/app/helpers/explore_helper.rb +++ b/app/helpers/explore_helper.rb @@ -10,7 +10,7 @@ module ExploreHelper options = exist_opts.merge(options) - path = request.path + path = explore_projects_path path << "?#{options.to_param}" path end diff --git a/app/helpers/tab_helper.rb b/app/helpers/tab_helper.rb index 9c99de1c3fa..0e7d8065ac7 100644 --- a/app/helpers/tab_helper.rb +++ b/app/helpers/tab_helper.rb @@ -68,7 +68,13 @@ module TabHelper current_path?(single_path) end elsif page = options.delete(:page) - current_page?(page) + unless page.respond_to?(:each) + page = [page] + end + + page.any? do |single_page| + current_page?(single_page) + end else c = options.delete(:controller) a = options.delete(:action) -- cgit v1.2.3