Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Toolbar Simplification #6290

Merged
merged 2 commits into from
Oct 12, 2019
Merged

Toolbar Simplification #6290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28ae9ba
Toolbar Simplification
epwinchell Oct 7, 2019
36ef497
Toolbar Simplification
epwinchell Oct 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/helpers/application_helper/toolbar/ansible_credential_center.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::AnsibleCredentialCenter < ApplicationHelper::T
button_group('ansible_repository', [
select(
:ansible_credential_configuration,
'fa fa-cog fa-lg',
nil,
t = N_('Configuration'),
t,
:items => [
Expand All @@ -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',
nil,
t = N_('Policy'),
t,
:items => [
Expand Down
4 changes: 2 additions & 2 deletions app/helpers/application_helper/toolbar/ansible_credentials_center.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class ApplicationHelper::Toolbar::AnsibleCredentialsCenter < ApplicationHelper::
button_group('embedded_ansible_credentials', [
select(
:embedded_ansible_credentials_configuration,
'fa fa-cog fa-lg',
nil,
t = N_('Configuration'),
t,
:items => [
Expand Down Expand Up @@ -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',
nil,
t = N_('Policy'),
t,
:enabled => false,
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/application_helper/toolbar/ansible_playbook_center.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 => [
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/application_helper/toolbar/ansible_playbooks_center.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions app/helpers/application_helper/toolbar/ansible_repositories_center.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ 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),
])
button_group('ansible_repositories', [
select(
:ansible_repositories_configuration,
'fa fa-cog fa-lg',
nil,
t = N_('Configuration'),
t,
:items => [
Expand Down Expand Up @@ -64,7 +64,7 @@ class ApplicationHelper::Toolbar::AnsibleRepositoriesCenter < ApplicationHelper:
button_group('ansible_repositories_policy', [
select(
:ansible_repositories_policy_choice,
'fa fa-shield fa-lg',
nil,
t = N_('Policy'),
t,
:enabled => false,
Expand Down
6 changes: 3 additions & 3 deletions app/helpers/application_helper/toolbar/ansible_repository_center.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ 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),
])
button_group('ansible_repository', [
select(
:ansible_repository_configuration,
'fa fa-cog fa-lg',
nil,
t = N_('Configuration'),
t,
:items => [
Expand Down Expand Up @@ -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',
nil,
t = N_('Policy'),
t,
:items => [
Expand Down
4 changes: 2 additions & 2 deletions app/helpers/application_helper/toolbar/auth_key_pair_cloud_center.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 => [
Expand Down Expand Up @@ -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 => [
Expand Down
4 changes: 2 additions & 2 deletions app/helpers/application_helper/toolbar/auth_key_pair_clouds_center.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 => [
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/application_helper/toolbar/automation_manager_provider_center.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions app/helpers/application_helper/toolbar/automation_manager_providers_center.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions app/helpers/application_helper/toolbar/availability_zone_center.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 => [
Expand All @@ -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 => [
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/application_helper/toolbar/availability_zones_center.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/application_helper/toolbar/catalogitem_button_center.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 => [
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/application_helper/toolbar/catalogitem_buttons_center.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 => [
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/application_helper/toolbar/chargeback_center.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 => [
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/application_helper/toolbar/chargebacks_center.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 => [
Expand Down
4 changes: 2 additions & 2 deletions app/helpers/application_helper/toolbar/cloud_network_center.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class ApplicationHelper::Toolbar::CloudNetworkCenter < ApplicationHelper::Toolba
[
select(
:cloud_network_vmdb_choice,
'fa fa-cog fa-lg',
nil,
t = N_('Configuration'),
t,
:items => [
Expand Down Expand Up @@ -38,7 +38,7 @@ class ApplicationHelper::Toolbar::CloudNetworkCenter < ApplicationHelper::Toolba
[
select(
:cloud_network_policy_choice,
'fa fa-shield fa-lg',
nil,
t = N_('Policy'),
t,
:items => [
Expand Down
4 changes: 2 additions & 2 deletions app/helpers/application_helper/toolbar/cloud_networks_center.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class ApplicationHelper::Toolbar::CloudNetworksCenter < ApplicationHelper::Toolb
[
select(
:cloud_network_vmdb_choice,
'fa fa-cog fa-lg',
nil,
t = N_('Configuration'),
t,
:items => [
Expand All @@ -24,7 +24,7 @@ class ApplicationHelper::Toolbar::CloudNetworksCenter < ApplicationHelper::Toolb
[
select(
:cloud_network_policy_choice,
'fa fa-shield fa-lg',
nil,
t = N_('Policy'),
t,
:enabled => false,
Expand Down
4 changes: 2 additions & 2 deletions app/helpers/application_helper/toolbar/cloud_object_store_container_center.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 => [
Expand Down Expand Up @@ -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 => [
Expand Down
4 changes: 2 additions & 2 deletions app/helpers/application_helper/toolbar/cloud_object_store_containers_center.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions app/helpers/application_helper/toolbar/cloud_object_store_object_center.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 => [
Expand All @@ -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 => [
Expand Down
4 changes: 2 additions & 2 deletions app/helpers/application_helper/toolbar/cloud_object_store_objects_center.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions app/helpers/application_helper/toolbar/cloud_subnet_center.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
nil,
t = N_('Configuration'),
t,
:items => [
Expand Down Expand Up @@ -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',
nil,
t = N_('Policy'),
t,
:items => [
Expand Down
4 changes: 2 additions & 2 deletions app/helpers/application_helper/toolbar/cloud_subnets_center.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
nil,
t = N_('Configuration'),
t,
:items => [
Expand Down Expand Up @@ -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',
nil,
t = N_('Policy'),
t,
:enabled => false,
Expand Down
4 changes: 2 additions & 2 deletions app/helpers/application_helper/toolbar/cloud_tenant_center.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
nil,
t = N_('Configuration'),
t,
:items => [
Expand All @@ -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',
nil,
t = N_('Policy'),
t,
:items => [
Expand Down
Loading