Download as
Browse Code »

Commit 0c884498d2efa02432d553ddb51361e7ba59da8f

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

Rename project_head partial to settings_nav

Showing 15 changed files with 36 additions and 34 deletions   Show diff stats
app/views/deploy_keys/index.html.haml
  Diff comments   View file @0c88449
1   -= render "repositories/head"
  1 += render "projects/settings_nav"
2 2  
3 3 %p.slead
4 4 Deploy keys allow read-only access to repository. It matches perfectly for CI, staging or production servers.
... ...
app/views/deploy_keys/new.html.haml
  Diff comments   View file @0c88449
1   -= render "repositories/head"
  1 += render "projects/settings_nav"
2 2  
3 3 %h3.page_title New Deploy key
4 4 %hr
... ...
app/views/deploy_keys/show.html.haml
  Diff comments   View file @0c88449
1   -= render "repositories/head"
  1 += render "projects/settings_nav"
  2 +
2 3 %h3.page_title
3 4 Deploy key:
4 5 = @key.title
... ...
app/views/hooks/index.html.haml
  Diff comments   View file @0c88449
1   -= render "projects/project_head"
  1 += render "projects/settings_nav"
2 2  
3 3 - if can? current_user, :admin_project, @project
4 4 .alert.alert-info
... ...
app/views/projects/_project_head.html.haml
View file @0eccc08
... ... @@ -1,21 +0,0 @@
1   -%ul.nav.nav-tabs
2   - = nav_link(path: 'projects#edit') do
3   - = link_to edit_project_path(@project), class: "stat-tab tab " do
4   - %i.icon-edit
5   - Edit
6   - = nav_link(controller: [:team_members, :teams]) do
7   - = link_to project_team_index_path(@project), class: "team-tab tab" do
8   - %i.icon-user
9   - Team
10   - = nav_link(controller: :deploy_keys) do
11   - = link_to project_deploy_keys_path(@project) do
12   - %span
13   - Deploy Keys
14   - = nav_link(controller: :hooks) do
15   - = link_to project_hooks_path(@project) do
16   - %span
17   - Hooks
18   - = nav_link(controller: :services) do
19   - = link_to project_services_path(@project) do
20   - %span
21   - Services
app/views/projects/_settings_nav.html.haml 0 → 100644
  Diff comments   View file @0c88449
... ... @@ -0,0 +1,21 @@
  1 +%ul.nav.nav-tabs
  2 + = nav_link(path: 'projects#edit') do
  3 + = link_to edit_project_path(@project), class: "stat-tab tab " do
  4 + %i.icon-edit
  5 + Edit
  6 + = nav_link(controller: [:team_members, :teams]) do
  7 + = link_to project_team_index_path(@project), class: "team-tab tab" do
  8 + %i.icon-user
  9 + Team
  10 + = nav_link(controller: :deploy_keys) do
  11 + = link_to project_deploy_keys_path(@project) do
  12 + %span
  13 + Deploy Keys
  14 + = nav_link(controller: :hooks) do
  15 + = link_to project_hooks_path(@project) do
  16 + %span
  17 + Hooks
  18 + = nav_link(controller: :services) do
  19 + = link_to project_services_path(@project) do
  20 + %span
  21 + Services
... ...
app/views/projects/edit.html.haml
  Diff comments   View file @0c88449
1   -= render "project_head"
  1 += render "projects/settings_nav"
  2 +
2 3 .project_edit_holder
3 4 %h3.page_title Edit Project
4 5 %hr
... ...
app/views/projects/empty.html.haml
  Diff comments   View file @0c88449
1   -= render "project_head"
2 1 = render 'clone_panel'
3 2  
4 3 %div.git-empty
... ...
app/views/projects/teams/available.html.haml
  Diff comments   View file @0c88449
1   -= render "projects/project_head"
  1 += render "projects/settings_nav"
2 2  
3 3 %h3.page_title
4 4 = "Assign project to team of users"
... ...
app/views/repositories/_head.html.haml
View file @0eccc08
... ... @@ -1 +0,0 @@
1   -= render "projects/project_head"
app/views/services/edit.html.haml
  Diff comments   View file @0c88449
1   -= render "projects/project_head"
  1 += render "projects/settings_nav"
  2 +
2 3 = render 'gitlab_ci'
... ...
app/views/services/index.html.haml
  Diff comments   View file @0c88449
1   -= render "projects/project_head"
  1 += render "projects/settings_nav"
  2 +
2 3 %h3.page_title Services
3 4 %br
4 5  
... ...
app/views/team_members/import.html.haml
  Diff comments   View file @0c88449
1   -= render "projects/project_head"
  1 += render "projects/settings_nav"
2 2  
3 3 %h3.page_title
4 4 = "Import team from another project"
... ...
app/views/team_members/index.html.haml
  Diff comments   View file @0c88449
1   -= render "projects/project_head"
  1 += render "projects/settings_nav"
2 2 %h3.page_title
3 3 Team Members
4 4 (#{@project.users.count})
... ...
app/views/team_members/new.html.haml
  Diff comments   View file @0c88449
1   -= render "projects/project_head"
  1 += render "projects/settings_nav"
2 2 = render "team_members/form"
... ...