On 08/04/2011 12:18 PM, jtomasek(a)redhat.com wrote:
From: Jiri Tomasek<jtomasek(a)redhat.com>
---
src/app/helpers/application_helper.rb | 1 -
src/app/views/hardware_profiles/_list.haml | 7 +++----
src/app/views/instances/_list.haml | 21 +++++++++++----------
src/app/views/layouts/_filter_table.haml | 4 ++--
src/app/views/pool_families/_list.haml | 7 +++----
src/app/views/pools/_list.haml | 13 +++++++------
src/app/views/provider_accounts/_list.haml | 7 +++----
src/app/views/providers/_list.haml | 7 +++----
src/app/views/realms/_list.haml | 7 +++----
src/app/views/roles/_list.haml | 7 +++----
src/app/views/suggested_deployables/_list.haml | 7 +++----
src/app/views/users/_list.haml | 7 +++----
12 files changed, 44 insertions(+), 51 deletions(-)
diff --git a/src/app/helpers/application_helper.rb
b/src/app/helpers/application_helper.rb
index c6b3f73..5db0f25 100644
--- a/src/app/helpers/application_helper.rb
+++ b/src/app/helpers/application_helper.rb
@@ -120,7 +120,6 @@ module ApplicationHelper
select_togle_opts = options[:show_select_toggle]
render :partial => 'layouts/filter_table', :locals => {
# TODO - Right now saved_searches are not functional; this will need to be
expanded
- :form_header => options[:form_header] ? options[:form_header] : '',
:saved_searches => ["<option>All
#{_class.name.pluralize}</option>"],
:object_count => rows.count,
# TODO - We need to support searches and filters below
diff --git a/src/app/views/hardware_profiles/_list.haml
b/src/app/views/hardware_profiles/_list.haml
index 31497d9..5ac2751 100644
--- a/src/app/views/hardware_profiles/_list.haml
+++ b/src/app/views/hardware_profiles/_list.haml
@@ -4,11 +4,10 @@
%span.label.badge.dark.count= @hardware_profiles.length
.content
- - form_header = capture_haml do
- = restful_submit_tag "Delete", "destroy",
multi_destroy_hardware_profiles_path, 'DELETE',
- :id => 'delete_button', :class => 'button danger'
+ - content_for :form_header do
+ %li= restful_submit_tag "Delete", "destroy",
multi_destroy_hardware_profiles_path, 'DELETE', :id =>
'delete_button', :class => 'button danger'
- = filter_table(@header, @hardware_profiles, :form_header => form_header) do
|hwp|
+ = filter_table(@header, @hardware_profiles) do |hwp|
%tr{:class => cycle('nostripe','stripe')}
%td
- selected = params[:select] == 'all'
diff --git a/src/app/views/instances/_list.haml b/src/app/views/instances/_list.haml
index 91bd300..7092b88 100644
--- a/src/app/views/instances/_list.haml
+++ b/src/app/views/instances/_list.haml
@@ -1,15 +1,16 @@
-- form_header = capture_haml do
- = restful_submit_tag 'Stop Selected Instances', 'stop',
multi_stop_instances_path, 'GET', :class => 'button', :id =>
'stop_selected_instances'
+- content_for :form_header do
+ %li= restful_submit_tag 'Stop Selected Instances', 'stop',
multi_stop_instances_path, 'GET', :class => 'button', :id =>
'stop_selected_instances'
= hidden_field_tag 'backlink', request.url
- - if @hide_stopped
- %b Stopped
- instances are hidden:
- = link_to "show all", params.merge('hide_stopped' =>
'false'), :id => 'show_all_instances'
- - else
- Showing all instances:
- = link_to "hide stopped", params.merge('hide_stopped' =>
'true')
+ %li
+ - if @hide_stopped
+ %b Stopped
+ instances are hidden:
+ = link_to "show all", params.merge('hide_stopped' =>
'false'), :id => 'show_all_instances'
+ - else
+ Showing all instances:
+ = link_to "hide stopped", params.merge('hide_stopped' =>
'true')
-= filter_table([{:name =>''}, {:name => ''}, {:name =>
'Name'}, {:name => 'Public Address'}, {:name => 'State'},
{:name => 'Provider'}, {:name => 'Owner'}], @instances,
:form_header => form_header) do |instance|
+= filter_table([{:name =>''}, {:name => ''}, {:name =>
'Name'}, {:name => 'Public Address'}, {:name => 'State'},
{:name => 'Provider'}, {:name => 'Owner'}], @instances) do
|instance|
%tr{ :class => cycle('nostripe', 'stripe') }
%td
- selected = params[:select] == 'all'
diff --git a/src/app/views/layouts/_filter_table.haml
b/src/app/views/layouts/_filter_table.haml
index 6b1a413..51a5047 100644
--- a/src/app/views/layouts/_filter_table.haml
+++ b/src/app/views/layouts/_filter_table.haml
@@ -1,8 +1,8 @@
- form_tag({}, :class => 'filterable-data') do
- -if form_header
+ - if content_for? :form_header
%ul.obj_actions
- %li= form_header
+ = yield :form_header
%div.controls
%ul.filter-controls
diff --git a/src/app/views/pool_families/_list.haml
b/src/app/views/pool_families/_list.haml
index b7112d5..d1dbbde 100644
--- a/src/app/views/pool_families/_list.haml
+++ b/src/app/views/pool_families/_list.haml
@@ -4,11 +4,10 @@
%span.label.badge.dark.count= @pool_families.length
.content
- - form_header = capture_haml do
- = restful_submit_tag "Delete", "destroy",
multi_destroy_pool_families_path, 'DELETE',
- :id => 'delete_button', :class => 'button danger'
+ - content_for :form_header do
+ %li= restful_submit_tag "Delete", "destroy",
multi_destroy_pool_families_path, 'DELETE', :id => 'delete_button',
:class => 'button danger'
- = filter_table(@header, @pool_families, :form_header => form_header) do
|pool_family|
+ = filter_table(@header, @pool_families) do |pool_family|
%tr{:class => cycle('nostripe','stripe')}
%td
- selected = params[:select] == 'all'
diff --git a/src/app/views/pools/_list.haml b/src/app/views/pools/_list.haml
index 691296a..fe5ef20 100644
--- a/src/app/views/pools/_list.haml
+++ b/src/app/views/pools/_list.haml
@@ -1,9 +1,10 @@
-- form_header = capture_haml do
- = link_to "New Pool", new_pool_path, { :class => 'button', :id
=> 'new_pool_button' }
- = restful_submit_tag "Destroy", "destroy",
multi_destroy_pools_path, 'DELETE', :id => 'delete_button', :class
=> 'button danger'
- = label_tag "More actions"
- = select_tag("more_actions",nil, :disabled => true)
-= filter_table(@header, @pools, :form_header => form_header) do |pool|
+- content_for :form_header do
+ %li= link_to "New Pool", new_pool_path, { :class => 'button',
:id => 'new_pool_button' }
+ %li= restful_submit_tag "Destroy", "destroy",
multi_destroy_pools_path, 'DELETE', :id => 'delete_button', :class
=> 'button danger'
+ %li
+ = label_tag "More actions"
+ = select_tag("more_actions",nil, :disabled => true)
+= filter_table(@header, @pools) do |pool|
%tr{:class => cycle('nostripe','stripe')}
%td
%input{:name => "pools_selected[]", :type =>
"checkbox", :value => pool.id, :id =>
"pool_checkbox_#{pool.id}" }
diff --git a/src/app/views/provider_accounts/_list.haml
b/src/app/views/provider_accounts/_list.haml
index 0b9bf92..4f44195 100644
--- a/src/app/views/provider_accounts/_list.haml
+++ b/src/app/views/provider_accounts/_list.haml
@@ -4,11 +4,10 @@
%span.label.badge.dark.count= @accounts.length
.content
- - form_header = capture_haml do
- = restful_submit_tag "Delete", "destroy",
multi_destroy_provider_accounts_path, 'DELETE',
- :id => 'delete_button', :class => 'button danger'
+ - content_for :form_header do
+ %li= restful_submit_tag "Delete", "destroy",
multi_destroy_suggested_deployables_path, 'DELETE', :id =>
'delete_button', :class => 'button danger'
- = filter_table(@header, @accounts, :form_header => form_header) do |account|
+ = filter_table(@header, @accounts) do |account|
%tr{:class => cycle('nostripe','stripe')}
%td
- selected = params[:select] == 'all'
diff --git a/src/app/views/providers/_list.haml b/src/app/views/providers/_list.haml
index 7b4b528..14da47a 100644
--- a/src/app/views/providers/_list.haml
+++ b/src/app/views/providers/_list.haml
@@ -4,11 +4,10 @@
%span.label.badge.dark.count= @providers.length
.content
- - form_header = capture_haml do
- = restful_submit_tag "Delete", "destroy",
multi_destroy_providers_path, 'DELETE',
- :id => 'delete_button', :class => 'button danger'
+ - content_for :form_header do
+ %li= restful_submit_tag "Delete", "destroy",
multi_destroy_providers_path, 'DELETE', :id => 'delete_button', :class
=> 'button danger'
- = filter_table(@header, @providers, :form_header => form_header) do |provider|
+ = filter_table(@header, @providers) do |provider|
%tr{:class => cycle('nostripe', 'stripe')}
%td
- selected = params[:select] == 'all'
diff --git a/src/app/views/realms/_list.haml b/src/app/views/realms/_list.haml
index 67d8c33..314018a 100644
--- a/src/app/views/realms/_list.haml
+++ b/src/app/views/realms/_list.haml
@@ -4,11 +4,10 @@
%span.label.badge.dark.count= @realms.length
.content
- - form_header = capture_haml do
- = restful_submit_tag "Delete", "destroy",
multi_destroy_realms_path, 'DELETE',
- :id => 'delete_button', :class => 'button danger'
+ - content_for :form_header do
+ %li= restful_submit_tag "Delete", "destroy",
multi_destroy_realms_path, 'DELETE', :id => 'delete_button', :class
=> 'button danger'
- = filter_table(@header, @realms, :form_header => form_header) do |realm|
+ = filter_table(@header, @realms) do |realm|
%tr{:class => cycle('nostripe','stripe')}
%td
- selected = params[:select] == 'all'
diff --git a/src/app/views/roles/_list.haml b/src/app/views/roles/_list.haml
index 50abace..0503717 100644
--- a/src/app/views/roles/_list.haml
+++ b/src/app/views/roles/_list.haml
@@ -4,11 +4,10 @@
%span.label.badge.dark.count= @roles.length
.content
- - form_header = capture_haml do
- = restful_submit_tag "Delete", "destroy",
multi_destroy_roles_path, 'DELETE',
- :id => 'delete_button', :class => 'button danger'
+ - content_for :form_header do
+ %li= restful_submit_tag "Delete", "destroy",
multi_destroy_roles_path, 'DELETE', :id => 'delete_button', :class
=> 'button danger'
- = filter_table(@header, @roles, :form_header => form_header) do |role|
+ = filter_table(@header, @roles) do |role|
%tr{:class => cycle('nostripe','stripe')}
%td
- selected = params[:select] == 'all'
diff --git a/src/app/views/suggested_deployables/_list.haml
b/src/app/views/suggested_deployables/_list.haml
index 5daf56a..131ed4f 100644
--- a/src/app/views/suggested_deployables/_list.haml
+++ b/src/app/views/suggested_deployables/_list.haml
@@ -4,11 +4,10 @@
%span.label.badge.dark.count= @suggested_deployables.length
.content
- - form_header = capture_haml do
- = restful_submit_tag "Delete", "destroy",
multi_destroy_suggested_deployables_path, 'DELETE',
- :id => 'delete_button', :class => 'button danger'
+ - content_for :form_header do
+ %li= restful_submit_tag "Delete", "destroy",
multi_destroy_suggested_deployables_path, 'DELETE', :id =>
'delete_button', :class => 'button danger'
- = filter_table(@header, @suggested_deployables, :form_header => form_header) do
|suggested_deployable|
+ = filter_table(@header, @suggested_deployables) do |suggested_deployable|
%tr{:class => cycle('nostripe','stripe')}
%td
- selected = params[:select] == 'all'
diff --git a/src/app/views/users/_list.haml b/src/app/views/users/_list.haml
index c7217bc..0e12645 100644
--- a/src/app/views/users/_list.haml
+++ b/src/app/views/users/_list.haml
@@ -4,11 +4,10 @@
%span.label.badge.dark.count= @users.length
.content
- - form_header = capture_haml do
- = restful_submit_tag "Delete", "destroy",
multi_destroy_users_path, 'DELETE',
- :id => 'delete_button', :class => 'button danger'
+ - content_for :form_header do
+ %li= restful_submit_tag "Delete", "destroy",
multi_destroy_users_path, 'DELETE', :id => 'delete_button', :class
=> 'button danger'
- = filter_table(@header, @users, :form_header => form_header) do |user|
+ = filter_table(@header, @users) do |user|
%tr{:class => cycle('nostripe','stripe')}
%td
- selected = params[:select] == 'all'
This works fine except one thing:
if content_for is called multiple times, data are attached to existing
content, so it's not possible to have more than 1 form with this patch,
adding optional param for passing content_for name could solve it.
Or alternatively we could investigate why capture_haml now renders
directly to response.
Jan