---
src/app/views/catalogs/_list.html.haml | 25 ++++++-------
src/app/views/hardware_profiles/_list.html.haml | 27 +++++++-------
.../views/layouts/_admin_content_tabs.html.haml | 9 ++---
src/app/views/layouts/_admin_users_tabs.html.haml | 9 ++---
src/app/views/realms/_list.html.haml | 19 +++++-----
src/app/views/users/_list.html.haml | 39 ++++++++++----------
6 files changed, 61 insertions(+), 67 deletions(-)
diff --git a/src/app/views/catalogs/_list.html.haml
b/src/app/views/catalogs/_list.html.haml
index 343a58c..000c3f9 100644
--- a/src/app/views/catalogs/_list.html.haml
+++ b/src/app/views/catalogs/_list.html.haml
@@ -1,14 +1,13 @@
-.content
- - content_for :form_header do
- %li= restful_submit_tag t("delete"), "destroy",
multi_destroy_catalogs_path, 'DELETE', :id => 'delete_button', :class
=> 'button danger'
- %li= link_to t("catalogs.new_catalog"), new_catalog_path, :id =>
'new_catalog_button', :class => 'button'
+- content_for :form_header do
+ %li= restful_submit_tag t("delete"), "destroy",
multi_destroy_catalogs_path, 'DELETE', :id => 'delete_button', :class
=> 'button danger'
+ %li= link_to t("catalogs.new_catalog"), new_catalog_path, :id =>
'new_catalog_button', :class => 'button'
- = filter_table(@header, @catalogs) do |catalog|
- %tr{:class => cycle('nostripe','stripe')}
- %td{:class => 'checkbox'}
- - selected = params[:select] == 'all'
- = check_box_tag "catalogs_selected[]", catalog.id, selected, :id =>
"catalog_checkbox_#{catalog.id}"
- %td
- = link_to catalog.name, catalog_path(catalog.id)
- %td
- = catalog.pool.name
+= filter_table(@header, @catalogs) do |catalog|
+ %tr{:class => cycle('nostripe','stripe')}
+ %td{:class => 'checkbox'}
+ - selected = params[:select] == 'all'
+ = check_box_tag "catalogs_selected[]", catalog.id, selected, :id =>
"catalog_checkbox_#{catalog.id}"
+ %td
+ = link_to catalog.name, catalog_path(catalog.id)
+ %td
+ = catalog.pool.name
diff --git a/src/app/views/hardware_profiles/_list.html.haml
b/src/app/views/hardware_profiles/_list.html.haml
index 2020f78..3a156f5 100644
--- a/src/app/views/hardware_profiles/_list.html.haml
+++ b/src/app/views/hardware_profiles/_list.html.haml
@@ -1,15 +1,14 @@
-.content
- - content_for :form_header do
- %li= restful_submit_tag t('hardware_profiles.list.delete_selected'),
"destroy", multi_destroy_hardware_profiles_path, 'DELETE', :id =>
'delete_button', :class => 'button danger'
- %li= link_to t('hardware_profiles.list.new_hardware'),
new_hardware_profile_path, :id => 'new_hardware_profile_button', :class =>
'button'
+- content_for :form_header do
+ %li= restful_submit_tag t('hardware_profiles.list.delete_selected'),
"destroy", multi_destroy_hardware_profiles_path, 'DELETE', :id =>
'delete_button', :class => 'button danger'
+ %li= link_to t('hardware_profiles.list.new_hardware'),
new_hardware_profile_path, :id => 'new_hardware_profile_button', :class =>
'button'
- = filter_table(hardware_profiles_header, @hardware_profiles) do |hwp|
- %tr{:class => cycle('nostripe','stripe')}
- %td
- - selected = params[:select] == 'all'
- = check_box_tag "hardware_profile_selected[]", hwp.id, selected, :id
=> "hardware_profile_checkbox_#{hwp.id}"
- %td= link_to hwp.name, hardware_profile_path(hwp)
- %td= hwp.architecture.to_s
- %td{:class => 'center'}= hwp.memory.to_s
- %td{:class => 'center'}= hwp.storage.to_s
- %td{:class => 'center'}= hwp.cpu.to_s
+= filter_table(hardware_profiles_header, @hardware_profiles) do |hwp|
+ %tr{:class => cycle('nostripe','stripe')}
+ %td{:class => "checkbox"}
+ - selected = params[:select] == 'all'
+ = check_box_tag "hardware_profile_selected[]", hwp.id, selected, :id
=> "hardware_profile_checkbox_#{hwp.id}"
+ %td= link_to hwp.name, hardware_profile_path(hwp)
+ %td= hwp.architecture.to_s
+ %td{:class => 'center'}= hwp.memory.to_s
+ %td{:class => 'center'}= hwp.storage.to_s
+ %td{:class => 'center'}= hwp.cpu.to_s
diff --git a/src/app/views/layouts/_admin_content_tabs.html.haml
b/src/app/views/layouts/_admin_content_tabs.html.haml
index 57d551a..1ddefbb 100644
--- a/src/app/views/layouts/_admin_content_tabs.html.haml
+++ b/src/app/views/layouts/_admin_content_tabs.html.haml
@@ -1,6 +1,5 @@
%section.admin-content-section
- %header#tab-container-1
- %h2
+ %header
%nav.faceted
%ul#tab-container-1-nav
- @tabs.each do |tab|
@@ -9,6 +8,6 @@
= tab[:name]
-if tab[:count]
%span.label.badge.count.dark=tab[:count]
- .content.collapsible.toggle-view.pools#tab
- %ul.deployable-cards
- = render :partial => 'list'
+ .clear
+ .content#tab
+ = render :partial => 'list'
diff --git a/src/app/views/layouts/_admin_users_tabs.html.haml
b/src/app/views/layouts/_admin_users_tabs.html.haml
index 57d551a..1ddefbb 100644
--- a/src/app/views/layouts/_admin_users_tabs.html.haml
+++ b/src/app/views/layouts/_admin_users_tabs.html.haml
@@ -1,6 +1,5 @@
%section.admin-content-section
- %header#tab-container-1
- %h2
+ %header
%nav.faceted
%ul#tab-container-1-nav
- @tabs.each do |tab|
@@ -9,6 +8,6 @@
= tab[:name]
-if tab[:count]
%span.label.badge.count.dark=tab[:count]
- .content.collapsible.toggle-view.pools#tab
- %ul.deployable-cards
- = render :partial => 'list'
+ .clear
+ .content#tab
+ = render :partial => 'list'
diff --git a/src/app/views/realms/_list.html.haml b/src/app/views/realms/_list.html.haml
index 543b44a..1e8847c 100644
--- a/src/app/views/realms/_list.html.haml
+++ b/src/app/views/realms/_list.html.haml
@@ -1,11 +1,10 @@
-.content
- - content_for :form_header do
- %li= restful_submit_tag t('realms.list.delete_selected'),
"destroy", multi_destroy_realms_path, 'DELETE', :id =>
'delete_button', :class => 'button danger'
- %li= link_to t('realms.new_realm'), new_realm_path, :id =>
'new_realm_button', :class => 'button'
+- content_for :form_header do
+ %li= restful_submit_tag t('realms.list.delete_selected'), "destroy",
multi_destroy_realms_path, 'DELETE', :id => 'delete_button', :class
=> 'button danger'
+ %li= link_to t('realms.new_realm'), new_realm_path, :id =>
'new_realm_button', :class => 'button'
- = filter_table(realms_header, @realms) do |realm|
- %tr{:class => cycle('nostripe','stripe')}
- %td{:class => 'checkbox'}
- - selected = params[:select] == 'all'
- = check_box_tag "realm_selected[]", realm.id, selected, :id =>
"realm_checkbox_#{realm.id}"
- %td= link_to realm.name, realm_path(realm)
+= filter_table(realms_header, @realms) do |realm|
+ %tr{:class => cycle('nostripe','stripe')}
+ %td{:class => 'checkbox'}
+ - selected = params[:select] == 'all'
+ = check_box_tag "realm_selected[]", realm.id, selected, :id =>
"realm_checkbox_#{realm.id}"
+ %td= link_to realm.name, realm_path(realm)
diff --git a/src/app/views/users/_list.html.haml b/src/app/views/users/_list.html.haml
index 74ed97f..932c6e2 100644
--- a/src/app/views/users/_list.html.haml
+++ b/src/app/views/users/_list.html.haml
@@ -1,21 +1,20 @@
-%section.admin-content-section.users
- %header
- %h2#users.users=t'users.users'
- .section-controls
- #obj_actions
- = link_to "", new_user_path, :class => 'add-user-button',
:id => 'add_user_button'
- .content
- - content_for :form_header do
- %li= restful_submit_tag "#{t'users.list.delete_selected'}",
"destroy", multi_destroy_users_path, 'DELETE', :id =>
'delete_button', :class => 'button danger'
+%header
+ %h2#users.users=t'users.users'
+ .section-controls
+ #obj_actions
+ = link_to "", new_user_path, :class => 'add-user-button', :id
=> 'add_user_button'
- = filter_table(@header, @users) do |user|
- %tr{:class => cycle('nostripe','stripe')}
- %td{:class => 'checkbox'}
- - selected = params[:select] == 'all'
- = check_box_tag "user_selected[]", user.id, selected, :id =>
"user_checkbox_#{user.id}"
- %td= link_to user.login, user_path(user)
- %td= user.last_name
- %td= user.first_name
- %td{:class => 'center'}= number_to_percentage
user.quota.percentage_used, :precision => 0
- %td{:class => 'center'}= user.quota.maximum_running_instances or
"#{t'users.list.unlimited'}"
- %td= user.email
+- content_for :form_header do
+ %li= restful_submit_tag "#{t'users.list.delete_selected'}",
"destroy", multi_destroy_users_path, 'DELETE', :id =>
'delete_button', :class => 'button danger'
+
+= filter_table(@header, @users) do |user|
+ %tr{:class => cycle('nostripe','stripe')}
+ %td{:class => 'checkbox'}
+ - selected = params[:select] == 'all'
+ = check_box_tag "user_selected[]", user.id, selected, :id =>
"user_checkbox_#{user.id}"
+ %td= link_to user.login, user_path(user)
+ %td= user.last_name
+ %td= user.first_name
+ %td{:class => 'center'}= number_to_percentage user.quota.percentage_used,
:precision => 0
+ %td{:class => 'center'}= user.quota.maximum_running_instances or
"#{t'users.list.unlimited'}"
+ %td= user.email
--
1.7.6.4