[PATCH conductor] Fixes pool family detail, pools tab. Adds generic table instead of pool_families one

[Jirka Tomasek]

From: Jiri Tomasek <jtomasek(a)redhat.com&gt;

---
 src/app/controllers/pool_families_controller.rb |   17 ++++++++++-
 src/app/views/pool_families/_pools.html.haml    |   37 +++++++---------------
 src/app/views/pool_families/show.html.haml      |    1 +
 src/app/views/providers/edit.html.haml          |    1 +
 4 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/src/app/controllers/pool_families_controller.rb
b/src/app/controllers/pool_families_controller.rb
index e1e7e07..a03d960 100644
--- a/src/app/controllers/pool_families_controller.rb
+++ b/src/app/controllers/pool_families_controller.rb
@@ -79,7 +79,6 @@ class PoolFamiliesController < ApplicationController
     require_privilege(Privilege::VIEW, @pool_family)
     load_pool_family_tabs
 
-
     respond_to do |format|
       format.html
       format.js do
@@ -229,5 +228,21 @@ class PoolFamiliesController < ApplicationController
     details_tab_name = params[:details_tab].blank? ? 'pools' :
params[:details_tab]
     @details_tab = @tabs.find {|t| t[:id] == details_tab_name} ||
@tabs.first[:name].downcase
     @view = @details_tab[:view]
+
+    if @view == 'pools'
+      @pools_header = [
+        {:name => t("pool_families.index.pool_name"), :sortable =>
false},
+        {:name => t("pool_families.index.deployments"), :class =>
'center', :sortable => false},
+        {:name => t("pool_families.index.total_instancies"), :class =>
'center', :sortable => false},
+        {:name => t("pool_families.index.pending_instances"), :class =>
'center', :sortable => false},
+        {:name => t("pool_families.index.failed_instances"), :class =>
'center', :sortable => false},
+        {:name => t("pool_families.index.quota_used"), :class =>
'center', :sortable => false},
+        {:name => t("pool_families.index.active_instances"), :class =>
'center', :sortable => false},
+        {:name => t("pool_families.index.available_instances"), :class =>
'center', :sortable => false},
+        {:name => t("pool_families.index.catalog"), :sortable => false},
+        {:name => '', :sortable => false}
+      ]
+    end
+
   end
 end
diff --git a/src/app/views/pool_families/_pools.html.haml
b/src/app/views/pool_families/_pools.html.haml
index 948ccfd..50a8c00 100644
--- a/src/app/views/pool_families/_pools.html.haml
+++ b/src/app/views/pool_families/_pools.html.haml
@@ -1,25 +1,12 @@
-%table.pool_families
-  - unless @pool_family.pools.blank?
-    %tr
-      %th= t("pool_families.index.pool_name")
-      %th= t("pool_families.index.deployments")
-      %th= t("pool_families.index.total_instancies")
-      %th= t("pool_families.index.pending_instances")
-      %th= t("pool_families.index.failed_instances")
-      %th= t("pool_families.index.quota_used")
-      %th= t("pool_families.index.active_instances")
-      %th= t("pool_families.index.available_instances")
-      %th= t("pool_families.index.catalog")
-      %th
-    - @pool_family.pools.each do |pool|
-      %tr
-        %td= link_to pool.name, pool
-        %td= pool.deployments.count
-        %td= pool.statistics[:total_instances]
-        %td= pool.statistics[:instances_pending]
-        %td= pool.statistics[:instances_failed]
-        %td= pool.statistics[:quota_percent]
-        %td= pool.statistics[:used_quota]
-        %td= pool.statistics[:available_quota].nil? ? raw('&infin;') :
pool.statistics[:available_quota]
-        %td= link_to pool.catalogs.first.name, catalog_path(pool.catalogs.first) if
pool.catalogs.any?
-        %td= link_to t(:edit), edit_pool_path(pool), :class => 'rounded-link'
+= filter_table(@pools_header, @pool_family.pools) do |pool|
+  %tr{:class => cycle('nostripe','stripe')}
+    %td= link_to pool.name, pool
+    %td{:class => 'center'}= pool.deployments.count
+    %td{:class => 'center'}= pool.statistics[:total_instances]
+    %td{:class => 'center'}= pool.statistics[:instances_pending]
+    %td{:class => 'center'}= pool.statistics[:instances_failed]
+    %td{:class => 'center'}= pool.statistics[:quota_percent]
+    %td{:class => 'center'}= pool.statistics[:used_quota]
+    %td{:class => 'center'}= pool.statistics[:available_quota].nil? ?
raw('&infin;') : pool.statistics[:available_quota]
+    %td= link_to pool.catalogs.first.name, catalog_path(pool.catalogs.first) if
pool.catalogs.any?
+    %td= link_to t(:edit), edit_pool_path(pool), :class => 'rounded-link'
diff --git a/src/app/views/pool_families/show.html.haml
b/src/app/views/pool_families/show.html.haml
index 8287e13..40fd972 100644
--- a/src/app/views/pool_families/show.html.haml
+++ b/src/app/views/pool_families/show.html.haml
@@ -17,5 +17,6 @@
               = tab[:name]
             -if tab[:count]
               %span.label.badge.count.dark=tab[:count]
