diff --git a/app/decorators/host_decorator.rb b/app/decorators/host_decorator.rb index d04df602a12..6318f0b3694 100644 --- a/app/decorators/host_decorator.rb +++ b/app/decorators/host_decorator.rb @@ -15,10 +15,7 @@ def quadicon :fileicon => fileicon, :tooltip => ui_lookup(:model => type) }, - :bottom_right => { - :fileicon => QuadiconHelper.status_img(authentication_status), - :tooltip => authentication_status - } + :bottom_right => QuadiconHelper.provider_status(authentication_status) } icon[:middle] = QuadiconHelper::POLICY_SHIELD if get_policies.present? icon diff --git a/app/decorators/manageiq/providers/cloud_manager_decorator.rb b/app/decorators/manageiq/providers/cloud_manager_decorator.rb index 255caa1ff5d..83d054f6759 100644 --- a/app/decorators/manageiq/providers/cloud_manager_decorator.rb +++ b/app/decorators/manageiq/providers/cloud_manager_decorator.rb @@ -19,10 +19,7 @@ def quadicon :fileicon => fileicon, :tooltip => ui_lookup(:model => type) }, - :bottom_right => { - :fileicon => QuadiconHelper.status_img(authentication_status), - :tooltip => authentication_status - } + :bottom_right => QuadiconHelper.provider_status(authentication_status, enabled?) } icon[:middle] = QuadiconHelper::POLICY_SHIELD if get_policies.present? icon diff --git a/app/decorators/manageiq/providers/container_manager_decorator.rb b/app/decorators/manageiq/providers/container_manager_decorator.rb index c94c4ad996e..e982acc434a 100644 --- a/app/decorators/manageiq/providers/container_manager_decorator.rb +++ b/app/decorators/manageiq/providers/container_manager_decorator.rb @@ -19,10 +19,7 @@ def quadicon :fileicon => fileicon, :tooltip => ui_lookup(:model => type) }, - :bottom_right => { - :fileicon => QuadiconHelper.status_img(authentication_status), - :tooltip => authentication_status - } + :bottom_right => QuadiconHelper.provider_status(authentication_status, enabled?) } icon[:middle] = QuadiconHelper::POLICY_SHIELD if get_policies.present? icon diff --git a/app/decorators/manageiq/providers/infra_manager_decorator.rb b/app/decorators/manageiq/providers/infra_manager_decorator.rb index 4d054a1d0ad..0cdf552eeb0 100644 --- a/app/decorators/manageiq/providers/infra_manager_decorator.rb +++ b/app/decorators/manageiq/providers/infra_manager_decorator.rb @@ -19,10 +19,7 @@ def quadicon :fileicon => fileicon, :tooltip => ui_lookup(:model => type) }, - :bottom_right => { - :fileicon => QuadiconHelper.status_img(authentication_status), - :tooltip => authentication_status - } + :bottom_right => QuadiconHelper.provider_status(authentication_status, enabled?) } icon[:middle] = QuadiconHelper::POLICY_SHIELD if get_policies.present? icon diff --git a/app/decorators/manageiq/providers/network_manager_decorator.rb b/app/decorators/manageiq/providers/network_manager_decorator.rb index cefcc8a054a..cbe639b6515 100644 --- a/app/decorators/manageiq/providers/network_manager_decorator.rb +++ b/app/decorators/manageiq/providers/network_manager_decorator.rb @@ -25,10 +25,7 @@ def quadicon :fileicon => fileicon, :tooltip => ui_lookup(:model => type) }, - :bottom_right => { - :fileicon => QuadiconHelper.status_img(authentication_status), - :tooltip => authentication_status - } + :bottom_right => QuadiconHelper.provider_status(authentication_status, enabled?) } icon[:middle] = QuadiconHelper::POLICY_SHIELD if get_policies.present? icon diff --git a/app/decorators/manageiq/providers/physical_infra_manager_decorator.rb b/app/decorators/manageiq/providers/physical_infra_manager_decorator.rb index 60d8e0c2be9..fb80e07c670 100644 --- a/app/decorators/manageiq/providers/physical_infra_manager_decorator.rb +++ b/app/decorators/manageiq/providers/physical_infra_manager_decorator.rb @@ -19,10 +19,7 @@ def quadicon :fileicon => fileicon, :tooltip => ui_lookup(:model => type) }, - :bottom_right => { - :fileicon => QuadiconHelper.status_img(authentication_status), - :tooltip => authentication_status - } + :bottom_right => QuadiconHelper.provider_status(authentication_status, enabled?) } icon[:middle] = QuadiconHelper::POLICY_SHIELD if get_policies.present? icon diff --git a/app/decorators/manageiq/providers/storage_manager_decorator.rb b/app/decorators/manageiq/providers/storage_manager_decorator.rb index fbd01974005..792ee1b5a3a 100644 --- a/app/decorators/manageiq/providers/storage_manager_decorator.rb +++ b/app/decorators/manageiq/providers/storage_manager_decorator.rb @@ -19,10 +19,7 @@ def quadicon :fileicon => fileicon, :tooltip => ui_lookup(:model => type) }, - :bottom_right => { - :fileicon => QuadiconHelper.status_img(authentication_status), - :tooltip => authentication_status - } + :bottom_right => QuadiconHelper.provider_status(authentication_status, enabled?) } icon[:middle] = QuadiconHelper::POLICY_SHIELD if get_policies.present? icon diff --git a/app/helpers/quadicon_helper.rb b/app/helpers/quadicon_helper.rb index d04be304cdb..79d34fa6824 100644 --- a/app/helpers/quadicon_helper.rb +++ b/app/helpers/quadicon_helper.rb @@ -34,12 +34,24 @@ module QuadiconHelper 'template' => {:fonticon => 'pficon pficon-template', :background => '#336699'}, }.freeze - def self.status_img(status) + def self.provider_status(status, enabled = true) + # If the provider is suspended, we don't care about the status itself + unless enabled + return { + :fonticon => 'pficon pficon-asleep', + :tooltip => _('Data collection for this provider is suspended.') + } + end + case status - when "Invalid" then "100/x.png" - when "Valid" then "100/checkmark.png" - when "None" then "100/unknown.png" - else "100/exclamationpoint.png" + when "Invalid" + {:fileicon => '100/x.png', :tooltip => _('Invalid authentication credentials')} + when "Valid" + {:fileicon => '100/checkmark.png', :tooltip => _('Authentication credentials are valid')} + when "None" + {:fileicon => '100/unknown.png', :tooltip => _('Could not determine the authentication status')} + else + {:fileicon => '100/exclamationpoint.png', :tooltip => _('Authentication status is %{status}') % {:status => status} } end end