--- src/app/views/pool_families/_form.haml | 3 +-- src/app/views/pool_families/_list.haml | 10 ++++++---- src/app/views/pool_families/edit.haml | 16 +++++++--------- src/app/views/pool_families/index.haml | 1 - src/app/views/pool_families/new.haml | 11 ++++++----- src/app/views/pool_families/show.haml | 18 ++++++------------ src/config/navigation.rb | 2 +- 7 files changed, 27 insertions(+), 34 deletions(-)
diff --git a/src/app/views/pool_families/_form.haml b/src/app/views/pool_families/_form.haml index faae226..6724f13 100644 --- a/src/app/views/pool_families/_form.haml +++ b/src/app/views/pool_families/_form.haml @@ -5,11 +5,10 @@ = form.label :name,'Pool Family Name' = form.text_field :name, :title => 'pool_family_name', :value => @pool_family.name, :class => 'em long'
-%fieldset = form.fields_for :quota do |quota_form| %p = quota_form.label :maximum_running_instances, t(:maximum_running_instances) = quota_form.text_field :maximum_running_instances
%fieldset.options - = form.submit "Save", :class => "submit button" + = form.submit "Save", :class => "submit button pill" diff --git a/src/app/views/pool_families/_list.haml b/src/app/views/pool_families/_list.haml index d1dbbde..d0b17d3 100644 --- a/src/app/views/pool_families/_list.haml +++ b/src/app/views/pool_families/_list.haml @@ -1,11 +1,13 @@ -%section.content-section.pool_families +%section.admin-content-section.pool_families %header - %h2 Pool Families - %span.label.badge.dark.count= @pool_families.length + %h2.pools Pool Families + .section-controls + #obj_actions + = link_to "New Pool Family", new_pool_family_path, :class => 'button pill'
.content - content_for :form_header do - %li= restful_submit_tag "Delete", "destroy", multi_destroy_pool_families_path, 'DELETE', :id => 'delete_button', :class => 'button danger' + %li= restful_submit_tag "Delete Selected", "destroy", multi_destroy_pool_families_path, 'DELETE', :id => 'delete_button', :class => 'button pill danger'
= filter_table(@header, @pool_families) do |pool_family| %tr{:class => cycle('nostripe','stripe')} diff --git a/src/app/views/pool_families/edit.haml b/src/app/views/pool_families/edit.haml index 7b8046a..0faa291 100644 --- a/src/app/views/pool_families/edit.haml +++ b/src/app/views/pool_families/edit.haml @@ -1,16 +1,14 @@ = render :partial => 'layouts/admin_nav'
-%header.page-header - %h1{:class => controller.controller_name}= @pool_family.name - #obj_actions.button-container - = link_to 'New Pool Family', new_pool_family_url, :class => 'button primary', :id => 'new_user_button' - %div.button-group - = link_to 'Cancel Editing', pool_family_path(@pool_family), :class => 'button pill danger', :id => 'new_user_button' - .corner +%header.admin-page-header + %h1= @pool_family.name + #obj_actions + Return to: + = link_to 'Environments', pool_families_path, :class => 'rounded-link'
-%section.content-section.pool_family +%section.admin-content-section.pool_family %header - %h2 Properties + %h2.settings Settings
.content -form_for @pool_family, :url => pool_family_path(@pool_family), :html => { :method => :put, :class => 'generic' } do |f| diff --git a/src/app/views/pool_families/index.haml b/src/app/views/pool_families/index.haml index 3fae6b6..0a79dc6 100644 --- a/src/app/views/pool_families/index.haml +++ b/src/app/views/pool_families/index.haml @@ -1,3 +1,2 @@ = 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 c328592..8535afa 100644 --- a/src/app/views/pool_families/new.haml +++ b/src/app/views/pool_families/new.haml @@ -1,10 +1,11 @@ = render :partial => 'layouts/admin_nav' -= render :partial => 'section_header' - -%section.content-section.pool_family - %header - %h2 New Pool Family +%header.admin-page-header + %h1 New Pool Family + #obj_actions + Return to: + = link_to "Environments", pool_families_path, :class => 'rounded-link'
+%section.admin-content-section.pool_family .content = form_for @pool_family, :url => pool_families_path, :html => {:class => 'generic'} do |f| = render :partial => "form", :locals => { :form => f, :cancel_path => pool_families_path } diff --git a/src/app/views/pool_families/show.haml b/src/app/views/pool_families/show.haml index bdc9936..70ad82d 100644 --- a/src/app/views/pool_families/show.haml +++ b/src/app/views/pool_families/show.haml @@ -1,18 +1,12 @@ = render :partial => 'layouts/admin_nav' -%header.page-header - %h1{:class => controller.controller_name}= @pool_family.name +%header.admin-page-header + %h1= @pool_family.name #obj_actions.button-container - = link_to 'New Pool Family', new_pool_family_url, :class => 'button primary', :id => 'new_user_button' .button-group = link_to 'Edit', edit_pool_family_path(@pool_family), :class => 'button pill' - = button_to 'Delete', pool_family_path(@pool_family), :method => :delete, :confirm => "Are you sure you want to delete?", :class => "button pill danger", :id => 'delete_pool_family_button' - .corner - -%section.content-section.pool_family - %header - %h2 Properties + = link_to 'Delete', pool_family_path(@pool_family), :method => :delete, :confirm => "Are you sure you want to delete?", :class => "button pill danger", :id => 'delete_pool_family_button'
+%section.admin-content-section.pool_family .content - %div#view - = render :partial => 'properties' - = render :partial => 'provider_accounts' + = render :partial => 'properties' + = render :partial => 'provider_accounts' diff --git a/src/config/navigation.rb b/src/config/navigation.rb index 8a72a56..b266438 100644 --- a/src/config/navigation.rb +++ b/src/config/navigation.rb @@ -23,7 +23,7 @@ SimpleNavigation::Configuration.run do |navigation| first_level.item :monitor, t(:monitor), pools_path, :class => 'monitor', :link => { :id => 'monitor' }, :highlights_on => //deployments|/pools|/instances/ 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|/roles/ - second_level.item :environments, "Environments", settings_path, :link => { :class => 'environments' }, :highlights_on => //settings|/self_service/ + second_level.item :environments, "Environments", pool_families_path, :link => { :class => 'environments' }, :highlights_on => //pool_families/ 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|/realms|/realm_mappingsi|/hardware_profiles/ end