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

Move webmks console button to instance operations button mixin #4481

Merged
merged 1 commit into from
Aug 16, 2018
Merged

Move webmks console button to instance operations button mixin #4481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions app/helpers/application_helper/toolbar/cloud/instance_operations_button_group_mixin.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
31 changes: 0 additions & 31 deletions app/helpers/application_helper/toolbar/x_vm_cloud_center.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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