use split button for shutdown/stop for vm/ct

uses the new split button for the shutdown action
to reduse the number of buttons, and reduce confusion

also make the stop button 'dangerous'
(shows just a different symbol on the confirm dialog)

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>

diff --git a/www/manager6/lxc/Config.js b/www/manager6/lxc/Config.js
index a98bf67ea737ab9794ace3661800af33fb51ce95..db98f71dab91ccf82ad0474091935885e6b3b665 100644 (file)
--- a/www/manager6/lxc/Config.js
+++ b/www/manager6/lxc/Config.js
@@ -55,21 +55,25 @@ Ext.define('PVE.lxc.Config', {
            }
        });
 
-       var stopBtn = Ext.create('PVE.button.Button', {
+       var stopBtn = Ext.create('Ext.menu.Item',{
            text: gettext('Stop'),
            disabled: !caps.vms['VM.PowerMgmt'],
            confirmMsg: PVE.Utils.format_task_description('vzstop', vmid),
+           dangerous: true,
            handler: function() {
                vm_command("stop");
            }
        });
 
-       var shutdownBtn = Ext.create('PVE.button.Button', {
+       var shutdownBtn = Ext.create('PVE.button.Split', {
            text: gettext('Shutdown'),
            disabled: !caps.vms['VM.PowerMgmt'],
            confirmMsg: PVE.Utils.format_task_description('vzshutdown', vmid),
            handler: function() {
                vm_command('shutdown');
+           },
+           menu: {
+               items:[stopBtn]
            }
        });
 
@@ -112,7 +116,7 @@ Ext.define('PVE.lxc.Config', {
        Ext.apply(me, {
            title: Ext.String.format(gettext("Container {0} on node {1}"), descr, "'" + nodename + "'"),
            hstateid: 'lxctab',
-           tbar: [ startBtn, shutdownBtn, umountBtn, stopBtn, removeBtn,
+           tbar: [ startBtn, shutdownBtn, umountBtn, removeBtn,
                    migrateBtn, consoleBtn ],
            defaults: { statusStore: me.statusStore },
            items: [
@@ -228,11 +232,11 @@ Ext.define('PVE.lxc.Config', {
            if (status === 'mounted') {
                umountBtn.setDisabled(false);
                umountBtn.setVisible(true);
-               stopBtn.setVisible(false);
+               stopBtn.setDisabled(true);
            } else {
                umountBtn.setDisabled(true);
                umountBtn.setVisible(false);
-               stopBtn.setVisible(true);
+               stopBtn.setDisabled(false);
            }
        });
 

diff --git a/www/manager6/qemu/Config.js b/www/manager6/qemu/Config.js
index e39fca7c70d6e1f812625600fd7c37caca46476a..0f74a4f4398f272448a293d3dc0bdbe9b8b2b0c5 100644 (file)
--- a/www/manager6/qemu/Config.js
+++ b/www/manager6/qemu/Config.js
@@ -55,15 +55,6 @@ Ext.define('PVE.qemu.Config', {
            }
        });
 
-       var stopBtn = Ext.create('PVE.button.Button', {
-           text: gettext('Stop'),
-           disabled: !caps.vms['VM.PowerMgmt'],
-           confirmMsg: PVE.Utils.format_task_description('qmstop', vmid),
-           handler: function() {
-               vm_command("stop", { timeout: 30 });
-           }
-       });
-
        var migrateBtn = Ext.create('Ext.Button', {
            text: gettext('Migrate'),
            disabled: !caps.vms['VM.Migrate'],
@@ -86,12 +77,23 @@ Ext.define('PVE.qemu.Config', {
            }
        });
 
-       var shutdownBtn = Ext.create('PVE.button.Button', {
+       var shutdownBtn = Ext.create('PVE.button.Split', {
            text: gettext('Shutdown'),
            disabled: !caps.vms['VM.PowerMgmt'],
            confirmMsg: PVE.Utils.format_task_description('qmshutdown', vmid),
            handler: function() {
                vm_command('shutdown');
+           },
+           menu: {
+               items: [{
+                   text: gettext('Stop'),
+                   disabled: !caps.vms['VM.PowerMgmt'],
+                   dangerous: true,
+                   confirmMsg: PVE.Utils.format_task_description('qmstop', vmid),
+                   handler: function() {
+                       vm_command("stop", { timeout: 30 });
+                   }
+               }]
            }
        });
 
@@ -121,7 +123,7 @@ Ext.define('PVE.qemu.Config', {
        Ext.apply(me, {
            title: Ext.String.format(gettext("Virtual Machine {0} on node {1}"), descr, "'" + nodename + "'"),
            hstateid: 'kvmtab',
-           tbar: [ resumeBtn, startBtn, shutdownBtn, stopBtn, resetBtn,
+           tbar: [ resumeBtn, startBtn, shutdownBtn, resetBtn,
                    removeBtn, migrateBtn, consoleBtn],
            defaults: { statusStore: me.statusStore },
            items: [
@@ -241,7 +243,6 @@ Ext.define('PVE.qemu.Config', {
            startBtn.setDisabled(!caps.vms['VM.PowerMgmt'] || status === 'running' || template);
            resetBtn.setDisabled(!caps.vms['VM.PowerMgmt'] || status !== 'running' || template);
            shutdownBtn.setDisabled(!caps.vms['VM.PowerMgmt'] || status !== 'running');
-           stopBtn.setDisabled(!caps.vms['VM.PowerMgmt'] || status === 'stopped');
            removeBtn.setDisabled(!caps.vms['VM.Allocate'] || status !== 'stopped');
            consoleBtn.setDisabled(template);
        });