move team navs to upper nav

2 files changed, 18 insertions, 19 deletions

diff --git a/app/views/layouts/user_team.html.haml b/app/views/layouts/user_team.html.haml
index 769fc3b78c3..12fce837238 100644
--- a/app/views/layouts/user_team.html.haml
+++ b/app/views/layouts/user_team.html.haml
@@ -8,15 +8,33 @@
       %ul.main_menu
         = nav_link(path: 'teams#show', html_options: {class: 'home'}) do
           = link_to "Home", team_path(@team), title: "Home"
+
         = nav_link(path: 'teams#issues') do
           = link_to issues_team_path(@team) do
             Issues
             %span.count= Issue.opened.of_user_team(@team).count
+
         = nav_link(path: 'teams#merge_requests') do
           = link_to merge_requests_team_path(@team) do
             Merge Requests
             %span.count= MergeRequest.opened.of_user_team(@team).count
+
         = nav_link(path: 'teams#search') do
           = link_to "Search", search_team_path(@team)
 
+        = nav_link(controller: [:members]) do
+          = link_to team_members_path(@team), class: "team-tab tab" do
+            Members
+
+        - if can? current_user, :admin_user_team, @team
+          = nav_link(controller: [:projects]) do
+            = link_to team_projects_path(@team), class: "team-tab tab" do
+              %i.icon-briefcase
+              Projects
+
+          = nav_link(path: 'teams#edit') do
+            = link_to edit_team_path(@team), class: "stat-tab tab " do
+              %i.icon-edit
+              Edit Team
+
       .content= yield
diff --git a/app/views/teams/_team_head.html.haml b/app/views/teams/_team_head.html.haml
index cb5c9567ba6..e69de29bb2d 100644
--- a/app/views/teams/_team_head.html.haml
+++ b/app/views/teams/_team_head.html.haml
@@ -1,19 +0,0 @@
-%ul.nav.nav-tabs
-  = nav_link(path: 'teams#show') do
-    = link_to team_path(@team), class: "activities-tab tab" do
-      %i.icon-home
-      Show
-  = nav_link(controller: [:members]) do
-    = link_to team_members_path(@team), class: "team-tab tab" do
-      %i.icon-user
-      Members
-  = nav_link(controller: [:projects]) do
-    = link_to team_projects_path(@team), class: "team-tab tab" do
-      %i.icon-briefcase
-      Projects
-
-  - if can? current_user, :admin_user_team, @team
-    = nav_link(path: 'teams#edit', html_options: {class: 'right'}) do
-      = link_to edit_team_path(@team), class: "stat-tab tab " do
-        %i.icon-edit
-        Edit Team