---
src/app/views/catalog_entries/edit.haml | 1 +
src/app/views/catalog_entries/index.haml | 2 +-
src/app/views/catalog_entries/new.haml | 2 +-
src/app/views/catalog_entries/show.haml | 2 +-
src/app/views/catalogs/edit.haml | 1 +
src/app/views/catalogs/index.haml | 2 +-
src/app/views/catalogs/new.haml | 2 +-
src/app/views/catalogs/show.haml | 2 +-
src/app/views/hardware_profiles/edit.haml | 2 +-
src/app/views/hardware_profiles/index.haml | 2 +-
src/app/views/hardware_profiles/new.haml | 2 +-
src/app/views/hardware_profiles/show.haml | 2 +-
src/app/views/layouts/_admin_header.haml | 17 -----------------
src/app/views/layouts/_admin_nav.haml | 17 +++++++++++++++++
src/app/views/pool_families/edit.haml | 2 +-
src/app/views/pool_families/index.haml | 2 +-
src/app/views/pool_families/new.haml | 2 +-
src/app/views/pool_families/show.haml | 2 +-
src/app/views/provider_accounts/edit.haml | 2 +-
src/app/views/provider_accounts/index.haml | 2 +-
src/app/views/provider_accounts/new.haml | 2 +-
src/app/views/provider_accounts/show.haml | 4 ++--
src/app/views/providers/edit.haml | 2 +-
src/app/views/providers/index.haml | 2 +-
src/app/views/providers/new.haml | 2 +-
src/app/views/providers/show.haml | 2 +-
src/app/views/realm_mappings/new.haml | 2 +-
src/app/views/realm_mappings/show.haml | 2 +-
src/app/views/realms/edit.haml | 2 +-
src/app/views/realms/index.haml | 2 +-
src/app/views/realms/new.haml | 2 +-
src/app/views/realms/show.haml | 2 +-
src/app/views/roles/edit.haml | 3 +--
src/app/views/roles/index.haml | 2 +-
src/app/views/roles/new.haml | 2 +-
src/app/views/roles/show.haml | 2 +-
src/app/views/settings/index.haml | 2 +-
src/app/views/users/edit.haml | 2 +-
src/app/views/users/index.haml | 2 +-
src/app/views/users/new.haml | 2 +-
src/app/views/users/show.haml | 2 +-
41 files changed, 57 insertions(+), 56 deletions(-)
delete mode 100644 src/app/views/layouts/_admin_header.haml
create mode 100644 src/app/views/layouts/_admin_nav.haml
diff --git a/src/app/views/catalog_entries/edit.haml
b/src/app/views/catalog_entries/edit.haml
index f522e35..cc3dcf4 100644
--- a/src/app/views/catalog_entries/edit.haml
+++ b/src/app/views/catalog_entries/edit.haml
@@ -1,3 +1,4 @@
+= render :partial => 'layouts/admin_nav'
%header.page-header
%h1{:class => controller.controller_name}= @catalog_entry.name
#obj_actions.button-container
diff --git a/src/app/views/catalog_entries/index.haml
b/src/app/views/catalog_entries/index.haml
index 55fac46..3fae6b6 100644
--- a/src/app/views/catalog_entries/index.haml
+++ b/src/app/views/catalog_entries/index.haml
@@ -1,3 +1,3 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
= render :partial => 'section_header'
= render :partial => 'list'
diff --git a/src/app/views/catalog_entries/new.haml
b/src/app/views/catalog_entries/new.haml
index b5afb14..034ad1b 100644
--- a/src/app/views/catalog_entries/new.haml
+++ b/src/app/views/catalog_entries/new.haml
@@ -1,4 +1,4 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
= render :partial => 'section_header'
%section.content-section.provider_accounts
diff --git a/src/app/views/catalog_entries/show.haml
b/src/app/views/catalog_entries/show.haml
index 2281236..0926c47 100644
--- a/src/app/views/catalog_entries/show.haml
+++ b/src/app/views/catalog_entries/show.haml
@@ -1,4 +1,4 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
%header.page-header
%h1{:class => controller.controller_name}= @catalog_entry.name
#obj_actions.button-container
diff --git a/src/app/views/catalogs/edit.haml b/src/app/views/catalogs/edit.haml
index fc43553..e5d60a6 100644
--- a/src/app/views/catalogs/edit.haml
+++ b/src/app/views/catalogs/edit.haml
@@ -1,3 +1,4 @@
+= render :partial => 'layouts/admin_nav'
%header.page-header
%h1{:class => controller.controller_name}= @catalog.name
#obj_actions.button-container
diff --git a/src/app/views/catalogs/index.haml b/src/app/views/catalogs/index.haml
index 55fac46..3fae6b6 100644
--- a/src/app/views/catalogs/index.haml
+++ b/src/app/views/catalogs/index.haml
@@ -1,3 +1,3 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
= render :partial => 'section_header'
= render :partial => 'list'
diff --git a/src/app/views/catalogs/new.haml b/src/app/views/catalogs/new.haml
index 4d6cd23..eee2fca 100644
--- a/src/app/views/catalogs/new.haml
+++ b/src/app/views/catalogs/new.haml
@@ -1,4 +1,4 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
= render :partial => 'section_header'
%section.content-section.provider_accounts
diff --git a/src/app/views/catalogs/show.haml b/src/app/views/catalogs/show.haml
index fafd962..4fee928 100644
--- a/src/app/views/catalogs/show.haml
+++ b/src/app/views/catalogs/show.haml
@@ -1,4 +1,4 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
%header.page-header
%h1{:class => controller.controller_name}= @catalog.name
#obj_actions.button-container
diff --git a/src/app/views/hardware_profiles/edit.haml
b/src/app/views/hardware_profiles/edit.haml
index d70b918..1d638a4 100644
--- a/src/app/views/hardware_profiles/edit.haml
+++ b/src/app/views/hardware_profiles/edit.haml
@@ -1,4 +1,4 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
%header.page-header
%h1{:class => controller.controller_name}= @hardware_profile.name.titlecase
diff --git a/src/app/views/hardware_profiles/index.haml
b/src/app/views/hardware_profiles/index.haml
index 55fac46..3fae6b6 100644
--- a/src/app/views/hardware_profiles/index.haml
+++ b/src/app/views/hardware_profiles/index.haml
@@ -1,3 +1,3 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
= render :partial => 'section_header'
= render :partial => 'list'
diff --git a/src/app/views/hardware_profiles/new.haml
b/src/app/views/hardware_profiles/new.haml
index 16ec045..8ccfd63 100644
--- a/src/app/views/hardware_profiles/new.haml
+++ b/src/app/views/hardware_profiles/new.haml
@@ -1,4 +1,4 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
= render :partial => 'section_header'
%section.content-section.users
diff --git a/src/app/views/hardware_profiles/show.haml
b/src/app/views/hardware_profiles/show.haml
index b9bec40..237df40 100644
--- a/src/app/views/hardware_profiles/show.haml
+++ b/src/app/views/hardware_profiles/show.haml
@@ -1,4 +1,4 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
%header.page-header
%h1{:class => controller.controller_name}= @hardware_profile.name + " (" +
(@hardware_profile.provider_id.nil? ? "Front End" : "Provider" ) +
")"
#obj_actions.button-container
diff --git a/src/app/views/layouts/_admin_header.haml
b/src/app/views/layouts/_admin_header.haml
deleted file mode 100644
index 262182f..0000000
--- a/src/app/views/layouts/_admin_header.haml
+++ /dev/null
@@ -1,17 +0,0 @@
-%nav#administer_nav
- %ul
- %li
- - link_to users_path do
- %div.users Users & Groups
- %li
- - link_to users_path do
- %div.environments Environments
- %li
- - link_to users_path, :class => "selected" do
- %div.content Content
- %li
- - link_to providers_path do
- %div.providers Cloud Providers
- .clear
-#admin_page_header
- this is admin_page_header
diff --git a/src/app/views/layouts/_admin_nav.haml
b/src/app/views/layouts/_admin_nav.haml
new file mode 100644
index 0000000..f3b42a6
--- /dev/null
+++ b/src/app/views/layouts/_admin_nav.haml
@@ -0,0 +1,17 @@
+%nav#administer_nav
+ %ul
+ %li
+ - link_to users_path do
+ %div.users Users & Groups
+ %li
+ - link_to users_path do
+ %div.environments Environments
+ %li
+ - link_to users_path, :class => "selected" do
+ %div.content Content
+ %li
+ - link_to providers_path do
+ %div.providers Cloud Providers
+ .clear
+#admin_page_header
+ this is admin_page_header, this div is going to go away from this partial
diff --git a/src/app/views/pool_families/edit.haml
b/src/app/views/pool_families/edit.haml
index 73c35b3..7b8046a 100644
--- a/src/app/views/pool_families/edit.haml
+++ b/src/app/views/pool_families/edit.haml
@@ -1,4 +1,4 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
%header.page-header
%h1{:class => controller.controller_name}= @pool_family.name
diff --git a/src/app/views/pool_families/index.haml
b/src/app/views/pool_families/index.haml
index 55fac46..3fae6b6 100644
--- a/src/app/views/pool_families/index.haml
+++ b/src/app/views/pool_families/index.haml
@@ -1,3 +1,3 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
= render :partial => 'section_header'
= render :partial => 'list'
diff --git a/src/app/views/pool_families/new.haml b/src/app/views/pool_families/new.haml
index c8b27be..c328592 100644
--- a/src/app/views/pool_families/new.haml
+++ b/src/app/views/pool_families/new.haml
@@ -1,4 +1,4 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
= render :partial => 'section_header'
%section.content-section.pool_family
diff --git a/src/app/views/pool_families/show.haml
b/src/app/views/pool_families/show.haml
index 3e08d45..bdc9936 100644
--- a/src/app/views/pool_families/show.haml
+++ b/src/app/views/pool_families/show.haml
@@ -1,4 +1,4 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
%header.page-header
%h1{:class => controller.controller_name}= @pool_family.name
#obj_actions.button-container
diff --git a/src/app/views/provider_accounts/edit.haml
b/src/app/views/provider_accounts/edit.haml
index 370a255..2abd583 100644
--- a/src/app/views/provider_accounts/edit.haml
+++ b/src/app/views/provider_accounts/edit.haml
@@ -1,4 +1,4 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
%header.page-header
%h1{:class => controller.controller_name}= @provider_account.name
#obj_actions.button-container
diff --git a/src/app/views/provider_accounts/index.haml
b/src/app/views/provider_accounts/index.haml
index 55fac46..3fae6b6 100644
--- a/src/app/views/provider_accounts/index.haml
+++ b/src/app/views/provider_accounts/index.haml
@@ -1,3 +1,3 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
= render :partial => 'section_header'
= render :partial => 'list'
diff --git a/src/app/views/provider_accounts/new.haml
b/src/app/views/provider_accounts/new.haml
index a5c86ea..5af7126 100644
--- a/src/app/views/provider_accounts/new.haml
+++ b/src/app/views/provider_accounts/new.haml
@@ -1,4 +1,4 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
= render :partial => 'section_header'
%section.content-section.provider_accounts
diff --git a/src/app/views/provider_accounts/show.haml
b/src/app/views/provider_accounts/show.haml
index c9f05dd..0751c45 100644
--- a/src/app/views/provider_accounts/show.haml
+++ b/src/app/views/provider_accounts/show.haml
@@ -1,4 +1,4 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
%header.page-header
%h1{:class => controller.controller_name}= @account.name
#obj_actions.button-container
@@ -14,4 +14,4 @@
.content
%div#view
- = render :partial => 'properties'
\ No newline at end of file
+ = render :partial => 'properties'
diff --git a/src/app/views/providers/edit.haml b/src/app/views/providers/edit.haml
index 2cef1e2..4ae0c62 100644
--- a/src/app/views/providers/edit.haml
+++ b/src/app/views/providers/edit.haml
@@ -1,4 +1,4 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
%header.page-header
%h1{:class => controller.controller_name}= @provider.name
diff --git a/src/app/views/providers/index.haml b/src/app/views/providers/index.haml
index 55fac46..3fae6b6 100644
--- a/src/app/views/providers/index.haml
+++ b/src/app/views/providers/index.haml
@@ -1,3 +1,3 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
= render :partial => 'section_header'
= render :partial => 'list'
diff --git a/src/app/views/providers/new.haml b/src/app/views/providers/new.haml
index 880513b..3862f40 100644
--- a/src/app/views/providers/new.haml
+++ b/src/app/views/providers/new.haml
@@ -1,4 +1,4 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
= render :partial => 'section_header'
%section.content-section.users
diff --git a/src/app/views/providers/show.haml b/src/app/views/providers/show.haml
index 4ebd795..10ba248 100644
--- a/src/app/views/providers/show.haml
+++ b/src/app/views/providers/show.haml
@@ -1,4 +1,4 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
%header.page-header
%h1{:class => controller.controller_name}= @provider.name
#obj_actions.button-container
diff --git a/src/app/views/realm_mappings/new.haml
b/src/app/views/realm_mappings/new.haml
index 9e2772b..a831230 100644
--- a/src/app/views/realm_mappings/new.haml
+++ b/src/app/views/realm_mappings/new.haml
@@ -1,4 +1,4 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
%div#view
= error_messages_for @realm_target
diff --git a/src/app/views/realm_mappings/show.haml
b/src/app/views/realm_mappings/show.haml
index 6fd58e3..9956efb 100644
--- a/src/app/views/realm_mappings/show.haml
+++ b/src/app/views/realm_mappings/show.haml
@@ -1 +1 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
diff --git a/src/app/views/realms/edit.haml b/src/app/views/realms/edit.haml
index 3b03a2c..064164c 100644
--- a/src/app/views/realms/edit.haml
+++ b/src/app/views/realms/edit.haml
@@ -1,4 +1,4 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
%header.page-header
%h1{:class => controller.controller_name}= @realm.name
diff --git a/src/app/views/realms/index.haml b/src/app/views/realms/index.haml
index 55fac46..3fae6b6 100644
--- a/src/app/views/realms/index.haml
+++ b/src/app/views/realms/index.haml
@@ -1,3 +1,3 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
= render :partial => 'section_header'
= render :partial => 'list'
diff --git a/src/app/views/realms/new.haml b/src/app/views/realms/new.haml
index 5462f1b..0a7a394 100644
--- a/src/app/views/realms/new.haml
+++ b/src/app/views/realms/new.haml
@@ -1,4 +1,4 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
= render :partial => 'section_header'
%section.content-section.users
diff --git a/src/app/views/realms/show.haml b/src/app/views/realms/show.haml
index 2368ee0..c70cb5f 100644
--- a/src/app/views/realms/show.haml
+++ b/src/app/views/realms/show.haml
@@ -1,4 +1,4 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
%header.page-header
%h1{:class => controller.controller_name}= @realm.name
#obj_actions.button-container
diff --git a/src/app/views/roles/edit.haml b/src/app/views/roles/edit.haml
index f66e49c..d685769 100644
--- a/src/app/views/roles/edit.haml
+++ b/src/app/views/roles/edit.haml
@@ -1,5 +1,4 @@
-= render :partial => 'layouts/admin_header'
-
+= render :partial => 'layouts/admin_nav'
%header.page-header
%h1{:class => controller.controller_name}= @role.name.titlecase
#obj_actions.button-container
diff --git a/src/app/views/roles/index.haml b/src/app/views/roles/index.haml
index 55fac46..3fae6b6 100644
--- a/src/app/views/roles/index.haml
+++ b/src/app/views/roles/index.haml
@@ -1,3 +1,3 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
= render :partial => 'section_header'
= render :partial => 'list'
diff --git a/src/app/views/roles/new.haml b/src/app/views/roles/new.haml
index e0ac48e..4d55105 100644
--- a/src/app/views/roles/new.haml
+++ b/src/app/views/roles/new.haml
@@ -1,4 +1,4 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
= render :partial => 'section_header'
%section.content-section.users
%header
diff --git a/src/app/views/roles/show.haml b/src/app/views/roles/show.haml
index a7804e3..d54cf2e 100644
--- a/src/app/views/roles/show.haml
+++ b/src/app/views/roles/show.haml
@@ -1,4 +1,4 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
%header.page-header
%h1{:class => controller.controller_name}= @role.name
#obj_actions.button-container
diff --git a/src/app/views/settings/index.haml b/src/app/views/settings/index.haml
index fa0be6f..0ddd839 100644
--- a/src/app/views/settings/index.haml
+++ b/src/app/views/settings/index.haml
@@ -1,4 +1,4 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
= render :partial => 'section_header'
%section.content-section.settings
diff --git a/src/app/views/users/edit.haml b/src/app/views/users/edit.haml
index e4d6686..ee0a0a1 100644
--- a/src/app/views/users/edit.haml
+++ b/src/app/views/users/edit.haml
@@ -1,4 +1,4 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
%header.page-header
%h1{:class => controller.controller_name}= @user.name
diff --git a/src/app/views/users/index.haml b/src/app/views/users/index.haml
index 55fac46..3fae6b6 100644
--- a/src/app/views/users/index.haml
+++ b/src/app/views/users/index.haml
@@ -1,3 +1,3 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
= render :partial => 'section_header'
= render :partial => 'list'
diff --git a/src/app/views/users/new.haml b/src/app/views/users/new.haml
index 326958c..ca26ce1 100644
--- a/src/app/views/users/new.haml
+++ b/src/app/views/users/new.haml
@@ -1,4 +1,4 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
= render :partial => 'section_header'
%section.content-section.users
diff --git a/src/app/views/users/show.haml b/src/app/views/users/show.haml
index 1632a6d..381d737 100644
--- a/src/app/views/users/show.haml
+++ b/src/app/views/users/show.haml
@@ -1,4 +1,4 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
%header.page-header
%h1{:class => controller.controller_name}= @user.name
#obj_actions.button-container
--
1.7.6