From: Tomas Sedovic <tsedovic(a)redhat.com>
---
src/app/controllers/pool_families_controller.rb | 7 ++++++-
src/app/views/pool_families/_form.haml | 12 ++++++------
src/app/views/pool_families/_list.haml | 2 +-
.../views/pool_families/_provider_accounts.haml | 2 +-
src/app/views/pool_families/index.haml | 3 ++-
src/app/views/pool_families/show.haml | 8 ++++----
src/app/views/realms/_list.haml | 2 +-
src/app/views/realms/_mapping.haml | 2 +-
8 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/src/app/controllers/pool_families_controller.rb
b/src/app/controllers/pool_families_controller.rb
index d38a04d..ad88b7b 100644
--- a/src/app/controllers/pool_families_controller.rb
+++ b/src/app/controllers/pool_families_controller.rb
@@ -3,6 +3,11 @@ class PoolFamiliesController < ApplicationController
before_filter :set_params_and_header, :only => [:index, :show]
before_filter :load_pool_families, :only =>[:show]
before_filter :load_tab_captions_and_details_tab, :only => [:show]
+ layout 'application'
+
+ def top_section
+ :administer
+ end
def index
@search_term = params[:q]
@@ -60,7 +65,7 @@ class PoolFamiliesController < ApplicationController
end
render :partial => @details_tab and return
end
- format.html { render :show }
+ format.html
end
end
diff --git a/src/app/views/pool_families/_form.haml
b/src/app/views/pool_families/_form.haml
index e493931..794d6a1 100644
--- a/src/app/views/pool_families/_form.haml
+++ b/src/app/views/pool_families/_form.haml
@@ -1,12 +1,12 @@
= error_messages_for :pool_family
= form.error_message_on :name, 'Name '
-%fieldset.clear
- = form.label :name,'Pool Family Name :'
- = form.text_field :name, :title => 'pool_family_name', :value =>
@pool_family.name, :class => "clear grid_4 alpha"
-%fieldset.clear
+%fieldset
+ = form.label :name,'Pool Family Name:'
+ = form.text_field :name, :title => 'pool_family_name', :value =>
@pool_family.name
+%fieldset
- form.fields_for :quota do |quota_form|
- %fieldset.clear
+ %fieldset
= quota_form.label :maximum_running_instances, t(:maximum_running_instances),
:class => "alpha grid_3"
= quota_form.text_field :maximum_running_instances
-%fieldset.clear
+%fieldset
= form.submit "Save", :class => "submit formbutton"
diff --git a/src/app/views/pool_families/_list.haml
b/src/app/views/pool_families/_list.haml
index 596dc2e..1133073 100644
--- a/src/app/views/pool_families/_list.haml
+++ b/src/app/views/pool_families/_list.haml
@@ -1,6 +1,6 @@
- form_tag do
= link_to "Create", new_pool_family_path, :class => "button"
- = restful_submit_tag "Delete", 'destroy',
multi_destroy_pool_families_path, 'DELETE', :id => 'delete_button'
+ = restful_submit_tag "Delete", 'destroy',
multi_destroy_pool_families_path, 'DELETE', :id => 'delete_button',
:class => 'button'
%p
Select:
diff --git a/src/app/views/pool_families/_provider_accounts.haml
b/src/app/views/pool_families/_provider_accounts.haml
index 4d22b9c..af87341 100644
--- a/src/app/views/pool_families/_provider_accounts.haml
+++ b/src/app/views/pool_families/_provider_accounts.haml
@@ -4,7 +4,7 @@
- unless @pool_family.provider_accounts.blank?
- form_tag do
- = restful_submit_tag "Remove selected", 'destroy',
multi_destroy_provider_accounts_pool_families_path(:pool_family_id => @pool_family.id),
'DELETE', :id => 'delete_button'
+ = restful_submit_tag "Remove selected", 'destroy',
multi_destroy_provider_accounts_pool_families_path(:pool_family_id => @pool_family.id),
'DELETE', :id => 'delete_button', :class => 'button'
= #submit_tag "Remove selected"
%table#provider_accounts_table
diff --git a/src/app/views/pool_families/index.haml
b/src/app/views/pool_families/index.haml
index 62ccbc6..acfa09b 100644
--- a/src/app/views/pool_families/index.haml
+++ b/src/app/views/pool_families/index.haml
@@ -1,2 +1,3 @@
-- content_for :list do
+= render :partial => 'layouts/admin_header'
+%div#view
= render :partial => 'list'
diff --git a/src/app/views/pool_families/show.haml
b/src/app/views/pool_families/show.haml
index 0c36221..7791b5f 100644
--- a/src/app/views/pool_families/show.haml
+++ b/src/app/views/pool_families/show.haml
@@ -1,5 +1,5 @@
-- content_for 'list' do
- = render :partial => 'list'
+= render :partial => 'layouts/admin_header'
+%div#view
-- content_for 'details' do
- = render :partial => 'layouts/details_pane'
+= render :partial => 'properties'
+= render :partial => 'provider_accounts'
diff --git a/src/app/views/realms/_list.haml b/src/app/views/realms/_list.haml
index d9b9c2c..2803e6a 100644
--- a/src/app/views/realms/_list.haml
+++ b/src/app/views/realms/_list.haml
@@ -1,6 +1,6 @@
- form_tag do
= link_to "Create", new_realm_path, :class => "button"
- = restful_submit_tag "Delete", 'destroy', multi_destroy_realms_path,
'DELETE', :id => 'delete_button'
+ = restful_submit_tag "Delete", 'destroy', multi_destroy_realms_path,
'DELETE', :id => 'delete_button', :class => 'button'
%p
Select:
diff --git a/src/app/views/realms/_mapping.haml b/src/app/views/realms/_mapping.haml
index e20cff9..dea5cda 100644
--- a/src/app/views/realms/_mapping.haml
+++ b/src/app/views/realms/_mapping.haml
@@ -1,7 +1,7 @@
- form_tag do
= link_to "Add mapping to realm", new_realm_mapping_path(:frontend_realm_id
=> @realm.id, :realm_or_provider_type => 'Realm'), :class =>
"button"
= link_to "Add mapping to provider",
new_realm_mapping_path(:frontend_realm_id => @realm.id, :realm_or_provider_type =>
'Provider'), :class => "button"
- = restful_submit_tag "Delete", 'destroy',
multi_destroy_realm_mappings_path(:frontend_realm_id => @realm.id), 'DELETE',
:id => 'delete_button'
+ = restful_submit_tag "Delete", 'destroy',
multi_destroy_realm_mappings_path(:frontend_realm_id => @realm.id), 'DELETE',
:id => 'delete_button', :class => 'button'
- unless @backend_provider_targets.empty?
%h2 Realm '#{(a)realm.name}' is mapped to providers:
--
1.7.4.4