From 7482010a3bff0778b6fc9cc14056c0fb4223a8e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20Hal=C3=A1sz?= Date: Thu, 16 Aug 2018 12:00:03 +0200 Subject: [PATCH] Move webmks console button to instance operations button mixin Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1615796 --- .../instance_operations_button_group_mixin.rb | 9 ++++++ .../toolbar/x_vm_cloud_center.rb | 31 ------------------- 2 files changed, 9 insertions(+), 31 deletions(-) diff --git a/app/helpers/application_helper/toolbar/cloud/instance_operations_button_group_mixin.rb b/app/helpers/application_helper/toolbar/cloud/instance_operations_button_group_mixin.rb index eb993a84aa8..a4c2167db48 100644 --- a/app/helpers/application_helper/toolbar/cloud/instance_operations_button_group_mixin.rb +++ b/app/helpers/application_helper/toolbar/cloud/instance_operations_button_group_mixin.rb @@ -114,6 +114,15 @@ def self.included(included_class) N_('VM Console'), :url => "html5_console", :klass => ApplicationHelper::Button::VmVncConsole), + included_class.button( + :vm_webmks_console, + 'pficon pficon-screen fa-lg', + N_('Open a web-based WebMKS console for this VM'), + N_('VM Console'), + :url => "console", + :confirm => N_("Open a WebMKS console for this VM"), + :klass => ApplicationHelper::Button::VmWebmksConsole + ), included_class.button( :cockpit_console, 'pficon pficon-screen fa-lg', 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 16896e008f8..dbeb6a49870 100644 --- a/app/helpers/application_helper/toolbar/x_vm_cloud_center.rb +++ b/app/helpers/application_helper/toolbar/x_vm_cloud_center.rb @@ -208,35 +208,4 @@ class ApplicationHelper::Toolbar::XVmCloudCenter < ApplicationHelper::Toolbar::B ), ]) include ApplicationHelper::Toolbar::Cloud::InstanceOperationsButtonGroupMixin - button_group( - 'vm_access', - [ - select( - :vm_remote_access_choice, - 'fa pficon-screen fa-lg', - N_('VM Remote Access'), - N_('Access'), - :items => [ - button( - :vm_webmks_console, - 'pficon pficon-screen fa-lg', - N_('Open a web-based WebMKS console for this VM'), - N_('VM Console'), - :url => "console", - :confirm => N_("Open a WebMKS console for this VM"), - :klass => ApplicationHelper::Button::VmWebmksConsole - ), - # TODO: remove cockpit button because backend isn't implemented yet. - button( - :cockpit_console, - 'pficon pficon-screen fa-lg', - N_('Open a new browser window with Cockpit for this VM. This requires that Cockpit is pre-configured on the VM.'), - N_('Web Console'), - :url => "launch_cockpit", - :klass => ApplicationHelper::Button::CockpitConsole - ) - ] - ) - ] - ) end