Merge pull request #2925 from epwinchell/toolbar_update

Update toolbar icons

app/assets/stylesheets/icon_customizations.scss

@@ -12,7 +12,7 @@
 }
 
 .fa-pause::before {
-  color: #eb7720;
+  // color: #eb7720;
 }
 
 .pficon-folder-close-blue::before {

app/helpers/application_helper/toolbar/cloud/instance_operations_button_group_mixin.rb

@@ -12,7 +12,7 @@ def self.included(included_class)
             nil,
             N_('Stop this Instance'),
             N_('Stop'),
-            :image   => "guest_shutdown",
+            :icon    => "fa fa-stop fa-lg",
             :confirm => N_("Stop this Instance?"),
             :klass   => ApplicationHelper::Button::GenericFeatureButton,
             :options => {:feature => :stop}),
@@ -21,7 +21,7 @@ def self.included(included_class)
             nil,
             N_('Start this Instance'),
             N_('Start'),
-            :image   => "power_on",
+            :icon    => "fa fa-play fa-lg",
             :confirm => N_("Start this Instance?"),
             :klass   => ApplicationHelper::Button::GenericFeatureButton,
             :options => {:feature => :start}),
@@ -30,7 +30,7 @@ def self.included(included_class)
             nil,
             N_('Pause this Instance'),
             N_('Pause'),
-            :image   => "power_pause",
+            :icon    => "fa fa-pause fa-lg",
             :confirm => N_("Pause this Instance?"),
             :klass   => ApplicationHelper::Button::GenericFeatureButton,
             :options => {:feature => :pause}),
@@ -39,7 +39,7 @@ def self.included(included_class)
             nil,
             N_('Suspend this Instance'),
             N_('Suspend'),
-            :image   => "suspend",
+            :icon    => "fa fa-pause fa-lg",
             :confirm => N_("Suspend this Instance?"),
             :klass   => ApplicationHelper::Button::GenericFeatureButton,
             :options => {:feature => :suspend}),
@@ -48,7 +48,7 @@ def self.included(included_class)
             nil,
             N_('Shelve this Instance'),
             N_('Shelve'),
-            :image   => "power_shelve",
+            :icon    => "pficon pficon-pending fa-lg",
             :confirm => N_("Shelve this Instance?"),
             :klass   => ApplicationHelper::Button::GenericFeatureButton,
             :options => {:feature => :shelve}),
@@ -57,7 +57,7 @@ def self.included(included_class)
             nil,
             N_('Shelve Offload this Instance'),
             N_('Shelve Offload'),
-            :image   => "power_shelve_offload",
+            :icon    => "pficon pficon-pending fa-lg",
             :confirm => N_("Shelve Offload this Instance?"),
             :klass   => ApplicationHelper::Button::GenericFeatureButton,
             :options => {:feature => :shelve_offload}),
@@ -66,7 +66,7 @@ def self.included(included_class)
             nil,
             N_('Resume this Instance'),
             N_('Resume'),
-            :image   => "power_resume",
+            :icon    => "fa fa-play fa-lg",
             :confirm => N_("Resume this Instance?"),
             :klass   => ApplicationHelper::Button::GenericFeatureButton,
             :options => {:feature => :start}),
@@ -76,7 +76,7 @@ def self.included(included_class)
             nil,
             N_('Soft Reboot this Instance'),
             N_('Soft Reboot'),
-            :image   => "power_reset",
+            :icon    => "pficon pficon-restart fa-lg",
             :confirm => N_("Soft Reboot this Instance?"),
             :klass   => ApplicationHelper::Button::GenericFeatureButton,
             :options => {:feature => :reboot_guest}),
@@ -85,15 +85,15 @@ def self.included(included_class)
             nil,
             N_('Hard Reboot the Guest OS on this Instance'),
             N_('Hard Reboot'),
-            :image   => "guest_restart",
+            :icon    => "pficon pficon-restart fa-lg",
             :confirm => N_("Hard Reboot the Guest OS on this Instance?"),
             :klass   => ApplicationHelper::Button::InstanceReset),
           included_class.button(
             :instance_terminate,
             nil,
             N_('Delete this Instance'),
             N_('Delete'),
-            :image   => "power_off",
+            :icon    => "pficon pficon-delete fa-lg",
             :confirm => N_("Delete this Instance?"),
             :klass   => ApplicationHelper::Button::GenericFeatureButton,
             :options => {:feature => :terminate}),

