From 28ae9ba3a50c24802eb70bab6a2243fb9d7a3119 Mon Sep 17 00:00:00 2001 From: Eric Winchell Date: Mon, 7 Oct 2019 15:25:27 -0400 Subject: [PATCH 1/2] Toolbar Simplification --- .../toolbar/ansible_credential_center.rb | 4 ++-- .../toolbar/ansible_credentials_center.rb | 4 ++-- .../toolbar/ansible_repositories_center.rb | 6 +++--- .../toolbar/ansible_repository_center.rb | 6 +++--- .../toolbar/cloud_network_center.rb | 4 ++-- .../toolbar/cloud_networks_center.rb | 4 ++-- .../toolbar/cloud_subnet_center.rb | 4 ++-- .../toolbar/cloud_subnets_center.rb | 4 ++-- .../toolbar/cloud_tenant_center.rb | 4 ++-- .../toolbar/cloud_tenants_center.rb | 4 ++-- .../toolbar/configuration_job_center.rb | 4 ++-- .../toolbar/configuration_jobs_center.rb | 4 ++-- .../toolbar/container_node_center.rb | 4 ++-- .../toolbar/container_nodes_center.rb | 2 +- .../application_helper/toolbar/hosts_center.rb | 6 +++--- .../application_helper/toolbar/vm_clouds_center.rb | 8 ++++---- .../application_helper/toolbar/vm_infras_center.rb | 8 ++++---- .../application_helper/toolbar/x_vm_center.rb | 12 ++++++------ .../application_helper/toolbar/x_vm_cloud_center.rb | 8 ++++---- 19 files changed, 50 insertions(+), 50 deletions(-) diff --git a/app/helpers/application_helper/toolbar/ansible_credential_center.rb b/app/helpers/application_helper/toolbar/ansible_credential_center.rb index 347a2babae8..6a5611c552d 100644 --- a/app/helpers/application_helper/toolbar/ansible_credential_center.rb +++ b/app/helpers/application_helper/toolbar/ansible_credential_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::AnsibleCredentialCenter < ApplicationHelper::T button_group('ansible_repository', [ select( :ansible_credential_configuration, - 'fa fa-cog fa-lg', + '', t = N_('Configuration'), t, :items => [ @@ -27,7 +27,7 @@ class ApplicationHelper::Toolbar::AnsibleCredentialCenter < ApplicationHelper::T button_group('embedded_ansible_credentials_policy', [ select( :embedded_ansible_credentials_policy_choice, - 'fa fa-shield fa-lg', + '', t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/ansible_credentials_center.rb b/app/helpers/application_helper/toolbar/ansible_credentials_center.rb index 35b05c0bdc5..8a74ab1e2b5 100644 --- a/app/helpers/application_helper/toolbar/ansible_credentials_center.rb +++ b/app/helpers/application_helper/toolbar/ansible_credentials_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::AnsibleCredentialsCenter < ApplicationHelper:: button_group('embedded_ansible_credentials', [ select( :embedded_ansible_credentials_configuration, - 'fa fa-cog fa-lg', + '', t = N_('Configuration'), t, :items => [ @@ -41,7 +41,7 @@ class ApplicationHelper::Toolbar::AnsibleCredentialsCenter < ApplicationHelper:: button_group('embedded_ansible_credentials_policy', [ select( :embedded_ansible_credentials_policy_choice, - 'fa fa-shield fa-lg', + '', t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/ansible_repositories_center.rb b/app/helpers/application_helper/toolbar/ansible_repositories_center.rb index 6b64496d0e9..1f1e87a0709 100644 --- a/app/helpers/application_helper/toolbar/ansible_repositories_center.rb +++ b/app/helpers/application_helper/toolbar/ansible_repositories_center.rb @@ -4,7 +4,7 @@ class ApplicationHelper::Toolbar::AnsibleRepositoriesCenter < ApplicationHelper: :ansible_repositories_reload, 'fa fa-refresh fa-lg', N_('Refresh this page'), - N_('Refresh'), + N_(''), :url_parms => "main_div", :send_checked => true, :klass => ApplicationHelper::Button::ButtonWithoutRbacCheck), @@ -12,7 +12,7 @@ class ApplicationHelper::Toolbar::AnsibleRepositoriesCenter < ApplicationHelper: button_group('ansible_repositories', [ select( :ansible_repositories_configuration, - 'fa fa-cog fa-lg', + '', t = N_('Configuration'), t, :items => [ @@ -64,7 +64,7 @@ class ApplicationHelper::Toolbar::AnsibleRepositoriesCenter < ApplicationHelper: button_group('ansible_repositories_policy', [ select( :ansible_repositories_policy_choice, - 'fa fa-shield fa-lg', + '', t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/ansible_repository_center.rb b/app/helpers/application_helper/toolbar/ansible_repository_center.rb index 1a358badc6d..7c318ee6231 100644 --- a/app/helpers/application_helper/toolbar/ansible_repository_center.rb +++ b/app/helpers/application_helper/toolbar/ansible_repository_center.rb @@ -4,7 +4,7 @@ class ApplicationHelper::Toolbar::AnsibleRepositoryCenter < ApplicationHelper::T :ansible_repository_reload, 'fa fa-refresh fa-lg', N_('Refresh this page'), - N_('Refresh'), + N_(''), :url_parms => "main_div", :send_checked => true, :klass => ApplicationHelper::Button::ButtonWithoutRbacCheck), @@ -12,7 +12,7 @@ class ApplicationHelper::Toolbar::AnsibleRepositoryCenter < ApplicationHelper::T button_group('ansible_repository', [ select( :ansible_repository_configuration, - 'fa fa-cog fa-lg', + '', t = N_('Configuration'), t, :items => [ @@ -48,7 +48,7 @@ class ApplicationHelper::Toolbar::AnsibleRepositoryCenter < ApplicationHelper::T button_group('ansible_repositories_policy', [ select( :ansible_repositories_policy_choice, - 'fa fa-shield fa-lg', + '', t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/cloud_network_center.rb b/app/helpers/application_helper/toolbar/cloud_network_center.rb index 41f9578b92c..473d01d6a0d 100644 --- a/app/helpers/application_helper/toolbar/cloud_network_center.rb +++ b/app/helpers/application_helper/toolbar/cloud_network_center.rb @@ -4,7 +4,7 @@ class ApplicationHelper::Toolbar::CloudNetworkCenter < ApplicationHelper::Toolba [ select( :cloud_network_vmdb_choice, - 'fa fa-cog fa-lg', + '', t = N_('Configuration'), t, :items => [ @@ -38,7 +38,7 @@ class ApplicationHelper::Toolbar::CloudNetworkCenter < ApplicationHelper::Toolba [ select( :cloud_network_policy_choice, - 'fa fa-shield fa-lg', + '', t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/cloud_networks_center.rb b/app/helpers/application_helper/toolbar/cloud_networks_center.rb index 57019f02a06..83659a7a060 100644 --- a/app/helpers/application_helper/toolbar/cloud_networks_center.rb +++ b/app/helpers/application_helper/toolbar/cloud_networks_center.rb @@ -4,7 +4,7 @@ class ApplicationHelper::Toolbar::CloudNetworksCenter < ApplicationHelper::Toolb [ select( :cloud_network_vmdb_choice, - 'fa fa-cog fa-lg', + '', t = N_('Configuration'), t, :items => [ @@ -24,7 +24,7 @@ class ApplicationHelper::Toolbar::CloudNetworksCenter < ApplicationHelper::Toolb [ select( :cloud_network_policy_choice, - 'fa fa-shield fa-lg', + '', t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/cloud_subnet_center.rb b/app/helpers/application_helper/toolbar/cloud_subnet_center.rb index 4b041c9c359..2dd42bb41e9 100644 --- a/app/helpers/application_helper/toolbar/cloud_subnet_center.rb +++ b/app/helpers/application_helper/toolbar/cloud_subnet_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::CloudSubnetCenter < ApplicationHelper::Toolbar button_group('cloud_subnet_vmdb', [ select( :cloud_subnet_vmdb_choice, - 'fa fa-cog fa-lg', + '', t = N_('Configuration'), t, :items => [ @@ -33,7 +33,7 @@ class ApplicationHelper::Toolbar::CloudSubnetCenter < ApplicationHelper::Toolbar button_group('cloud_subnet_policy', [ select( :cloud_subnet_policy_choice, - 'fa fa-shield fa-lg', + '', t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/cloud_subnets_center.rb b/app/helpers/application_helper/toolbar/cloud_subnets_center.rb index 44fac8eb1c8..10f40e2435f 100644 --- a/app/helpers/application_helper/toolbar/cloud_subnets_center.rb +++ b/app/helpers/application_helper/toolbar/cloud_subnets_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::CloudSubnetsCenter < ApplicationHelper::Toolba button_group('cloud_subnet_vmdb', [ select( :cloud_subnet_vmdb_choice, - 'fa fa-cog fa-lg', + '', t = N_('Configuration'), t, :items => [ @@ -41,7 +41,7 @@ class ApplicationHelper::Toolbar::CloudSubnetsCenter < ApplicationHelper::Toolba button_group('cloud_subnet_policy', [ select( :cloud_subnet_policy_choice, - 'fa fa-shield fa-lg', + '', t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/cloud_tenant_center.rb b/app/helpers/application_helper/toolbar/cloud_tenant_center.rb index 886f204f37b..a195cb418a6 100644 --- a/app/helpers/application_helper/toolbar/cloud_tenant_center.rb +++ b/app/helpers/application_helper/toolbar/cloud_tenant_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::CloudTenantCenter < ApplicationHelper::Toolbar button_group('cloud_tenant_vmdb', [ select( :cloud_tenant_vmdb_choice, - 'fa fa-shield fa-lg', + '', t = N_('Configuration'), t, :items => [ @@ -22,7 +22,7 @@ class ApplicationHelper::Toolbar::CloudTenantCenter < ApplicationHelper::Toolbar button_group('cloud_tenant_policy', [ select( :cloud_tenant_policy_choice, - 'fa fa-shield fa-lg', + '', t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/cloud_tenants_center.rb b/app/helpers/application_helper/toolbar/cloud_tenants_center.rb index 2aaf408bcb3..8a6794fd037 100644 --- a/app/helpers/application_helper/toolbar/cloud_tenants_center.rb +++ b/app/helpers/application_helper/toolbar/cloud_tenants_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::CloudTenantsCenter < ApplicationHelper::Toolba button_group('cloud_tenant_vmdb', [ select( :cloud_tenant_vmdb_choice, - 'fa fa-cog fa-lg', + '', t = N_('Configuration'), t, :items => [ @@ -37,7 +37,7 @@ class ApplicationHelper::Toolbar::CloudTenantsCenter < ApplicationHelper::Toolba button_group('cloud_tenant_policy', [ select( :cloud_tenant_policy_choice, - 'fa fa-shield fa-lg', + '', t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/configuration_job_center.rb b/app/helpers/application_helper/toolbar/configuration_job_center.rb index 17a5a9fde8e..e9c6952c49d 100644 --- a/app/helpers/application_helper/toolbar/configuration_job_center.rb +++ b/app/helpers/application_helper/toolbar/configuration_job_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ConfigurationJobCenter < ApplicationHelper::To button_group('configuration_job_vmdb', [ select( :configuration_job_vmdb_choice, - 'fa fa-cog fa-lg', + '', t = N_('Configuration'), t, :items => [ @@ -19,7 +19,7 @@ class ApplicationHelper::Toolbar::ConfigurationJobCenter < ApplicationHelper::To button_group('configuration_job_policy', [ select( :configuration_job_policy_choice, - 'fa fa-shield fa-lg', + '', t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/configuration_jobs_center.rb b/app/helpers/application_helper/toolbar/configuration_jobs_center.rb index a5aa77d3dfd..153828101ad 100644 --- a/app/helpers/application_helper/toolbar/configuration_jobs_center.rb +++ b/app/helpers/application_helper/toolbar/configuration_jobs_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ConfigurationJobsCenter < ApplicationHelper::T button_group('configuration_job_vmdb', [ select( :configuration_job_vmdb_choice, - 'fa fa-cog fa-lg', + '', t = N_('Configuration'), t, :items => [ @@ -22,7 +22,7 @@ class ApplicationHelper::Toolbar::ConfigurationJobsCenter < ApplicationHelper::T button_group('configuration_job_policy', [ select( :configuration_job_policy_choice, - 'fa fa-shield fa-lg', + '', t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/container_node_center.rb b/app/helpers/application_helper/toolbar/container_node_center.rb index 07c485baae2..769a0a6e0e1 100644 --- a/app/helpers/application_helper/toolbar/container_node_center.rb +++ b/app/helpers/application_helper/toolbar/container_node_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ContainerNodeCenter < ApplicationHelper::Toolb button_group('container_node_monitoring', [ select( :container_node_monitoring_choice, - 'ff ff-monitoring fa-lg', + '', t = N_('Monitoring'), t, :items => [ @@ -48,7 +48,7 @@ class ApplicationHelper::Toolbar::ContainerNodeCenter < ApplicationHelper::Toolb button_group('container_node_policy', [ select( :container_node_policy_choice, - 'fa fa-shield fa-lg', + '', t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/container_nodes_center.rb b/app/helpers/application_helper/toolbar/container_nodes_center.rb index e17b07d5149..fa2e9e64e99 100644 --- a/app/helpers/application_helper/toolbar/container_nodes_center.rb +++ b/app/helpers/application_helper/toolbar/container_nodes_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ContainerNodesCenter < ApplicationHelper::Tool button_group('container_node_policy', [ select( :container_node_policy_choice, - 'fa fa-shield fa-lg', + '', t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/hosts_center.rb b/app/helpers/application_helper/toolbar/hosts_center.rb index 49d2e91cc69..0a3ce3f5686 100644 --- a/app/helpers/application_helper/toolbar/hosts_center.rb +++ b/app/helpers/application_helper/toolbar/hosts_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::HostsCenter < ApplicationHelper::Toolbar::Basi button_group('host_vmdb', [ select( :host_vmdb_choice, - 'fa fa-cog fa-lg', + '', t = N_('Configuration'), t, :items => [ @@ -98,7 +98,7 @@ class ApplicationHelper::Toolbar::HostsCenter < ApplicationHelper::Toolbar::Basi button_group('host_policy', [ select( :host_policy_choice, - 'fa fa-shield fa-lg', + '', t = N_('Policy'), t, :enabled => false, @@ -148,7 +148,7 @@ class ApplicationHelper::Toolbar::HostsCenter < ApplicationHelper::Toolbar::Basi button_group('host_operations', [ select( :host_power_choice, - 'fa fa-power-off fa-lg', + '', N_('Power Operations'), N_('Power'), :enabled => false, diff --git a/app/helpers/application_helper/toolbar/vm_clouds_center.rb b/app/helpers/application_helper/toolbar/vm_clouds_center.rb index 89d1adf31d5..bee206758e8 100644 --- a/app/helpers/application_helper/toolbar/vm_clouds_center.rb +++ b/app/helpers/application_helper/toolbar/vm_clouds_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::VmCloudsCenter < ApplicationHelper::Toolbar::B button_group('instance_vmdb', [ select( :instance_vmdb_choice, - 'fa fa-cog fa-lg', + '', N_('Configuration'), :enabled => false, :onwhen => "1+", @@ -82,7 +82,7 @@ class ApplicationHelper::Toolbar::VmCloudsCenter < ApplicationHelper::Toolbar::B button_group('instance_policy', [ select( :instance_policy_choice, - 'fa fa-shield fa-lg', + '', N_('Policy'), :enabled => false, :onwhen => "1+", @@ -131,7 +131,7 @@ class ApplicationHelper::Toolbar::VmCloudsCenter < ApplicationHelper::Toolbar::B button_group('instance_lifecycle', [ select( :instance_lifecycle_choice, - 'fa fa-recycle fa-lg', + '', N_('Lifecycle'), :items => [ button( @@ -184,7 +184,7 @@ class ApplicationHelper::Toolbar::VmCloudsCenter < ApplicationHelper::Toolbar::B button_group('instance_operations', [ select( :instance_power_choice, - 'fa fa-power-off fa-lg', + '', N_('Power Operations'), N_('Power'), :enabled => false, diff --git a/app/helpers/application_helper/toolbar/vm_infras_center.rb b/app/helpers/application_helper/toolbar/vm_infras_center.rb index d68dbb64388..3ed2972f6a6 100644 --- a/app/helpers/application_helper/toolbar/vm_infras_center.rb +++ b/app/helpers/application_helper/toolbar/vm_infras_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::VmInfrasCenter < ApplicationHelper::Toolbar::B button_group('vm_vmdb', [ select( :vm_vmdb_choice, - 'fa fa-cog fa-lg', + '', N_('Configuration'), :enabled => false, :onwhen => "1+", @@ -110,7 +110,7 @@ class ApplicationHelper::Toolbar::VmInfrasCenter < ApplicationHelper::Toolbar::B button_group('vm_policy', [ select( :vm_policy_choice, - 'fa fa-shield fa-lg', + '', N_('Policy'), :enabled => false, :onwhen => "1+", @@ -159,7 +159,7 @@ class ApplicationHelper::Toolbar::VmInfrasCenter < ApplicationHelper::Toolbar::B button_group('vm_lifecycle', [ select( :vm_lifecycle_choice, - 'fa fa-recycle fa-lg', + '', N_('Lifecycle'), :items => [ button( @@ -226,7 +226,7 @@ class ApplicationHelper::Toolbar::VmInfrasCenter < ApplicationHelper::Toolbar::B button_group('vm_operations', [ select( :vm_power_choice, - 'fa fa-power-off fa-lg', + '', N_('Power Operations'), N_('Power'), :enabled => false, diff --git a/app/helpers/application_helper/toolbar/x_vm_center.rb b/app/helpers/application_helper/toolbar/x_vm_center.rb index f4d678de680..aba2464cfc5 100644 --- a/app/helpers/application_helper/toolbar/x_vm_center.rb +++ b/app/helpers/application_helper/toolbar/x_vm_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::XVmCenter < ApplicationHelper::Toolbar::Basic button_group('vm_vmdb', [ select( :vm_vmdb_choice, - 'fa fa-cog fa-lg', + '', t = N_('Configuration'), t, :items => [ @@ -85,7 +85,7 @@ class ApplicationHelper::Toolbar::XVmCenter < ApplicationHelper::Toolbar::Basic button_group('vm_policy', [ select( :vm_policy_choice, - 'fa fa-shield fa-lg', + '', t = N_('Policy'), t, :items => [ @@ -119,7 +119,7 @@ class ApplicationHelper::Toolbar::XVmCenter < ApplicationHelper::Toolbar::Basic button_group('vm_lifecycle', [ select( :vm_lifecycle_choice, - 'fa fa-recycle fa-lg', + '', t = N_('Lifecycle'), t, :items => [ @@ -163,7 +163,7 @@ class ApplicationHelper::Toolbar::XVmCenter < ApplicationHelper::Toolbar::Basic button_group('vm_monitoring', [ select( :vm_monitoring_choice, - 'ff ff-monitoring fa-lg', + '', t = N_('Monitoring'), t, :items => [ @@ -193,7 +193,7 @@ class ApplicationHelper::Toolbar::XVmCenter < ApplicationHelper::Toolbar::Basic button_group('vm_operations', [ select( :vm_power_choice, - 'fa fa-power-off fa-lg', + '', N_('VM Power Functions'), N_('Power'), :items => [ @@ -258,7 +258,7 @@ class ApplicationHelper::Toolbar::XVmCenter < ApplicationHelper::Toolbar::Basic button_group('vm_access', [ select( :vm_remote_access_choice, - 'pficon pficon-screen fa-lg', + '', N_('VM Remote Access'), N_('Access'), :items => [ diff --git a/app/helpers/application_helper/toolbar/x_vm_cloud_center.rb b/app/helpers/application_helper/toolbar/x_vm_cloud_center.rb index 4d5306ccb1b..8d511f3f8ae 100644 --- a/app/helpers/application_helper/toolbar/x_vm_cloud_center.rb +++ b/app/helpers/application_helper/toolbar/x_vm_cloud_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::XVmCloudCenter < ApplicationHelper::Toolbar::B button_group('instance_vmdb', [ select( :instance_vmdb_choice, - 'fa fa-cog fa-lg', + '', t = N_('Configuration'), t, :items => [ @@ -121,7 +121,7 @@ class ApplicationHelper::Toolbar::XVmCloudCenter < ApplicationHelper::Toolbar::B button_group('instance_policy', [ select( :instance_policy_choice, - 'fa fa-shield fa-lg', + '', t = N_('Policy'), t, :items => [ @@ -153,7 +153,7 @@ class ApplicationHelper::Toolbar::XVmCloudCenter < ApplicationHelper::Toolbar::B button_group('instance_lifecycle', [ select( :instance_lifecycle_choice, - 'fa fa-recycle fa-lg', + '', t = N_('Lifecycle'), t, :items => [ @@ -193,7 +193,7 @@ class ApplicationHelper::Toolbar::XVmCloudCenter < ApplicationHelper::Toolbar::B button_group('instance_monitoring', [ select( :instance_monitoring_choice, - 'ff ff-monitoring fa-lg', + '', t = N_('Monitoring'), t, :items => [ From 36ef4978a7e413666db87af72f0dd143a8b61c65 Mon Sep 17 00:00:00 2001 From: Eric Winchell Date: Wed, 9 Oct 2019 12:35:31 -0400 Subject: [PATCH 2/2] Toolbar Simplification --- .../toolbar/ansible_credential_center.rb | 4 ++-- .../toolbar/ansible_credentials_center.rb | 4 ++-- .../toolbar/ansible_playbook_center.rb | 2 +- .../toolbar/ansible_playbooks_center.rb | 2 +- .../toolbar/ansible_repositories_center.rb | 4 ++-- .../toolbar/ansible_repository_center.rb | 4 ++-- .../toolbar/auth_key_pair_cloud_center.rb | 4 ++-- .../toolbar/auth_key_pair_clouds_center.rb | 4 ++-- .../toolbar/automation_manager_provider_center.rb | 2 +- .../toolbar/automation_manager_providers_center.rb | 4 ++-- .../toolbar/availability_zone_center.rb | 4 ++-- .../toolbar/availability_zones_center.rb | 2 +- .../toolbar/catalogitem_button_center.rb | 2 +- .../toolbar/catalogitem_buttons_center.rb | 2 +- .../application_helper/toolbar/chargeback_center.rb | 2 +- .../application_helper/toolbar/chargebacks_center.rb | 2 +- .../toolbar/cloud_network_center.rb | 4 ++-- .../toolbar/cloud_networks_center.rb | 4 ++-- .../toolbar/cloud_object_store_container_center.rb | 4 ++-- .../toolbar/cloud_object_store_containers_center.rb | 4 ++-- .../toolbar/cloud_object_store_object_center.rb | 4 ++-- .../toolbar/cloud_object_store_objects_center.rb | 4 ++-- .../toolbar/cloud_subnet_center.rb | 4 ++-- .../toolbar/cloud_subnets_center.rb | 4 ++-- .../toolbar/cloud_tenant_center.rb | 4 ++-- .../toolbar/cloud_tenants_center.rb | 4 ++-- .../toolbar/cloud_volume_backup_center.rb | 4 ++-- .../toolbar/cloud_volume_backups_center.rb | 4 ++-- .../toolbar/cloud_volume_center.rb | 4 ++-- .../toolbar/cloud_volume_snapshot_center.rb | 4 ++-- .../toolbar/cloud_volume_snapshots_center.rb | 2 +- .../toolbar/cloud_volume_type_center.rb | 2 +- .../toolbar/cloud_volume_types_center.rb | 2 +- .../toolbar/cloud_volumes_center.rb | 4 ++-- .../application_helper/toolbar/condition_center.rb | 2 +- .../application_helper/toolbar/conditions_center.rb | 2 +- .../toolbar/configuration_job_center.rb | 4 ++-- .../toolbar/configuration_jobs_center.rb | 4 ++-- .../toolbar/configuration_manager_provider_center.rb | 2 +- .../configuration_manager_providers_center.rb | 4 ++-- .../toolbar/configuration_script_center.rb | 4 ++-- .../toolbar/configuration_scripts/policy_mixin.rb | 2 +- .../toolbar/configuration_scripts_center.rb | 2 +- .../configured_system/automation/policy_mixin.rb | 2 +- .../configured_system/foreman/lifecycle_mixin.rb | 2 +- .../configured_system/foreman/policy_mixin.rb | 2 +- .../toolbar/container_build_center.rb | 4 ++-- .../toolbar/container_builds_center.rb | 4 ++-- .../application_helper/toolbar/container_center.rb | 4 ++-- .../toolbar/container_group_center.rb | 4 ++-- .../toolbar/container_groups_center.rb | 2 +- .../toolbar/container_image_center.rb | 4 ++-- .../toolbar/container_image_registries_center.rb | 2 +- .../toolbar/container_image_registry_center.rb | 2 +- .../toolbar/container_images_center.rb | 4 ++-- .../toolbar/container_node_center.rb | 4 ++-- .../toolbar/container_nodes_center.rb | 2 +- .../toolbar/container_project_center.rb | 4 ++-- .../toolbar/container_projects_center.rb | 2 +- .../toolbar/container_replicator_center.rb | 4 ++-- .../toolbar/container_replicators_center.rb | 2 +- .../toolbar/container_route_center.rb | 2 +- .../toolbar/container_routes_center.rb | 2 +- .../toolbar/container_service_center.rb | 4 ++-- .../toolbar/container_services_center.rb | 2 +- .../toolbar/container_template_center.rb | 4 ++-- .../toolbar/container_templates_center.rb | 2 +- .../application_helper/toolbar/containers_center.rb | 2 +- .../toolbar/custom_button_center.rb | 2 +- .../toolbar/custom_button_set_center.rb | 2 +- .../toolbar/custom_buttons_center.rb | 2 +- .../toolbar/customization_template_center.rb | 2 +- .../toolbar/customization_templates_center.rb | 2 +- .../toolbar/diagnostics_region_center.rb | 2 +- .../toolbar/diagnostics_server_center.rb | 2 +- .../toolbar/diagnostics_zone_center.rb | 2 +- .../application_helper/toolbar/dialog_center.rb | 2 +- .../application_helper/toolbar/dialogs_center.rb | 2 +- .../toolbar/ems_block_storages_center.rb | 4 ++-- .../application_helper/toolbar/ems_cloud_center.rb | 6 +++--- .../application_helper/toolbar/ems_clouds_center.rb | 4 ++-- .../application_helper/toolbar/ems_cluster_center.rb | 6 +++--- .../toolbar/ems_clusters_center.rb | 4 ++-- .../toolbar/ems_container_center.rb | 6 +++--- .../toolbar/ems_containers_center.rb | 4 ++-- .../application_helper/toolbar/ems_infra_center.rb | 6 +++--- .../application_helper/toolbar/ems_infras_center.rb | 4 ++-- .../application_helper/toolbar/ems_network_center.rb | 6 +++--- .../toolbar/ems_networks_center.rb | 4 ++-- .../toolbar/ems_object_storages_center.rb | 4 ++-- .../toolbar/ems_physical_infra_center.rb | 6 +++--- .../toolbar/ems_physical_infras_center.rb | 4 ++-- .../application_helper/toolbar/ems_storage_center.rb | 6 +++--- .../toolbar/ems_storages_center.rb | 4 ++-- .../toolbar/firmware_registries_center.rb | 2 +- .../toolbar/firmware_registry_center.rb | 2 +- .../application_helper/toolbar/flavor_center.rb | 4 ++-- .../application_helper/toolbar/flavors_center.rb | 4 ++-- .../application_helper/toolbar/floating_ip_center.rb | 4 ++-- .../toolbar/floating_ips_center.rb | 4 ++-- .../toolbar/generic_object_center.rb | 2 +- .../generic_object_definition_actions_node_center.rb | 2 +- .../generic_object_definition_button_center.rb | 2 +- .../generic_object_definition_button_group_center.rb | 2 +- .../toolbar/generic_object_definition_center.rb | 2 +- .../toolbar/generic_object_definitions_center.rb | 2 +- .../toolbar/generic_objects_center.rb | 2 +- .../toolbar/host_aggregate_center.rb | 4 ++-- .../toolbar/host_aggregates_center.rb | 4 ++-- .../application_helper/toolbar/host_center.rb | 6 +++--- .../toolbar/host_cloud_service_center.rb | 2 +- .../toolbar/host_cloud_services_center.rb | 2 +- .../application_helper/toolbar/hosts_center.rb | 6 +++--- .../toolbar/infra_networking_center.rb | 2 +- .../toolbar/infra_networkings_center.rb | 2 +- .../toolbar/inventory_group_center.rb | 2 +- .../toolbar/iso_datastore_center.rb | 2 +- .../toolbar/iso_datastores_center.rb | 2 +- .../application_helper/toolbar/iso_image_center.rb | 2 +- .../application_helper/toolbar/miq_action_center.rb | 2 +- .../application_helper/toolbar/miq_actions_center.rb | 2 +- .../toolbar/miq_ae_class_center.rb | 2 +- .../toolbar/miq_ae_domain_center.rb | 2 +- .../toolbar/miq_ae_domains_center.rb | 2 +- .../toolbar/miq_ae_fields_center.rb | 2 +- .../toolbar/miq_ae_instance_center.rb | 2 +- .../toolbar/miq_ae_instances_center.rb | 2 +- .../toolbar/miq_ae_method_center.rb | 2 +- .../toolbar/miq_ae_methods_center.rb | 2 +- .../toolbar/miq_ae_namespace_center.rb | 2 +- .../application_helper/toolbar/miq_alert_center.rb | 2 +- .../toolbar/miq_alert_profile_center.rb | 2 +- .../toolbar/miq_alert_profiles_center.rb | 2 +- .../application_helper/toolbar/miq_alerts_center.rb | 2 +- .../application_helper/toolbar/miq_dialog_center.rb | 2 +- .../application_helper/toolbar/miq_dialogs_center.rb | 2 +- .../application_helper/toolbar/miq_event_center.rb | 2 +- .../application_helper/toolbar/miq_group_center.rb | 4 ++-- .../application_helper/toolbar/miq_groups_center.rb | 4 ++-- .../toolbar/miq_policies_center.rb | 2 +- .../application_helper/toolbar/miq_policy_center.rb | 2 +- .../toolbar/miq_policy_profile_center.rb | 2 +- .../toolbar/miq_policy_profiles_center.rb | 2 +- .../application_helper/toolbar/miq_report_center.rb | 2 +- .../toolbar/miq_report_schedule_center.rb | 2 +- .../toolbar/miq_report_schedules_center.rb | 2 +- .../application_helper/toolbar/miq_reports_center.rb | 2 +- .../toolbar/miq_schedule_center.rb | 2 +- .../toolbar/miq_schedules_center.rb | 2 +- .../toolbar/miq_templates_center.rb | 4 ++-- .../application_helper/toolbar/miq_widget_center.rb | 4 ++-- .../toolbar/miq_widget_set_center.rb | 2 +- .../toolbar/miq_widget_sets_center.rb | 2 +- .../application_helper/toolbar/miq_widgets_center.rb | 2 +- .../toolbar/network_port_center.rb | 2 +- .../toolbar/network_ports_center.rb | 2 +- .../toolbar/network_router_center.rb | 4 ++-- .../toolbar/network_routers_center.rb | 4 ++-- .../toolbar/orchestration_stack_center.rb | 6 +++--- .../toolbar/orchestration_stacks_center.rb | 6 +++--- .../toolbar/orchestration_template_center.rb | 4 ++-- .../toolbar/orchestration_templates_center.rb | 4 ++-- .../toolbar/persistent_volume_center.rb | 2 +- .../toolbar/persistent_volumes_center.rb | 2 +- .../toolbar/physical_rack_center.rb | 2 +- .../toolbar/physical_racks_center.rb | 2 +- .../toolbar/physical_server_center.rb | 8 ++++---- .../toolbar/physical_servers_center.rb | 6 +++--- .../toolbar/physical_storage_center.rb | 2 +- .../toolbar/physical_storages_center.rb | 2 +- .../toolbar/physical_switch_center.rb | 2 +- .../toolbar/physical_switches_center.rb | 2 +- .../application_helper/toolbar/pxe_image_center.rb | 2 +- .../toolbar/pxe_image_type_center.rb | 2 +- .../toolbar/pxe_image_types_center.rb | 2 +- .../application_helper/toolbar/pxe_server_center.rb | 2 +- .../application_helper/toolbar/pxe_servers_center.rb | 2 +- .../toolbar/resource_pool_center.rb | 4 ++-- .../toolbar/resource_pools_center.rb | 4 ++-- .../toolbar/saved_report_center.rb | 2 +- .../toolbar/saved_reports_center.rb | 2 +- .../toolbar/scan_profile_center.rb | 2 +- .../toolbar/scan_profiles_center.rb | 2 +- .../toolbar/security_group_center.rb | 4 ++-- .../toolbar/security_groups_center.rb | 4 ++-- .../toolbar/service/lifecycle_mixin.rb | 2 +- .../toolbar/service/policy_mixin.rb | 2 +- .../application_helper/toolbar/service/vmdb_mixin.rb | 2 +- .../application_helper/toolbar/service_center.rb | 6 +++--- .../toolbar/servicetemplate_center.rb | 4 ++-- .../toolbar/servicetemplatecatalog_center.rb | 2 +- .../toolbar/servicetemplatecatalogs_center.rb | 2 +- .../toolbar/servicetemplates_center.rb | 4 ++-- .../toolbar/stack_orchestration_template_center.rb | 2 +- .../application_helper/toolbar/storage_center.rb | 6 +++--- .../application_helper/toolbar/storages_center.rb | 4 ++-- .../toolbar/template_clouds_center.rb | 4 ++-- .../toolbar/template_infras_center.rb | 6 +++--- .../application_helper/toolbar/tenant_center.rb | 4 ++-- .../application_helper/toolbar/tenants_center.rb | 4 ++-- .../toolbar/time_profiles_center.rb | 2 +- .../application_helper/toolbar/user_center.rb | 4 ++-- .../application_helper/toolbar/user_role_center.rb | 2 +- .../application_helper/toolbar/user_roles_center.rb | 2 +- .../application_helper/toolbar/users_center.rb | 4 ++-- .../application_helper/toolbar/vm_clouds_center.rb | 8 ++++---- .../application_helper/toolbar/vm_infras_center.rb | 8 ++++---- app/helpers/application_helper/toolbar/vms_center.rb | 6 +++--- .../toolbar/windows_image_center.rb | 2 +- ...manager_ansible_tower_configured_system_center.rb | 2 +- .../toolbar/x_configuration_script_center.rb | 4 ++-- .../toolbar/x_configuration_scripts_center.rb | 2 +- .../toolbar/x_foreman_configured_system_center.rb | 4 ++-- .../toolbar/x_miq_template_center.rb | 8 ++++---- ...vider_foreman_foreman_configured_system_center.rb | 4 ++-- .../toolbar/x_template_cloud_center.rb | 6 +++--- .../application_helper/toolbar/x_vm_center.rb | 12 ++++++------ .../application_helper/toolbar/x_vm_cloud_center.rb | 8 ++++---- .../application_helper/toolbar/zone_center.rb | 2 +- .../application_helper/toolbar/zones_center.rb | 2 +- .../application_helper/toolbar_builder_spec.rb | 4 ++-- 221 files changed, 352 insertions(+), 352 deletions(-) diff --git a/app/helpers/application_helper/toolbar/ansible_credential_center.rb b/app/helpers/application_helper/toolbar/ansible_credential_center.rb index 6a5611c552d..b18c6e88a5e 100644 --- a/app/helpers/application_helper/toolbar/ansible_credential_center.rb +++ b/app/helpers/application_helper/toolbar/ansible_credential_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::AnsibleCredentialCenter < ApplicationHelper::T button_group('ansible_repository', [ select( :ansible_credential_configuration, - '', + nil, t = N_('Configuration'), t, :items => [ @@ -27,7 +27,7 @@ class ApplicationHelper::Toolbar::AnsibleCredentialCenter < ApplicationHelper::T button_group('embedded_ansible_credentials_policy', [ select( :embedded_ansible_credentials_policy_choice, - '', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/ansible_credentials_center.rb b/app/helpers/application_helper/toolbar/ansible_credentials_center.rb index 8a74ab1e2b5..b4040be537d 100644 --- a/app/helpers/application_helper/toolbar/ansible_credentials_center.rb +++ b/app/helpers/application_helper/toolbar/ansible_credentials_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::AnsibleCredentialsCenter < ApplicationHelper:: button_group('embedded_ansible_credentials', [ select( :embedded_ansible_credentials_configuration, - '', + nil, t = N_('Configuration'), t, :items => [ @@ -41,7 +41,7 @@ class ApplicationHelper::Toolbar::AnsibleCredentialsCenter < ApplicationHelper:: button_group('embedded_ansible_credentials_policy', [ select( :embedded_ansible_credentials_policy_choice, - '', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/ansible_playbook_center.rb b/app/helpers/application_helper/toolbar/ansible_playbook_center.rb index 1abf1940e5c..cd114ab669f 100644 --- a/app/helpers/application_helper/toolbar/ansible_playbook_center.rb +++ b/app/helpers/application_helper/toolbar/ansible_playbook_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::AnsiblePlaybookCenter < ApplicationHelper::Too button_group('ansible_playbooks_policy', [ select( :ansible_playbooks_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/ansible_playbooks_center.rb b/app/helpers/application_helper/toolbar/ansible_playbooks_center.rb index ffad5991c04..2210727432d 100644 --- a/app/helpers/application_helper/toolbar/ansible_playbooks_center.rb +++ b/app/helpers/application_helper/toolbar/ansible_playbooks_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::AnsiblePlaybooksCenter < ApplicationHelper::To button_group('ansible_playbooks_policy', [ select( :ansible_playbooks_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/ansible_repositories_center.rb b/app/helpers/application_helper/toolbar/ansible_repositories_center.rb index 1f1e87a0709..935fab17602 100644 --- a/app/helpers/application_helper/toolbar/ansible_repositories_center.rb +++ b/app/helpers/application_helper/toolbar/ansible_repositories_center.rb @@ -12,7 +12,7 @@ class ApplicationHelper::Toolbar::AnsibleRepositoriesCenter < ApplicationHelper: button_group('ansible_repositories', [ select( :ansible_repositories_configuration, - '', + nil, t = N_('Configuration'), t, :items => [ @@ -64,7 +64,7 @@ class ApplicationHelper::Toolbar::AnsibleRepositoriesCenter < ApplicationHelper: button_group('ansible_repositories_policy', [ select( :ansible_repositories_policy_choice, - '', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/ansible_repository_center.rb b/app/helpers/application_helper/toolbar/ansible_repository_center.rb index 7c318ee6231..ac16760e1e8 100644 --- a/app/helpers/application_helper/toolbar/ansible_repository_center.rb +++ b/app/helpers/application_helper/toolbar/ansible_repository_center.rb @@ -12,7 +12,7 @@ class ApplicationHelper::Toolbar::AnsibleRepositoryCenter < ApplicationHelper::T button_group('ansible_repository', [ select( :ansible_repository_configuration, - '', + nil, t = N_('Configuration'), t, :items => [ @@ -48,7 +48,7 @@ class ApplicationHelper::Toolbar::AnsibleRepositoryCenter < ApplicationHelper::T button_group('ansible_repositories_policy', [ select( :ansible_repositories_policy_choice, - '', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/auth_key_pair_cloud_center.rb b/app/helpers/application_helper/toolbar/auth_key_pair_cloud_center.rb index 9b2718ba55b..f0073dda9a2 100644 --- a/app/helpers/application_helper/toolbar/auth_key_pair_cloud_center.rb +++ b/app/helpers/application_helper/toolbar/auth_key_pair_cloud_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::AuthKeyPairCloudCenter < ApplicationHelper::To button_group('auth_key_pair_cloud_vmdb', [ select( :auth_key_pair_cloud_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -32,7 +32,7 @@ class ApplicationHelper::Toolbar::AuthKeyPairCloudCenter < ApplicationHelper::To button_group('auth_key_pair_cloud_policy', [ select( :auth_key_pair_cloud_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/auth_key_pair_clouds_center.rb b/app/helpers/application_helper/toolbar/auth_key_pair_clouds_center.rb index bc3124efb4c..51f638bcc2f 100644 --- a/app/helpers/application_helper/toolbar/auth_key_pair_clouds_center.rb +++ b/app/helpers/application_helper/toolbar/auth_key_pair_clouds_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::AuthKeyPairCloudsCenter < ApplicationHelper::T button_group('auth_key_pair_cloud_vmdb', [ select( :auth_key_pair_cloud_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -38,7 +38,7 @@ class ApplicationHelper::Toolbar::AuthKeyPairCloudsCenter < ApplicationHelper::T button_group('auth_key_pair_cloud_policy', [ select( :auth_key_pair_cloud_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/automation_manager_provider_center.rb b/app/helpers/application_helper/toolbar/automation_manager_provider_center.rb index 7fc899ba14a..e272d7bb042 100644 --- a/app/helpers/application_helper/toolbar/automation_manager_provider_center.rb +++ b/app/helpers/application_helper/toolbar/automation_manager_provider_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::AutomationManagerProviderCenter < ApplicationH button_group('provider_vmdb', [ select( :provider_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :enabled => true, diff --git a/app/helpers/application_helper/toolbar/automation_manager_providers_center.rb b/app/helpers/application_helper/toolbar/automation_manager_providers_center.rb index 495cc9059b7..c39ae636c62 100644 --- a/app/helpers/application_helper/toolbar/automation_manager_providers_center.rb +++ b/app/helpers/application_helper/toolbar/automation_manager_providers_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::AutomationManagerProvidersCenter < Application button_group('provider_vmdb', [ select( :provider_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :enabled => true, @@ -57,7 +57,7 @@ class ApplicationHelper::Toolbar::AutomationManagerProvidersCenter < Application button_group('automation_manager_policy', [ select( :automation_manager_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/availability_zone_center.rb b/app/helpers/application_helper/toolbar/availability_zone_center.rb index 60d82c700d6..87818b1dbb7 100644 --- a/app/helpers/application_helper/toolbar/availability_zone_center.rb +++ b/app/helpers/application_helper/toolbar/availability_zone_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::AvailabilityZoneCenter < ApplicationHelper::To button_group('availability_zone_policy', [ select( :availability_zone_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ @@ -17,7 +17,7 @@ class ApplicationHelper::Toolbar::AvailabilityZoneCenter < ApplicationHelper::To button_group('availability_zone_monitoring', [ select( :availability_zone_monitoring_choice, - 'ff ff-monitoring fa-lg', + nil, t = N_('Monitoring'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/availability_zones_center.rb b/app/helpers/application_helper/toolbar/availability_zones_center.rb index e16a0777e1e..2ed62788f11 100644 --- a/app/helpers/application_helper/toolbar/availability_zones_center.rb +++ b/app/helpers/application_helper/toolbar/availability_zones_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::AvailabilityZonesCenter < ApplicationHelper::T button_group('availability_zone_policy', [ select( :availability_zone_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/catalogitem_button_center.rb b/app/helpers/application_helper/toolbar/catalogitem_button_center.rb index a9dec75d7b6..39d1e07c98a 100644 --- a/app/helpers/application_helper/toolbar/catalogitem_button_center.rb +++ b/app/helpers/application_helper/toolbar/catalogitem_button_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::CatalogitemButtonCenter < ApplicationHelper::T button_group('catalogitem_button_vmdb', [ select( :catalogitem_button_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/catalogitem_buttons_center.rb b/app/helpers/application_helper/toolbar/catalogitem_buttons_center.rb index afb08475145..8d18b14de2c 100644 --- a/app/helpers/application_helper/toolbar/catalogitem_buttons_center.rb +++ b/app/helpers/application_helper/toolbar/catalogitem_buttons_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::CatalogitemButtonsCenter < ApplicationHelper:: button_group('catalogitem_button_vmdb', [ select( :catalogitem_button_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/chargeback_center.rb b/app/helpers/application_helper/toolbar/chargeback_center.rb index a7a2d7090ee..9219acb5460 100644 --- a/app/helpers/application_helper/toolbar/chargeback_center.rb +++ b/app/helpers/application_helper/toolbar/chargeback_center.rb @@ -44,7 +44,7 @@ class ApplicationHelper::Toolbar::ChargebackCenter < ApplicationHelper::Toolbar: button_group('chargeback_vmdb', [ select( :chargeback_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/chargebacks_center.rb b/app/helpers/application_helper/toolbar/chargebacks_center.rb index 8af11ec0f36..38419b34fb5 100644 --- a/app/helpers/application_helper/toolbar/chargebacks_center.rb +++ b/app/helpers/application_helper/toolbar/chargebacks_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ChargebacksCenter < ApplicationHelper::Toolbar button_group('chargeback_vmdb', [ select( :chargeback_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/cloud_network_center.rb b/app/helpers/application_helper/toolbar/cloud_network_center.rb index 473d01d6a0d..e0d7462e1bc 100644 --- a/app/helpers/application_helper/toolbar/cloud_network_center.rb +++ b/app/helpers/application_helper/toolbar/cloud_network_center.rb @@ -4,7 +4,7 @@ class ApplicationHelper::Toolbar::CloudNetworkCenter < ApplicationHelper::Toolba [ select( :cloud_network_vmdb_choice, - '', + nil, t = N_('Configuration'), t, :items => [ @@ -38,7 +38,7 @@ class ApplicationHelper::Toolbar::CloudNetworkCenter < ApplicationHelper::Toolba [ select( :cloud_network_policy_choice, - '', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/cloud_networks_center.rb b/app/helpers/application_helper/toolbar/cloud_networks_center.rb index 83659a7a060..fb0c85405c2 100644 --- a/app/helpers/application_helper/toolbar/cloud_networks_center.rb +++ b/app/helpers/application_helper/toolbar/cloud_networks_center.rb @@ -4,7 +4,7 @@ class ApplicationHelper::Toolbar::CloudNetworksCenter < ApplicationHelper::Toolb [ select( :cloud_network_vmdb_choice, - '', + nil, t = N_('Configuration'), t, :items => [ @@ -24,7 +24,7 @@ class ApplicationHelper::Toolbar::CloudNetworksCenter < ApplicationHelper::Toolb [ select( :cloud_network_policy_choice, - '', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/cloud_object_store_container_center.rb b/app/helpers/application_helper/toolbar/cloud_object_store_container_center.rb index 0079be73431..c0d5b5af648 100644 --- a/app/helpers/application_helper/toolbar/cloud_object_store_container_center.rb +++ b/app/helpers/application_helper/toolbar/cloud_object_store_container_center.rb @@ -4,7 +4,7 @@ class ApplicationHelper::Toolbar::CloudObjectStoreContainerCenter < ApplicationH [ select( :cloud_object_store_container_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -39,7 +39,7 @@ class ApplicationHelper::Toolbar::CloudObjectStoreContainerCenter < ApplicationH button_group('cloud_object_store_container_policy', [ select( :cloud_object_store_container_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/cloud_object_store_containers_center.rb b/app/helpers/application_helper/toolbar/cloud_object_store_containers_center.rb index 003307a5d4e..5fa9e450048 100644 --- a/app/helpers/application_helper/toolbar/cloud_object_store_containers_center.rb +++ b/app/helpers/application_helper/toolbar/cloud_object_store_containers_center.rb @@ -4,7 +4,7 @@ class ApplicationHelper::Toolbar::CloudObjectStoreContainersCenter < Application [ select( :cloud_object_store_container_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :enabled => true, @@ -48,7 +48,7 @@ class ApplicationHelper::Toolbar::CloudObjectStoreContainersCenter < Application button_group('cloud_object_store_container_policy', [ select( :cloud_object_store_container_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/cloud_object_store_object_center.rb b/app/helpers/application_helper/toolbar/cloud_object_store_object_center.rb index 657f5eed8e3..42156cbfcfd 100644 --- a/app/helpers/application_helper/toolbar/cloud_object_store_object_center.rb +++ b/app/helpers/application_helper/toolbar/cloud_object_store_object_center.rb @@ -4,7 +4,7 @@ class ApplicationHelper::Toolbar::CloudObjectStoreObjectCenter < ApplicationHelp [ select( :cloud_object_store_object_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -26,7 +26,7 @@ class ApplicationHelper::Toolbar::CloudObjectStoreObjectCenter < ApplicationHelp button_group('cloud_object_store_object_policy', [ select( :cloud_object_store_object_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/cloud_object_store_objects_center.rb b/app/helpers/application_helper/toolbar/cloud_object_store_objects_center.rb index 8687169e39d..f8528e0223a 100644 --- a/app/helpers/application_helper/toolbar/cloud_object_store_objects_center.rb +++ b/app/helpers/application_helper/toolbar/cloud_object_store_objects_center.rb @@ -4,7 +4,7 @@ class ApplicationHelper::Toolbar::CloudObjectStoreObjectsCenter < ApplicationHel [ select( :cloud_object_store_object_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :enabled => false, @@ -28,7 +28,7 @@ class ApplicationHelper::Toolbar::CloudObjectStoreObjectsCenter < ApplicationHel button_group('cloud_object_store_object_policy', [ select( :cloud_object_store_object_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/cloud_subnet_center.rb b/app/helpers/application_helper/toolbar/cloud_subnet_center.rb index 2dd42bb41e9..6bfdb64ba71 100644 --- a/app/helpers/application_helper/toolbar/cloud_subnet_center.rb +++ b/app/helpers/application_helper/toolbar/cloud_subnet_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::CloudSubnetCenter < ApplicationHelper::Toolbar button_group('cloud_subnet_vmdb', [ select( :cloud_subnet_vmdb_choice, - '', + nil, t = N_('Configuration'), t, :items => [ @@ -33,7 +33,7 @@ class ApplicationHelper::Toolbar::CloudSubnetCenter < ApplicationHelper::Toolbar button_group('cloud_subnet_policy', [ select( :cloud_subnet_policy_choice, - '', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/cloud_subnets_center.rb b/app/helpers/application_helper/toolbar/cloud_subnets_center.rb index 10f40e2435f..80b6b65b840 100644 --- a/app/helpers/application_helper/toolbar/cloud_subnets_center.rb +++ b/app/helpers/application_helper/toolbar/cloud_subnets_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::CloudSubnetsCenter < ApplicationHelper::Toolba button_group('cloud_subnet_vmdb', [ select( :cloud_subnet_vmdb_choice, - '', + nil, t = N_('Configuration'), t, :items => [ @@ -41,7 +41,7 @@ class ApplicationHelper::Toolbar::CloudSubnetsCenter < ApplicationHelper::Toolba button_group('cloud_subnet_policy', [ select( :cloud_subnet_policy_choice, - '', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/cloud_tenant_center.rb b/app/helpers/application_helper/toolbar/cloud_tenant_center.rb index a195cb418a6..7d09c2db370 100644 --- a/app/helpers/application_helper/toolbar/cloud_tenant_center.rb +++ b/app/helpers/application_helper/toolbar/cloud_tenant_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::CloudTenantCenter < ApplicationHelper::Toolbar button_group('cloud_tenant_vmdb', [ select( :cloud_tenant_vmdb_choice, - '', + nil, t = N_('Configuration'), t, :items => [ @@ -22,7 +22,7 @@ class ApplicationHelper::Toolbar::CloudTenantCenter < ApplicationHelper::Toolbar button_group('cloud_tenant_policy', [ select( :cloud_tenant_policy_choice, - '', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/cloud_tenants_center.rb b/app/helpers/application_helper/toolbar/cloud_tenants_center.rb index 8a6794fd037..9dca3d269ae 100644 --- a/app/helpers/application_helper/toolbar/cloud_tenants_center.rb +++ b/app/helpers/application_helper/toolbar/cloud_tenants_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::CloudTenantsCenter < ApplicationHelper::Toolba button_group('cloud_tenant_vmdb', [ select( :cloud_tenant_vmdb_choice, - '', + nil, t = N_('Configuration'), t, :items => [ @@ -37,7 +37,7 @@ class ApplicationHelper::Toolbar::CloudTenantsCenter < ApplicationHelper::Toolba button_group('cloud_tenant_policy', [ select( :cloud_tenant_policy_choice, - '', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/cloud_volume_backup_center.rb b/app/helpers/application_helper/toolbar/cloud_volume_backup_center.rb index b5f8e4cba88..59018fc5431 100644 --- a/app/helpers/application_helper/toolbar/cloud_volume_backup_center.rb +++ b/app/helpers/application_helper/toolbar/cloud_volume_backup_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::CloudVolumeBackupCenter < ApplicationHelper::T button_group('cloud_volume_backup', [ select( :cloud_volume_backup_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -20,7 +20,7 @@ class ApplicationHelper::Toolbar::CloudVolumeBackupCenter < ApplicationHelper::T button_group('cloud_volume_backup_policy', [ select( :cloud_volume_backup_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/cloud_volume_backups_center.rb b/app/helpers/application_helper/toolbar/cloud_volume_backups_center.rb index 0490ef443fb..160f994b727 100644 --- a/app/helpers/application_helper/toolbar/cloud_volume_backups_center.rb +++ b/app/helpers/application_helper/toolbar/cloud_volume_backups_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::CloudVolumeBackupsCenter < ApplicationHelper:: button_group('cloud_volume_backup', [ select( :cloud_volume_backup_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -34,7 +34,7 @@ class ApplicationHelper::Toolbar::CloudVolumeBackupsCenter < ApplicationHelper:: button_group('cloud_volume_backup_policy', [ select( :cloud_volume_backup_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/cloud_volume_center.rb b/app/helpers/application_helper/toolbar/cloud_volume_center.rb index e135e0fbde9..03adfb70a8f 100644 --- a/app/helpers/application_helper/toolbar/cloud_volume_center.rb +++ b/app/helpers/application_helper/toolbar/cloud_volume_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::CloudVolumeCenter < ApplicationHelper::Toolbar button_group('cloud_volume_vmdb', [ select( :cloud_volume_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -78,7 +78,7 @@ class ApplicationHelper::Toolbar::CloudVolumeCenter < ApplicationHelper::Toolbar button_group('cloud_volume_policy', [ select( :cloud_volume_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/cloud_volume_snapshot_center.rb b/app/helpers/application_helper/toolbar/cloud_volume_snapshot_center.rb index 174441b5de7..4860dae5c31 100644 --- a/app/helpers/application_helper/toolbar/cloud_volume_snapshot_center.rb +++ b/app/helpers/application_helper/toolbar/cloud_volume_snapshot_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::CloudVolumeSnapshotCenter < ApplicationHelper: button_group('cloud_volume_snapshot_vmdb', [ select( :cloud_volume_snapshot_vmdb_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -18,7 +18,7 @@ class ApplicationHelper::Toolbar::CloudVolumeSnapshotCenter < ApplicationHelper: button_group('cloud_volume_snapshot_policy', [ select( :cloud_volume_snapshot_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/cloud_volume_snapshots_center.rb b/app/helpers/application_helper/toolbar/cloud_volume_snapshots_center.rb index 4bd0b5c4ddc..a0ecd1ba1af 100644 --- a/app/helpers/application_helper/toolbar/cloud_volume_snapshots_center.rb +++ b/app/helpers/application_helper/toolbar/cloud_volume_snapshots_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::CloudVolumeSnapshotsCenter < ApplicationHelper button_group('cloud_volume_snapshot_policy', [ select( :cloud_volume_snapshot_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/cloud_volume_type_center.rb b/app/helpers/application_helper/toolbar/cloud_volume_type_center.rb index a41017d5bca..8c33ad79726 100644 --- a/app/helpers/application_helper/toolbar/cloud_volume_type_center.rb +++ b/app/helpers/application_helper/toolbar/cloud_volume_type_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::CloudVolumeTypeCenter < ApplicationHelper::Too button_group('cloud_volume_type_policy', [ select( :cloud_volume_type_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/cloud_volume_types_center.rb b/app/helpers/application_helper/toolbar/cloud_volume_types_center.rb index 90583b5656c..1a02b5de94e 100644 --- a/app/helpers/application_helper/toolbar/cloud_volume_types_center.rb +++ b/app/helpers/application_helper/toolbar/cloud_volume_types_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::CloudVolumeTypesCenter < ApplicationHelper::To button_group('cloud_volume_type_policy', [ select( :cloud_volume_type_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/cloud_volumes_center.rb b/app/helpers/application_helper/toolbar/cloud_volumes_center.rb index a25e98149fc..7bae552ef07 100644 --- a/app/helpers/application_helper/toolbar/cloud_volumes_center.rb +++ b/app/helpers/application_helper/toolbar/cloud_volumes_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::CloudVolumesCenter < ApplicationHelper::Toolba button_group('cloud_volume_vmdb', [ select( :cloud_volume_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -93,7 +93,7 @@ class ApplicationHelper::Toolbar::CloudVolumesCenter < ApplicationHelper::Toolba button_group('cloud_volume_policy', [ select( :cloud_volume_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => "false", diff --git a/app/helpers/application_helper/toolbar/condition_center.rb b/app/helpers/application_helper/toolbar/condition_center.rb index 613141111d7..c9f803f4a3a 100644 --- a/app/helpers/application_helper/toolbar/condition_center.rb +++ b/app/helpers/application_helper/toolbar/condition_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ConditionCenter < ApplicationHelper::Toolbar:: button_group('condition_vmdb', [ select( :condition_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/conditions_center.rb b/app/helpers/application_helper/toolbar/conditions_center.rb index 07ffce028f9..20512223d4d 100644 --- a/app/helpers/application_helper/toolbar/conditions_center.rb +++ b/app/helpers/application_helper/toolbar/conditions_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ConditionsCenter < ApplicationHelper::Toolbar: button_group('condition_vmdb', [ select( :condition_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/configuration_job_center.rb b/app/helpers/application_helper/toolbar/configuration_job_center.rb index e9c6952c49d..01f24a86855 100644 --- a/app/helpers/application_helper/toolbar/configuration_job_center.rb +++ b/app/helpers/application_helper/toolbar/configuration_job_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ConfigurationJobCenter < ApplicationHelper::To button_group('configuration_job_vmdb', [ select( :configuration_job_vmdb_choice, - '', + nil, t = N_('Configuration'), t, :items => [ @@ -19,7 +19,7 @@ class ApplicationHelper::Toolbar::ConfigurationJobCenter < ApplicationHelper::To button_group('configuration_job_policy', [ select( :configuration_job_policy_choice, - '', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/configuration_jobs_center.rb b/app/helpers/application_helper/toolbar/configuration_jobs_center.rb index 153828101ad..2aa234dc281 100644 --- a/app/helpers/application_helper/toolbar/configuration_jobs_center.rb +++ b/app/helpers/application_helper/toolbar/configuration_jobs_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ConfigurationJobsCenter < ApplicationHelper::T button_group('configuration_job_vmdb', [ select( :configuration_job_vmdb_choice, - '', + nil, t = N_('Configuration'), t, :items => [ @@ -22,7 +22,7 @@ class ApplicationHelper::Toolbar::ConfigurationJobsCenter < ApplicationHelper::T button_group('configuration_job_policy', [ select( :configuration_job_policy_choice, - '', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/configuration_manager_provider_center.rb b/app/helpers/application_helper/toolbar/configuration_manager_provider_center.rb index 65b62fe2517..73f8d58700d 100644 --- a/app/helpers/application_helper/toolbar/configuration_manager_provider_center.rb +++ b/app/helpers/application_helper/toolbar/configuration_manager_provider_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ConfigurationManagerProviderCenter < Applicati button_group('provider_vmdb', [ select( :provider_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :enabled => true, diff --git a/app/helpers/application_helper/toolbar/configuration_manager_providers_center.rb b/app/helpers/application_helper/toolbar/configuration_manager_providers_center.rb index 21b9bfbe18a..80171de0df3 100644 --- a/app/helpers/application_helper/toolbar/configuration_manager_providers_center.rb +++ b/app/helpers/application_helper/toolbar/configuration_manager_providers_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ConfigurationManagerProvidersCenter < Applicat button_group('provider_vmdb', [ select( :provider_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :enabled => true, @@ -54,7 +54,7 @@ class ApplicationHelper::Toolbar::ConfigurationManagerProvidersCenter < Applicat button_group('configuration_manager_policy', [ select( :configuration_manager_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/configuration_script_center.rb b/app/helpers/application_helper/toolbar/configuration_script_center.rb index 6f9b4c2e7e4..ef791f3229a 100644 --- a/app/helpers/application_helper/toolbar/configuration_script_center.rb +++ b/app/helpers/application_helper/toolbar/configuration_script_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ConfigurationScriptCenter < ApplicationHelper: button_group('configuration_script_vmdb', [ select( :configuration_script_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -15,7 +15,7 @@ class ApplicationHelper::Toolbar::ConfigurationScriptCenter < ApplicationHelper: ), select( :automation_manager_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => true, diff --git a/app/helpers/application_helper/toolbar/configuration_scripts/policy_mixin.rb b/app/helpers/application_helper/toolbar/configuration_scripts/policy_mixin.rb index e2bc2d885c2..0a7c7e440dd 100644 --- a/app/helpers/application_helper/toolbar/configuration_scripts/policy_mixin.rb +++ b/app/helpers/application_helper/toolbar/configuration_scripts/policy_mixin.rb @@ -2,7 +2,7 @@ module ApplicationHelper::Toolbar::ConfigurationScripts::PolicyMixin def self.included(included_class) included_class.button_group('provider_foreman_policy', [included_class.select(:provider_foreman_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/configuration_scripts_center.rb b/app/helpers/application_helper/toolbar/configuration_scripts_center.rb index 517480f707c..216c4d9e9d9 100644 --- a/app/helpers/application_helper/toolbar/configuration_scripts_center.rb +++ b/app/helpers/application_helper/toolbar/configuration_scripts_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ConfigurationScriptsCenter < ApplicationHelper button_group('configuration_script_vmdb', [ select( :configuration_script_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/configured_system/automation/policy_mixin.rb b/app/helpers/application_helper/toolbar/configured_system/automation/policy_mixin.rb index 6706d39407a..b48d53213a5 100644 --- a/app/helpers/application_helper/toolbar/configured_system/automation/policy_mixin.rb +++ b/app/helpers/application_helper/toolbar/configured_system/automation/policy_mixin.rb @@ -3,7 +3,7 @@ def self.included(included_class) included_class.button_group('automation_manager_policy', [ included_class.select( :automation_manager_policy_choice, - 'fa fa-shield fa-lg', + nil, N_('Policy'), :enabled => true, :items => [ diff --git a/app/helpers/application_helper/toolbar/configured_system/foreman/lifecycle_mixin.rb b/app/helpers/application_helper/toolbar/configured_system/foreman/lifecycle_mixin.rb index baa6133a565..dc3b9a07f7a 100644 --- a/app/helpers/application_helper/toolbar/configured_system/foreman/lifecycle_mixin.rb +++ b/app/helpers/application_helper/toolbar/configured_system/foreman/lifecycle_mixin.rb @@ -3,7 +3,7 @@ def self.included(included_class) included_class.button_group('provider_foreman_lifecycle', [ included_class.select( :provider_foreman_lifecycle_choice, - 'fa fa-recycle fa-lg', + nil, N_('Lifecycle'), :enabled => true, :items => [ diff --git a/app/helpers/application_helper/toolbar/configured_system/foreman/policy_mixin.rb b/app/helpers/application_helper/toolbar/configured_system/foreman/policy_mixin.rb index cf99550bb95..278d75b464c 100644 --- a/app/helpers/application_helper/toolbar/configured_system/foreman/policy_mixin.rb +++ b/app/helpers/application_helper/toolbar/configured_system/foreman/policy_mixin.rb @@ -3,7 +3,7 @@ def self.included(included_class) included_class.button_group('provider_foreman_policy', [ included_class.select( :provider_foreman_policy_choice, - 'fa fa-shield fa-lg', + nil, N_('Policy'), :items => [ included_class.button( diff --git a/app/helpers/application_helper/toolbar/container_build_center.rb b/app/helpers/application_helper/toolbar/container_build_center.rb index c5d11794b33..288949f26f1 100644 --- a/app/helpers/application_helper/toolbar/container_build_center.rb +++ b/app/helpers/application_helper/toolbar/container_build_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ContainerBuildCenter < ApplicationHelper::Tool button_group('container_build_vmdb', [ select( :container_build_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -18,7 +18,7 @@ class ApplicationHelper::Toolbar::ContainerBuildCenter < ApplicationHelper::Tool button_group('container_build_policy', [ select( :container_build_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/container_builds_center.rb b/app/helpers/application_helper/toolbar/container_builds_center.rb index e07974e99f6..687575b4584 100644 --- a/app/helpers/application_helper/toolbar/container_builds_center.rb +++ b/app/helpers/application_helper/toolbar/container_builds_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ContainerBuildsCenter < ApplicationHelper::Too button_group('container_build_vmdb', [ select( :container_build_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -22,7 +22,7 @@ class ApplicationHelper::Toolbar::ContainerBuildsCenter < ApplicationHelper::Too button_group('container_build_policy', [ select( :container_build_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/container_center.rb b/app/helpers/application_helper/toolbar/container_center.rb index 0debb2fa8dc..38f6357f7b8 100644 --- a/app/helpers/application_helper/toolbar/container_center.rb +++ b/app/helpers/application_helper/toolbar/container_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ContainerCenter < ApplicationHelper::Toolbar:: button_group('container_monitoring', [ select( :container_monitoring_choice, - 'ff ff-monitoring fa-lg', + nil, t = N_('Monitoring'), t, :items => [ @@ -32,7 +32,7 @@ class ApplicationHelper::Toolbar::ContainerCenter < ApplicationHelper::Toolbar:: button_group('container_policy', [ select( :container_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/container_group_center.rb b/app/helpers/application_helper/toolbar/container_group_center.rb index 2c8c860bac2..ec5352fadc5 100644 --- a/app/helpers/application_helper/toolbar/container_group_center.rb +++ b/app/helpers/application_helper/toolbar/container_group_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ContainerGroupCenter < ApplicationHelper::Tool button_group('container_group_monitoring', [ select( :container_group_monitoring_choice, - 'ff ff-monitoring fa-lg', + nil, t = N_('Monitoring'), t, :items => [ @@ -31,7 +31,7 @@ class ApplicationHelper::Toolbar::ContainerGroupCenter < ApplicationHelper::Tool button_group('container_group_policy', [ select( :container_group_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/container_groups_center.rb b/app/helpers/application_helper/toolbar/container_groups_center.rb index 8cea367f678..3429f389059 100644 --- a/app/helpers/application_helper/toolbar/container_groups_center.rb +++ b/app/helpers/application_helper/toolbar/container_groups_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ContainerGroupsCenter < ApplicationHelper::Too button_group('container_group_policy', [ select( :container_group_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/container_image_center.rb b/app/helpers/application_helper/toolbar/container_image_center.rb index b0b6d708c39..f0c1812432e 100644 --- a/app/helpers/application_helper/toolbar/container_image_center.rb +++ b/app/helpers/application_helper/toolbar/container_image_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ContainerImageCenter < ApplicationHelper::Tool button_group('container_image_vmdb', [ select( :container_image_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -20,7 +20,7 @@ class ApplicationHelper::Toolbar::ContainerImageCenter < ApplicationHelper::Tool button_group('container_image_policy', [ select( :container_image_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/container_image_registries_center.rb b/app/helpers/application_helper/toolbar/container_image_registries_center.rb index 52a6fa481b9..b13d85193d9 100644 --- a/app/helpers/application_helper/toolbar/container_image_registries_center.rb +++ b/app/helpers/application_helper/toolbar/container_image_registries_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ContainerImageRegistriesCenter < ApplicationHe button_group('container_image_registry_policy', [ select( :container_image_registry_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/container_image_registry_center.rb b/app/helpers/application_helper/toolbar/container_image_registry_center.rb index 06759ddb7be..c5ae6045d1d 100644 --- a/app/helpers/application_helper/toolbar/container_image_registry_center.rb +++ b/app/helpers/application_helper/toolbar/container_image_registry_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ContainerImageRegistryCenter < ApplicationHelp button_group('container_image_registry_policy', [ select( :container_image_registry_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/container_images_center.rb b/app/helpers/application_helper/toolbar/container_images_center.rb index 4f697ce6034..1e8b06c8c15 100644 --- a/app/helpers/application_helper/toolbar/container_images_center.rb +++ b/app/helpers/application_helper/toolbar/container_images_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ContainerImagesCenter < ApplicationHelper::Too button_group('container_image_vmdb', [ select( :container_image_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -23,7 +23,7 @@ class ApplicationHelper::Toolbar::ContainerImagesCenter < ApplicationHelper::Too button_group('container_image_policy', [ select( :container_image_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/container_node_center.rb b/app/helpers/application_helper/toolbar/container_node_center.rb index 769a0a6e0e1..568fc2ae9bd 100644 --- a/app/helpers/application_helper/toolbar/container_node_center.rb +++ b/app/helpers/application_helper/toolbar/container_node_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ContainerNodeCenter < ApplicationHelper::Toolb button_group('container_node_monitoring', [ select( :container_node_monitoring_choice, - '', + nil, t = N_('Monitoring'), t, :items => [ @@ -48,7 +48,7 @@ class ApplicationHelper::Toolbar::ContainerNodeCenter < ApplicationHelper::Toolb button_group('container_node_policy', [ select( :container_node_policy_choice, - '', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/container_nodes_center.rb b/app/helpers/application_helper/toolbar/container_nodes_center.rb index fa2e9e64e99..906cffe184d 100644 --- a/app/helpers/application_helper/toolbar/container_nodes_center.rb +++ b/app/helpers/application_helper/toolbar/container_nodes_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ContainerNodesCenter < ApplicationHelper::Tool button_group('container_node_policy', [ select( :container_node_policy_choice, - '', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/container_project_center.rb b/app/helpers/application_helper/toolbar/container_project_center.rb index 8a6d000f1f4..fcc45ede0ff 100644 --- a/app/helpers/application_helper/toolbar/container_project_center.rb +++ b/app/helpers/application_helper/toolbar/container_project_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ContainerProjectCenter < ApplicationHelper::To button_group('container_project_monitoring', [ select( :container_project_monitoring_choice, - 'ff ff-monitoring fa-lg', + nil, t = N_('Monitoring'), t, :items => [ @@ -31,7 +31,7 @@ class ApplicationHelper::Toolbar::ContainerProjectCenter < ApplicationHelper::To button_group('container_project_policy', [ select( :container_project_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/container_projects_center.rb b/app/helpers/application_helper/toolbar/container_projects_center.rb index 5f7b1d905f4..832b7241588 100644 --- a/app/helpers/application_helper/toolbar/container_projects_center.rb +++ b/app/helpers/application_helper/toolbar/container_projects_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ContainerProjectsCenter < ApplicationHelper::T button_group('container_project_policy', [ select( :container_project_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/container_replicator_center.rb b/app/helpers/application_helper/toolbar/container_replicator_center.rb index 918e9cda7ea..ee0cc4c1a3f 100644 --- a/app/helpers/application_helper/toolbar/container_replicator_center.rb +++ b/app/helpers/application_helper/toolbar/container_replicator_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ContainerReplicatorCenter < ApplicationHelper: button_group('container_replicator_monitoring', [ select( :container_replicator_monitoring_choice, - 'ff ff-monitoring fa-lg', + nil, t = N_('Monitoring'), t, :items => [ @@ -28,7 +28,7 @@ class ApplicationHelper::Toolbar::ContainerReplicatorCenter < ApplicationHelper: button_group('container_replicator_policy', [ select( :container_replicator_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/container_replicators_center.rb b/app/helpers/application_helper/toolbar/container_replicators_center.rb index 4fbb947cc0b..9bf9b008966 100644 --- a/app/helpers/application_helper/toolbar/container_replicators_center.rb +++ b/app/helpers/application_helper/toolbar/container_replicators_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ContainerReplicatorsCenter < ApplicationHelper button_group('container_replicator_policy', [ select( :container_replicator_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/container_route_center.rb b/app/helpers/application_helper/toolbar/container_route_center.rb index b19eebebe07..f4a03f006fe 100644 --- a/app/helpers/application_helper/toolbar/container_route_center.rb +++ b/app/helpers/application_helper/toolbar/container_route_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ContainerRouteCenter < ApplicationHelper::Tool button_group('container_route_policy', [ select( :container_route_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/container_routes_center.rb b/app/helpers/application_helper/toolbar/container_routes_center.rb index e5fc1f2ce65..36ecd6d5951 100644 --- a/app/helpers/application_helper/toolbar/container_routes_center.rb +++ b/app/helpers/application_helper/toolbar/container_routes_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ContainerRoutesCenter < ApplicationHelper::Too button_group('container_route_policy', [ select( :container_route_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/container_service_center.rb b/app/helpers/application_helper/toolbar/container_service_center.rb index 62f97ede934..92e95ea0525 100644 --- a/app/helpers/application_helper/toolbar/container_service_center.rb +++ b/app/helpers/application_helper/toolbar/container_service_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ContainerServiceCenter < ApplicationHelper::To button_group('container_service_monitoring', [ select( :container_service_monitoring_choice, - 'ff ff-monitoring fa-lg', + nil, t = N_('Monitoring'), t, :items => [ @@ -22,7 +22,7 @@ class ApplicationHelper::Toolbar::ContainerServiceCenter < ApplicationHelper::To button_group('container_service_policy', [ select( :container_service_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/container_services_center.rb b/app/helpers/application_helper/toolbar/container_services_center.rb index 6f0853581bf..6f58e381115 100644 --- a/app/helpers/application_helper/toolbar/container_services_center.rb +++ b/app/helpers/application_helper/toolbar/container_services_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ContainerServicesCenter < ApplicationHelper::T button_group('container_service_policy', [ select( :container_service_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/container_template_center.rb b/app/helpers/application_helper/toolbar/container_template_center.rb index 79d2ea0bc51..1ad0f14b552 100644 --- a/app/helpers/application_helper/toolbar/container_template_center.rb +++ b/app/helpers/application_helper/toolbar/container_template_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ContainerTemplateCenter < ApplicationHelper::T button_group('orchestration_template_vmdb', [ select( :orchestration_template_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -17,7 +17,7 @@ class ApplicationHelper::Toolbar::ContainerTemplateCenter < ApplicationHelper::T button_group('container_template_policy', [ select( :container_template_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/container_templates_center.rb b/app/helpers/application_helper/toolbar/container_templates_center.rb index dad179eb9cf..bde3587b595 100644 --- a/app/helpers/application_helper/toolbar/container_templates_center.rb +++ b/app/helpers/application_helper/toolbar/container_templates_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ContainerTemplatesCenter < ApplicationHelper:: button_group('container_template_policy', [ select( :container_template_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/containers_center.rb b/app/helpers/application_helper/toolbar/containers_center.rb index 7ec2e1b77de..7b1108dbceb 100644 --- a/app/helpers/application_helper/toolbar/containers_center.rb +++ b/app/helpers/application_helper/toolbar/containers_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ContainersCenter < ApplicationHelper::Toolbar: button_group('container_policy', [ select( :container_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/custom_button_center.rb b/app/helpers/application_helper/toolbar/custom_button_center.rb index 6b020da822f..8a188bc9aed 100644 --- a/app/helpers/application_helper/toolbar/custom_button_center.rb +++ b/app/helpers/application_helper/toolbar/custom_button_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::CustomButtonCenter < ApplicationHelper::Toolba button_group('custom_button_vmdb', [ select( :custom_button_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/custom_button_set_center.rb b/app/helpers/application_helper/toolbar/custom_button_set_center.rb index ba61493ed92..7a63043b9f9 100644 --- a/app/helpers/application_helper/toolbar/custom_button_set_center.rb +++ b/app/helpers/application_helper/toolbar/custom_button_set_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::CustomButtonSetCenter < ApplicationHelper::Too button_group('custom_button_set_vmdb', [ select( :custom_button_set_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/custom_buttons_center.rb b/app/helpers/application_helper/toolbar/custom_buttons_center.rb index 25e428aa815..b7fab49d914 100644 --- a/app/helpers/application_helper/toolbar/custom_buttons_center.rb +++ b/app/helpers/application_helper/toolbar/custom_buttons_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::CustomButtonsCenter < ApplicationHelper::Toolb button_group('custom_button_vmdb', [ select( :custom_button_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/customization_template_center.rb b/app/helpers/application_helper/toolbar/customization_template_center.rb index 670a3afc672..712aa80fac3 100644 --- a/app/helpers/application_helper/toolbar/customization_template_center.rb +++ b/app/helpers/application_helper/toolbar/customization_template_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::CustomizationTemplateCenter < ApplicationHelpe button_group('customization_template_vmdb', [ select( :customization_template_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/customization_templates_center.rb b/app/helpers/application_helper/toolbar/customization_templates_center.rb index 6757a74e3f2..60c4bfd25d8 100644 --- a/app/helpers/application_helper/toolbar/customization_templates_center.rb +++ b/app/helpers/application_helper/toolbar/customization_templates_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::CustomizationTemplatesCenter < ApplicationHelp button_group('customization_template_vmdb', [ select( :pxe_server_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/diagnostics_region_center.rb b/app/helpers/application_helper/toolbar/diagnostics_region_center.rb index 1bae8707263..c1226ccd4cc 100644 --- a/app/helpers/application_helper/toolbar/diagnostics_region_center.rb +++ b/app/helpers/application_helper/toolbar/diagnostics_region_center.rb @@ -12,7 +12,7 @@ class ApplicationHelper::Toolbar::DiagnosticsRegionCenter < ApplicationHelper::T button_group('ldap_domain_vmdb', [ select( :support_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/diagnostics_server_center.rb b/app/helpers/application_helper/toolbar/diagnostics_server_center.rb index e0bfbdddfc6..c04d562939e 100644 --- a/app/helpers/application_helper/toolbar/diagnostics_server_center.rb +++ b/app/helpers/application_helper/toolbar/diagnostics_server_center.rb @@ -87,7 +87,7 @@ class ApplicationHelper::Toolbar::DiagnosticsServerCenter < ApplicationHelper::T :klass => ApplicationHelper::Button::LogDepotEdit), select( :restart_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/diagnostics_zone_center.rb b/app/helpers/application_helper/toolbar/diagnostics_zone_center.rb index 2687d62d590..07cc14bf509 100644 --- a/app/helpers/application_helper/toolbar/diagnostics_zone_center.rb +++ b/app/helpers/application_helper/toolbar/diagnostics_zone_center.rb @@ -12,7 +12,7 @@ class ApplicationHelper::Toolbar::DiagnosticsZoneCenter < ApplicationHelper::Too button_group('ldap_domain_vmdb', [ select( :zone_configuration_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/dialog_center.rb b/app/helpers/application_helper/toolbar/dialog_center.rb index cfc8097034a..8e22c7df2b6 100644 --- a/app/helpers/application_helper/toolbar/dialog_center.rb +++ b/app/helpers/application_helper/toolbar/dialog_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::DialogCenter < ApplicationHelper::Toolbar::Bas button_group('dialog_vmdb', [ select( :dialog_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/dialogs_center.rb b/app/helpers/application_helper/toolbar/dialogs_center.rb index bb4e1e5ba7e..6461066aec0 100644 --- a/app/helpers/application_helper/toolbar/dialogs_center.rb +++ b/app/helpers/application_helper/toolbar/dialogs_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::DialogsCenter < ApplicationHelper::Toolbar::Ba button_group('dialog_vmdb', [ select( :dialog_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/ems_block_storages_center.rb b/app/helpers/application_helper/toolbar/ems_block_storages_center.rb index 9afbfb832ac..64ab00dc9ea 100644 --- a/app/helpers/application_helper/toolbar/ems_block_storages_center.rb +++ b/app/helpers/application_helper/toolbar/ems_block_storages_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::EmsBlockStoragesCenter < ApplicationHelper::To button_group('ems_storage_vmdb', [ select( :ems_storage_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -33,7 +33,7 @@ class ApplicationHelper::Toolbar::EmsBlockStoragesCenter < ApplicationHelper::To button_group('ems_storage_policy', [ select( :ems_storage_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/ems_cloud_center.rb b/app/helpers/application_helper/toolbar/ems_cloud_center.rb index 82772c4c222..a000e4cbad6 100644 --- a/app/helpers/application_helper/toolbar/ems_cloud_center.rb +++ b/app/helpers/application_helper/toolbar/ems_cloud_center.rb @@ -7,7 +7,7 @@ class ApplicationHelper::Toolbar::EmsCloudCenter < ApplicationHelper::Toolbar::B nil), select( :ems_cloud_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -45,7 +45,7 @@ class ApplicationHelper::Toolbar::EmsCloudCenter < ApplicationHelper::Toolbar::B button_group('ems_cloud_policy', [ select( :ems_cloud_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ @@ -71,7 +71,7 @@ class ApplicationHelper::Toolbar::EmsCloudCenter < ApplicationHelper::Toolbar::B button_group('ems_cloud_monitoring', [ select( :ems_cloud_monitoring_choice, - 'ff ff-monitoring fa-lg', + nil, t = N_('Monitoring'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/ems_clouds_center.rb b/app/helpers/application_helper/toolbar/ems_clouds_center.rb index 628aa244f63..568e677041e 100644 --- a/app/helpers/application_helper/toolbar/ems_clouds_center.rb +++ b/app/helpers/application_helper/toolbar/ems_clouds_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::EmsCloudsCenter < ApplicationHelper::Toolbar:: button_group('ems_cloud_vmdb', [ select( :ems_cloud_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -49,7 +49,7 @@ class ApplicationHelper::Toolbar::EmsCloudsCenter < ApplicationHelper::Toolbar:: button_group('ems_cloud_policy', [ select( :ems_cloud_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/ems_cluster_center.rb b/app/helpers/application_helper/toolbar/ems_cluster_center.rb index abdd70f8891..4afa1166213 100644 --- a/app/helpers/application_helper/toolbar/ems_cluster_center.rb +++ b/app/helpers/application_helper/toolbar/ems_cluster_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::EmsClusterCenter < ApplicationHelper::Toolbar: button_group('ems_cluster_vmdb', [ select( :cluster_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -25,7 +25,7 @@ class ApplicationHelper::Toolbar::EmsClusterCenter < ApplicationHelper::Toolbar: button_group('ems_cluster_policy', [ select( :ems_cluster_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ @@ -45,7 +45,7 @@ class ApplicationHelper::Toolbar::EmsClusterCenter < ApplicationHelper::Toolbar: button_group('ems_cluster_monitoring', [ select( :ems_cluster_monitoring_choice, - 'ff ff-monitoring fa-lg', + nil, t = N_('Monitoring'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/ems_clusters_center.rb b/app/helpers/application_helper/toolbar/ems_clusters_center.rb index 81069cfa8a7..a5f5f9fe273 100644 --- a/app/helpers/application_helper/toolbar/ems_clusters_center.rb +++ b/app/helpers/application_helper/toolbar/ems_clusters_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::EmsClustersCenter < ApplicationHelper::Toolbar button_group('ems_cluster_vmdb', [ select( :ems_cluster_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :enabled => false, @@ -44,7 +44,7 @@ class ApplicationHelper::Toolbar::EmsClustersCenter < ApplicationHelper::Toolbar button_group('ems_cluster_policy', [ select( :ems_cluster_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/ems_container_center.rb b/app/helpers/application_helper/toolbar/ems_container_center.rb index dbac7dc553c..020712d4674 100644 --- a/app/helpers/application_helper/toolbar/ems_container_center.rb +++ b/app/helpers/application_helper/toolbar/ems_container_center.rb @@ -7,7 +7,7 @@ class ApplicationHelper::Toolbar::EmsContainerCenter < ApplicationHelper::Toolba nil), select( :ems_container_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -45,7 +45,7 @@ class ApplicationHelper::Toolbar::EmsContainerCenter < ApplicationHelper::Toolba button_group('ems_container_monitoring', [ select( :ems_container_monitoring_choice, - 'ff ff-monitoring fa-lg', + nil, t = N_('Monitoring'), t, :items => [ @@ -88,7 +88,7 @@ class ApplicationHelper::Toolbar::EmsContainerCenter < ApplicationHelper::Toolba button_group('ems_container_policy', [ select( :ems_container_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/ems_containers_center.rb b/app/helpers/application_helper/toolbar/ems_containers_center.rb index 1fe23094c7e..cd5ef1360b6 100644 --- a/app/helpers/application_helper/toolbar/ems_containers_center.rb +++ b/app/helpers/application_helper/toolbar/ems_containers_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::EmsContainersCenter < ApplicationHelper::Toolb button_group('ems_container_vmdb', [ select( :ems_container_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -61,7 +61,7 @@ class ApplicationHelper::Toolbar::EmsContainersCenter < ApplicationHelper::Toolb button_group('ems_container_policy', [ select( :ems_container_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/ems_infra_center.rb b/app/helpers/application_helper/toolbar/ems_infra_center.rb index 259dab1cad7..e0649351e41 100644 --- a/app/helpers/application_helper/toolbar/ems_infra_center.rb +++ b/app/helpers/application_helper/toolbar/ems_infra_center.rb @@ -7,7 +7,7 @@ class ApplicationHelper::Toolbar::EmsInfraCenter < ApplicationHelper::Toolbar::B nil), select( :ems_infra_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -58,7 +58,7 @@ class ApplicationHelper::Toolbar::EmsInfraCenter < ApplicationHelper::Toolbar::B button_group('ems_infra_policy', [ select( :ems_infra_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ @@ -84,7 +84,7 @@ class ApplicationHelper::Toolbar::EmsInfraCenter < ApplicationHelper::Toolbar::B button_group('ems_infra_monitoring', [ select( :ems_infra_monitoring_choice, - 'ff ff-monitoring fa-lg', + nil, t = N_('Monitoring'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/ems_infras_center.rb b/app/helpers/application_helper/toolbar/ems_infras_center.rb index 25210e54c33..3840cd38e26 100644 --- a/app/helpers/application_helper/toolbar/ems_infras_center.rb +++ b/app/helpers/application_helper/toolbar/ems_infras_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::EmsInfrasCenter < ApplicationHelper::Toolbar:: button_group('ems_infra_vmdb', [ select( :ems_infra_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -57,7 +57,7 @@ class ApplicationHelper::Toolbar::EmsInfrasCenter < ApplicationHelper::Toolbar:: button_group('ems_infra_policy', [ select( :ems_infra_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/ems_network_center.rb b/app/helpers/application_helper/toolbar/ems_network_center.rb index 229cab92729..4e5e1fb1139 100644 --- a/app/helpers/application_helper/toolbar/ems_network_center.rb +++ b/app/helpers/application_helper/toolbar/ems_network_center.rb @@ -7,7 +7,7 @@ class ApplicationHelper::Toolbar::EmsNetworkCenter < ApplicationHelper::Toolbar: nil), select( :ems_network_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -38,7 +38,7 @@ class ApplicationHelper::Toolbar::EmsNetworkCenter < ApplicationHelper::Toolbar: button_group('ems_network_policy', [ select( :ems_network_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ @@ -58,7 +58,7 @@ class ApplicationHelper::Toolbar::EmsNetworkCenter < ApplicationHelper::Toolbar: button_group('ems_network_monitoring', [ select( :ems_network_monitoring_choice, - 'ff ff-monitoring fa-lg', + nil, t = N_('Monitoring'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/ems_networks_center.rb b/app/helpers/application_helper/toolbar/ems_networks_center.rb index b153ada8317..5097b6ba851 100644 --- a/app/helpers/application_helper/toolbar/ems_networks_center.rb +++ b/app/helpers/application_helper/toolbar/ems_networks_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::EmsNetworksCenter < ApplicationHelper::Toolbar button_group('ems_network_vmdb', [ select( :ems_network_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -50,7 +50,7 @@ class ApplicationHelper::Toolbar::EmsNetworksCenter < ApplicationHelper::Toolbar button_group('ems_network_policy', [ select( :ems_network_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/ems_object_storages_center.rb b/app/helpers/application_helper/toolbar/ems_object_storages_center.rb index 4381282678e..3c0d9fd5941 100644 --- a/app/helpers/application_helper/toolbar/ems_object_storages_center.rb +++ b/app/helpers/application_helper/toolbar/ems_object_storages_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::EmsObjectStoragesCenter < ApplicationHelper::T button_group('ems_storage_vmdb', [ select( :ems_storage_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -33,7 +33,7 @@ class ApplicationHelper::Toolbar::EmsObjectStoragesCenter < ApplicationHelper::T button_group('ems_storage_policy', [ select( :ems_storage_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/ems_physical_infra_center.rb b/app/helpers/application_helper/toolbar/ems_physical_infra_center.rb index 87566eed4bb..c2a7585df17 100644 --- a/app/helpers/application_helper/toolbar/ems_physical_infra_center.rb +++ b/app/helpers/application_helper/toolbar/ems_physical_infra_center.rb @@ -7,7 +7,7 @@ class ApplicationHelper::Toolbar::EmsPhysicalInfraCenter < ApplicationHelper::To nil), select( :ems_physical_infra_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -37,7 +37,7 @@ class ApplicationHelper::Toolbar::EmsPhysicalInfraCenter < ApplicationHelper::To button_group('ems_physical_infra_policy', [ select( :ems_physical_infra_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ @@ -63,7 +63,7 @@ class ApplicationHelper::Toolbar::EmsPhysicalInfraCenter < ApplicationHelper::To button_group('ems_physical_infra_monitoring', [ select( :ems_physical_infra_monitoring_choice, - 'ff ff-monitoring fa-lg', + nil, t = N_('Monitoring'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/ems_physical_infras_center.rb b/app/helpers/application_helper/toolbar/ems_physical_infras_center.rb index 93f420bed10..f1cb8fc32cd 100644 --- a/app/helpers/application_helper/toolbar/ems_physical_infras_center.rb +++ b/app/helpers/application_helper/toolbar/ems_physical_infras_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::EmsPhysicalInfrasCenter < ApplicationHelper::T button_group('ems_physical_infra_vmdb', [ select( :ems_physical_infra_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -55,7 +55,7 @@ class ApplicationHelper::Toolbar::EmsPhysicalInfrasCenter < ApplicationHelper::T button_group('ems_physical_infra_policy', [ select( :ems_physical_infra_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/ems_storage_center.rb b/app/helpers/application_helper/toolbar/ems_storage_center.rb index bd113efa694..e41fd0e52b2 100644 --- a/app/helpers/application_helper/toolbar/ems_storage_center.rb +++ b/app/helpers/application_helper/toolbar/ems_storage_center.rb @@ -7,7 +7,7 @@ class ApplicationHelper::Toolbar::EmsStorageCenter < ApplicationHelper::Toolbar: nil), select( :ems_storage_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -31,7 +31,7 @@ class ApplicationHelper::Toolbar::EmsStorageCenter < ApplicationHelper::Toolbar: button_group('ems_storage_policy', [ select( :ems_storage_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ @@ -51,7 +51,7 @@ class ApplicationHelper::Toolbar::EmsStorageCenter < ApplicationHelper::Toolbar: button_group('ems_storage_monitoring', [ select( :ems_storage_monitoring_choice, - 'ff ff-monitoring fa-lg', + nil, t = N_('Monitoring'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/ems_storages_center.rb b/app/helpers/application_helper/toolbar/ems_storages_center.rb index 472bd9a8964..c3cf838a272 100644 --- a/app/helpers/application_helper/toolbar/ems_storages_center.rb +++ b/app/helpers/application_helper/toolbar/ems_storages_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::EmsStoragesCenter < ApplicationHelper::Toolbar button_group('ems_storage_vmdb', [ select( :ems_storage_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -33,7 +33,7 @@ class ApplicationHelper::Toolbar::EmsStoragesCenter < ApplicationHelper::Toolbar button_group('ems_storage_policy', [ select( :ems_storage_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/firmware_registries_center.rb b/app/helpers/application_helper/toolbar/firmware_registries_center.rb index 5ce37884a1c..70e0e1a5fed 100644 --- a/app/helpers/application_helper/toolbar/firmware_registries_center.rb +++ b/app/helpers/application_helper/toolbar/firmware_registries_center.rb @@ -17,7 +17,7 @@ class ApplicationHelper::Toolbar::FirmwareRegistriesCenter < ApplicationHelper:: [ select( :firmware_registry_config_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :enabled => true, diff --git a/app/helpers/application_helper/toolbar/firmware_registry_center.rb b/app/helpers/application_helper/toolbar/firmware_registry_center.rb index 57eac2a9f25..9fea8fae5e4 100644 --- a/app/helpers/application_helper/toolbar/firmware_registry_center.rb +++ b/app/helpers/application_helper/toolbar/firmware_registry_center.rb @@ -17,7 +17,7 @@ class ApplicationHelper::Toolbar::FirmwareRegistryCenter < ApplicationHelper::To [ select( :firmware_registry_config_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :enabled => true, diff --git a/app/helpers/application_helper/toolbar/flavor_center.rb b/app/helpers/application_helper/toolbar/flavor_center.rb index 880bea72cc9..ee318c99332 100644 --- a/app/helpers/application_helper/toolbar/flavor_center.rb +++ b/app/helpers/application_helper/toolbar/flavor_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::FlavorCenter < ApplicationHelper::Toolbar::Bas button_group('flavor_configuration', [ select( :flavor_configuration_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -20,7 +20,7 @@ class ApplicationHelper::Toolbar::FlavorCenter < ApplicationHelper::Toolbar::Bas button_group('flavor_policy', [ select( :flavor_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/flavors_center.rb b/app/helpers/application_helper/toolbar/flavors_center.rb index 052ea3b882c..59563970253 100644 --- a/app/helpers/application_helper/toolbar/flavors_center.rb +++ b/app/helpers/application_helper/toolbar/flavors_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::FlavorsCenter < ApplicationHelper::Toolbar::Ba button_group('flavor_configuration', [ select( :flavor_configuration_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -31,7 +31,7 @@ class ApplicationHelper::Toolbar::FlavorsCenter < ApplicationHelper::Toolbar::Ba button_group('flavor_policy', [ select( :flavor_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/floating_ip_center.rb b/app/helpers/application_helper/toolbar/floating_ip_center.rb index 40c7d832b19..5d691f64b7f 100644 --- a/app/helpers/application_helper/toolbar/floating_ip_center.rb +++ b/app/helpers/application_helper/toolbar/floating_ip_center.rb @@ -4,7 +4,7 @@ class ApplicationHelper::Toolbar::FloatingIpCenter < ApplicationHelper::Toolbar: [ select( :floating_ip_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -38,7 +38,7 @@ class ApplicationHelper::Toolbar::FloatingIpCenter < ApplicationHelper::Toolbar: [ select( :floating_ip_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/floating_ips_center.rb b/app/helpers/application_helper/toolbar/floating_ips_center.rb index 2c0c1d3759c..62dbd49a99d 100644 --- a/app/helpers/application_helper/toolbar/floating_ips_center.rb +++ b/app/helpers/application_helper/toolbar/floating_ips_center.rb @@ -4,7 +4,7 @@ class ApplicationHelper::Toolbar::FloatingIpsCenter < ApplicationHelper::Toolbar [ select( :floating_ip_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -44,7 +44,7 @@ class ApplicationHelper::Toolbar::FloatingIpsCenter < ApplicationHelper::Toolbar [ select( :floating_ip_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/generic_object_center.rb b/app/helpers/application_helper/toolbar/generic_object_center.rb index b88b1721e4c..b6e6afb97d8 100644 --- a/app/helpers/application_helper/toolbar/generic_object_center.rb +++ b/app/helpers/application_helper/toolbar/generic_object_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::GenericObjectCenter < ApplicationHelper::Toolb button_group('generic_object_policy', [ select( :generic_object_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/generic_object_definition_actions_node_center.rb b/app/helpers/application_helper/toolbar/generic_object_definition_actions_node_center.rb index d3ef4fee8a8..a811807d6d7 100644 --- a/app/helpers/application_helper/toolbar/generic_object_definition_actions_node_center.rb +++ b/app/helpers/application_helper/toolbar/generic_object_definition_actions_node_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::GenericObjectDefinitionActionsNodeCenter < App button_group('generic_object_definition', [ select( :generic_object_definition_configuration, - 'fa fa-cog fa-lg', + nil, N_('Configuration'), :items => [ button( diff --git a/app/helpers/application_helper/toolbar/generic_object_definition_button_center.rb b/app/helpers/application_helper/toolbar/generic_object_definition_button_center.rb index fc31d40e0a3..bd840642dda 100644 --- a/app/helpers/application_helper/toolbar/generic_object_definition_button_center.rb +++ b/app/helpers/application_helper/toolbar/generic_object_definition_button_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::GenericObjectDefinitionButtonCenter < Applicat button_group('generic_object_definition', [ select( :generic_object_definition_configuration, - 'fa fa-cog fa-lg', + nil, N_('Configuration'), :items => [ button( diff --git a/app/helpers/application_helper/toolbar/generic_object_definition_button_group_center.rb b/app/helpers/application_helper/toolbar/generic_object_definition_button_group_center.rb index f346911c9fc..9b4d5fc52df 100644 --- a/app/helpers/application_helper/toolbar/generic_object_definition_button_group_center.rb +++ b/app/helpers/application_helper/toolbar/generic_object_definition_button_group_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::GenericObjectDefinitionButtonGroupCenter < App button_group('generic_object_definition', [ select( :generic_object_definition_configuration, - 'fa fa-cog fa-lg', + nil, N_('Configuration'), :items => [ button( diff --git a/app/helpers/application_helper/toolbar/generic_object_definition_center.rb b/app/helpers/application_helper/toolbar/generic_object_definition_center.rb index 5a072a54577..b441c08e26c 100644 --- a/app/helpers/application_helper/toolbar/generic_object_definition_center.rb +++ b/app/helpers/application_helper/toolbar/generic_object_definition_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::GenericObjectDefinitionCenter < ApplicationHel button_group('generic_object_definition', [ select( :generic_object_definition_configuration, - 'fa fa-cog fa-lg', + nil, N_('Configuration'), :items => [ button( diff --git a/app/helpers/application_helper/toolbar/generic_object_definitions_center.rb b/app/helpers/application_helper/toolbar/generic_object_definitions_center.rb index 5ab161cb7f6..dfa08db0bf6 100644 --- a/app/helpers/application_helper/toolbar/generic_object_definitions_center.rb +++ b/app/helpers/application_helper/toolbar/generic_object_definitions_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::GenericObjectDefinitionsCenter < ApplicationHe button_group('generic_object_definition', [ select( :generic_object_definition_configuration, - 'fa fa-cog fa-lg', + nil, N_('Configuration'), :items => [ button( diff --git a/app/helpers/application_helper/toolbar/generic_objects_center.rb b/app/helpers/application_helper/toolbar/generic_objects_center.rb index 9f7c93b5b19..7972bc0413f 100644 --- a/app/helpers/application_helper/toolbar/generic_objects_center.rb +++ b/app/helpers/application_helper/toolbar/generic_objects_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::GenericObjectsCenter < ApplicationHelper::Tool button_group('generic_object_policy', [ select( :generic_object_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/host_aggregate_center.rb b/app/helpers/application_helper/toolbar/host_aggregate_center.rb index bf5059a1f58..e57b417d379 100644 --- a/app/helpers/application_helper/toolbar/host_aggregate_center.rb +++ b/app/helpers/application_helper/toolbar/host_aggregate_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::HostAggregateCenter < ApplicationHelper::Toolb button_group('host_aggregate_vmdb', [ select( :host_aggregate_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -53,7 +53,7 @@ class ApplicationHelper::Toolbar::HostAggregateCenter < ApplicationHelper::Toolb button_group('host_aggregate_policy', [ select( :host_aggregate_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/host_aggregates_center.rb b/app/helpers/application_helper/toolbar/host_aggregates_center.rb index 8ca695c4da4..13a025c5ebd 100644 --- a/app/helpers/application_helper/toolbar/host_aggregates_center.rb +++ b/app/helpers/application_helper/toolbar/host_aggregates_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::HostAggregatesCenter < ApplicationHelper::Tool button_group('host_aggregate_vmdb', [ select( :host_aggregate_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -56,7 +56,7 @@ class ApplicationHelper::Toolbar::HostAggregatesCenter < ApplicationHelper::Tool button_group('host_aggregate_policy', [ select( :host_aggregate_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/host_center.rb b/app/helpers/application_helper/toolbar/host_center.rb index 241e9bdc212..fe5719e7807 100644 --- a/app/helpers/application_helper/toolbar/host_center.rb +++ b/app/helpers/application_helper/toolbar/host_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::HostCenter < ApplicationHelper::Toolbar::Basic button_group('host_vmdb', [ select( :host_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -68,7 +68,7 @@ class ApplicationHelper::Toolbar::HostCenter < ApplicationHelper::Toolbar::Basic button_group('host_policy', [ select( :host_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ @@ -103,7 +103,7 @@ class ApplicationHelper::Toolbar::HostCenter < ApplicationHelper::Toolbar::Basic button_group('host_monitoring', [ select( :host_monitoring_choice, - 'ff ff-monitoring fa-lg', + nil, t = N_('Monitoring'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/host_cloud_service_center.rb b/app/helpers/application_helper/toolbar/host_cloud_service_center.rb index 9b9cefaa5df..4613c5e503b 100644 --- a/app/helpers/application_helper/toolbar/host_cloud_service_center.rb +++ b/app/helpers/application_helper/toolbar/host_cloud_service_center.rb @@ -1,7 +1,7 @@ class ApplicationHelper::Toolbar::HostCloudServiceCenter < ApplicationHelper::Toolbar::Basic button_group('host_cloud_services_vmdb', [select( :host_cloud_services_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Cloud Service Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/host_cloud_services_center.rb b/app/helpers/application_helper/toolbar/host_cloud_services_center.rb index 223541069fe..12287f6d88c 100644 --- a/app/helpers/application_helper/toolbar/host_cloud_services_center.rb +++ b/app/helpers/application_helper/toolbar/host_cloud_services_center.rb @@ -1,7 +1,7 @@ class ApplicationHelper::Toolbar::HostCloudServicesCenter < ApplicationHelper::Toolbar::Basic button_group('host_cloud_services_vmdb', [select( :host_cloud_services_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Cloud Service Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/hosts_center.rb b/app/helpers/application_helper/toolbar/hosts_center.rb index 0a3ce3f5686..3536a65a863 100644 --- a/app/helpers/application_helper/toolbar/hosts_center.rb +++ b/app/helpers/application_helper/toolbar/hosts_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::HostsCenter < ApplicationHelper::Toolbar::Basi button_group('host_vmdb', [ select( :host_vmdb_choice, - '', + nil, t = N_('Configuration'), t, :items => [ @@ -98,7 +98,7 @@ class ApplicationHelper::Toolbar::HostsCenter < ApplicationHelper::Toolbar::Basi button_group('host_policy', [ select( :host_policy_choice, - '', + nil, t = N_('Policy'), t, :enabled => false, @@ -148,7 +148,7 @@ class ApplicationHelper::Toolbar::HostsCenter < ApplicationHelper::Toolbar::Basi button_group('host_operations', [ select( :host_power_choice, - '', + nil, N_('Power Operations'), N_('Power'), :enabled => false, diff --git a/app/helpers/application_helper/toolbar/infra_networking_center.rb b/app/helpers/application_helper/toolbar/infra_networking_center.rb index f3026c86f8a..801cdde9279 100644 --- a/app/helpers/application_helper/toolbar/infra_networking_center.rb +++ b/app/helpers/application_helper/toolbar/infra_networking_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::InfraNetworkingCenter < ApplicationHelper::Too button_group('infra_networking_policy', [ select( :infra_networking_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/infra_networkings_center.rb b/app/helpers/application_helper/toolbar/infra_networkings_center.rb index 67714f554b9..d0e26356738 100644 --- a/app/helpers/application_helper/toolbar/infra_networkings_center.rb +++ b/app/helpers/application_helper/toolbar/infra_networkings_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::InfraNetworkingsCenter < ApplicationHelper::To button_group('infra_networking_policy', [ select( :infra_networking_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/inventory_group_center.rb b/app/helpers/application_helper/toolbar/inventory_group_center.rb index dda67813b6d..caf941957d1 100644 --- a/app/helpers/application_helper/toolbar/inventory_group_center.rb +++ b/app/helpers/application_helper/toolbar/inventory_group_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::InventoryGroupCenter < ApplicationHelper::Tool button_group('provider_vmdb', [ select( :provider_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :enabled => true, diff --git a/app/helpers/application_helper/toolbar/iso_datastore_center.rb b/app/helpers/application_helper/toolbar/iso_datastore_center.rb index d2d98771dd0..c66cc73b905 100644 --- a/app/helpers/application_helper/toolbar/iso_datastore_center.rb +++ b/app/helpers/application_helper/toolbar/iso_datastore_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::IsoDatastoreCenter < ApplicationHelper::Toolba button_group('iso_datastore_vmdb', [ select( :iso_datastore_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/iso_datastores_center.rb b/app/helpers/application_helper/toolbar/iso_datastores_center.rb index e613459879b..1454c7c7bdc 100644 --- a/app/helpers/application_helper/toolbar/iso_datastores_center.rb +++ b/app/helpers/application_helper/toolbar/iso_datastores_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::IsoDatastoresCenter < ApplicationHelper::Toolb button_group('iso_datastore_vmdb', [ select( :iso_datastore_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/iso_image_center.rb b/app/helpers/application_helper/toolbar/iso_image_center.rb index 1b1c5660227..8e3d60be4b0 100644 --- a/app/helpers/application_helper/toolbar/iso_image_center.rb +++ b/app/helpers/application_helper/toolbar/iso_image_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::IsoImageCenter < ApplicationHelper::Toolbar::B button_group('iso_image_vmdb', [ select( :iso_image_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/miq_action_center.rb b/app/helpers/application_helper/toolbar/miq_action_center.rb index 86e44bcc4a0..fbf3f60957e 100644 --- a/app/helpers/application_helper/toolbar/miq_action_center.rb +++ b/app/helpers/application_helper/toolbar/miq_action_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqActionCenter < ApplicationHelper::Toolbar:: button_group('miq_action_vmdb', [ select( :miq_action_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/miq_actions_center.rb b/app/helpers/application_helper/toolbar/miq_actions_center.rb index 9240f0954e4..581ee13d630 100644 --- a/app/helpers/application_helper/toolbar/miq_actions_center.rb +++ b/app/helpers/application_helper/toolbar/miq_actions_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqActionsCenter < ApplicationHelper::Toolbar: button_group('miq_action_vmdb', [ select( :miq_action_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/miq_ae_class_center.rb b/app/helpers/application_helper/toolbar/miq_ae_class_center.rb index 67127225f9d..9a29527600c 100644 --- a/app/helpers/application_helper/toolbar/miq_ae_class_center.rb +++ b/app/helpers/application_helper/toolbar/miq_ae_class_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqAeClassCenter < ApplicationHelper::Toolbar: button_group('miq_ae_class_vmdb', [ select( :miq_ae_class_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/miq_ae_domain_center.rb b/app/helpers/application_helper/toolbar/miq_ae_domain_center.rb index 785d45bd46d..c3920b72946 100644 --- a/app/helpers/application_helper/toolbar/miq_ae_domain_center.rb +++ b/app/helpers/application_helper/toolbar/miq_ae_domain_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqAeDomainCenter < ApplicationHelper::Toolbar button_group('miq_ae_domain_vmdb', [ select( :miq_ae_domain_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/miq_ae_domains_center.rb b/app/helpers/application_helper/toolbar/miq_ae_domains_center.rb index 5be5acb53b5..e318a2975a6 100644 --- a/app/helpers/application_helper/toolbar/miq_ae_domains_center.rb +++ b/app/helpers/application_helper/toolbar/miq_ae_domains_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqAeDomainsCenter < ApplicationHelper::Toolba button_group('miq_ae_domain_vmdb', [ select( :miq_ae_domain_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/miq_ae_fields_center.rb b/app/helpers/application_helper/toolbar/miq_ae_fields_center.rb index 83bf1f810aa..e24957e72bd 100644 --- a/app/helpers/application_helper/toolbar/miq_ae_fields_center.rb +++ b/app/helpers/application_helper/toolbar/miq_ae_fields_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqAeFieldsCenter < ApplicationHelper::Toolbar button_group('miq_ae_field_vmdb', [ select( :miq_ae_field_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/miq_ae_instance_center.rb b/app/helpers/application_helper/toolbar/miq_ae_instance_center.rb index 8ba68f10c0e..f39704390c9 100644 --- a/app/helpers/application_helper/toolbar/miq_ae_instance_center.rb +++ b/app/helpers/application_helper/toolbar/miq_ae_instance_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqAeInstanceCenter < ApplicationHelper::Toolb button_group('miq_ae_instance_vmdb', [ select( :miq_ae_instance_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/miq_ae_instances_center.rb b/app/helpers/application_helper/toolbar/miq_ae_instances_center.rb index 568acaa9906..4f2cc6ba57d 100644 --- a/app/helpers/application_helper/toolbar/miq_ae_instances_center.rb +++ b/app/helpers/application_helper/toolbar/miq_ae_instances_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqAeInstancesCenter < ApplicationHelper::Tool button_group('miq_ae_instance_vmdb', [ select( :miq_ae_instance_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/miq_ae_method_center.rb b/app/helpers/application_helper/toolbar/miq_ae_method_center.rb index 42f484d504c..231930310f3 100644 --- a/app/helpers/application_helper/toolbar/miq_ae_method_center.rb +++ b/app/helpers/application_helper/toolbar/miq_ae_method_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqAeMethodCenter < ApplicationHelper::Toolbar button_group('miq_ae_method_vmdb', [ select( :miq_ae_method_vmdb_choice, - 'fa fa-cog fa-lg', + nil, N_('Configuration'), :items => [ button( diff --git a/app/helpers/application_helper/toolbar/miq_ae_methods_center.rb b/app/helpers/application_helper/toolbar/miq_ae_methods_center.rb index cde5bf5ad14..9f1738cba8c 100644 --- a/app/helpers/application_helper/toolbar/miq_ae_methods_center.rb +++ b/app/helpers/application_helper/toolbar/miq_ae_methods_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqAeMethodsCenter < ApplicationHelper::Toolba button_group('miq_ae_method_vmdb', [ select( :miq_ae_method_vmdb_choice, - 'fa fa-cog fa-lg', + nil, N_('Configuration'), :items => [ button( diff --git a/app/helpers/application_helper/toolbar/miq_ae_namespace_center.rb b/app/helpers/application_helper/toolbar/miq_ae_namespace_center.rb index bb127e17786..a454c9c4981 100644 --- a/app/helpers/application_helper/toolbar/miq_ae_namespace_center.rb +++ b/app/helpers/application_helper/toolbar/miq_ae_namespace_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqAeNamespaceCenter < ApplicationHelper::Tool button_group('miq_ae_namespace_vmdb', [ select( :miq_ae_namespace_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/miq_alert_center.rb b/app/helpers/application_helper/toolbar/miq_alert_center.rb index 5cb2d2315b6..6c656f81580 100644 --- a/app/helpers/application_helper/toolbar/miq_alert_center.rb +++ b/app/helpers/application_helper/toolbar/miq_alert_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqAlertCenter < ApplicationHelper::Toolbar::B button_group('miq_alert_vmdb', [ select( :miq_alert_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/miq_alert_profile_center.rb b/app/helpers/application_helper/toolbar/miq_alert_profile_center.rb index 5804f0e02dc..754fe1df33d 100644 --- a/app/helpers/application_helper/toolbar/miq_alert_profile_center.rb +++ b/app/helpers/application_helper/toolbar/miq_alert_profile_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqAlertProfileCenter < ApplicationHelper::Too button_group('miq_alert_profile_vmdb', [ select( :miq_alert_profile_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/miq_alert_profiles_center.rb b/app/helpers/application_helper/toolbar/miq_alert_profiles_center.rb index 918621091a9..0fb2ade93c0 100644 --- a/app/helpers/application_helper/toolbar/miq_alert_profiles_center.rb +++ b/app/helpers/application_helper/toolbar/miq_alert_profiles_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqAlertProfilesCenter < ApplicationHelper::To button_group('miq_alert_profile_vmdb', [ select( :miq_alert_profile_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/miq_alerts_center.rb b/app/helpers/application_helper/toolbar/miq_alerts_center.rb index 6db9bfc1f41..5765e066920 100644 --- a/app/helpers/application_helper/toolbar/miq_alerts_center.rb +++ b/app/helpers/application_helper/toolbar/miq_alerts_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqAlertsCenter < ApplicationHelper::Toolbar:: button_group('miq_alert_vmdb', [ select( :miq_alert_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/miq_dialog_center.rb b/app/helpers/application_helper/toolbar/miq_dialog_center.rb index e9019292450..39a4108a401 100644 --- a/app/helpers/application_helper/toolbar/miq_dialog_center.rb +++ b/app/helpers/application_helper/toolbar/miq_dialog_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqDialogCenter < ApplicationHelper::Toolbar:: button_group('miq_dialog_vmdb', [ select( :host_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/miq_dialogs_center.rb b/app/helpers/application_helper/toolbar/miq_dialogs_center.rb index 835c20ce36c..d8193076d29 100644 --- a/app/helpers/application_helper/toolbar/miq_dialogs_center.rb +++ b/app/helpers/application_helper/toolbar/miq_dialogs_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqDialogsCenter < ApplicationHelper::Toolbar: button_group('miq_dialog_vmdb', [ select( :miq_dialog_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/miq_event_center.rb b/app/helpers/application_helper/toolbar/miq_event_center.rb index 398ece5c266..18bc428fb0f 100644 --- a/app/helpers/application_helper/toolbar/miq_event_center.rb +++ b/app/helpers/application_helper/toolbar/miq_event_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqEventCenter < ApplicationHelper::Toolbar::B button_group('policy_vmdb', [ select( :policy_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/miq_group_center.rb b/app/helpers/application_helper/toolbar/miq_group_center.rb index 91fabfcf50b..7cef1c1b916 100644 --- a/app/helpers/application_helper/toolbar/miq_group_center.rb +++ b/app/helpers/application_helper/toolbar/miq_group_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqGroupCenter < ApplicationHelper::Toolbar::B button_group('rbac_group_vmdb', [ select( :rbac_group_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -26,7 +26,7 @@ class ApplicationHelper::Toolbar::MiqGroupCenter < ApplicationHelper::Toolbar::B button_group('rbac_group_policy', [ select( :rbac_group_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/miq_groups_center.rb b/app/helpers/application_helper/toolbar/miq_groups_center.rb index 8b2daed9201..973259c9539 100644 --- a/app/helpers/application_helper/toolbar/miq_groups_center.rb +++ b/app/helpers/application_helper/toolbar/miq_groups_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqGroupsCenter < ApplicationHelper::Toolbar:: button_group('rbac_group_vmdb', [ select( :rbac_group_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -44,7 +44,7 @@ class ApplicationHelper::Toolbar::MiqGroupsCenter < ApplicationHelper::Toolbar:: button_group('rbac_group_policy', [ select( :rbac_group_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/miq_policies_center.rb b/app/helpers/application_helper/toolbar/miq_policies_center.rb index cb8173aa5ca..12edc43b9b0 100644 --- a/app/helpers/application_helper/toolbar/miq_policies_center.rb +++ b/app/helpers/application_helper/toolbar/miq_policies_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqPoliciesCenter < ApplicationHelper::Toolbar button_group('policy_vmdb', [ select( :policy_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/miq_policy_center.rb b/app/helpers/application_helper/toolbar/miq_policy_center.rb index fafe566b601..ce786a951f9 100644 --- a/app/helpers/application_helper/toolbar/miq_policy_center.rb +++ b/app/helpers/application_helper/toolbar/miq_policy_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqPolicyCenter < ApplicationHelper::Toolbar:: button_group('policy_vmdb', [ select( :policy_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/miq_policy_profile_center.rb b/app/helpers/application_helper/toolbar/miq_policy_profile_center.rb index 1b031636788..883298462ca 100644 --- a/app/helpers/application_helper/toolbar/miq_policy_profile_center.rb +++ b/app/helpers/application_helper/toolbar/miq_policy_profile_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqPolicyProfileCenter < ApplicationHelper::To button_group('policy_profile_vmdb', [ select( :policy_profile_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/miq_policy_profiles_center.rb b/app/helpers/application_helper/toolbar/miq_policy_profiles_center.rb index b921dd7ca39..1fdb01a8c32 100644 --- a/app/helpers/application_helper/toolbar/miq_policy_profiles_center.rb +++ b/app/helpers/application_helper/toolbar/miq_policy_profiles_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqPolicyProfilesCenter < ApplicationHelper::T button_group('policy_profile_vmdb', [ select( :policy_profile_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/miq_report_center.rb b/app/helpers/application_helper/toolbar/miq_report_center.rb index 5419ee324ee..dc55d3b209e 100644 --- a/app/helpers/application_helper/toolbar/miq_report_center.rb +++ b/app/helpers/application_helper/toolbar/miq_report_center.rb @@ -10,7 +10,7 @@ class ApplicationHelper::Toolbar::MiqReportCenter < ApplicationHelper::Toolbar:: button_group('report_vmdb', [ select( :report_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/miq_report_schedule_center.rb b/app/helpers/application_helper/toolbar/miq_report_schedule_center.rb index e5a6a2fa00e..114b0a62005 100644 --- a/app/helpers/application_helper/toolbar/miq_report_schedule_center.rb +++ b/app/helpers/application_helper/toolbar/miq_report_schedule_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqReportScheduleCenter < ApplicationHelper::T button_group('miq_schedule_vmdb', [ select( :miq_schedule_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/miq_report_schedules_center.rb b/app/helpers/application_helper/toolbar/miq_report_schedules_center.rb index b0c1d278968..57f60d2e639 100644 --- a/app/helpers/application_helper/toolbar/miq_report_schedules_center.rb +++ b/app/helpers/application_helper/toolbar/miq_report_schedules_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqReportSchedulesCenter < ApplicationHelper:: button_group('miq_schedule_vmdb', [ select( :miq_schedule_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/miq_reports_center.rb b/app/helpers/application_helper/toolbar/miq_reports_center.rb index fb69d161894..dc2ec86c55a 100644 --- a/app/helpers/application_helper/toolbar/miq_reports_center.rb +++ b/app/helpers/application_helper/toolbar/miq_reports_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqReportsCenter < ApplicationHelper::Toolbar: button_group('report_vmdb', [ select( :report_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/miq_schedule_center.rb b/app/helpers/application_helper/toolbar/miq_schedule_center.rb index cca88cddc11..440738ede16 100644 --- a/app/helpers/application_helper/toolbar/miq_schedule_center.rb +++ b/app/helpers/application_helper/toolbar/miq_schedule_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqScheduleCenter < ApplicationHelper::Toolbar button_group('miq_schedule_vmdb', [ select( :miq_schedule_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/miq_schedules_center.rb b/app/helpers/application_helper/toolbar/miq_schedules_center.rb index 037d000da3d..e44f4ee281c 100644 --- a/app/helpers/application_helper/toolbar/miq_schedules_center.rb +++ b/app/helpers/application_helper/toolbar/miq_schedules_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqSchedulesCenter < ApplicationHelper::Toolba button_group('miq_schedule_vmdb', [ select( :miq_schedule_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/miq_templates_center.rb b/app/helpers/application_helper/toolbar/miq_templates_center.rb index d0749a86358..a36837ebf04 100644 --- a/app/helpers/application_helper/toolbar/miq_templates_center.rb +++ b/app/helpers/application_helper/toolbar/miq_templates_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqTemplatesCenter < ApplicationHelper::Toolba button_group('miq_template_vmdb', [ select( :miq_template_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :enabled => false, @@ -62,7 +62,7 @@ class ApplicationHelper::Toolbar::MiqTemplatesCenter < ApplicationHelper::Toolba button_group('miq_template_policy', [ select( :miq_template_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/miq_widget_center.rb b/app/helpers/application_helper/toolbar/miq_widget_center.rb index 81fa4b6ff63..e3896f7d06d 100644 --- a/app/helpers/application_helper/toolbar/miq_widget_center.rb +++ b/app/helpers/application_helper/toolbar/miq_widget_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqWidgetCenter < ApplicationHelper::Toolbar:: button_group('widget_vmdb', [ select( :widget_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -26,7 +26,7 @@ class ApplicationHelper::Toolbar::MiqWidgetCenter < ApplicationHelper::Toolbar:: separator, button( :widget_generate_content, - 'fa fa-cog fa-lg', + nil, t = N_('Generate Widget content now'), t, :confirm => N_("Are you sure you want initiate content generation for this Widget now?"), diff --git a/app/helpers/application_helper/toolbar/miq_widget_set_center.rb b/app/helpers/application_helper/toolbar/miq_widget_set_center.rb index 39fa06544f5..edb83c1531c 100644 --- a/app/helpers/application_helper/toolbar/miq_widget_set_center.rb +++ b/app/helpers/application_helper/toolbar/miq_widget_set_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqWidgetSetCenter < ApplicationHelper::Toolba button_group('db_vmdb', [ select( :db_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/miq_widget_sets_center.rb b/app/helpers/application_helper/toolbar/miq_widget_sets_center.rb index 77aaadaaa4d..e521c703302 100644 --- a/app/helpers/application_helper/toolbar/miq_widget_sets_center.rb +++ b/app/helpers/application_helper/toolbar/miq_widget_sets_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::MiqWidgetSetsCenter < ApplicationHelper::Toolb button_group('db_vmdb', [ select( :db_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/miq_widgets_center.rb b/app/helpers/application_helper/toolbar/miq_widgets_center.rb index b627b656247..dfe581bbf87 100644 --- a/app/helpers/application_helper/toolbar/miq_widgets_center.rb +++ b/app/helpers/application_helper/toolbar/miq_widgets_center.rb @@ -9,7 +9,7 @@ class ApplicationHelper::Toolbar::MiqWidgetsCenter < ApplicationHelper::Toolbar: button_group('widget_vmdb', [ select( :widget_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/network_port_center.rb b/app/helpers/application_helper/toolbar/network_port_center.rb index 155064449ba..2bf160708fc 100644 --- a/app/helpers/application_helper/toolbar/network_port_center.rb +++ b/app/helpers/application_helper/toolbar/network_port_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::NetworkPortCenter < ApplicationHelper::Toolbar button_group('network_port_policy', [ select( :network_port_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/network_ports_center.rb b/app/helpers/application_helper/toolbar/network_ports_center.rb index f4dca9a548d..2fb6ca97c1e 100644 --- a/app/helpers/application_helper/toolbar/network_ports_center.rb +++ b/app/helpers/application_helper/toolbar/network_ports_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::NetworkPortsCenter < ApplicationHelper::Toolba button_group('network_port_policy', [ select( :network_port_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/network_router_center.rb b/app/helpers/application_helper/toolbar/network_router_center.rb index 66ee999df33..2eb7ccce1b2 100644 --- a/app/helpers/application_helper/toolbar/network_router_center.rb +++ b/app/helpers/application_helper/toolbar/network_router_center.rb @@ -4,7 +4,7 @@ class ApplicationHelper::Toolbar::NetworkRouterCenter < ApplicationHelper::Toolb [ select( :network_router_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -72,7 +72,7 @@ class ApplicationHelper::Toolbar::NetworkRouterCenter < ApplicationHelper::Toolb [ select( :network_router_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/network_routers_center.rb b/app/helpers/application_helper/toolbar/network_routers_center.rb index 7908734801d..459562e0b93 100644 --- a/app/helpers/application_helper/toolbar/network_routers_center.rb +++ b/app/helpers/application_helper/toolbar/network_routers_center.rb @@ -4,7 +4,7 @@ class ApplicationHelper::Toolbar::NetworkRoutersCenter < ApplicationHelper::Tool [ select( :network_router_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -49,7 +49,7 @@ class ApplicationHelper::Toolbar::NetworkRoutersCenter < ApplicationHelper::Tool [ select( :network_router_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/orchestration_stack_center.rb b/app/helpers/application_helper/toolbar/orchestration_stack_center.rb index 5e9365c63ef..25496f6204f 100644 --- a/app/helpers/application_helper/toolbar/orchestration_stack_center.rb +++ b/app/helpers/application_helper/toolbar/orchestration_stack_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::OrchestrationStackCenter < ApplicationHelper:: button_group('orchestration_stack_vmdb', [ select( :orchestration_stack_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -19,7 +19,7 @@ class ApplicationHelper::Toolbar::OrchestrationStackCenter < ApplicationHelper:: button_group('orchestration_stack_policy', [ select( :orchestration_stack_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ @@ -34,7 +34,7 @@ class ApplicationHelper::Toolbar::OrchestrationStackCenter < ApplicationHelper:: button_group('orchestration_stack_lifecycle', [ select( :orchestration_stack_lifecycle_choice, - 'fa fa-recycle fa-lg', + nil, t = N_('Lifecycle'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/orchestration_stacks_center.rb b/app/helpers/application_helper/toolbar/orchestration_stacks_center.rb index f436a143cda..8e2dc31d15b 100644 --- a/app/helpers/application_helper/toolbar/orchestration_stacks_center.rb +++ b/app/helpers/application_helper/toolbar/orchestration_stacks_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::OrchestrationStacksCenter < ApplicationHelper: button_group('orchestration_stack_vmdb', [ select( :orchestration_stack_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -22,7 +22,7 @@ class ApplicationHelper::Toolbar::OrchestrationStacksCenter < ApplicationHelper: button_group('orchestration_stack_policy', [ select( :orchestration_stack_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, @@ -43,7 +43,7 @@ class ApplicationHelper::Toolbar::OrchestrationStacksCenter < ApplicationHelper: button_group('orchestration_stack_lifecycle', [ select( :orchestration_stack_lifecycle_choice, - 'fa fa-recycle fa-lg', + nil, t = N_('Lifecycle'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/orchestration_template_center.rb b/app/helpers/application_helper/toolbar/orchestration_template_center.rb index aac759c26ac..022603896c8 100644 --- a/app/helpers/application_helper/toolbar/orchestration_template_center.rb +++ b/app/helpers/application_helper/toolbar/orchestration_template_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::OrchestrationTemplateCenter < ApplicationHelpe button_group('orchestration_template_vmdb', [ select( :orchestration_template_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -37,7 +37,7 @@ class ApplicationHelper::Toolbar::OrchestrationTemplateCenter < ApplicationHelpe button_group('orchestration_template_policy', [ select( :orchestration_template_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/orchestration_templates_center.rb b/app/helpers/application_helper/toolbar/orchestration_templates_center.rb index 68514d82cc4..62851a2fa88 100644 --- a/app/helpers/application_helper/toolbar/orchestration_templates_center.rb +++ b/app/helpers/application_helper/toolbar/orchestration_templates_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::OrchestrationTemplatesCenter < ApplicationHelp button_group('orchestration_template_vmdb', [ select( :orchestration_template_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -47,7 +47,7 @@ class ApplicationHelper::Toolbar::OrchestrationTemplatesCenter < ApplicationHelp button_group('orchestration_template_policy', [ select( :orchestration_template_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/persistent_volume_center.rb b/app/helpers/application_helper/toolbar/persistent_volume_center.rb index 389a8c6d087..701895a42cb 100644 --- a/app/helpers/application_helper/toolbar/persistent_volume_center.rb +++ b/app/helpers/application_helper/toolbar/persistent_volume_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::PersistentVolumeCenter < ApplicationHelper::To button_group('persistent_volume_policy', [ select( :persistent_volume_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/persistent_volumes_center.rb b/app/helpers/application_helper/toolbar/persistent_volumes_center.rb index 07cebcefbee..fc716ddc2c5 100644 --- a/app/helpers/application_helper/toolbar/persistent_volumes_center.rb +++ b/app/helpers/application_helper/toolbar/persistent_volumes_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::PersistentVolumesCenter < ApplicationHelper::T button_group('persistent_volume_policy', [ select( :persistent_volume_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/physical_rack_center.rb b/app/helpers/application_helper/toolbar/physical_rack_center.rb index 35eab0e57ff..f2778954f7c 100644 --- a/app/helpers/application_helper/toolbar/physical_rack_center.rb +++ b/app/helpers/application_helper/toolbar/physical_rack_center.rb @@ -3,7 +3,7 @@ class ApplicationHelper::Toolbar::PhysicalRackCenter < ApplicationHelper::Toolba [ select( :physical_rack_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/physical_racks_center.rb b/app/helpers/application_helper/toolbar/physical_racks_center.rb index 079ec1daec5..067bcd4b327 100644 --- a/app/helpers/application_helper/toolbar/physical_racks_center.rb +++ b/app/helpers/application_helper/toolbar/physical_racks_center.rb @@ -3,7 +3,7 @@ class ApplicationHelper::Toolbar::PhysicalRacksCenter < ApplicationHelper::Toolb [ select( :physical_rack_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/physical_server_center.rb b/app/helpers/application_helper/toolbar/physical_server_center.rb index 2bb801bd785..7de39625bf8 100644 --- a/app/helpers/application_helper/toolbar/physical_server_center.rb +++ b/app/helpers/application_helper/toolbar/physical_server_center.rb @@ -4,7 +4,7 @@ class ApplicationHelper::Toolbar::PhysicalServerCenter < ApplicationHelper::Tool [ select( :physical_server_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -33,7 +33,7 @@ class ApplicationHelper::Toolbar::PhysicalServerCenter < ApplicationHelper::Tool [ select( :physical_server_policy_choice, - 'fa fa-shield fa-lg', + nil, N_('Policy'), :enabled => true, :onwhen => "1+", @@ -62,7 +62,7 @@ class ApplicationHelper::Toolbar::PhysicalServerCenter < ApplicationHelper::Tool ), select( :physical_server_lifecycle_choice, - 'fa fa-recycle fa-lg', + nil, t = N_('Lifecycle'), t, :enabled => true, @@ -87,7 +87,7 @@ class ApplicationHelper::Toolbar::PhysicalServerCenter < ApplicationHelper::Tool [ select( :physical_server_monitoring_choice, - 'ff ff-monitoring fa-lg', + nil, t = N_('Monitoring'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/physical_servers_center.rb b/app/helpers/application_helper/toolbar/physical_servers_center.rb index 59e8ee58f8a..369f0f28b58 100644 --- a/app/helpers/application_helper/toolbar/physical_servers_center.rb +++ b/app/helpers/application_helper/toolbar/physical_servers_center.rb @@ -4,7 +4,7 @@ class ApplicationHelper::Toolbar::PhysicalServersCenter < ApplicationHelper::Too [ select( :physical_server_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -203,7 +203,7 @@ class ApplicationHelper::Toolbar::PhysicalServersCenter < ApplicationHelper::Too [ select( :physical_server_policy_choice, - 'fa fa-shield fa-lg', + nil, N_('Policy'), :enabled => true, :items => [ @@ -231,7 +231,7 @@ class ApplicationHelper::Toolbar::PhysicalServersCenter < ApplicationHelper::Too ), select( :physical_server_lifecycle_choice, - 'fa fa-recycle fa-lg', + nil, t = N_('Lifecycle'), t, :enabled => true, diff --git a/app/helpers/application_helper/toolbar/physical_storage_center.rb b/app/helpers/application_helper/toolbar/physical_storage_center.rb index acdbd7a341f..ae72a2c43fa 100644 --- a/app/helpers/application_helper/toolbar/physical_storage_center.rb +++ b/app/helpers/application_helper/toolbar/physical_storage_center.rb @@ -4,7 +4,7 @@ class ApplicationHelper::Toolbar::PhysicalStorageCenter < ApplicationHelper::Too [ select( :physical_storage_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/physical_storages_center.rb b/app/helpers/application_helper/toolbar/physical_storages_center.rb index dccd178b323..b35e2c72c50 100644 --- a/app/helpers/application_helper/toolbar/physical_storages_center.rb +++ b/app/helpers/application_helper/toolbar/physical_storages_center.rb @@ -4,7 +4,7 @@ class ApplicationHelper::Toolbar::PhysicalStoragesCenter < ApplicationHelper::To [ select( :physical_storage_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/physical_switch_center.rb b/app/helpers/application_helper/toolbar/physical_switch_center.rb index b679decf003..72562ccda64 100644 --- a/app/helpers/application_helper/toolbar/physical_switch_center.rb +++ b/app/helpers/application_helper/toolbar/physical_switch_center.rb @@ -4,7 +4,7 @@ class ApplicationHelper::Toolbar::PhysicalSwitchCenter < ApplicationHelper::Tool [ select( :physical_switch_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/physical_switches_center.rb b/app/helpers/application_helper/toolbar/physical_switches_center.rb index 412719a5040..eb2a43c005c 100644 --- a/app/helpers/application_helper/toolbar/physical_switches_center.rb +++ b/app/helpers/application_helper/toolbar/physical_switches_center.rb @@ -4,7 +4,7 @@ class ApplicationHelper::Toolbar::PhysicalSwitchesCenter < ApplicationHelper::To [ select( :physical_switch_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/pxe_image_center.rb b/app/helpers/application_helper/toolbar/pxe_image_center.rb index 204b14144c1..f3a73fb31e5 100644 --- a/app/helpers/application_helper/toolbar/pxe_image_center.rb +++ b/app/helpers/application_helper/toolbar/pxe_image_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::PxeImageCenter < ApplicationHelper::Toolbar::B button_group('pxe_image_vmdb', [ select( :pxe_image_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/pxe_image_type_center.rb b/app/helpers/application_helper/toolbar/pxe_image_type_center.rb index 044d0cf3a99..d7b9be94fff 100644 --- a/app/helpers/application_helper/toolbar/pxe_image_type_center.rb +++ b/app/helpers/application_helper/toolbar/pxe_image_type_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::PxeImageTypeCenter < ApplicationHelper::Toolba button_group('pxe_image_type_vmdb', [ select( :pxe_image_type_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/pxe_image_types_center.rb b/app/helpers/application_helper/toolbar/pxe_image_types_center.rb index dd80324f85d..bf2f047b13e 100644 --- a/app/helpers/application_helper/toolbar/pxe_image_types_center.rb +++ b/app/helpers/application_helper/toolbar/pxe_image_types_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::PxeImageTypesCenter < ApplicationHelper::Toolb button_group('pxe_image_type_vmdb', [ select( :pxe_image_type_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/pxe_server_center.rb b/app/helpers/application_helper/toolbar/pxe_server_center.rb index 1acd781743f..893dea6d984 100644 --- a/app/helpers/application_helper/toolbar/pxe_server_center.rb +++ b/app/helpers/application_helper/toolbar/pxe_server_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::PxeServerCenter < ApplicationHelper::Toolbar:: button_group('pxe_server_vmdb', [ select( :pxe_server_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/pxe_servers_center.rb b/app/helpers/application_helper/toolbar/pxe_servers_center.rb index 65e9804debf..10a0feb3929 100644 --- a/app/helpers/application_helper/toolbar/pxe_servers_center.rb +++ b/app/helpers/application_helper/toolbar/pxe_servers_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::PxeServersCenter < ApplicationHelper::Toolbar: button_group('pxe_server_vmdb', [ select( :pxe_server_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/resource_pool_center.rb b/app/helpers/application_helper/toolbar/resource_pool_center.rb index 9111f626538..6127c85404f 100644 --- a/app/helpers/application_helper/toolbar/resource_pool_center.rb +++ b/app/helpers/application_helper/toolbar/resource_pool_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ResourcePoolCenter < ApplicationHelper::Toolba button_group('resource_pool_vmdb', [ select( :resource_pool_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -19,7 +19,7 @@ class ApplicationHelper::Toolbar::ResourcePoolCenter < ApplicationHelper::Toolba button_group('resource_pool_policy', [ select( :resource_pool_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/resource_pools_center.rb b/app/helpers/application_helper/toolbar/resource_pools_center.rb index 8e1c378953a..181f1c0419e 100644 --- a/app/helpers/application_helper/toolbar/resource_pools_center.rb +++ b/app/helpers/application_helper/toolbar/resource_pools_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ResourcePoolsCenter < ApplicationHelper::Toolb button_group('resource_pool_vmdb', [ select( :resource_pool_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :enabled => false, @@ -24,7 +24,7 @@ class ApplicationHelper::Toolbar::ResourcePoolsCenter < ApplicationHelper::Toolb button_group('resource_pool_policy', [ select( :resource_pool_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/saved_report_center.rb b/app/helpers/application_helper/toolbar/saved_report_center.rb index bd0e7cd5976..71dfe59e326 100644 --- a/app/helpers/application_helper/toolbar/saved_report_center.rb +++ b/app/helpers/application_helper/toolbar/saved_report_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::SavedReportCenter < ApplicationHelper::Toolbar button_group('saved_report_vmdb', [ select( :saved_report_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/saved_reports_center.rb b/app/helpers/application_helper/toolbar/saved_reports_center.rb index 3737b14a6ae..ce9f8003751 100644 --- a/app/helpers/application_helper/toolbar/saved_reports_center.rb +++ b/app/helpers/application_helper/toolbar/saved_reports_center.rb @@ -11,7 +11,7 @@ class ApplicationHelper::Toolbar::SavedReportsCenter < ApplicationHelper::Toolba button_group('saved_report_vmdb', [ select( :saved_report_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/scan_profile_center.rb b/app/helpers/application_helper/toolbar/scan_profile_center.rb index 1b21090137f..74fa43cccb0 100644 --- a/app/helpers/application_helper/toolbar/scan_profile_center.rb +++ b/app/helpers/application_helper/toolbar/scan_profile_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ScanProfileCenter < ApplicationHelper::Toolbar button_group('scan_vmdb', [ select( :scan_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/scan_profiles_center.rb b/app/helpers/application_helper/toolbar/scan_profiles_center.rb index 6fa8b24b3e6..e28ea555a67 100644 --- a/app/helpers/application_helper/toolbar/scan_profiles_center.rb +++ b/app/helpers/application_helper/toolbar/scan_profiles_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ScanProfilesCenter < ApplicationHelper::Toolba button_group('scan_vmdb', [ select( :scan_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/security_group_center.rb b/app/helpers/application_helper/toolbar/security_group_center.rb index 5e870be21f8..6d680b85431 100644 --- a/app/helpers/application_helper/toolbar/security_group_center.rb +++ b/app/helpers/application_helper/toolbar/security_group_center.rb @@ -4,7 +4,7 @@ class ApplicationHelper::Toolbar::SecurityGroupCenter < ApplicationHelper::Toolb [ select( :security_group_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -36,7 +36,7 @@ class ApplicationHelper::Toolbar::SecurityGroupCenter < ApplicationHelper::Toolb button_group('security_group_policy', [ select( :security_group_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/security_groups_center.rb b/app/helpers/application_helper/toolbar/security_groups_center.rb index 6d7cb24a044..4e2e0fa6f05 100644 --- a/app/helpers/application_helper/toolbar/security_groups_center.rb +++ b/app/helpers/application_helper/toolbar/security_groups_center.rb @@ -4,7 +4,7 @@ class ApplicationHelper::Toolbar::SecurityGroupsCenter < ApplicationHelper::Tool [ select( :security_group_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -42,7 +42,7 @@ class ApplicationHelper::Toolbar::SecurityGroupsCenter < ApplicationHelper::Tool button_group('security_group_policy', [ select( :security_group_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/service/lifecycle_mixin.rb b/app/helpers/application_helper/toolbar/service/lifecycle_mixin.rb index 25bb79c54cb..883fc716d46 100644 --- a/app/helpers/application_helper/toolbar/service/lifecycle_mixin.rb +++ b/app/helpers/application_helper/toolbar/service/lifecycle_mixin.rb @@ -3,7 +3,7 @@ def self.included(included_class) included_class.button_group('service_lifecycle', [ included_class.select( :service_lifecycle_choice, - 'fa fa-recycle fa-lg', + nil, t = N_('Lifecycle'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/service/policy_mixin.rb b/app/helpers/application_helper/toolbar/service/policy_mixin.rb index 8514101121c..ffa508d6b9a 100644 --- a/app/helpers/application_helper/toolbar/service/policy_mixin.rb +++ b/app/helpers/application_helper/toolbar/service/policy_mixin.rb @@ -3,7 +3,7 @@ def self.included(included_class) included_class.button_group('service_policy', [ included_class.select( :service_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/service/vmdb_mixin.rb b/app/helpers/application_helper/toolbar/service/vmdb_mixin.rb index 609b45da63c..c659c880afb 100644 --- a/app/helpers/application_helper/toolbar/service/vmdb_mixin.rb +++ b/app/helpers/application_helper/toolbar/service/vmdb_mixin.rb @@ -3,7 +3,7 @@ def self.included(included_class) included_class.button_group('service_vmdb', [ included_class.select( :service_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/service_center.rb b/app/helpers/application_helper/toolbar/service_center.rb index 3535a62757b..7961febe433 100644 --- a/app/helpers/application_helper/toolbar/service_center.rb +++ b/app/helpers/application_helper/toolbar/service_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ServiceCenter < ApplicationHelper::Toolbar::Ba button_group('service_vmdb', [ select( :service_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -39,7 +39,7 @@ class ApplicationHelper::Toolbar::ServiceCenter < ApplicationHelper::Toolbar::Ba button_group('service_policy', [ select( :service_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ @@ -56,7 +56,7 @@ class ApplicationHelper::Toolbar::ServiceCenter < ApplicationHelper::Toolbar::Ba button_group('service_lifecycle', [ select( :service_lifecycle_choice, - 'fa fa-recycle fa-lg', + nil, t = N_('Lifecycle'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/servicetemplate_center.rb b/app/helpers/application_helper/toolbar/servicetemplate_center.rb index 2675190bead..490f7d0adc8 100644 --- a/app/helpers/application_helper/toolbar/servicetemplate_center.rb +++ b/app/helpers/application_helper/toolbar/servicetemplate_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ServicetemplateCenter < ApplicationHelper::Too button_group('catalogitem_vmdb', [ select( :catalogitem_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -63,7 +63,7 @@ class ApplicationHelper::Toolbar::ServicetemplateCenter < ApplicationHelper::Too button_group('catalogitem_policy', [ select( :catalogitem_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/servicetemplatecatalog_center.rb b/app/helpers/application_helper/toolbar/servicetemplatecatalog_center.rb index 5a9cd1f2754..1fc24e71ce8 100644 --- a/app/helpers/application_helper/toolbar/servicetemplatecatalog_center.rb +++ b/app/helpers/application_helper/toolbar/servicetemplatecatalog_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ServicetemplatecatalogCenter < ApplicationHelp button_group('st_catalog_vmdb', [ select( :st_catalog_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :onwhen => "1+", diff --git a/app/helpers/application_helper/toolbar/servicetemplatecatalogs_center.rb b/app/helpers/application_helper/toolbar/servicetemplatecatalogs_center.rb index 8ef4630ed1f..022ab70d4c6 100644 --- a/app/helpers/application_helper/toolbar/servicetemplatecatalogs_center.rb +++ b/app/helpers/application_helper/toolbar/servicetemplatecatalogs_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ServicetemplatecatalogsCenter < ApplicationHel button_group('st_catalog_vmdb', [ select( :st_catalog_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/servicetemplates_center.rb b/app/helpers/application_helper/toolbar/servicetemplates_center.rb index 21f83c38dac..08d81dda152 100644 --- a/app/helpers/application_helper/toolbar/servicetemplates_center.rb +++ b/app/helpers/application_helper/toolbar/servicetemplates_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ServicetemplatesCenter < ApplicationHelper::To button_group('catalogitem_vmdb', [ select( :catalogitem_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -63,7 +63,7 @@ class ApplicationHelper::Toolbar::ServicetemplatesCenter < ApplicationHelper::To button_group('catalogitem_policy', [ select( :catalogitem_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/stack_orchestration_template_center.rb b/app/helpers/application_helper/toolbar/stack_orchestration_template_center.rb index 01c444292d6..d4b5ccce0e6 100644 --- a/app/helpers/application_helper/toolbar/stack_orchestration_template_center.rb +++ b/app/helpers/application_helper/toolbar/stack_orchestration_template_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::StackOrchestrationTemplateCenter < Application button_group('stack_orchestration_template_vmdb', [ select( :stack_orchestration_template_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/storage_center.rb b/app/helpers/application_helper/toolbar/storage_center.rb index 30fdf99ee1e..7f38955113e 100644 --- a/app/helpers/application_helper/toolbar/storage_center.rb +++ b/app/helpers/application_helper/toolbar/storage_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::StorageCenter < ApplicationHelper::Toolbar::Ba button_group('storage_vmdb', [ select( :storage_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -29,7 +29,7 @@ class ApplicationHelper::Toolbar::StorageCenter < ApplicationHelper::Toolbar::Ba button_group('storage_policy', [ select( :storage_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ @@ -44,7 +44,7 @@ class ApplicationHelper::Toolbar::StorageCenter < ApplicationHelper::Toolbar::Ba button_group('storage_monitoring', [ select( :storage_monitoring_choice, - 'ff ff-monitoring fa-lg', + nil, t = N_('Monitoring'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/storages_center.rb b/app/helpers/application_helper/toolbar/storages_center.rb index 005902f25cb..d14cfdb717a 100644 --- a/app/helpers/application_helper/toolbar/storages_center.rb +++ b/app/helpers/application_helper/toolbar/storages_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::StoragesCenter < ApplicationHelper::Toolbar::B button_group('storage_vmdb', [ select( :storage_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :enabled => false, @@ -34,7 +34,7 @@ class ApplicationHelper::Toolbar::StoragesCenter < ApplicationHelper::Toolbar::B button_group('storage_policy', [ select( :storage_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/template_clouds_center.rb b/app/helpers/application_helper/toolbar/template_clouds_center.rb index 97c0b656390..a78bc73dbbc 100644 --- a/app/helpers/application_helper/toolbar/template_clouds_center.rb +++ b/app/helpers/application_helper/toolbar/template_clouds_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::TemplateCloudsCenter < ApplicationHelper::Tool button_group('image_vmdb', [ select( :image_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :enabled => false, @@ -111,7 +111,7 @@ class ApplicationHelper::Toolbar::TemplateCloudsCenter < ApplicationHelper::Tool button_group('image_policy', [ select( :image_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/template_infras_center.rb b/app/helpers/application_helper/toolbar/template_infras_center.rb index 1dfc0f68d56..484b61f9edf 100644 --- a/app/helpers/application_helper/toolbar/template_infras_center.rb +++ b/app/helpers/application_helper/toolbar/template_infras_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::TemplateInfrasCenter < ApplicationHelper::Tool button_group('miq_template_vmdb', [ select( :miq_template_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :enabled => false, @@ -72,7 +72,7 @@ class ApplicationHelper::Toolbar::TemplateInfrasCenter < ApplicationHelper::Tool button_group('miq_template_policy', [ select( :miq_template_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, @@ -121,7 +121,7 @@ class ApplicationHelper::Toolbar::TemplateInfrasCenter < ApplicationHelper::Tool button_group('miq_template_lifecycle', [ select( :miq_template_lifecycle_choice, - 'fa fa-recycle fa-lg', + nil, t = N_('Lifecycle'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/tenant_center.rb b/app/helpers/application_helper/toolbar/tenant_center.rb index 900e5191707..60999019a67 100644 --- a/app/helpers/application_helper/toolbar/tenant_center.rb +++ b/app/helpers/application_helper/toolbar/tenant_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::TenantCenter < ApplicationHelper::Toolbar::Bas button_group('rbac_tenant_vmdb', [ select( :rbac_tenant_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -47,7 +47,7 @@ class ApplicationHelper::Toolbar::TenantCenter < ApplicationHelper::Toolbar::Bas button_group('rbac_tenant_policy', [ select( :rbac_tenant_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/tenants_center.rb b/app/helpers/application_helper/toolbar/tenants_center.rb index 7b14ae90e7c..9679575344d 100644 --- a/app/helpers/application_helper/toolbar/tenants_center.rb +++ b/app/helpers/application_helper/toolbar/tenants_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::TenantsCenter < ApplicationHelper::Toolbar::Ba button_group('rbac_tenant_vmdb', [ select( :rbac_tenant_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -40,7 +40,7 @@ class ApplicationHelper::Toolbar::TenantsCenter < ApplicationHelper::Toolbar::Ba button_group('rbac_tenant_policy', [ select( :rbac_group_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/time_profiles_center.rb b/app/helpers/application_helper/toolbar/time_profiles_center.rb index e371d569c9c..4036107859b 100644 --- a/app/helpers/application_helper/toolbar/time_profiles_center.rb +++ b/app/helpers/application_helper/toolbar/time_profiles_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::TimeProfilesCenter < ApplicationHelper::Toolba button_group('miq_schedule_vmdb', [ select( :miq_schedule_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/user_center.rb b/app/helpers/application_helper/toolbar/user_center.rb index 62a092ae742..475be4fdf40 100644 --- a/app/helpers/application_helper/toolbar/user_center.rb +++ b/app/helpers/application_helper/toolbar/user_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::UserCenter < ApplicationHelper::Toolbar::Basic button_group('user_vmdb', [ select( :user_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -31,7 +31,7 @@ class ApplicationHelper::Toolbar::UserCenter < ApplicationHelper::Toolbar::Basic button_group('rbac_user_policy', [ select( :rbac_user_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/user_role_center.rb b/app/helpers/application_helper/toolbar/user_role_center.rb index 6ea724205b4..d9a6ed964e0 100644 --- a/app/helpers/application_helper/toolbar/user_role_center.rb +++ b/app/helpers/application_helper/toolbar/user_role_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::UserRoleCenter < ApplicationHelper::Toolbar::B button_group('rbac_role_vmdb', [ select( :rbac_role_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/user_roles_center.rb b/app/helpers/application_helper/toolbar/user_roles_center.rb index cfab1052cea..f94ad18131e 100644 --- a/app/helpers/application_helper/toolbar/user_roles_center.rb +++ b/app/helpers/application_helper/toolbar/user_roles_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::UserRolesCenter < ApplicationHelper::Toolbar:: button_group('rbac_role_vmdb', [ select( :rbac_role_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/users_center.rb b/app/helpers/application_helper/toolbar/users_center.rb index ede57c4ced6..a8af9ba5663 100644 --- a/app/helpers/application_helper/toolbar/users_center.rb +++ b/app/helpers/application_helper/toolbar/users_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::UsersCenter < ApplicationHelper::Toolbar::Basi button_group('user_vmdb', [ select( :user_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -45,7 +45,7 @@ class ApplicationHelper::Toolbar::UsersCenter < ApplicationHelper::Toolbar::Basi button_group('rbac_user_policy', [ select( :rbac_user_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => false, diff --git a/app/helpers/application_helper/toolbar/vm_clouds_center.rb b/app/helpers/application_helper/toolbar/vm_clouds_center.rb index bee206758e8..9e424bd309f 100644 --- a/app/helpers/application_helper/toolbar/vm_clouds_center.rb +++ b/app/helpers/application_helper/toolbar/vm_clouds_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::VmCloudsCenter < ApplicationHelper::Toolbar::B button_group('instance_vmdb', [ select( :instance_vmdb_choice, - '', + nil, N_('Configuration'), :enabled => false, :onwhen => "1+", @@ -82,7 +82,7 @@ class ApplicationHelper::Toolbar::VmCloudsCenter < ApplicationHelper::Toolbar::B button_group('instance_policy', [ select( :instance_policy_choice, - '', + nil, N_('Policy'), :enabled => false, :onwhen => "1+", @@ -131,7 +131,7 @@ class ApplicationHelper::Toolbar::VmCloudsCenter < ApplicationHelper::Toolbar::B button_group('instance_lifecycle', [ select( :instance_lifecycle_choice, - '', + nil, N_('Lifecycle'), :items => [ button( @@ -184,7 +184,7 @@ class ApplicationHelper::Toolbar::VmCloudsCenter < ApplicationHelper::Toolbar::B button_group('instance_operations', [ select( :instance_power_choice, - '', + nil, N_('Power Operations'), N_('Power'), :enabled => false, diff --git a/app/helpers/application_helper/toolbar/vm_infras_center.rb b/app/helpers/application_helper/toolbar/vm_infras_center.rb index 3ed2972f6a6..94eac91af75 100644 --- a/app/helpers/application_helper/toolbar/vm_infras_center.rb +++ b/app/helpers/application_helper/toolbar/vm_infras_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::VmInfrasCenter < ApplicationHelper::Toolbar::B button_group('vm_vmdb', [ select( :vm_vmdb_choice, - '', + nil, N_('Configuration'), :enabled => false, :onwhen => "1+", @@ -110,7 +110,7 @@ class ApplicationHelper::Toolbar::VmInfrasCenter < ApplicationHelper::Toolbar::B button_group('vm_policy', [ select( :vm_policy_choice, - '', + nil, N_('Policy'), :enabled => false, :onwhen => "1+", @@ -159,7 +159,7 @@ class ApplicationHelper::Toolbar::VmInfrasCenter < ApplicationHelper::Toolbar::B button_group('vm_lifecycle', [ select( :vm_lifecycle_choice, - '', + nil, N_('Lifecycle'), :items => [ button( @@ -226,7 +226,7 @@ class ApplicationHelper::Toolbar::VmInfrasCenter < ApplicationHelper::Toolbar::B button_group('vm_operations', [ select( :vm_power_choice, - '', + nil, N_('Power Operations'), N_('Power'), :enabled => false, diff --git a/app/helpers/application_helper/toolbar/vms_center.rb b/app/helpers/application_helper/toolbar/vms_center.rb index 8a6299ba7f2..a4e5d0a8ea9 100644 --- a/app/helpers/application_helper/toolbar/vms_center.rb +++ b/app/helpers/application_helper/toolbar/vms_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::VmsCenter < ApplicationHelper::Toolbar::Basic button_group('vm_vmdb', [ select( :vm_vmdb_choice, - 'fa fa-cog fa-lg', + nil, N_('Configuration'), :enabled => false, :onwhen => "1+", @@ -61,7 +61,7 @@ class ApplicationHelper::Toolbar::VmsCenter < ApplicationHelper::Toolbar::Basic button_group('vm_policy', [ select( :vm_policy_choice, - 'fa fa-shield fa-lg', + nil, N_('Policy'), :enabled => false, :onwhen => "1+", @@ -110,7 +110,7 @@ class ApplicationHelper::Toolbar::VmsCenter < ApplicationHelper::Toolbar::Basic button_group('vm_lifecycle', [ select( :vm_lifecycle_choice, - 'fa fa-recycle fa-lg', + nil, N_('Lifecycle'), :items => [ button( diff --git a/app/helpers/application_helper/toolbar/windows_image_center.rb b/app/helpers/application_helper/toolbar/windows_image_center.rb index fc5530a837c..ca31d1cd1ad 100644 --- a/app/helpers/application_helper/toolbar/windows_image_center.rb +++ b/app/helpers/application_helper/toolbar/windows_image_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::WindowsImageCenter < ApplicationHelper::Toolba button_group('pxe_wimg_vmdb', [ select( :pxe_wimg_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/x_automation_manager_ansible_tower_configured_system_center.rb b/app/helpers/application_helper/toolbar/x_automation_manager_ansible_tower_configured_system_center.rb index 9c443b77228..493675ca8e8 100644 --- a/app/helpers/application_helper/toolbar/x_automation_manager_ansible_tower_configured_system_center.rb +++ b/app/helpers/application_helper/toolbar/x_automation_manager_ansible_tower_configured_system_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::XAutomationManagerAnsibleTowerConfiguredSystem button_group('record_summary', [ select( :automation_manager_policy_choice, - 'fa fa-shield fa-lg', + nil, N_('Policy'), :enabled => true, :items => [ diff --git a/app/helpers/application_helper/toolbar/x_configuration_script_center.rb b/app/helpers/application_helper/toolbar/x_configuration_script_center.rb index c8a6a30565c..bdcf25453a8 100644 --- a/app/helpers/application_helper/toolbar/x_configuration_script_center.rb +++ b/app/helpers/application_helper/toolbar/x_configuration_script_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::XConfigurationScriptCenter < ApplicationHelper button_group('configuration_script_vmdb', [ select( :configuration_script_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -15,7 +15,7 @@ class ApplicationHelper::Toolbar::XConfigurationScriptCenter < ApplicationHelper ), select( :automation_manager_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => true, diff --git a/app/helpers/application_helper/toolbar/x_configuration_scripts_center.rb b/app/helpers/application_helper/toolbar/x_configuration_scripts_center.rb index 2283d63198c..f8e9f479f6a 100644 --- a/app/helpers/application_helper/toolbar/x_configuration_scripts_center.rb +++ b/app/helpers/application_helper/toolbar/x_configuration_scripts_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::XConfigurationScriptsCenter < ApplicationHelpe button_group('configuration_script_vmdb', [ select( :configuration_script_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/x_foreman_configured_system_center.rb b/app/helpers/application_helper/toolbar/x_foreman_configured_system_center.rb index 57b1b2c2149..4bfbbb5dad4 100644 --- a/app/helpers/application_helper/toolbar/x_foreman_configured_system_center.rb +++ b/app/helpers/application_helper/toolbar/x_foreman_configured_system_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::XForemanConfiguredSystemCenter < ApplicationHe button_group('record_summary', [ select( :provider_foreman_lifecycle_choice, - 'fa fa-recycle fa-lg', + nil, t = N_('Lifecycle'), t, :enabled => true, @@ -20,7 +20,7 @@ class ApplicationHelper::Toolbar::XForemanConfiguredSystemCenter < ApplicationHe ), select( :provider_foreman_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => true, diff --git a/app/helpers/application_helper/toolbar/x_miq_template_center.rb b/app/helpers/application_helper/toolbar/x_miq_template_center.rb index ebd03632fcc..62bc9cc3cba 100644 --- a/app/helpers/application_helper/toolbar/x_miq_template_center.rb +++ b/app/helpers/application_helper/toolbar/x_miq_template_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::XMiqTemplateCenter < ApplicationHelper::Toolba button_group('miq_template_vmdb', [ select( :miq_template_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -44,7 +44,7 @@ class ApplicationHelper::Toolbar::XMiqTemplateCenter < ApplicationHelper::Toolba button_group('miq_template_policy', [ select( :miq_template_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ @@ -78,7 +78,7 @@ class ApplicationHelper::Toolbar::XMiqTemplateCenter < ApplicationHelper::Toolba button_group('miq_template_lifecycle', [ select( :miq_template_lifecycle_choice, - 'fa fa-recycle fa-lg', + nil, t = N_('Lifecycle'), t, :items => [ @@ -102,7 +102,7 @@ class ApplicationHelper::Toolbar::XMiqTemplateCenter < ApplicationHelper::Toolba button_group('miq_template_monitoring', [ select( :miq_template_monitoring_choice, - 'ff ff-monitoring fa-lg', + nil, t = N_('Monitoring'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/x_provider_foreman_foreman_configured_system_center.rb b/app/helpers/application_helper/toolbar/x_provider_foreman_foreman_configured_system_center.rb index 443115e7a1e..9bde578ef66 100644 --- a/app/helpers/application_helper/toolbar/x_provider_foreman_foreman_configured_system_center.rb +++ b/app/helpers/application_helper/toolbar/x_provider_foreman_foreman_configured_system_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::XProviderForemanForemanConfiguredSystemCenter button_group('record_summary', [ select( :provider_foreman_lifecycle_choice, - 'fa fa-recycle fa-lg', + nil, t = N_('Lifecycle'), t, :enabled => true, @@ -20,7 +20,7 @@ class ApplicationHelper::Toolbar::XProviderForemanForemanConfiguredSystemCenter ), select( :provider_foreman_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :enabled => true, diff --git a/app/helpers/application_helper/toolbar/x_template_cloud_center.rb b/app/helpers/application_helper/toolbar/x_template_cloud_center.rb index 25d6173c919..8ae02066bbd 100644 --- a/app/helpers/application_helper/toolbar/x_template_cloud_center.rb +++ b/app/helpers/application_helper/toolbar/x_template_cloud_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::XTemplateCloudCenter < ApplicationHelper::Tool button_group('image_vmdb', [ select( :image_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ @@ -56,7 +56,7 @@ class ApplicationHelper::Toolbar::XTemplateCloudCenter < ApplicationHelper::Tool button_group('image_lifecycle', [ select( :image_lifecycle_choice, - 'fa fa-recycle fa-lg', + nil, t = N_('Lifecycle'), t, :items => [ @@ -73,7 +73,7 @@ class ApplicationHelper::Toolbar::XTemplateCloudCenter < ApplicationHelper::Tool button_group('image_policy', [ select( :image_policy_choice, - 'fa fa-shield fa-lg', + nil, t = N_('Policy'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/x_vm_center.rb b/app/helpers/application_helper/toolbar/x_vm_center.rb index aba2464cfc5..75e73536762 100644 --- a/app/helpers/application_helper/toolbar/x_vm_center.rb +++ b/app/helpers/application_helper/toolbar/x_vm_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::XVmCenter < ApplicationHelper::Toolbar::Basic button_group('vm_vmdb', [ select( :vm_vmdb_choice, - '', + nil, t = N_('Configuration'), t, :items => [ @@ -85,7 +85,7 @@ class ApplicationHelper::Toolbar::XVmCenter < ApplicationHelper::Toolbar::Basic button_group('vm_policy', [ select( :vm_policy_choice, - '', + nil, t = N_('Policy'), t, :items => [ @@ -119,7 +119,7 @@ class ApplicationHelper::Toolbar::XVmCenter < ApplicationHelper::Toolbar::Basic button_group('vm_lifecycle', [ select( :vm_lifecycle_choice, - '', + nil, t = N_('Lifecycle'), t, :items => [ @@ -163,7 +163,7 @@ class ApplicationHelper::Toolbar::XVmCenter < ApplicationHelper::Toolbar::Basic button_group('vm_monitoring', [ select( :vm_monitoring_choice, - '', + nil, t = N_('Monitoring'), t, :items => [ @@ -193,7 +193,7 @@ class ApplicationHelper::Toolbar::XVmCenter < ApplicationHelper::Toolbar::Basic button_group('vm_operations', [ select( :vm_power_choice, - '', + nil, N_('VM Power Functions'), N_('Power'), :items => [ @@ -258,7 +258,7 @@ class ApplicationHelper::Toolbar::XVmCenter < ApplicationHelper::Toolbar::Basic button_group('vm_access', [ select( :vm_remote_access_choice, - '', + nil, N_('VM Remote Access'), N_('Access'), :items => [ diff --git a/app/helpers/application_helper/toolbar/x_vm_cloud_center.rb b/app/helpers/application_helper/toolbar/x_vm_cloud_center.rb index 8d511f3f8ae..9e027738b55 100644 --- a/app/helpers/application_helper/toolbar/x_vm_cloud_center.rb +++ b/app/helpers/application_helper/toolbar/x_vm_cloud_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::XVmCloudCenter < ApplicationHelper::Toolbar::B button_group('instance_vmdb', [ select( :instance_vmdb_choice, - '', + nil, t = N_('Configuration'), t, :items => [ @@ -121,7 +121,7 @@ class ApplicationHelper::Toolbar::XVmCloudCenter < ApplicationHelper::Toolbar::B button_group('instance_policy', [ select( :instance_policy_choice, - '', + nil, t = N_('Policy'), t, :items => [ @@ -153,7 +153,7 @@ class ApplicationHelper::Toolbar::XVmCloudCenter < ApplicationHelper::Toolbar::B button_group('instance_lifecycle', [ select( :instance_lifecycle_choice, - '', + nil, t = N_('Lifecycle'), t, :items => [ @@ -193,7 +193,7 @@ class ApplicationHelper::Toolbar::XVmCloudCenter < ApplicationHelper::Toolbar::B button_group('instance_monitoring', [ select( :instance_monitoring_choice, - '', + nil, t = N_('Monitoring'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/zone_center.rb b/app/helpers/application_helper/toolbar/zone_center.rb index 3d4b74ae3dc..eb69b27d2fb 100644 --- a/app/helpers/application_helper/toolbar/zone_center.rb +++ b/app/helpers/application_helper/toolbar/zone_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ZoneCenter < ApplicationHelper::Toolbar::Basic button_group('zone_vmdb', [ select( :zone_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/app/helpers/application_helper/toolbar/zones_center.rb b/app/helpers/application_helper/toolbar/zones_center.rb index fb026b21ff9..4f27843f35c 100644 --- a/app/helpers/application_helper/toolbar/zones_center.rb +++ b/app/helpers/application_helper/toolbar/zones_center.rb @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::ZonesCenter < ApplicationHelper::Toolbar::Basi button_group('scan_vmdb', [ select( :zone_vmdb_choice, - 'fa fa-cog fa-lg', + nil, t = N_('Configuration'), t, :items => [ diff --git a/spec/helpers/application_helper/toolbar_builder_spec.rb b/spec/helpers/application_helper/toolbar_builder_spec.rb index 6c2a6024f96..58eb1e61a3d 100644 --- a/spec/helpers/application_helper/toolbar_builder_spec.rb +++ b/spec/helpers/application_helper/toolbar_builder_spec.rb @@ -488,7 +488,7 @@ def add_button_to_set(button_set, button) expect(_toolbar_builder.build_toolbar(toolbar_to_build).first).to include( :id => "generic_object_policy_choice", - :icon => "fa fa-shield fa-lg", + :icon => nil, :title => "Policy", :text => "Policy", :items => [a_hash_including(items_hash)] @@ -508,7 +508,7 @@ def add_button_to_set(button_set, button) expect(_toolbar_builder.build_toolbar(toolbar_to_build).first).to include( :id => "generic_object_definition_configuration", :type => :buttonSelect, - :icon => "fa fa-cog fa-lg", + :icon => nil, :title => "Configuration", :text => "Configuration" )