diff --git a/app/views/deploy_keys/index.html.haml b/app/views/deploy_keys/index.html.haml index db167f4..80d30e1 100644 --- a/app/views/deploy_keys/index.html.haml +++ b/app/views/deploy_keys/index.html.haml @@ -1,4 +1,4 @@ -= render "repositories/head" += render "projects/settings_nav" %p.slead Deploy keys allow read-only access to repository. It matches perfectly for CI, staging or production servers. diff --git a/app/views/deploy_keys/new.html.haml b/app/views/deploy_keys/new.html.haml index e973cb7..0bbea1e 100644 --- a/app/views/deploy_keys/new.html.haml +++ b/app/views/deploy_keys/new.html.haml @@ -1,4 +1,4 @@ -= render "repositories/head" += render "projects/settings_nav" %h3.page_title New Deploy key %hr diff --git a/app/views/deploy_keys/show.html.haml b/app/views/deploy_keys/show.html.haml index 227afec..0a9f376 100644 --- a/app/views/deploy_keys/show.html.haml +++ b/app/views/deploy_keys/show.html.haml @@ -1,4 +1,5 @@ -= render "repositories/head" += render "projects/settings_nav" + %h3.page_title Deploy key: = @key.title diff --git a/app/views/hooks/index.html.haml b/app/views/hooks/index.html.haml index 808a348..3155dd3 100644 --- a/app/views/hooks/index.html.haml +++ b/app/views/hooks/index.html.haml @@ -1,4 +1,4 @@ -= render "projects/project_head" += render "projects/settings_nav" - if can? current_user, :admin_project, @project .alert.alert-info diff --git a/app/views/projects/_project_head.html.haml b/app/views/projects/_project_head.html.haml deleted file mode 100644 index acaa03f..0000000 --- a/app/views/projects/_project_head.html.haml +++ /dev/null @@ -1,21 +0,0 @@ -%ul.nav.nav-tabs - = nav_link(path: 'projects#edit') do - = link_to edit_project_path(@project), class: "stat-tab tab " do - %i.icon-edit - Edit - = nav_link(controller: [:team_members, :teams]) do - = link_to project_team_index_path(@project), class: "team-tab tab" do - %i.icon-user - Team - = nav_link(controller: :deploy_keys) do - = link_to project_deploy_keys_path(@project) do - %span - Deploy Keys - = nav_link(controller: :hooks) do - = link_to project_hooks_path(@project) do - %span - Hooks - = nav_link(controller: :services) do - = link_to project_services_path(@project) do - %span - Services diff --git a/app/views/projects/_settings_nav.html.haml b/app/views/projects/_settings_nav.html.haml new file mode 100644 index 0000000..acaa03f --- /dev/null +++ b/app/views/projects/_settings_nav.html.haml @@ -0,0 +1,21 @@ +%ul.nav.nav-tabs + = nav_link(path: 'projects#edit') do + = link_to edit_project_path(@project), class: "stat-tab tab " do + %i.icon-edit + Edit + = nav_link(controller: [:team_members, :teams]) do + = link_to project_team_index_path(@project), class: "team-tab tab" do + %i.icon-user + Team + = nav_link(controller: :deploy_keys) do + = link_to project_deploy_keys_path(@project) do + %span + Deploy Keys + = nav_link(controller: :hooks) do + = link_to project_hooks_path(@project) do + %span + Hooks + = nav_link(controller: :services) do + = link_to project_services_path(@project) do + %span + Services diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index fdd537d..394522b 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -1,4 +1,5 @@ -= render "project_head" += render "projects/settings_nav" + .project_edit_holder %h3.page_title Edit Project %hr diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml index 07132e6..b1795b3 100644 --- a/app/views/projects/empty.html.haml +++ b/app/views/projects/empty.html.haml @@ -1,4 +1,3 @@ -= render "project_head" = render 'clone_panel' %div.git-empty diff --git a/app/views/projects/teams/available.html.haml b/app/views/projects/teams/available.html.haml index da78236..29fe8ed 100644 --- a/app/views/projects/teams/available.html.haml +++ b/app/views/projects/teams/available.html.haml @@ -1,4 +1,4 @@ -= render "projects/project_head" += render "projects/settings_nav" %h3.page_title = "Assign project to team of users" diff --git a/app/views/repositories/_head.html.haml b/app/views/repositories/_head.html.haml deleted file mode 100644 index bc96f30..0000000 --- a/app/views/repositories/_head.html.haml +++ /dev/null @@ -1 +0,0 @@ -= render "projects/project_head" diff --git a/app/views/services/edit.html.haml b/app/views/services/edit.html.haml index d893847..0c63a7e 100644 --- a/app/views/services/edit.html.haml +++ b/app/views/services/edit.html.haml @@ -1,2 +1,3 @@ -= render "projects/project_head" += render "projects/settings_nav" + = render 'gitlab_ci' diff --git a/app/views/services/index.html.haml b/app/views/services/index.html.haml index 27dbf50..eb2f8d0 100644 --- a/app/views/services/index.html.haml +++ b/app/views/services/index.html.haml @@ -1,4 +1,5 @@ -= render "projects/project_head" += render "projects/settings_nav" + %h3.page_title Services %br diff --git a/app/views/team_members/import.html.haml b/app/views/team_members/import.html.haml index d6c81be..0f7175b 100644 --- a/app/views/team_members/import.html.haml +++ b/app/views/team_members/import.html.haml @@ -1,4 +1,4 @@ -= render "projects/project_head" += render "projects/settings_nav" %h3.page_title = "Import team from another project" diff --git a/app/views/team_members/index.html.haml b/app/views/team_members/index.html.haml index 6958ec4..50d44bc 100644 --- a/app/views/team_members/index.html.haml +++ b/app/views/team_members/index.html.haml @@ -1,4 +1,4 @@ -= render "projects/project_head" += render "projects/settings_nav" %h3.page_title Team Members (#{@project.users.count}) diff --git a/app/views/team_members/new.html.haml b/app/views/team_members/new.html.haml index 40eb4ce..7e20f50 100644 --- a/app/views/team_members/new.html.haml +++ b/app/views/team_members/new.html.haml @@ -1,2 +1,2 @@ -= render "projects/project_head" += render "projects/settings_nav" = render "team_members/form" -- libgit2 0.21.2