From 0c884498d2efa02432d553ddb51361e7ba59da8f Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
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 db167f4e2f2..80d30e1c2dc 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 e973cb7d305..0bbea1ebed5 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 227afecb061..0a9f376d046 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 808a348133c..3155dd32177 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 fdd537da3aa..394522bfd88 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 07132e67872..b1795b301b0 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 da7823638b9..29fe8ed25cd 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 bc96f306eee..00000000000
--- 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 d893847f1ae..0c63a7ed58c 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 27dbf502569..eb2f8d0ca1c 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 d6c81befd08..0f7175b9018 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 6958ec4cfcc..50d44bcd8d8 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 40eb4cebf08..7e20f50d964 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"
--
GitLab