From 0c884498d2efa02432d553ddb51361e7ba59da8f Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 18 Mar 2013 19:35:27 +0200 Subject: [PATCH] Rename project_head partial to settings_nav --- app/views/deploy_keys/index.html.haml | 2 +- app/views/deploy_keys/new.html.haml | 2 +- app/views/deploy_keys/show.html.haml | 3 ++- app/views/hooks/index.html.haml | 2 +- .../{_project_head.html.haml => _settings_nav.html.haml} | 0 app/views/projects/edit.html.haml | 3 ++- app/views/projects/empty.html.haml | 1 - app/views/projects/teams/available.html.haml | 2 +- app/views/repositories/_head.html.haml | 1 - app/views/services/edit.html.haml | 3 ++- app/views/services/index.html.haml | 3 ++- app/views/team_members/import.html.haml | 2 +- app/views/team_members/index.html.haml | 2 +- app/views/team_members/new.html.haml | 2 +- 14 files changed, 15 insertions(+), 13 deletions(-) rename app/views/projects/{_project_head.html.haml => _settings_nav.html.haml} (100%) delete mode 100644 app/views/repositories/_head.html.haml diff --git a/app/views/deploy_keys/index.html.haml b/app/views/deploy_keys/index.html.haml index db167f4e..80d30e1c 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 e973cb7d..0bbea1eb 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 227afecb..0a9f376d 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 808a3481..3155dd32 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/_settings_nav.html.haml similarity index 100% rename from app/views/projects/_project_head.html.haml rename to app/views/projects/_settings_nav.html.haml diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index fdd537da..394522bf 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 07132e67..b1795b30 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 da782363..29fe8ed2 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 bc96f306..00000000 --- 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 d893847f..0c63a7ed 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 27dbf502..eb2f8d0c 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 d6c81bef..0f7175b9 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 6958ec4c..50d44bcd 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 40eb4ceb..7e20f50d 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"