Re: [PATCH] New UI elements for Administration section part1

From: Jiri Tomasek<jtomasek(a)redhat.com> Addded new ui elements for Index views in Administration section --- src/app/views/hardware_profiles/_list.haml | 59 +++++++++++--------- .../views/hardware_profiles/_section_header.haml | 5 ++ src/app/views/hardware_profiles/index.haml | 4 +- src/app/views/layouts/_admin_header.haml | 9 +--- src/app/views/pool_families/_list.haml | 47 +++++++++------- src/app/views/pool_families/_section_header.haml | 5 ++ src/app/views/pool_families/index.haml | 4 +- src/app/views/provider_accounts/_list.haml | 45 ++++++++------- .../views/provider_accounts/_section_header.haml | 5 ++ src/app/views/provider_accounts/index.haml | 4 +- src/app/views/providers/_list.haml | 41 ++++++++------ src/app/views/providers/_section_header.haml | 5 ++ src/app/views/providers/index.haml | 4 +- src/app/views/providers/show.haml | 20 ++++++- src/app/views/realms/_list.haml | 39 +++++++------ src/app/views/realms/_section_header.haml | 5 ++ src/app/views/realms/index.haml | 4 +- src/app/views/roles/_list.haml | 37 +++++++----- src/app/views/roles/_section_header.haml | 5 ++ src/app/views/roles/index.haml | 4 +- src/features/pool_family.feature | 2 +- src/features/provider.feature | 4 +- src/features/provider_account.feature | 6 +- src/features/realm.feature | 2 +- 24 files changed, 217 insertions(+), 148 deletions(-) create mode 100644 src/app/views/hardware_profiles/_section_header.haml create mode 100644 src/app/views/pool_families/_section_header.haml create mode 100644 src/app/views/provider_accounts/_section_header.haml create mode 100644 src/app/views/providers/_section_header.haml create mode 100644 src/app/views/realms/_section_header.haml create mode 100644 src/app/views/roles/_section_header.haml diff --git a/src/app/views/hardware_profiles/_list.haml b/src/app/views/hardware_profiles/_list.haml index bbca7a6..808ae2a 100644 --- a/src/app/views/hardware_profiles/_list.haml +++ b/src/app/views/hardware_profiles/_list.haml @@ -1,28 +1,33 @@ -- form_tag do - #object-actions - = link_to "New Hardware Profile", new_hardware_profile_path, :class => 'button' - = restful_submit_tag "Delete", 'destroy', multi_destroy_hardware_profiles_path, 'DELETE', :id => 'delete_button', :class => 'button' - #selections - %p - Select:  - = link_to "All", @url_params.merge(:select => 'all') - %span> ,  - = link_to "None", @url_params.merge(:select => 'none') +%section.content-section.hardware_profiles + %header + %h2 Hardware Profiles + %span.label.badge.dark.count= @hardware_profiles.length - #list - %table - = sortable_table_header @header - - @hardware_profiles.each do |hwp| - %tr - %td - - selected = @url_params[:select] == 'all' - %input{:name => "hardware_profile_selected[]", :type => "checkbox", :value => hwp.id, :id => "hardware_profile_checkbox_#{hwp.id}", :checked => selected } - = link_to hwp.name, hardware_profile_path(hwp) - %td - =hwp.architecture.to_s - %td - =hwp.memory.to_s - %td - =hwp.storage.to_s - %td - =hwp.cpu.to_s + .content + - form_tag do + #object-actions + = restful_submit_tag "Delete", 'destroy', multi_destroy_hardware_profiles_path, 'DELETE', :id => 'delete_button', :class => 'button' + #selections + %p + Select:  + = link_to "All", @url_params.merge(:select => 'all') + %span> ,  + = link_to "None", @url_params.merge(:select => 'none') + + #list + %table + = sortable_table_header @header + - @hardware_profiles.each do |hwp| + %tr + %td + - selected = @url_params[:select] == 'all' + %input{:name => "hardware_profile_selected[]", :type => "checkbox", :value => hwp.id, :id => "hardware_profile_checkbox_#{hwp.id}", :checked => selected } + = link_to hwp.name, hardware_profile_path(hwp) + %td + =hwp.architecture.to_s + %td + =hwp.memory.to_s + %td + =hwp.storage.to_s + %td + =hwp.cpu.to_s diff --git a/src/app/views/hardware_profiles/_section_header.haml b/src/app/views/hardware_profiles/_section_header.haml new file mode 100644 index 0000000..d5a975e --- /dev/null +++ b/src/app/views/hardware_profiles/_section_header.haml @@ -0,0 +1,5 @@ +%header.page-header + %h1{:class => controller.controller_name} Hardware Profiles + #obj_actions.button-group + = link_to 'New Hardware Profile', new_hardware_profile_url, :class => 'button primary', :id => 'new_hardware_profile_button' + .corner  diff --git a/src/app/views/hardware_profiles/index.haml b/src/app/views/hardware_profiles/index.haml index acfa09b..55fac46 100644 --- a/src/app/views/hardware_profiles/index.haml +++ b/src/app/views/hardware_profiles/index.haml @@ -1,3 +1,3 @@ = render :partial => 'layouts/admin_header' -%div#view - = render :partial => 'list' += render :partial => 'section_header' += render :partial => 'list' diff --git a/src/app/views/layouts/_admin_header.haml b/src/app/views/layouts/_admin_header.haml index 3b5c935..19834d5 100644 --- a/src/app/views/layouts/_admin_header.haml +++ b/src/app/views/layouts/_admin_header.haml @@ -18,16 +18,9 @@ %option{:value => pool_families_path} Pool Families %option{:value => settings_path} Settings -- unless controller.controller_name == 'users' - %header.page-header - %h1{:class => controller.controller_name}= controller.controller_name.titlecase - -##obj_actions.button-group - -#= link_to 'New Object', new_object_url, :class => 'button primary', :id => 'new_object_button' - .corner  - :javascript $(document).ready(function() { $('select#admin-section-select').change(function() { window.location = $(this).val(); }); - }); \ No newline at end of file + }); diff --git a/src/app/views/pool_families/_list.haml b/src/app/views/pool_families/_list.haml index 1133073..e6afe8e 100644 --- a/src/app/views/pool_families/_list.haml +++ b/src/app/views/pool_families/_list.haml @@ -1,23 +1,28 @@ -- 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', :class => 'button' +%section.content-section.pool_families + %header + %h2 Pool Families + %span.label.badge.dark.count= @pool_families.length - %p - Select:  - = link_to "All", @url_params.merge(:select => 'all') - %span> ,  - = link_to "None", @url_params.merge(:select => 'none') + .content + - form_tag do + = restful_submit_tag "Delete", 'destroy', multi_destroy_pool_families_path, 'DELETE', :id => 'delete_button', :class => 'button' - %table#pool_families_table - = sortable_table_header @header - - unless @pool_families.blank? - - @pool_families.each do |pool_family| - %tr - %td - - selected = @url_params[:select] == 'all' - %input{:name => "pool_family_selected[]", :type => "checkbox", :value => pool_family.id, :id => "pool_family_checkbox_#{pool_family.id}", :checked => selected } - = link_to pool_family.name, pool_family_path(pool_family) - %td - = pool_family.quota.maximum_running_instances or 'unlimited' - %td - = "#{pool_family.quota.percentage_used} %" + %p + Select:  + = link_to "All", @url_params.merge(:select => 'all') + %span> ,  + = link_to "None", @url_params.merge(:select => 'none') + + %table#pool_families_table + = sortable_table_header @header + - unless @pool_families.blank? + - @pool_families.each do |pool_family| + %tr + %td + - selected = @url_params[:select] == 'all' + %input{:name => "pool_family_selected[]", :type => "checkbox", :value => pool_family.id, :id => "pool_family_checkbox_#{pool_family.id}", :checked => selected } + = link_to pool_family.name, pool_family_path(pool_family) + %td + = pool_family.quota.maximum_running_instances or 'unlimited' + %td + = "#{pool_family.quota.percentage_used} %" diff --git a/src/app/views/pool_families/_section_header.haml b/src/app/views/pool_families/_section_header.haml new file mode 100644 index 0000000..8fb7cf3 --- /dev/null +++ b/src/app/views/pool_families/_section_header.haml @@ -0,0 +1,5 @@ +%header.page-header + %h1{:class => controller.controller_name} Pool Families + #obj_actions.button-group + = link_to 'New Pool Family', new_pool_family_url, :class => 'button primary', :id => 'new_pool_family_button' + .corner  diff --git a/src/app/views/pool_families/index.haml b/src/app/views/pool_families/index.haml index acfa09b..55fac46 100644 --- a/src/app/views/pool_families/index.haml +++ b/src/app/views/pool_families/index.haml @@ -1,3 +1,3 @@ = render :partial => 'layouts/admin_header' -%div#view - = render :partial => 'list' += render :partial => 'section_header' += render :partial => 'list' diff --git a/src/app/views/provider_accounts/_list.haml b/src/app/views/provider_accounts/_list.haml index 5f598c8..8dfb3a0 100644 --- a/src/app/views/provider_accounts/_list.haml +++ b/src/app/views/provider_accounts/_list.haml @@ -1,20 +1,25 @@ -- form_tag do - = link_to "New Account", new_provider_account_path, :class => 'button' - = restful_submit_tag "Delete", "delete", multi_destroy_provider_accounts_path, 'DELETE', :class => 'button' - %p - Select:  - = link_to "All", @url_params.merge(:select => 'all') - %span> ,  - = link_to "None", @url_params.merge(:select => 'none') - %table - = sortable_table_header @header - - @accounts.each do |account| - %tr - %td - - selected = @url_params[:select] == 'all' - %input{:name => 'accounts_selected[]', :type => 'checkbox', :value => account.id, :id => "account_checkbox_#{account.id}", :checked => selected } - = link_to account.name, provider_account_path(account) - %td - =account.credentials_hash['username'] - %td - =account.provider.provider_type.name +%section.content-section.users + %header + %h2 Provider Accounts + %span.label.badge.dark.count= @accounts.length + + .content + - form_tag do + = restful_submit_tag "Delete", "delete", multi_destroy_provider_accounts_path, 'DELETE', :class => 'button' + %p + Select:  + = link_to "All", @url_params.merge(:select => 'all') + %span> ,  + = link_to "None", @url_params.merge(:select => 'none') + %table + = sortable_table_header @header + - @accounts.each do |account| + %tr + %td + - selected = @url_params[:select] == 'all' + %input{:name => 'accounts_selected[]', :type => 'checkbox', :value => account.id, :id => "account_checkbox_#{account.id}", :checked => selected } + = link_to account.name, provider_account_path(account) + %td + =account.credentials_hash['username'] + %td + =account.provider.provider_type.name diff --git a/src/app/views/provider_accounts/_section_header.haml b/src/app/views/provider_accounts/_section_header.haml new file mode 100644 index 0000000..5ef520a --- /dev/null +++ b/src/app/views/provider_accounts/_section_header.haml @@ -0,0 +1,5 @@ +%header.page-header + %h1{:class => controller.controller_name} Provider Accounts + #obj_actions.button-group + = link_to 'New Provider Account', new_provider_account_url, :class => 'button primary', :id => 'new_provider_account_button' + .corner  diff --git a/src/app/views/provider_accounts/index.haml b/src/app/views/provider_accounts/index.haml index acfa09b..55fac46 100644 --- a/src/app/views/provider_accounts/index.haml +++ b/src/app/views/provider_accounts/index.haml @@ -1,3 +1,3 @@ = render :partial => 'layouts/admin_header' -%div#view - = render :partial => 'list' += render :partial => 'section_header' += render :partial => 'list' diff --git a/src/app/views/providers/_list.haml b/src/app/views/providers/_list.haml index 417b416..10abadd 100644 --- a/src/app/views/providers/_list.haml +++ b/src/app/views/providers/_list.haml @@ -1,20 +1,25 @@ -- form_tag do - = link_to "Create", new_provider_url, :class => "button" - = restful_submit_tag "Delete", 'destroy', multi_destroy_providers_path, 'DELETE', :id => 'delete_button', :class => 'button' +%section.content-section.providers + %header + %h2 Providers + %span.label.badge.dark.count= @providers.length - %p - Select:  - = link_to "All", @url_params.merge(:select => 'all') - %span> ,  - = link_to "None", @url_params.merge(:select => 'none') + .content + - form_tag do + = restful_submit_tag "Delete", 'destroy', multi_destroy_providers_path, 'DELETE', :id => 'delete_button', :class => 'button' - %table#providers_table - = sortable_table_header @header - -(a)providers.each do |provider| - %tr - %td - - selected = @url_params[:select] == 'all' - %input{:name => "provider_selected[]", :type => "checkbox", :value => provider.id, :id => "provider_checkbox_#{provider.id}", :checked => selected } - = link_to provider.name, provider_path(provider) - %td= provider.url - %td= provider.provider_type.name + %p + Select:  + = link_to "All", @url_params.merge(:select => 'all') + %span> ,  + = link_to "None", @url_params.merge(:select => 'none') + + %table#providers_table + = sortable_table_header @header + -(a)providers.each do |provider| + %tr + %td + - selected = @url_params[:select] == 'all' + %input{:name => "provider_selected[]", :type => "checkbox", :value => provider.id, :id => "provider_checkbox_#{provider.id}", :checked => selected } + = link_to provider.name, provider_path(provider) + %td= provider.url + %td= provider.provider_type.name diff --git a/src/app/views/providers/_section_header.haml b/src/app/views/providers/_section_header.haml new file mode 100644 index 0000000..b667673 --- /dev/null +++ b/src/app/views/providers/_section_header.haml @@ -0,0 +1,5 @@ +%header.page-header + %h1{:class => controller.controller_name} Providers + #obj_actions.button-group + = link_to 'New Provider', new_provider_url, :class => 'button primary', :id => 'new_provider_button' + .corner  diff --git a/src/app/views/providers/index.haml b/src/app/views/providers/index.haml index acfa09b..55fac46 100644 --- a/src/app/views/providers/index.haml +++ b/src/app/views/providers/index.haml @@ -1,3 +1,3 @@ = render :partial => 'layouts/admin_header' -%div#view - = render :partial => 'list' += render :partial => 'section_header' += render :partial => 'list' diff --git a/src/app/views/providers/show.haml b/src/app/views/providers/show.haml index 2eadbfd..c9313a5 100644 --- a/src/app/views/providers/show.haml +++ b/src/app/views/providers/show.haml @@ -1,3 +1,19 @@ = render :partial => 'layouts/admin_header' -%div#view - = render :partial => 'properties' +%header.page-header + %h1{:class => controller.controller_name}= @provider.name + #obj_actions.button-container + = link_to 'New Provider', new_provider_url, :class => 'button primary', :id => 'new_provider_button' + %form.button-group{:action => provider_path(@provider), :method => 'POST'} + = link_to 'Edit', edit_provider_path(@provider), :class => 'button pill' + = link_to "Test", provider_path(@provider, {:test_provider => true}), { :class => 'button' } + %input{:name => "provider_selected[]", :type => "hidden", :value => @provider.id} + = restful_submit_tag('Delete', 'destroy', multi_destroy_providers_path, 'DELETE', :class => "button pill danger") + .corner  + +%section.content-section.provider + %header + %h2 Properties + + .content + %div#view + = render :partial => 'properties' diff --git a/src/app/views/realms/_list.haml b/src/app/views/realms/_list.haml index 2803e6a..054eb33 100644 --- a/src/app/views/realms/_list.haml +++ b/src/app/views/realms/_list.haml @@ -1,19 +1,24 @@ -- form_tag do - = link_to "Create", new_realm_path, :class => "button" - = restful_submit_tag "Delete", 'destroy', multi_destroy_realms_path, 'DELETE', :id => 'delete_button', :class => 'button' +%section.content-section.realms + %header + %h2 Realms + %span.label.badge.dark.count= @realms.length - %p - Select:  - = link_to "All", @url_params.merge(:select => 'all') - %span> ,  - = link_to "None", @url_params.merge(:select => 'none') + .content + - form_tag do + = restful_submit_tag "Delete", 'destroy', multi_destroy_realms_path, 'DELETE', :id => 'delete_button', :class => 'button' - %table#realms_table - = sortable_table_header @header - - unless @realms.blank? - - @realms.each do |realm| - %tr - %td - - selected = @url_params[:select] == 'all' - %input{:name => "id[]", :type => "checkbox", :value => realm.id, :id => "realm_id_#{realm.id}", :checked => selected } - = link_to realm.name, realm_path(realm) + %p + Select:  + = link_to "All", @url_params.merge(:select => 'all') + %span> ,  + = link_to "None", @url_params.merge(:select => 'none') + + %table#realms_table + = sortable_table_header @header + - unless @realms.blank? + - @realms.each do |realm| + %tr + %td + - selected = @url_params[:select] == 'all' + %input{:name => "id[]", :type => "checkbox", :value => realm.id, :id => "realm_id_#{realm.id}", :checked => selected } + = link_to realm.name, realm_path(realm) diff --git a/src/app/views/realms/_section_header.haml b/src/app/views/realms/_section_header.haml new file mode 100644 index 0000000..7230e81 --- /dev/null +++ b/src/app/views/realms/_section_header.haml @@ -0,0 +1,5 @@ +%header.page-header + %h1{:class => controller.controller_name} Realms + #obj_actions.button-group + = link_to 'New Realm', new_realm_url, :class => 'button primary', :id => 'new_realm_button' + .corner  diff --git a/src/app/views/realms/index.haml b/src/app/views/realms/index.haml index acfa09b..55fac46 100644 --- a/src/app/views/realms/index.haml +++ b/src/app/views/realms/index.haml @@ -1,3 +1,3 @@ = render :partial => 'layouts/admin_header' -%div#view - = render :partial => 'list' += render :partial => 'section_header' += render :partial => 'list' diff --git a/src/app/views/roles/_list.haml b/src/app/views/roles/_list.haml index 5bd1247..114faa7 100644 --- a/src/app/views/roles/_list.haml +++ b/src/app/views/roles/_list.haml @@ -1,19 +1,24 @@ -- form_tag do - = link_to "New Role", new_role_path, :class => 'button' - = restful_submit_tag "Destroy", "destroy", multi_destroy_roles_path, 'DELETE', :id => 'delete_button', :class => 'button' - %p - Select:  - = link_to "All", @url_params.merge(:select => 'all') - %span> ,  - = link_to "None", @url_params.merge(:select => 'none') - %table#roles_table - = sortable_table_header @header - - @roles.each do |role| - %tr - %td - - selected = @url_params[:select] == 'all' - %input{:name => "role_selected[]", :type => "checkbox", :value => role.id, :id => "role_checkbox_#{role.id}", :checked => selected } - = link_to role.name, role_path(role) +%section.content-section.roles + %header + %h2 Roles List + %span.label.badge.dark.count= @roles.length + + .content + - form_tag do + = restful_submit_tag "Destroy", "destroy", multi_destroy_roles_path, 'DELETE', :id => 'delete_button', :class => 'button' + %p + Select:  + = link_to "All", @url_params.merge(:select => 'all') + %span> ,  + = link_to "None", @url_params.merge(:select => 'none') + %table#roles_table + = sortable_table_header @header + - @roles.each do |role| + %tr + %td + - selected = @url_params[:select] == 'all' + %input{:name => "role_selected[]", :type => "checkbox", :value => role.id, :id => "role_checkbox_#{role.id}", :checked => selected } + = link_to role.name, role_path(role) :javascript $(document).ready(function () { diff --git a/src/app/views/roles/_section_header.haml b/src/app/views/roles/_section_header.haml new file mode 100644 index 0000000..8441d22 --- /dev/null +++ b/src/app/views/roles/_section_header.haml @@ -0,0 +1,5 @@ +%header.page-header + %h1{:class => controller.controller_name} Roles + #obj_actions.button-group + = link_to 'New Role', new_role_url, :class => 'button primary', :id => 'new_role_button' + .corner  diff --git a/src/app/views/roles/index.haml b/src/app/views/roles/index.haml index acfa09b..55fac46 100644 --- a/src/app/views/roles/index.haml +++ b/src/app/views/roles/index.haml @@ -1,3 +1,3 @@ = render :partial => 'layouts/admin_header' -%div#view - = render :partial => 'list' += render :partial => 'section_header' += render :partial => 'list' diff --git a/src/features/pool_family.feature b/src/features/pool_family.feature index 010bac9..2954242 100644 --- a/src/features/pool_family.feature +++ b/src/features/pool_family.feature @@ -29,7 +29,7 @@ Feature: Pool Families Scenario: Create a new Pool family Given I am on the pool families page And there is not a pool family named "testpoolfamily" - When I follow "Create" + When I follow "New Pool Family" Then I should be on the new pool family page When I fill in "pool_family[name]" with "testpoolfamily" When I fill in "pool_family[quota_attributes][maximum_running_instances]" with "2" diff --git a/src/features/provider.feature b/src/features/provider.feature index 69ac381..c49379c 100644 --- a/src/features/provider.feature +++ b/src/features/provider.feature @@ -50,7 +50,7 @@ Feature: Manage Providers Scenario: Create a new Provider Given I am on the providers page And there is not a provider named "testprovider" - When I follow "Create" + When I follow "New Provider" Then I should be on the new provider page When I fill in "provider[name]" with "testprovider" And I fill in "provider[url]" with "http://localhost:3001/api" @@ -63,7 +63,7 @@ Feature: Manage Providers Scenario: Create a new Provider failure when using wrong url Given I am on the providers page And there is not a provider named "testprovider" - When I follow "Create" + When I follow "New Provider" Then I should be on the new provider page When I fill in "provider[name]" with "testprovider" And I fill in "provider[url]" with "http://localhost:3010/api" diff --git a/src/features/provider_account.feature b/src/features/provider_account.feature index d5fee06..d25ec0a 100644 --- a/src/features/provider_account.feature +++ b/src/features/provider_account.feature @@ -12,7 +12,7 @@ Feature: Manage Provider Accounts Given I am on the homepage And there is a provider named "testprovider" When I go to the provider accounts page - Then I should see "New Account" + Then I should see "New Provider Account" And there should be no provider accounts Scenario: List providers in XML format @@ -32,7 +32,7 @@ Feature: Manage Provider Accounts Given there is a provider named "testprovider" And there are no provider accounts And I am on the provider accounts page - When I follow "New Account" + When I follow "New Provider Account" Then I should be on the new provider account page And I should see "New Account" When I select "testprovider" from "provider_account_provider_id" @@ -51,7 +51,7 @@ Feature: Manage Provider Accounts Given there is a provider named "testprovider" And there are no provider accounts And I am on the provider accounts page - When I follow "New Account" + When I follow "New Provider Account" Then I should be on the new provider account page And I should see "New Account" When I select "testprovider" from "provider_account_provider_id" diff --git a/src/features/realm.feature b/src/features/realm.feature index 82deec7..5764ae0 100644 --- a/src/features/realm.feature +++ b/src/features/realm.feature @@ -11,7 +11,7 @@ Feature: Manage Realms Scenario: Create new frontend realm Given I am on the realms page - When I follow "Create" + When I follow "New Realm" Then I should see "Create a new Realm" When I fill in "frontend_realm[name]" with "testrealm2" And I press "Save"