app/helpers/application_helper/toolbar/diagnostics_server_center.rb

@@ -93,14 +93,14 @@ class ApplicationHelper::Toolbar::DiagnosticsServerCenter < ApplicationHelper::T
       :items => [
         button(
           :restart_server,
-          'pficon pficon-restart',
+          'pficon pficon-restart fa-lg',
           t = N_('Restart server'),
           t,
           :confirm => N_("Warning: Server will be restarted, do you want to continue?"),
           :klass   => ApplicationHelper::Button::DiagnosticsSummary),
         button(
           :restart_workers,
-          'pficon pficon-restart',
+          'pficon pficon-restart fa-lg',
           N_('Select a worker to restart'),
           N_('Restart selected worker'),
           :confirm      => N_("Warning: Selected node will be restarted, do you want to continue?"),

app/helpers/application_helper/toolbar/host_center.rb

@@ -154,7 +154,7 @@ class ApplicationHelper::Toolbar::HostCenter < ApplicationHelper::Toolbar::Basic
           nil,
           N_('Put this item into Maintenance Mode'),
           N_('Enter Maintenance Mode'),
-          :image   => "enter_maint_mode",
+          :icon    => "pficon pficon-maintenance",
           :confirm => N_("Put this item into Maintenance Mode?"),
           :klass   => ApplicationHelper::Button::GenericFeatureButton,
           :options => {:feature => :enter_maint_mode}),
@@ -163,7 +163,7 @@ class ApplicationHelper::Toolbar::HostCenter < ApplicationHelper::Toolbar::Basic
           nil,
           N_('Take this item out of Maintenance Mode'),
           N_('Exit Maintenance Mode'),
-          :image   => "exit_maint_mode",
+          :icon    => "pficon pficon-maintenance",
           :confirm => N_("Take this item out of Maintenance Mode?"),
           :klass   => ApplicationHelper::Button::GenericFeatureButton,
           :options => {:feature => :exit_maint_mode}),
@@ -172,7 +172,7 @@ class ApplicationHelper::Toolbar::HostCenter < ApplicationHelper::Toolbar::Basic
           nil,
           N_('Shutdown this item to Standby Mode'),
           N_('Enter Standby Mode'),
-          :image   => "standby",
+          :icon    => "pficon pficon-asleep fa-lg",
           :confirm => N_("Shutdown this item to Standby Mode?"),
           :klass   => ApplicationHelper::Button::HostFeatureButton,
           :options => {:feature => :standby}),
@@ -181,7 +181,7 @@ class ApplicationHelper::Toolbar::HostCenter < ApplicationHelper::Toolbar::Basic
           nil,
           N_('Shutdown this item'),
           N_('Shutdown'),
-          :image   => "guest_shutdown",
+          :icon    => "fa fa-stop fa-lg",
           :confirm => N_("Shutdown this item?"),
           :klass   => ApplicationHelper::Button::HostFeatureButtonWithDisable,
           :options => {:feature => :shutdown}),
@@ -190,7 +190,7 @@ class ApplicationHelper::Toolbar::HostCenter < ApplicationHelper::Toolbar::Basic
           nil,
           N_('Restart this item'),
           N_('Restart'),
-          :image   => "guest_restart",
+          :icon    => "pficon pficon-restart fa-lg",
           :confirm => N_("Restart this item?"),
           :klass   => ApplicationHelper::Button::HostFeatureButton,
           :options => {:feature => :reboot}),
@@ -200,7 +200,7 @@ class ApplicationHelper::Toolbar::HostCenter < ApplicationHelper::Toolbar::Basic
           nil,
           N_('Power On this item'),
           N_('Power On'),
-          :image   => "power_on",
+          :icon    => "pficon pficon-on fa-lg",
           :confirm => N_("Power On this item?"),
           :klass   => ApplicationHelper::Button::HostFeatureButton,
           :options => {:feature => :start}),
@@ -209,7 +209,7 @@ class ApplicationHelper::Toolbar::HostCenter < ApplicationHelper::Toolbar::Basic
           nil,
           N_('Power Off this item'),
           N_('Power Off'),
