Download as
Browse Code »

Commit 11b7b93cf7a0329ce9c012ef866c975acc42d9b4

Authored by Dmitriy Zaporozhets
1 parent b5dd9e67
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

move team navs to upper nav

Showing 2 changed files with 18 additions and 19 deletions   Show diff stats
app/views/layouts/user_team.html.haml
  Diff comments   View file @11b7b93
@@ -8,15 +8,33 @@ @@ -8,15 +8,33 @@
8 %ul.main_menu 8 %ul.main_menu
9 = nav_link(path: 'teams#show', html_options: {class: 'home'}) do 9 = nav_link(path: 'teams#show', html_options: {class: 'home'}) do
10 = link_to "Home", team_path(@team), title: "Home" 10 = link_to "Home", team_path(@team), title: "Home"
  11 +
11 = nav_link(path: 'teams#issues') do 12 = nav_link(path: 'teams#issues') do
12 = link_to issues_team_path(@team) do 13 = link_to issues_team_path(@team) do
13 Issues 14 Issues
14 %span.count= Issue.opened.of_user_team(@team).count 15 %span.count= Issue.opened.of_user_team(@team).count
  16 +
15 = nav_link(path: 'teams#merge_requests') do 17 = nav_link(path: 'teams#merge_requests') do
16 = link_to merge_requests_team_path(@team) do 18 = link_to merge_requests_team_path(@team) do
17 Merge Requests 19 Merge Requests
18 %span.count= MergeRequest.opened.of_user_team(@team).count 20 %span.count= MergeRequest.opened.of_user_team(@team).count
  21 +
19 = nav_link(path: 'teams#search') do 22 = nav_link(path: 'teams#search') do
20 = link_to "Search", search_team_path(@team) 23 = link_to "Search", search_team_path(@team)
21 24
  25 + = nav_link(controller: [:members]) do
  26 + = link_to team_members_path(@team), class: "team-tab tab" do
  27 + Members
  28 +
  29 + - if can? current_user, :admin_user_team, @team
  30 + = nav_link(controller: [:projects]) do
  31 + = link_to team_projects_path(@team), class: "team-tab tab" do
  32 + %i.icon-briefcase
  33 + Projects
  34 +
  35 + = nav_link(path: 'teams#edit') do
  36 + = link_to edit_team_path(@team), class: "stat-tab tab " do
  37 + %i.icon-edit
  38 + Edit Team
  39 +
22 .content= yield 40 .content= yield
app/views/teams/_team_head.html.haml
  Diff comments   View file @11b7b93
@@ -1,19 +0,0 @@ @@ -1,19 +0,0 @@
1 -%ul.nav.nav-tabs  
2 - = nav_link(path: 'teams#show') do  
3 - = link_to team_path(@team), class: "activities-tab tab" do  
4 - %i.icon-home  
5 - Show  
6 - = nav_link(controller: [:members]) do  
7 - = link_to team_members_path(@team), class: "team-tab tab" do  
8 - %i.icon-user  
9 - Members  
10 - = nav_link(controller: [:projects]) do  
11 - = link_to team_projects_path(@team), class: "team-tab tab" do  
12 - %i.icon-briefcase  
13 - Projects  
14 -  
15 - - if can? current_user, :admin_user_team, @team  
16 - = nav_link(path: 'teams#edit', html_options: {class: 'right'}) do  
17 - = link_to edit_team_path(@team), class: "stat-tab tab " do  
18 - %i.icon-edit  
19 - Edit Team