+    .clear
   .content#tab
     = render :partial => @view
diff --git a/src/app/views/providers/edit.html.haml
b/src/app/views/providers/edit.html.haml
index f43931f..671aace 100644
--- a/src/app/views/providers/edit.html.haml
+++ b/src/app/views/providers/edit.html.haml
@@ -42,5 +42,6 @@
             = link_to tab[:name], edit_provider_path(@provider, :details_tab =>
tab[:id], :only_tab => true), :id => "details_#{tab[:id]}", :class =>
"#{'active' if @details_tab[:id] == tab[:id]} show"
             -if tab[:count]
               %span.label.badge.count.dark=tab[:count]
+    .clear
   .content#tab
     = render :partial => @view
-- 
1.7.7.3

Pool family detail fix rev1.

[Jirka Tomasek]

Fixes pool family detail, pools tab. Adds generic table instead
of pool_families

[Jirka Tomasek]

From: Jiri Tomasek <jtomasek(a)redhat.com&gt;

---
 src/app/controllers/pool_families_controller.rb |   17 ++++++++++-
 src/app/views/layouts/_filter_table.html.haml   |   15 +++++----
 src/app/views/pool_families/_pools.html.haml    |   37 +++++++---------------
 src/app/views/pool_families/show.html.haml      |    1 +
 src/app/views/providers/edit.html.haml          |    1 +
 5 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/src/app/controllers/pool_families_controller.rb
b/src/app/controllers/pool_families_controller.rb
index e1e7e07..a03d960 100644
--- a/src/app/controllers/pool_families_controller.rb
+++ b/src/app/controllers/pool_families_controller.rb
@@ -79,7 +79,6 @@ class PoolFamiliesController < ApplicationController
     require_privilege(Privilege::VIEW, @pool_family)
     load_pool_family_tabs
 
-
     respond_to do |format|
       format.html
       format.js do
@@ -229,5 +228,21 @@ class PoolFamiliesController < ApplicationController
     details_tab_name = params[:details_tab].blank? ? 'pools' :
params[:details_tab]
     @details_tab = @tabs.find {|t| t[:id] == details_tab_name} ||
@tabs.first[:name].downcase
     @view = @details_tab[:view]
+
+    if @view == 'pools'
+      @pools_header = [
+        {:name => t("pool_families.index.pool_name"), :sortable =>
false},
+        {:name => t("pool_families.index.deployments"), :class =>
'center', :sortable => false},
+        {:name => t("pool_families.index.total_instancies"), :class =>
'center', :sortable => false},
+        {:name => t("pool_families.index.pending_instances"), :class =>
'center', :sortable => false},
+        {:name => t("pool_families.index.failed_instances"), :class =>
'center', :sortable => false},
+        {:name => t("pool_families.index.quota_used"), :class =>
'center', :sortable => false},
+        {:name => t("pool_families.index.active_instances"), :class =>
'center', :sortable => false},
+        {:name => t("pool_families.index.available_instances"), :class =>
'center', :sortable => false},
+        {:name => t("pool_families.index.catalog"), :sortable => false},
+        {:name => '', :sortable => false}
+      ]
+    end
+
   end
 end
diff --git a/src/app/views/layouts/_filter_table.html.haml
b/src/app/views/layouts/_filter_table.html.haml
index 1455024..02b753d 100644
--- a/src/app/views/layouts/_filter_table.html.haml
+++ b/src/app/views/layouts/_filter_table.html.haml
@@ -1,14 +1,15 @@
 = form_tag({}, :class => 'filterable-data') do
 