-          :image   => "power_off",
+          :icon    => "pficon pficon-off fa-lg",
           :confirm => N_("Power Off this item?"),
           :klass   => ApplicationHelper::Button::HostFeatureButton,
           :options => {:feature => :stop}),
@@ -218,7 +218,7 @@ class ApplicationHelper::Toolbar::HostCenter < ApplicationHelper::Toolbar::Basic
           nil,
           N_('Reset this item'),
           N_('Reset'),
-          :image   => "power_reset",
+          :icon    => "fa fa-refresh fa-lg",
           :confirm => N_("Reset this item?"),
           :klass   => ApplicationHelper::Button::HostFeatureButtonWithDisable,
           :options => {:feature => :reset}),

app/helpers/application_helper/toolbar/hosts_center.rb

@@ -194,7 +194,7 @@ class ApplicationHelper::Toolbar::HostsCenter < ApplicationHelper::Toolbar::Basi
           nil,
           N_('Shutdown the selected items to Standby Mode'),
           N_('Enter Standby Mode'),
-          :image        => "standby",
+          :icon         => "pficon pficon-asleep fa-lg",
           :confirm      => N_("Shutdown the selected items to Standy Mode?"),
           :url_parms    => "main_div",
           :send_checked => true,
@@ -207,7 +207,7 @@ class ApplicationHelper::Toolbar::HostsCenter < ApplicationHelper::Toolbar::Basi
           nil,
           N_('Shutdown the selected items'),
           N_('Shutdown'),
-          :image        => "guest_shutdown",
+          :icon         => "fa fa-stop fa-lg",
           :url_parms    => "main_div",
           :send_checked => true,
           :confirm      => N_("Shutdown the selected items?"),
@@ -220,7 +220,7 @@ class ApplicationHelper::Toolbar::HostsCenter < ApplicationHelper::Toolbar::Basi
           nil,
           N_('Restart the selected items'),
           N_('Restart'),
-          :image        => "guest_restart",
+          :icon         => "pficon pficon-restart fa-lg",
           :url_parms    => "main_div",
           :send_checked => true,
           :confirm      => N_("Restart the selected items?"),
@@ -234,7 +234,7 @@ class ApplicationHelper::Toolbar::HostsCenter < ApplicationHelper::Toolbar::Basi
           nil,
           N_('Power On the selected items'),
           N_('Power On'),
-          :image        => "power_on",
+          :icon         => "pficon pficon-on fa-lg",
           :url_parms    => "main_div",
           :send_checked => true,
           :confirm      => N_("Power On the selected items?"),
@@ -245,7 +245,7 @@ class ApplicationHelper::Toolbar::HostsCenter < ApplicationHelper::Toolbar::Basi
           nil,
           N_('Power Off the selected items'),
           N_('Power Off'),
-          :image        => "power_off",
+          :icon         => "pficon pficon-off fa-lg",
           :url_parms    => "main_div",
           :send_checked => true,
           :confirm      => N_("Power Off the selected items?"),
@@ -256,7 +256,7 @@ class ApplicationHelper::Toolbar::HostsCenter < ApplicationHelper::Toolbar::Basi
           nil,
           N_('Reset the selected items'),
           N_('Reset'),
-          :image        => "power_reset",
+          :icon         => "fa fa-refresh fa-lg",
           :url_parms    => "main_div",
           :send_checked => true,
           :confirm      => N_("Reset the selected items?"),

app/helpers/application_helper/toolbar/middleware_domain_center.rb

@@ -28,7 +28,7 @@ class ApplicationHelper::Toolbar::MiddlewareDomainCenter < ApplicationHelper::To
                        nil,
                        N_('Shutdown this Domain'),
                        N_('Shutdown Domain'),
-                       :image   => 'power_off',
+                       :icon    => "pficon pficon-off fa-lg",
                        :confirm => N_('This operation will shutdown the entire domain, including all EAP instances that are serving user requests. Are you sure you want to proceed?')
                      )
                    ]

app/helpers/application_helper/toolbar/middleware_server_center.rb

@@ -24,7 +24,7 @@ class ApplicationHelper::Toolbar::MiddlewareServerCenter < ApplicationHelper::To
       t = N_('Policy'),
       t,
       :enabled => "false",
