From b65f1e8ade988bc7524c8a487cea3e2369d3c1ba Mon Sep 17 00:00:00 2001 From: Attila Vecerek Date: Tue, 20 Dec 2016 18:37:00 +0100 Subject: [PATCH] Assign the buttons ending with _new or _discover to their new button classes (cherry picked from commit a5e6ea690bb3163285a4e471640272efd9f37d40) --- .../toolbar/arbitration_profiles_center.rb | 37 +++++++++++++++++++ .../toolbar/catalogitem_button_set_center.rb | 4 +- .../toolbar/catalogitem_buttons_center.rb | 2 +- .../toolbar/cloud_networks_center.rb | 3 +- .../toolbar/cloud_tenants_center.rb | 3 +- .../toolbar/conditions_center.rb | 3 +- .../toolbar/custom_button_set_center.rb | 3 +- .../toolbar/dialogs_center.rb | 2 +- .../toolbar/ems_cloud_center.rb | 7 ++++ .../toolbar/ems_clouds_center.rb | 6 ++- .../toolbar/ems_containers_center.rb | 3 +- .../toolbar/ems_datawarehouses_center.rb | 3 +- .../toolbar/ems_infras_center.rb | 6 ++- .../toolbar/ems_middlewares_center.rb | 3 +- .../toolbar/ems_networks_center.rb | 2 +- .../toolbar/host_aggregates_center.rb | 3 +- .../toolbar/hosts_center.rb | 9 +++-- .../toolbar/iso_datastores_center.rb | 3 +- .../toolbar/miq_actions_center.rb | 3 +- .../toolbar/miq_ae_domain_center.rb | 2 +- .../toolbar/miq_ae_domains_center.rb | 2 +- .../toolbar/miq_ae_instances_center.rb | 2 +- .../toolbar/miq_ae_methods_center.rb | 2 +- .../toolbar/miq_ae_namespace_center.rb | 4 +- .../toolbar/miq_alert_profiles_center.rb | 3 +- .../toolbar/miq_alerts_center.rb | 3 +- .../toolbar/miq_dialogs_center.rb | 3 +- .../toolbar/miq_policies_center.rb | 3 +- .../toolbar/miq_policy_profiles_center.rb | 3 +- .../toolbar/miq_report_center.rb | 2 +- .../toolbar/miq_reports_center.rb | 2 +- .../toolbar/miq_widget_sets_center.rb | 3 +- .../toolbar/network_routers_center.rb | 3 +- .../toolbar/persistent_volumes_center.rb | 3 +- .../toolbar/pxe_image_types_center.rb | 3 +- .../toolbar/pxe_servers_center.rb | 3 +- .../toolbar/security_groups_center.rb | 3 +- .../toolbar/servicetemplate_center.rb | 4 +- .../toolbar/servicetemplatecatalogs_center.rb | 3 +- .../toolbar/servicetemplates_center.rb | 6 ++- .../toolbar/storage_managers_center.rb | 3 +- .../toolbar/template_clouds_center.rb | 3 +- .../toolbar/template_infras_center.rb | 3 +- .../toolbar/time_profiles_center.rb | 3 +- .../application_helper/toolbar/vms_center.rb | 3 +- .../toolbar/x_miq_template_center.rb | 2 +- .../toolbar/x_template_cloud_center.rb | 2 +- .../toolbar/zones_center.rb | 3 +- 48 files changed, 135 insertions(+), 54 deletions(-) create mode 100644 app/helpers/application_helper/toolbar/arbitration_profiles_center.rb diff --git a/app/helpers/application_helper/toolbar/arbitration_profiles_center.rb b/app/helpers/application_helper/toolbar/arbitration_profiles_center.rb new file mode 100644 index 00000000000..9af29cbb81e --- /dev/null +++ b/app/helpers/application_helper/toolbar/arbitration_profiles_center.rb @@ -0,0 +1,37 @@ +class ApplicationHelper::Toolbar::ArbitrationProfilesCenter < ApplicationHelper::Toolbar::Basic + button_group('arbitration_profile_cloud_vmdb', [ + select( + :arbitration_profile_vmdb_choice, + 'fa fa-cog fa-lg', + t = N_('Configuration'), + t, + :items => [ + button( + :arbitration_profile_new, + 'pficon pficon-edit fa-lg', + N_('Add a new Arbitration Profile'), + N_('Add a new Arbitration Profile'), + :klass => ApplicationHelper::Button::ButtonNewDiscover), + button( + :arbitration_profile_edit, + 'pficon pficon-edit fa-lg', + N_('Select a single Arbitration Profile to edit'), + N_('Edit Selected Arbitration Profile'), + :url_parms => "main_div", + :enabled => false, + :onwhen => "1"), + button( + :arbitration_profile_delete, + 'pficon pficon-delete fa-lg', + N_('Remove selected Arbitration Profiles from the VMDB'), + N_('Remove Arbitration Profiles from the VMDB'), + :url_parms => "main_div", + # rubocop:disable LineLength + :confirm => N_("Warning: The selected Cloud Providers and ALL of their components will be permanently removed from the Virtual Management Database. Are you sure you want to remove the selected Cloud Providers?"), + :enabled => false, + :onwhen => "1+"), + ] + ), + ] + ) +end diff --git a/app/helpers/application_helper/toolbar/catalogitem_button_set_center.rb b/app/helpers/application_helper/toolbar/catalogitem_button_set_center.rb index c9f7be90859..1c4c9a91ac6 100644 --- a/app/helpers/application_helper/toolbar/catalogitem_button_set_center.rb +++ b/app/helpers/application_helper/toolbar/catalogitem_button_set_center.rb @@ -11,13 +11,13 @@ class ApplicationHelper::Toolbar::CatalogitemButtonSetCenter < ApplicationHelper 'pficon pficon-add-circle-o fa-lg', t = N_('Add a new Button Group'), t, - :klass => ApplicationHelper::Button::CatalogItemButton), + :klass => ApplicationHelper::Button::CatalogItemButtonNew), button( :ab_button_new, 'pficon pficon-add-circle-o fa-lg', t = N_('Add a new Button'), t, - :klass => ApplicationHelper::Button::CatalogItemButton), + :klass => ApplicationHelper::Button::CatalogItemButtonNew), button( :ab_group_reorder, 'pficon pficon-edit fa-lg', diff --git a/app/helpers/application_helper/toolbar/catalogitem_buttons_center.rb b/app/helpers/application_helper/toolbar/catalogitem_buttons_center.rb index d618fdab706..a814396f640 100644 --- a/app/helpers/application_helper/toolbar/catalogitem_buttons_center.rb +++ b/app/helpers/application_helper/toolbar/catalogitem_buttons_center.rb @@ -18,7 +18,7 @@ class ApplicationHelper::Toolbar::CatalogitemButtonsCenter < ApplicationHelper:: 'pficon pficon-add-circle-o fa-lg', t = N_('Add a new Button'), t, - :klass => ApplicationHelper::Button::CatalogItemButton), + :klass => ApplicationHelper::Button::CatalogItemButtonNew), button( :ab_group_delete, 'pficon pficon-delete fa-lg', diff --git a/app/helpers/application_helper/toolbar/cloud_networks_center.rb b/app/helpers/application_helper/toolbar/cloud_networks_center.rb index ee6a632e207..6883064a278 100644 --- a/app/helpers/application_helper/toolbar/cloud_networks_center.rb +++ b/app/helpers/application_helper/toolbar/cloud_networks_center.rb @@ -12,7 +12,8 @@ class ApplicationHelper::Toolbar::CloudNetworksCenter < ApplicationHelper::Toolb :cloud_network_new, 'pficon pficon-add-circle-o fa-lg', t = N_('Add a new Cloud Network'), - t), + t, + :klass => ApplicationHelper::Button::ButtonNewDiscover), separator, # TODO: Restore when cross controllers show_list issue fully in place # https://github.com/ManageIQ/manageiq/pull/12551 diff --git a/app/helpers/application_helper/toolbar/cloud_tenants_center.rb b/app/helpers/application_helper/toolbar/cloud_tenants_center.rb index 067ea0867e7..e78621ddf43 100644 --- a/app/helpers/application_helper/toolbar/cloud_tenants_center.rb +++ b/app/helpers/application_helper/toolbar/cloud_tenants_center.rb @@ -10,7 +10,8 @@ class ApplicationHelper::Toolbar::CloudTenantsCenter < ApplicationHelper::Toolba :cloud_tenant_new, 'pficon pficon-edit fa-lg', t = N_('Create Cloud Tenant'), - t), + t, + :klass => ApplicationHelper::Button::ButtonNewDiscover), button( :cloud_tenant_edit, 'pficon pficon-edit fa-lg', diff --git a/app/helpers/application_helper/toolbar/conditions_center.rb b/app/helpers/application_helper/toolbar/conditions_center.rb index d5c07040a2e..07ffce028f9 100644 --- a/app/helpers/application_helper/toolbar/conditions_center.rb +++ b/app/helpers/application_helper/toolbar/conditions_center.rb @@ -18,7 +18,8 @@ class ApplicationHelper::Toolbar::ConditionsCenter < ApplicationHelper::Toolbar: } end end, - t), + t, + :klass => ApplicationHelper::Button::ButtonNewDiscover), ] ), ]) 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 2acdd490ba3..ba61493ed92 100644 --- a/app/helpers/application_helper/toolbar/custom_button_set_center.rb +++ b/app/helpers/application_helper/toolbar/custom_button_set_center.rb @@ -10,7 +10,8 @@ class ApplicationHelper::Toolbar::CustomButtonSetCenter < ApplicationHelper::Too :ab_group_new, 'pficon pficon-add-circle-o fa-lg', t = N_('Add a new Button Group'), - t), + t, + :klass => ApplicationHelper::Button::ButtonNewDiscover), button( :ab_button_new, 'pficon pficon-add-circle-o fa-lg', diff --git a/app/helpers/application_helper/toolbar/dialogs_center.rb b/app/helpers/application_helper/toolbar/dialogs_center.rb index 58b9e573618..e2c6ea84631 100644 --- a/app/helpers/application_helper/toolbar/dialogs_center.rb +++ b/app/helpers/application_helper/toolbar/dialogs_center.rb @@ -11,7 +11,7 @@ class ApplicationHelper::Toolbar::DialogsCenter < ApplicationHelper::Toolbar::Ba 'pficon pficon-add-circle-o fa-lg', t = N_('Add a new Dialog'), t, - :klass => ApplicationHelper::Button::DialogAction), + :klass => ApplicationHelper::Button::DialogNew), button( :dialog_edit, 'pficon pficon-edit fa-lg', diff --git a/app/helpers/application_helper/toolbar/ems_cloud_center.rb b/app/helpers/application_helper/toolbar/ems_cloud_center.rb index 97fd2ff30d4..1aad81ca679 100644 --- a/app/helpers/application_helper/toolbar/ems_cloud_center.rb +++ b/app/helpers/application_helper/toolbar/ems_cloud_center.rb @@ -31,6 +31,13 @@ class ApplicationHelper::Toolbar::EmsCloudCenter < ApplicationHelper::Toolbar::B t, :url_parms => "&refresh=y", :confirm => N_("Warning: This Cloud Provider and ALL of its components will be permanently removed!")), + separator, + button( + :arbitration_profile_new, + 'pficon pficon-edit fa-lg', + t = N_('Add a new Arbitration Profile to this Cloud Provider'), + t, + :klass => ApplicationHelper::Button::ButtonNewDiscover), ] ), ]) diff --git a/app/helpers/application_helper/toolbar/ems_clouds_center.rb b/app/helpers/application_helper/toolbar/ems_clouds_center.rb index adc3df76fb8..a1ca0b58c17 100644 --- a/app/helpers/application_helper/toolbar/ems_clouds_center.rb +++ b/app/helpers/application_helper/toolbar/ems_clouds_center.rb @@ -21,14 +21,16 @@ class ApplicationHelper::Toolbar::EmsCloudsCenter < ApplicationHelper::Toolbar:: t = N_('Discover Cloud Providers'), t, :url => "/discover", - :url_parms => "?discover_type=ems"), + :url_parms => "?discover_type=ems", + :klass => ApplicationHelper::Button::ButtonNewDiscover), separator, button( :ems_cloud_new, 'pficon pficon-add-circle-o fa-lg', t = N_('Add a New Cloud Provider'), t, - :url => "/new"), + :url => "/new", + :klass => ApplicationHelper::Button::ButtonNewDiscover), button( :ems_cloud_edit, 'pficon pficon-edit fa-lg', diff --git a/app/helpers/application_helper/toolbar/ems_containers_center.rb b/app/helpers/application_helper/toolbar/ems_containers_center.rb index 2d514d25bb5..d0554ff0abc 100644 --- a/app/helpers/application_helper/toolbar/ems_containers_center.rb +++ b/app/helpers/application_helper/toolbar/ems_containers_center.rb @@ -21,7 +21,8 @@ class ApplicationHelper::Toolbar::EmsContainersCenter < ApplicationHelper::Toolb 'pficon pficon-add-circle-o fa-lg', t = N_('Add Existing Containers Provider'), t, - :url => "/new"), + :url => "/new", + :klass => ApplicationHelper::Button::ButtonNewDiscover), button( :ems_container_deployment, 'pficon pficon-add-circle-o fa-lg', diff --git a/app/helpers/application_helper/toolbar/ems_datawarehouses_center.rb b/app/helpers/application_helper/toolbar/ems_datawarehouses_center.rb index ee9934b9f4e..43dc836a63f 100644 --- a/app/helpers/application_helper/toolbar/ems_datawarehouses_center.rb +++ b/app/helpers/application_helper/toolbar/ems_datawarehouses_center.rb @@ -21,7 +21,8 @@ class ApplicationHelper::Toolbar::EmsDatawarehousesCenter < ApplicationHelper::T 'pficon pficon-add-circle-o fa-lg', t = N_('Add a New Datawarehouse Provider'), t, - :url => "/new"), + :url => "/new", + :klass => ApplicationHelper::Button::ButtonNewDiscover), button( :ems_datawarehouse_edit, 'pficon pficon-edit fa-lg', diff --git a/app/helpers/application_helper/toolbar/ems_infras_center.rb b/app/helpers/application_helper/toolbar/ems_infras_center.rb index 3e9c871eb29..9073e568a5f 100644 --- a/app/helpers/application_helper/toolbar/ems_infras_center.rb +++ b/app/helpers/application_helper/toolbar/ems_infras_center.rb @@ -21,14 +21,16 @@ class ApplicationHelper::Toolbar::EmsInfrasCenter < ApplicationHelper::Toolbar:: t = N_('Discover Infrastructure Providers'), t, :url => "/discover", - :url_parms => "?discover_type=ems"), + :url_parms => "?discover_type=ems", + :klass => ApplicationHelper::Button::ButtonNewDiscover), separator, button( :ems_infra_new, 'pficon pficon-add-circle-o fa-lg', t = N_('Add a New Infrastructure Provider'), t, - :url => "/new"), + :url => "/new", + :klass => ApplicationHelper::Button::ButtonNewDiscover), button( :ems_infra_edit, 'pficon pficon-edit fa-lg', diff --git a/app/helpers/application_helper/toolbar/ems_middlewares_center.rb b/app/helpers/application_helper/toolbar/ems_middlewares_center.rb index ed115f69264..eaec703030c 100644 --- a/app/helpers/application_helper/toolbar/ems_middlewares_center.rb +++ b/app/helpers/application_helper/toolbar/ems_middlewares_center.rb @@ -21,7 +21,8 @@ class ApplicationHelper::Toolbar::EmsMiddlewaresCenter < ApplicationHelper::Tool 'pficon pficon-add-circle-o fa-lg', t = N_('Add a New Middleware Provider'), t, - :url => "/new"), + :url => "/new", + :klass => ApplicationHelper::Button::ButtonNewDiscover), button( :ems_middleware_edit, 'pficon pficon-edit fa-lg', diff --git a/app/helpers/application_helper/toolbar/ems_networks_center.rb b/app/helpers/application_helper/toolbar/ems_networks_center.rb index eb0f05077da..a1a9cc7d8e7 100644 --- a/app/helpers/application_helper/toolbar/ems_networks_center.rb +++ b/app/helpers/application_helper/toolbar/ems_networks_center.rb @@ -22,7 +22,7 @@ class ApplicationHelper::Toolbar::EmsNetworksCenter < ApplicationHelper::Toolbar t = N_('Add a New Network Provider'), t, :url => "/new", - :klass => ApplicationHelper::Button::EmsNetwork), + :klass => ApplicationHelper::Button::EmsNetworkNew), button( :ems_network_edit, 'pficon pficon-edit fa-lg', diff --git a/app/helpers/application_helper/toolbar/host_aggregates_center.rb b/app/helpers/application_helper/toolbar/host_aggregates_center.rb index a85502e1e47..6d7e92a68c6 100644 --- a/app/helpers/application_helper/toolbar/host_aggregates_center.rb +++ b/app/helpers/application_helper/toolbar/host_aggregates_center.rb @@ -11,7 +11,8 @@ class ApplicationHelper::Toolbar::HostAggregatesCenter < ApplicationHelper::Tool 'pficon pficon-add-circle-o fa-lg', t = N_('Add a New Host Aggregate'), t, - :url => "/new"), + :url => "/new", + :klass => ApplicationHelper::Button::ButtonNewDiscover), button( :host_aggregate_edit, 'pficon pficon-edit fa-lg', diff --git a/app/helpers/application_helper/toolbar/hosts_center.rb b/app/helpers/application_helper/toolbar/hosts_center.rb index 9eaeb195b10..09dff2695e2 100644 --- a/app/helpers/application_helper/toolbar/hosts_center.rb +++ b/app/helpers/application_helper/toolbar/hosts_center.rb @@ -72,14 +72,16 @@ class ApplicationHelper::Toolbar::HostsCenter < ApplicationHelper::Toolbar::Basi t = N_('Discover items'), t, :url => "/discover", - :url_parms => "?discover_type=hosts"), + :url_parms => "?discover_type=hosts", + :klass => ApplicationHelper::Button::ButtonNewDiscover), separator, button( :host_new, 'pficon pficon-add-circle-o fa-lg', t = N_('Add a New item'), t, - :url => "/new"), + :url => "/new", + :klass => ApplicationHelper::Button::ButtonNewDiscover), button( :host_edit, 'pficon pficon-edit fa-lg', @@ -160,7 +162,8 @@ class ApplicationHelper::Toolbar::HostsCenter < ApplicationHelper::Toolbar::Basi N_('Provision items'), :url_parms => "main_div", :enabled => false, - :onwhen => "1+"), + :onwhen => "1+", + :klass => ApplicationHelper::Button::ButtonNewDiscover), ] ), ]) diff --git a/app/helpers/application_helper/toolbar/iso_datastores_center.rb b/app/helpers/application_helper/toolbar/iso_datastores_center.rb index 181c88e245e..4cb66967f91 100644 --- a/app/helpers/application_helper/toolbar/iso_datastores_center.rb +++ b/app/helpers/application_helper/toolbar/iso_datastores_center.rb @@ -10,7 +10,8 @@ class ApplicationHelper::Toolbar::IsoDatastoresCenter < ApplicationHelper::Toolb :iso_datastore_new, 'pficon pficon-add-circle-o fa-lg', t = N_('Add a New ISO Datastore'), - t), + t, + :klass => ApplicationHelper::Button::ButtonNewDiscover), button( :iso_datastore_delete, 'pficon pficon-delete fa-lg', diff --git a/app/helpers/application_helper/toolbar/miq_actions_center.rb b/app/helpers/application_helper/toolbar/miq_actions_center.rb index c8339dc0824..9240f0954e4 100644 --- a/app/helpers/application_helper/toolbar/miq_actions_center.rb +++ b/app/helpers/application_helper/toolbar/miq_actions_center.rb @@ -10,7 +10,8 @@ class ApplicationHelper::Toolbar::MiqActionsCenter < ApplicationHelper::Toolbar: :action_new, 'pficon pficon-add-circle-o fa-lg', t = N_('Add a new Action'), - t), + t, + :klass => ApplicationHelper::Button::ButtonNewDiscover), ] ), ]) 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 18192e24d7b..11de58d26a6 100644 --- a/app/helpers/application_helper/toolbar/miq_ae_domain_center.rb +++ b/app/helpers/application_helper/toolbar/miq_ae_domain_center.rb @@ -43,7 +43,7 @@ class ApplicationHelper::Toolbar::MiqAeDomainCenter < ApplicationHelper::Toolbar 'pficon pficon-add-circle-o fa-lg', t = N_('Add a New Namespace'), t, - :klass => ApplicationHelper::Button::MiqAeDefault), + :klass => ApplicationHelper::Button::MiqAeNew), button( :miq_ae_namespace_edit, 'pficon pficon-edit fa-lg', 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 6c0a245cebc..213574fcc6b 100644 --- a/app/helpers/application_helper/toolbar/miq_ae_domains_center.rb +++ b/app/helpers/application_helper/toolbar/miq_ae_domains_center.rb @@ -11,7 +11,7 @@ class ApplicationHelper::Toolbar::MiqAeDomainsCenter < ApplicationHelper::Toolba 'pficon pficon-add-circle-o fa-lg', t = N_('Add a New Domain'), t, - :klass => ApplicationHelper::Button::MiqAeDefaultNoRecord), + :klass => ApplicationHelper::Button::MiqAeDefaultNoRecordNew), button( :miq_ae_domain_edit, 'pficon pficon-edit fa-lg', 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 fae00ca4417..906be9c3e99 100644 --- a/app/helpers/application_helper/toolbar/miq_ae_instances_center.rb +++ b/app/helpers/application_helper/toolbar/miq_ae_instances_center.rb @@ -32,7 +32,7 @@ class ApplicationHelper::Toolbar::MiqAeInstancesCenter < ApplicationHelper::Tool 'pficon pficon-add-circle-o fa-lg', t = N_('Add a New Instance'), t, - :klass => ApplicationHelper::Button::MiqAeDefault), + :klass => ApplicationHelper::Button::MiqAeNew), button( :miq_ae_instance_edit, 'pficon pficon-edit fa-lg', 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 2222aa4668c..369ec80545d 100644 --- a/app/helpers/application_helper/toolbar/miq_ae_methods_center.rb +++ b/app/helpers/application_helper/toolbar/miq_ae_methods_center.rb @@ -32,7 +32,7 @@ class ApplicationHelper::Toolbar::MiqAeMethodsCenter < ApplicationHelper::Toolba 'pficon pficon-add-circle-o fa-lg', t = N_('Add a New Method'), t, - :klass => ApplicationHelper::Button::MiqAeDefault), + :klass => ApplicationHelper::Button::MiqAeNew), button( :miq_ae_method_edit, 'pficon pficon-edit fa-lg', 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 dca2b1c4827..03d95bf6c04 100644 --- a/app/helpers/application_helper/toolbar/miq_ae_namespace_center.rb +++ b/app/helpers/application_helper/toolbar/miq_ae_namespace_center.rb @@ -25,13 +25,13 @@ class ApplicationHelper::Toolbar::MiqAeNamespaceCenter < ApplicationHelper::Tool 'pficon pficon-add-circle-o fa-lg', t = N_('Add a New Namespace'), t, - :klass => ApplicationHelper::Button::MiqAeDefault), + :klass => ApplicationHelper::Button::MiqAeNew), button( :miq_ae_class_new, 'pficon pficon-add-circle-o fa-lg', t = N_('Add a New Class'), t, - :klass => ApplicationHelper::Button::MiqAeDefault), + :klass => ApplicationHelper::Button::MiqAeNew), button( :miq_ae_item_edit, 'pficon pficon-edit fa-lg', 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 e950057c520..918621091a9 100644 --- a/app/helpers/application_helper/toolbar/miq_alert_profiles_center.rb +++ b/app/helpers/application_helper/toolbar/miq_alert_profiles_center.rb @@ -12,7 +12,8 @@ class ApplicationHelper::Toolbar::MiqAlertProfilesCenter < ApplicationHelper::To t = proc do _('Add a New %{alert_profile_type} Alert Profile') % {:alert_profile_type => ui_lookup(:model => @sb[:folder])} end, - t), + t, + :klass => ApplicationHelper::Button::ButtonNewDiscover), ] ), ]) diff --git a/app/helpers/application_helper/toolbar/miq_alerts_center.rb b/app/helpers/application_helper/toolbar/miq_alerts_center.rb index 94ca66874b0..6db9bfc1f41 100644 --- a/app/helpers/application_helper/toolbar/miq_alerts_center.rb +++ b/app/helpers/application_helper/toolbar/miq_alerts_center.rb @@ -10,7 +10,8 @@ class ApplicationHelper::Toolbar::MiqAlertsCenter < ApplicationHelper::Toolbar:: :alert_new, 'pficon pficon-add-circle-o fa-lg', t = N_('Add a New Alert'), - t), + t, + :klass => ApplicationHelper::Button::ButtonNewDiscover), ] ), ]) diff --git a/app/helpers/application_helper/toolbar/miq_dialogs_center.rb b/app/helpers/application_helper/toolbar/miq_dialogs_center.rb index 00dec153608..87c8d6eecf3 100644 --- a/app/helpers/application_helper/toolbar/miq_dialogs_center.rb +++ b/app/helpers/application_helper/toolbar/miq_dialogs_center.rb @@ -10,7 +10,8 @@ class ApplicationHelper::Toolbar::MiqDialogsCenter < ApplicationHelper::Toolbar: :old_dialogs_new, 'pficon pficon-add-circle-o fa-lg', t = N_('Add a new Dialog'), - t), + t, + :klass => ApplicationHelper::Button::ButtonNewDiscover), button( :old_dialogs_edit, 'pficon pficon-edit fa-lg', diff --git a/app/helpers/application_helper/toolbar/miq_policies_center.rb b/app/helpers/application_helper/toolbar/miq_policies_center.rb index 86a44ac46b9..cb8173aa5ca 100644 --- a/app/helpers/application_helper/toolbar/miq_policies_center.rb +++ b/app/helpers/application_helper/toolbar/miq_policies_center.rb @@ -16,7 +16,8 @@ class ApplicationHelper::Toolbar::MiqPoliciesCenter < ApplicationHelper::Toolbar } end, t, - :url_parms => "?typ=basic"), + :url_parms => "?typ=basic", + :klass => ApplicationHelper::Button::ButtonNewDiscover), ] ), ]) 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 9fb2cb45629..b921dd7ca39 100644 --- a/app/helpers/application_helper/toolbar/miq_policy_profiles_center.rb +++ b/app/helpers/application_helper/toolbar/miq_policy_profiles_center.rb @@ -10,7 +10,8 @@ class ApplicationHelper::Toolbar::MiqPolicyProfilesCenter < ApplicationHelper::T :profile_new, 'pficon pficon-add-circle-o fa-lg', t = N_('Add a New Policy Profile'), - t), + t, + :klass => ApplicationHelper::Button::ButtonNewDiscover), ] ), ]) diff --git a/app/helpers/application_helper/toolbar/miq_report_center.rb b/app/helpers/application_helper/toolbar/miq_report_center.rb index 6acd8180386..fadf624cae3 100644 --- a/app/helpers/application_helper/toolbar/miq_report_center.rb +++ b/app/helpers/application_helper/toolbar/miq_report_center.rb @@ -19,7 +19,7 @@ class ApplicationHelper::Toolbar::MiqReportCenter < ApplicationHelper::Toolbar:: 'pficon pficon-add-circle-o fa-lg', t = N_('Add a new Report'), t, - :klass => ApplicationHelper::Button::MiqReportAction), + :klass => ApplicationHelper::Button::MiqReportNew), button( :miq_report_edit, 'pficon pficon-edit fa-lg', diff --git a/app/helpers/application_helper/toolbar/miq_reports_center.rb b/app/helpers/application_helper/toolbar/miq_reports_center.rb index f26bcbce2e4..fb69d161894 100644 --- a/app/helpers/application_helper/toolbar/miq_reports_center.rb +++ b/app/helpers/application_helper/toolbar/miq_reports_center.rb @@ -11,7 +11,7 @@ class ApplicationHelper::Toolbar::MiqReportsCenter < ApplicationHelper::Toolbar: 'pficon pficon-add-circle-o fa-lg', t = N_('Add a new Report'), t, - :klass => ApplicationHelper::Button::MiqReportAction), + :klass => ApplicationHelper::Button::MiqReportNew), ] ), ]) 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 c99f375e3c1..0b0af1da268 100644 --- a/app/helpers/application_helper/toolbar/miq_widget_sets_center.rb +++ b/app/helpers/application_helper/toolbar/miq_widget_sets_center.rb @@ -10,7 +10,8 @@ class ApplicationHelper::Toolbar::MiqWidgetSetsCenter < ApplicationHelper::Toolb :db_new, 'pficon pficon-add-circle-o fa-lg', t = N_('Add a new Dashboard'), - t), + t, + :klass => ApplicationHelper::Button::ButtonNewDiscover), separator, button( :db_seq_edit, diff --git a/app/helpers/application_helper/toolbar/network_routers_center.rb b/app/helpers/application_helper/toolbar/network_routers_center.rb index 73f9908b786..a2eed0b6052 100644 --- a/app/helpers/application_helper/toolbar/network_routers_center.rb +++ b/app/helpers/application_helper/toolbar/network_routers_center.rb @@ -12,7 +12,8 @@ class ApplicationHelper::Toolbar::NetworkRoutersCenter < ApplicationHelper::Tool :network_router_new, 'pficon pficon-add-circle-o fa-lg', t = N_('Add a new Router'), - t + t, + :klass => ApplicationHelper::Button::ButtonNewDiscover ), separator, button( diff --git a/app/helpers/application_helper/toolbar/persistent_volumes_center.rb b/app/helpers/application_helper/toolbar/persistent_volumes_center.rb index f84ed923849..d5f57023888 100644 --- a/app/helpers/application_helper/toolbar/persistent_volumes_center.rb +++ b/app/helpers/application_helper/toolbar/persistent_volumes_center.rb @@ -13,7 +13,8 @@ class ApplicationHelper::Toolbar::PersistentVolumesCenter < ApplicationHelper::T t = N_('Add a New Volume'), t, :image => "new", - :url => "/new"), + :url => "/new", + :klass => ApplicationHelper::Button::ButtonNewDiscover), button( :persistent_volume_edit, nil, 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 56d112336e0..92224c610bb 100644 --- a/app/helpers/application_helper/toolbar/pxe_image_types_center.rb +++ b/app/helpers/application_helper/toolbar/pxe_image_types_center.rb @@ -10,7 +10,8 @@ class ApplicationHelper::Toolbar::PxeImageTypesCenter < ApplicationHelper::Toolb :pxe_image_type_new, 'pficon pficon-add-circle-o fa-lg', t = N_('Add a new System Image Type'), - t), + t, + :klass => ApplicationHelper::Button::ButtonNewDiscover), button( :pxe_image_type_edit, 'pficon pficon-edit fa-lg', diff --git a/app/helpers/application_helper/toolbar/pxe_servers_center.rb b/app/helpers/application_helper/toolbar/pxe_servers_center.rb index ac90b279054..2f60aa53e1d 100644 --- a/app/helpers/application_helper/toolbar/pxe_servers_center.rb +++ b/app/helpers/application_helper/toolbar/pxe_servers_center.rb @@ -10,7 +10,8 @@ class ApplicationHelper::Toolbar::PxeServersCenter < ApplicationHelper::Toolbar: :pxe_server_new, 'pficon pficon-add-circle-o fa-lg', t = N_('Add a New PXE Server'), - t), + t, + :klass => ApplicationHelper::Button::ButtonNewDiscover), button( :pxe_server_edit, 'pficon pficon-edit fa-lg', diff --git a/app/helpers/application_helper/toolbar/security_groups_center.rb b/app/helpers/application_helper/toolbar/security_groups_center.rb index 221027cff96..cede38448ec 100644 --- a/app/helpers/application_helper/toolbar/security_groups_center.rb +++ b/app/helpers/application_helper/toolbar/security_groups_center.rb @@ -12,7 +12,8 @@ class ApplicationHelper::Toolbar::SecurityGroupsCenter < ApplicationHelper::Tool :security_group_new, 'pficon pficon-add-circle-o fa-lg', t = N_('Add a new Security Group'), - t), + t, + :klass => ApplicationHelper::Button::ButtonNewDiscover), separator, # TODO: Uncomment until cross controllers show_list issue fully in place # https://github.com/ManageIQ/manageiq/pull/12551 diff --git a/app/helpers/application_helper/toolbar/servicetemplate_center.rb b/app/helpers/application_helper/toolbar/servicetemplate_center.rb index 4b23a5834cd..1ebd02aed0b 100644 --- a/app/helpers/application_helper/toolbar/servicetemplate_center.rb +++ b/app/helpers/application_helper/toolbar/servicetemplate_center.rb @@ -11,14 +11,14 @@ class ApplicationHelper::Toolbar::ServicetemplateCenter < ApplicationHelper::Too 'pficon pficon-add-circle-o fa-lg', t = N_('Add a new Button Group'), t, - :klass => ApplicationHelper::Button::CatalogItemButton, + :klass => ApplicationHelper::Button::CatalogItemButtonNew, ), button( :ab_button_new, 'pficon pficon-add-circle-o fa-lg', t = N_('Add a new Button'), t, - :klass => ApplicationHelper::Button::CatalogItemButton, + :klass => ApplicationHelper::Button::CatalogItemButtonNew, ), button( :catalogitem_edit, diff --git a/app/helpers/application_helper/toolbar/servicetemplatecatalogs_center.rb b/app/helpers/application_helper/toolbar/servicetemplatecatalogs_center.rb index a507877a445..3002c2d5eca 100644 --- a/app/helpers/application_helper/toolbar/servicetemplatecatalogs_center.rb +++ b/app/helpers/application_helper/toolbar/servicetemplatecatalogs_center.rb @@ -10,7 +10,8 @@ class ApplicationHelper::Toolbar::ServicetemplatecatalogsCenter < ApplicationHel :st_catalog_new, 'pficon pficon-add-circle-o fa-lg', t = N_('Add a New Catalog'), - t), + t, + :klass => ApplicationHelper::Button::ButtonNewDiscover), button( :st_catalog_edit, 'pficon pficon-edit fa-lg', diff --git a/app/helpers/application_helper/toolbar/servicetemplates_center.rb b/app/helpers/application_helper/toolbar/servicetemplates_center.rb index 590d2e29713..4149e5aafb0 100644 --- a/app/helpers/application_helper/toolbar/servicetemplates_center.rb +++ b/app/helpers/application_helper/toolbar/servicetemplates_center.rb @@ -10,12 +10,14 @@ class ApplicationHelper::Toolbar::ServicetemplatesCenter < ApplicationHelper::To :atomic_catalogitem_new, 'pficon pficon-add-circle-o fa-lg', t = N_('Add a New Catalog Item'), - t), + t, + :klass => ApplicationHelper::Button::ButtonNewDiscover), button( :catalogitem_new, 'pficon pficon-add-circle-o fa-lg', t = N_('Add a New Catalog Bundle'), - t), + t, + :klass => ApplicationHelper::Button::ButtonNewDiscover), button( :catalogitem_edit, 'pficon pficon-edit fa-lg', diff --git a/app/helpers/application_helper/toolbar/storage_managers_center.rb b/app/helpers/application_helper/toolbar/storage_managers_center.rb index 585fa443863..e356c97c08f 100644 --- a/app/helpers/application_helper/toolbar/storage_managers_center.rb +++ b/app/helpers/application_helper/toolbar/storage_managers_center.rb @@ -30,7 +30,8 @@ class ApplicationHelper::Toolbar::StorageManagersCenter < ApplicationHelper::Too 'pficon pficon-add-circle-o fa-lg', t = N_('Add a New Storage Manager'), t, - :url => "/new"), + :url => "/new", + :klass => ApplicationHelper::Button::ButtonNewDiscover), button( :storage_manager_edit, 'pficon pficon-edit fa-lg', diff --git a/app/helpers/application_helper/toolbar/template_clouds_center.rb b/app/helpers/application_helper/toolbar/template_clouds_center.rb index 92ca5d35caf..67b3484c55d 100644 --- a/app/helpers/application_helper/toolbar/template_clouds_center.rb +++ b/app/helpers/application_helper/toolbar/template_clouds_center.rb @@ -94,7 +94,8 @@ class ApplicationHelper::Toolbar::TemplateCloudsCenter < ApplicationHelper::Tool N_('Provision Instances using selected Image'), :url_parms => "main_div", :enabled => false, - :onwhen => "1"), + :onwhen => "1", + :klass => ApplicationHelper::Button::ButtonNewDiscover), ] ), ]) diff --git a/app/helpers/application_helper/toolbar/template_infras_center.rb b/app/helpers/application_helper/toolbar/template_infras_center.rb index 530a0302680..c620cdbf4d7 100644 --- a/app/helpers/application_helper/toolbar/template_infras_center.rb +++ b/app/helpers/application_helper/toolbar/template_infras_center.rb @@ -122,7 +122,8 @@ class ApplicationHelper::Toolbar::TemplateInfrasCenter < ApplicationHelper::Tool N_('Provision VMs using selected Template'), :url_parms => "main_div", :enabled => false, - :onwhen => "1"), + :onwhen => "1", + :klass => ApplicationHelper::Button::ButtonNewDiscover), button( :miq_template_clone, 'product product-clone fa-lg', diff --git a/app/helpers/application_helper/toolbar/time_profiles_center.rb b/app/helpers/application_helper/toolbar/time_profiles_center.rb index e0f6db49c7f..6fa70108d6f 100644 --- a/app/helpers/application_helper/toolbar/time_profiles_center.rb +++ b/app/helpers/application_helper/toolbar/time_profiles_center.rb @@ -11,7 +11,8 @@ class ApplicationHelper::Toolbar::TimeProfilesCenter < ApplicationHelper::Toolba 'pficon pficon-add-circle-o fa-lg', t = N_('Add a new Time Profile'), t, - :url => "/timeprofile_new"), + :url => "/timeprofile_new", + :klass => ApplicationHelper::Button::ButtonNewDiscover), button( :tp_edit, 'pficon pficon-edit fa-lg', diff --git a/app/helpers/application_helper/toolbar/vms_center.rb b/app/helpers/application_helper/toolbar/vms_center.rb index b5ed0ec0362..1464e4db174 100644 --- a/app/helpers/application_helper/toolbar/vms_center.rb +++ b/app/helpers/application_helper/toolbar/vms_center.rb @@ -113,7 +113,8 @@ class ApplicationHelper::Toolbar::VmsCenter < ApplicationHelper::Toolbar::Basic 'pficon pficon-add-circle-o fa-lg', N_('Request to Provision'), N_('Provision'), - :url_parms => "main_div"), + :url_parms => "main_div", + :klass => ApplicationHelper::Button::ButtonNewDiscover), ] ), ]) 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 11264d9404b..b5928ea8a6f 100644 --- a/app/helpers/application_helper/toolbar/x_miq_template_center.rb +++ b/app/helpers/application_helper/toolbar/x_miq_template_center.rb @@ -86,7 +86,7 @@ class ApplicationHelper::Toolbar::XMiqTemplateCenter < ApplicationHelper::Toolba 'pficon pficon-add-circle-o fa-lg', t = N_('Provision VMs using this Template'), t, - :klass => ApplicationHelper::Button::GenericFeatureButtonWithDisable, + :klass => ApplicationHelper::Button::MiqTemplateMiqRequestNew, :options => {:feature => :provisioning}), button( :miq_template_clone, 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 0efb80799c2..15e0bcf082e 100644 --- a/app/helpers/application_helper/toolbar/x_template_cloud_center.rb +++ b/app/helpers/application_helper/toolbar/x_template_cloud_center.rb @@ -63,7 +63,7 @@ class ApplicationHelper::Toolbar::XTemplateCloudCenter < ApplicationHelper::Tool 'pficon pficon-add-circle-o fa-lg', t = N_('Provision Instances using this Image'), t, - :klass => ApplicationHelper::Button::GenericFeatureButtonWithDisable, + :klass => ApplicationHelper::Button::MiqTemplateMiqRequestNew, :options => {:feature => :provisioning}) ] ), diff --git a/app/helpers/application_helper/toolbar/zones_center.rb b/app/helpers/application_helper/toolbar/zones_center.rb index 3d7693e6fa5..fb026b21ff9 100644 --- a/app/helpers/application_helper/toolbar/zones_center.rb +++ b/app/helpers/application_helper/toolbar/zones_center.rb @@ -10,7 +10,8 @@ class ApplicationHelper::Toolbar::ZonesCenter < ApplicationHelper::Toolbar::Basi :zone_new, 'pficon pficon-add-circle-o fa-lg', t = N_('Add a new Zone'), - t), + t, + :klass => ApplicationHelper::Button::ButtonNewDiscover), ] ), ])