-  %div.controls
-    %ul.filter-controls
-      = yield filter_controls if content_for? filter_controls
+  - if content_for? filter_controls or content_for? form_header
+    %div.controls
+      %ul.filter-controls
+        = yield filter_controls if content_for? filter_controls
 
-    - if content_for? form_header
-      %ul.actions
-        = yield form_header
+      - if content_for? form_header
+        %ul.actions
+          = yield form_header
 
-    .clear
+      .clear
 
   %table.flat.checkbox_table
     %thead
diff --git a/src/app/views/pool_families/_pools.html.haml
b/src/app/views/pool_families/_pools.html.haml
index 948ccfd..50a8c00 100644
--- a/src/app/views/pool_families/_pools.html.haml
+++ b/src/app/views/pool_families/_pools.html.haml
@@ -1,25 +1,12 @@
-%table.pool_families
-  - unless @pool_family.pools.blank?
-    %tr
-      %th= t("pool_families.index.pool_name")
-      %th= t("pool_families.index.deployments")
-      %th= t("pool_families.index.total_instancies")
-      %th= t("pool_families.index.pending_instances")
-      %th= t("pool_families.index.failed_instances")
-      %th= t("pool_families.index.quota_used")
-      %th= t("pool_families.index.active_instances")
-      %th= t("pool_families.index.available_instances")
-      %th= t("pool_families.index.catalog")
-      %th
-    - @pool_family.pools.each do |pool|
-      %tr
-        %td= link_to pool.name, pool
-        %td= pool.deployments.count
-        %td= pool.statistics[:total_instances]
-        %td= pool.statistics[:instances_pending]
-        %td= pool.statistics[:instances_failed]
-        %td= pool.statistics[:quota_percent]
-        %td= pool.statistics[:used_quota]
-        %td= pool.statistics[:available_quota].nil? ? raw('&infin;') :
pool.statistics[:available_quota]
-        %td= link_to pool.catalogs.first.name, catalog_path(pool.catalogs.first) if
pool.catalogs.any?
-        %td= link_to t(:edit), edit_pool_path(pool), :class => 'rounded-link'
+= filter_table(@pools_header, @pool_family.pools) do |pool|
+  %tr{:class => cycle('nostripe','stripe')}
+    %td= link_to pool.name, pool
+    %td{:class => 'center'}= pool.deployments.count
+    %td{:class => 'center'}= pool.statistics[:total_instances]
+    %td{:class => 'center'}= pool.statistics[:instances_pending]
+    %td{:class => 'center'}= pool.statistics[:instances_failed]
+    %td{:class => 'center'}= pool.statistics[:quota_percent]
+    %td{:class => 'center'}= pool.statistics[:used_quota]
+    %td{:class => 'center'}= pool.statistics[:available_quota].nil? ?
raw('&infin;') : pool.statistics[:available_quota]
+    %td= link_to pool.catalogs.first.name, catalog_path(pool.catalogs.first) if
pool.catalogs.any?
+    %td= link_to t(:edit), edit_pool_path(pool), :class => 'rounded-link'
diff --git a/src/app/views/pool_families/show.html.haml
b/src/app/views/pool_families/show.html.haml
index 8287e13..40fd972 100644
--- a/src/app/views/pool_families/show.html.haml
+++ b/src/app/views/pool_families/show.html.haml
@@ -17,5 +17,6 @@
               = tab[:name]
             -if tab[:count]
               %span.label.badge.count.dark=tab[:count]
+    .clear
   .content#tab
     = render :partial => @view
diff --git a/src/app/views/providers/edit.html.haml
b/src/app/views/providers/edit.html.haml
index f43931f..671aace 100644
--- a/src/app/views/providers/edit.html.haml
+++ b/src/app/views/providers/edit.html.haml
@@ -42,5 +42,6 @@
             = link_to tab[:name], edit_provider_path(@provider, :details_tab =>
tab[:id], :only_tab => true), :id => "details_#{tab[:id]}", :class =>
"#{'active' if @details_tab[:id] == tab[:id]} show"
             -if tab[:count]
               %span.label.badge.count.dark=tab[:count]
+    .clear
   .content#tab
     = render :partial => @view
-- 
1.7.7.3

Pool family detail fix rev1.

[Jirka Tomasek]

On 11/28/2011 01:09 PM, jtomasek(a)redhat.com wrote:
>  Fixes pool family detail, pools tab. Adds generic table instead
>  of pool_families
>  
Self ACK and pushed.