--- src/app/views/catalog_entries/_list.haml | 2 +- src/app/views/catalog_entries/_section_header.haml | 3 +-- src/app/views/catalog_entries/edit.haml | 5 ++--- src/app/views/catalog_entries/new.haml | 2 +- src/app/views/catalog_entries/show.haml | 7 +++---- src/app/views/catalogs/_list.haml | 2 +- src/app/views/catalogs/_properties.haml | 2 +- src/app/views/catalogs/_section_header.haml | 3 +-- src/app/views/catalogs/edit.haml | 5 ++--- src/app/views/catalogs/new.haml | 2 +- src/app/views/catalogs/show.haml | 10 ++++------ src/config/navigation.rb | 2 +- 12 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/src/app/views/catalog_entries/_list.haml b/src/app/views/catalog_entries/_list.haml index 19f8b91..8495b77 100644 --- a/src/app/views/catalog_entries/_list.haml +++ b/src/app/views/catalog_entries/_list.haml @@ -1,4 +1,4 @@ -%section.content-section.roles +%section.admin-content-section %header %h2 Catalog Entries List %span.label.badge.dark.count= @catalog_entries.length diff --git a/src/app/views/catalog_entries/_section_header.haml b/src/app/views/catalog_entries/_section_header.haml index aab36d9..bf61888 100644 --- a/src/app/views/catalog_entries/_section_header.haml +++ b/src/app/views/catalog_entries/_section_header.haml @@ -1,5 +1,4 @@ -%header.page-header +%header.admin-page-header %h1{:class => controller.controller_name} Catalog Entries #obj_actions.button-group = link_to 'New Catalog Entry', new_catalog_entry_url, :class => 'button primary', :id => 'new_catalog_entry_button' - .corner diff --git a/src/app/views/catalog_entries/edit.haml b/src/app/views/catalog_entries/edit.haml index cc3dcf4..3f044dc 100644 --- a/src/app/views/catalog_entries/edit.haml +++ b/src/app/views/catalog_entries/edit.haml @@ -1,13 +1,12 @@ = render :partial => 'layouts/admin_nav' -%header.page-header +%header.admin-page-header %h1{:class => controller.controller_name}= @catalog_entry.name #obj_actions.button-container = link_to 'New Deployable', new_catalog_entry_url, :class => 'button primary', :id => 'new_deployable_button' .button-group = link_to 'Cancel Editing', catalog_entries_path(@user), :class => 'button pill danger', :id => 'new_deployable_button' - .corner
-%section.content-section.user +%section.admin-content-section.user %header %h2 Editing Catalog Entry
diff --git a/src/app/views/catalog_entries/new.haml b/src/app/views/catalog_entries/new.haml index 034ad1b..75959db 100644 --- a/src/app/views/catalog_entries/new.haml +++ b/src/app/views/catalog_entries/new.haml @@ -1,7 +1,7 @@ = render :partial => 'layouts/admin_nav' = render :partial => 'section_header'
-%section.content-section.provider_accounts +%section.admin-content-section %header %h2 Add New Catalog Entry
diff --git a/src/app/views/catalog_entries/show.haml b/src/app/views/catalog_entries/show.haml index 0926c47..4a5754b 100644 --- a/src/app/views/catalog_entries/show.haml +++ b/src/app/views/catalog_entries/show.haml @@ -1,14 +1,13 @@ = render :partial => 'layouts/admin_nav' -%header.page-header +%header.admin-page-header %h1{:class => controller.controller_name}= @catalog_entry.name #obj_actions.button-container = link_to 'New Catalog Entry', new_catalog_entry_url, :class => 'button primary', :id => 'new_catalog_entry_button' .button-group = link_to 'Edit', edit_catalog_entry_path(@catalog_entry), :class => 'button pill', :id => 'edit_button' - = button_to "Delete", catalog_entry_path(@catalog_entry), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button pill danger', :id => 'delete_button' - .corner + = link_to "Delete", catalog_entry_path(@catalog_entry), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button pill danger', :id => 'delete_button'
-%section.content-section.user +%section.admin-content-section.user %header %h2 Properties
diff --git a/src/app/views/catalogs/_list.haml b/src/app/views/catalogs/_list.haml index 885d9e7..3e1a6cf 100644 --- a/src/app/views/catalogs/_list.haml +++ b/src/app/views/catalogs/_list.haml @@ -1,4 +1,4 @@ -%section.content-section.catalogs +%section.admin-content-section.catalogs %header %h2 Catalogs List %span.label.badge.dark.count= @catalogs.length diff --git a/src/app/views/catalogs/_properties.haml b/src/app/views/catalogs/_properties.haml index 698e793..52d9714 100644 --- a/src/app/views/catalogs/_properties.haml +++ b/src/app/views/catalogs/_properties.haml @@ -11,7 +11,7 @@ %td = @catalog.pool.name
-%section.content-section.catalog_entries +%section.admin-content-section.catalog_entries %header %h2 Catalog Entries %span.label.badge.dark.count= @catalog.catalog_entries.length diff --git a/src/app/views/catalogs/_section_header.haml b/src/app/views/catalogs/_section_header.haml index c7d31cc..a102e6e 100644 --- a/src/app/views/catalogs/_section_header.haml +++ b/src/app/views/catalogs/_section_header.haml @@ -1,5 +1,4 @@ -%header.page-header +%header.admin-page-header %h1{:class => controller.controller_name} Catalogs #obj_actions.button-group = link_to 'New Catalog', new_catalog_url, :class => 'button primary', :id => 'new_catalog_button' - .corner diff --git a/src/app/views/catalogs/edit.haml b/src/app/views/catalogs/edit.haml index e5d60a6..1d85348 100644 --- a/src/app/views/catalogs/edit.haml +++ b/src/app/views/catalogs/edit.haml @@ -1,13 +1,12 @@ = render :partial => 'layouts/admin_nav' -%header.page-header +%header.admin-page-header %h1{:class => controller.controller_name}= @catalog.name #obj_actions.button-container = link_to 'New Catalog', new_catalog_url, :class => 'button primary', :id => 'new_catalog_button' .button-group = link_to 'Cancel Editing', catalogs_path, :class => 'button pill danger', :id => 'cancel_catalog_button' - .corner
-%section.content-section.user +%section.admin-content-section.user %header %h2 Editing Catalog
diff --git a/src/app/views/catalogs/new.haml b/src/app/views/catalogs/new.haml index eee2fca..be583cf 100644 --- a/src/app/views/catalogs/new.haml +++ b/src/app/views/catalogs/new.haml @@ -1,7 +1,7 @@ = render :partial => 'layouts/admin_nav' = render :partial => 'section_header'
-%section.content-section.provider_accounts +%section.admin-content-section.provider_accounts %header %h2 Add New Catalog
diff --git a/src/app/views/catalogs/show.haml b/src/app/views/catalogs/show.haml index 4fee928..a7c3e05 100644 --- a/src/app/views/catalogs/show.haml +++ b/src/app/views/catalogs/show.haml @@ -1,17 +1,15 @@ = render :partial => 'layouts/admin_nav' -%header.page-header +%header.admin-page-header %h1{:class => controller.controller_name}= @catalog.name #obj_actions.button-container = link_to 'New Catalog', new_catalog_url, :class => 'button primary', :id => 'new_catalog_entry_button' .button-group = link_to 'Edit', edit_catalog_path(@catalog), :class => 'button pill', :id => 'edit_button' - = button_to "Delete", catalog_path(@catalog), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button pill danger', :id => 'delete_button' - .corner + = link_to "Delete", catalog_path(@catalog), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button pill danger', :id => 'delete_button'
-%section.content-section.user +%section.admin-content-section.user %header %h2 Properties
.content - %div#view - = render :partial => 'properties' + = render :partial => 'properties' diff --git a/src/config/navigation.rb b/src/config/navigation.rb index aa896cf..e0967a2 100644 --- a/src/config/navigation.rb +++ b/src/config/navigation.rb @@ -24,7 +24,7 @@ SimpleNavigation::Configuration.run do |navigation| first_level.item :administer, t(:administer), users_path, :class => 'administer' do |second_level| second_level.item :users_and_groups, "Users & Groups", users_path, :link => { :class => 'users' }, :highlights_on => //users/ second_level.item :environments, "Environments", settings_path, :link => { :class => 'environments' }, :highlights_on => //settings/ - second_level.item :content, "Content", settings_path, :link => { :class => 'content' }, :highlights_on => //settings/ + second_level.item :content, "Content", catalogs_path, :link => { :class => 'content' }, :highlights_on => //catalogs|/catalog_entries/ second_level.item :cloud_providers, "Cloud Providers", providers_path, :link => { :class => 'providers' }, :highlights_on => //providers/ end end