-      :items => [
+      :items   => [
         button(
           :middleware_server_protect,
           'pficon pficon-edit fa-lg',
@@ -56,7 +56,7 @@ class ApplicationHelper::Toolbar::MiddlewareServerCenter < ApplicationHelper::To
           nil,
           N_('Gracefully shut this server down'),
           N_('Gracefully shutdown Server'),
-          :image => 'guest_shutdown',
+          :icon  => "pficon pficon-off fa-lg",
           :data  => {'toggle'        => 'modal',
                      'target'        => '#modal_param_div',
                      'function'      => 'sendDataWithRx',
@@ -67,7 +67,7 @@ class ApplicationHelper::Toolbar::MiddlewareServerCenter < ApplicationHelper::To
           nil,
           N_('Restart this server'),
           N_('Restart Server'),
-          :image   => 'restart',
+          :icon    => "pficon pficon-restart fa-lg",
           :confirm => N_('Do you want to restart this server?'),
           :klass   => ApplicationHelper::Button::MiddlewareStandaloneServerAction),
         separator,
@@ -76,26 +76,27 @@ class ApplicationHelper::Toolbar::MiddlewareServerCenter < ApplicationHelper::To
           nil,
           N_('Stop this Middleware Server'),
           N_('Stop Server'),
-          :image   => 'power_off',
+          :icon    => "fa fa-stop fa-lg",
           :confirm => N_('Do you want to stop this server?'),
           :klass   => ApplicationHelper::Button::MiddlewareStandaloneServerAction),
         button(
           :middleware_server_suspend,
           nil,
           N_('Suspend this server'),
           N_('Suspend Server'),
-          :image => 'suspend',
+          :icon  => "fa fa-pause fa-lg",
           :data  => {'toggle'        => 'modal',
                      'target'        => '#modal_param_div',
                      'function'      => 'sendDataWithRx',
-                     'function-data' => '{"type": "mwServerOps", "operation": "suspend", "timeout": 10}'},
+                     'function-data' => '{"type": "mwServerOps",
+                                          "operation": "suspend", "timeout": 10}'},
           :klass => ApplicationHelper::Button::MiddlewareDomainServerAction),
         button(
           :middleware_server_resume,
           nil,
           N_('Resume this server'),
           N_('Resume Server'),
-          :image   => 'resume',
+          :icon    => 'fa fa-play fa-lg',
           :confirm => N_('Do you want to resume this server?'),
           :klass   => ApplicationHelper::Button::MiddlewareServerAction),
         button(
@@ -104,38 +105,38 @@ class ApplicationHelper::Toolbar::MiddlewareServerCenter < ApplicationHelper::To
           N_('Reload this server'),
           N_('Reload Server'),
           :confirm => N_('Do you want to trigger a reload of this server?'),
-          :image   => 'guest_restart',
+          :icon    => "pficon pficon-restart fa-lg",
           :klass   => ApplicationHelper::Button::MiddlewareServerAction),
         button(
           :middleware_domain_server_start,
           nil,
           N_('Start this server'),
           N_('Start Server'),
-          :image   => 'start',
+          :icon    => 'fa fa-play fa-lg',
           :confirm => N_('Do you want to trigger a start of this server?'),
           :klass   => ApplicationHelper::Button::MiddlewareDomainServerAction),
         button(
           :middleware_domain_server_stop,
           nil,
           N_('Stop this server'),
           N_('Stop Server'),
-          :image   => 'guest_shutdown',
+          :icon    => "fa fa-stop fa-lg",
           :confirm => N_('Do you want to trigger a stop of this server?'),
           :klass   => ApplicationHelper::Button::MiddlewareDomainServerAction),
         button(
           :middleware_domain_server_restart,
           nil,
           N_('Restart this server'),
           N_('Restart Server'),
-          :image   => 'reset',
+          :icon    => 'pficon pficon-restart fa-lg',
           :confirm => N_('Do you want to trigger a restart of this server?'),
           :klass   => ApplicationHelper::Button::MiddlewareDomainServerAction),
         button(
           :middleware_domain_server_kill,
           nil,
           N_('Kill this server'),
           N_('Kill Server'),
-          :image   => 'power_off',
+          :icon    => "pficon pficon-off fa-lg",
           :confirm => N_('Do you want to trigger a kill of this server?'),
           :klass   => ApplicationHelper::Button::MiddlewareDomainServerAction),
       ]