use HelpButton from widget toolkit

Proxmox.button.Help renamed the css class for the button styling, as
this class is only used rarely and the widget toolkit does not
provides a (shared) css file itself, just rename it here too.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Reviewed-by: Dominik Csapak <d.csapak@proxmox.com>

diff --git a/www/css/ext6-pve.css b/www/css/ext6-pve.css
index adbcb7c0eeb25ccb504f93ac6cace489ec47ce3d..8eca2b439190952436a2a050a47f828b82efb5a6 100644 (file)
--- a/www/css/ext6-pve.css
+++ b/www/css/ext6-pve.css
@@ -358,7 +358,7 @@
     top: 2px;
 }
 
-.pve-inline-button .x-btn-inner {
+.proxmox-inline-button .x-btn-inner {
     color: black;
 }
 

diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index 350711e36fea8c567e3dfa99e0e81cd74aac9013..00ae999f5856f9af77a85a25a8cfa27df07e2818 100644 (file)
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -8,7 +8,6 @@ JSSRC=                                                  \
        menu/MenuItem.js                                \
        button/ConsoleButton.js                         \
        button/Split.js                                 \
-       button/HelpButton.js                            \
        controller/StorageEdit.js                       \
        qemu/CmdMenu.js                                 \
        qemu/TemplateMenu.js                            \

diff --git a/www/manager6/Workspace.js b/www/manager6/Workspace.js
index 334b9b71fe3552bf96ffed6fa0b7cfa4e8d9e495..8d6bb4d11c9abc048accb9c0298428284a30e915 100644 (file)
--- a/www/manager6/Workspace.js
+++ b/www/manager6/Workspace.js
@@ -323,7 +323,7 @@ Ext.define('PVE.StdWorkspace', {
                            }
                        },
                        {
-                           xtype: 'pveHelpButton',
+                           xtype: 'proxmoxHelpButton',
                            hidden: false,
                            baseCls: 'x-btn',
                            iconCls: 'fa fa-book x-btn-icon-el-default-toolbar-small ',

diff --git a/www/manager6/button/HelpButton.js b/www/manager6/button/HelpButton.js
deleted file mode 100644 (file)
index 048a7d3..0000000
--- a/www/manager6/button/HelpButton.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/* help button pointing to an online documentation
-   for components contained in a modal window
-*/
-/*global
-  pveOnlineHelpInfo
-*/
-Ext.define('PVE.button.Help', {
-    extend: 'Ext.button.Button',
-    alias: 'widget.pveHelpButton',
-    text: gettext('Help'),
-    // make help button less flashy by styling it like toolbar buttons
-    iconCls: ' x-btn-icon-el-default-toolbar-small fa fa-question-circle',
-    cls: 'x-btn-default-toolbar-small pve-inline-button',
-    hidden: true,
-    listenToGlobalEvent: true,
-    controller: {
-       xclass: 'Ext.app.ViewController',
-       listen: {
-           global: {
-               pveShowHelp: 'onPveShowHelp',
-               pveHideHelp: 'onPveHideHelp'
-           }
-       },
-       onPveShowHelp: function(helpLink) {
-           var me = this.getView();
-           if (me.listenToGlobalEvent === true) {
-               me.setOnlineHelp(helpLink);
-               me.show();
-           }
-       },
-       onPveHideHelp: function() {
-           var me = this.getView();
-           if (me.listenToGlobalEvent === true) {
-               me.hide();
-           }
-       }
-    },
-
-    // this sets the link and
-    // sets the tooltip text
-    setOnlineHelp:function(blockid) {
-       var me = this;
-
-       var info = pveOnlineHelpInfo[blockid];
-       if (info) {
-           me.onlineHelp = blockid;
-           var title = info.title;
-           if (info.subtitle) {
-               title += ' - ' + info.subtitle;
-           }
-           me.setTooltip(title);
-       }
-    },
-
-    // helper to set the onlineHelp via a config object
-    setHelpConfig: function(config) {
-       var me = this;
-       me.setOnlineHelp(config.onlineHelp);
-    },
-
-    handler: function() {
-       var me = this;
-       var docsURI;
-
-       if (me.onlineHelp) {
-           var info = pveOnlineHelpInfo[me.onlineHelp];
-           if (info) {
-               docsURI = window.location.origin + info.link;
-           }
-       }
-
-       if (docsURI) {
-           window.open(docsURI);
-       } else {
-           Ext.Msg.alert(gettext('Help'), gettext('No Help available'));
-       }
-    }
-});

diff --git a/www/manager6/panel/ConfigPanel.js b/www/manager6/panel/ConfigPanel.js
index c659af216a4362f58be70c06416cfb784051d10a..e3c71eef2568925e050db7455e10f6a5f774af70 100644 (file)
--- a/www/manager6/panel/ConfigPanel.js
+++ b/www/manager6/panel/ConfigPanel.js
@@ -190,7 +190,7 @@ Ext.define('PVE.panel.Config', {
            baseCls: 'x-panel-header-text'
        });
 
-       me.helpButton = Ext.create('PVE.button.Help', {
+       me.helpButton = Ext.create('Proxmox.button.Help', {
            hidden: false,
            listenToGlobalEvent: false,
            onlineHelp: me.onlineHelp || undefined

diff --git a/www/manager6/qemu/Clone.js b/www/manager6/qemu/Clone.js
index ef202c70a324620ff46f702b7c3b4768117af3f1..0df7825ef03b19670d9d99b1890eb9ea0b9e8fcc 100644 (file)
--- a/www/manager6/qemu/Clone.js
+++ b/www/manager6/qemu/Clone.js
@@ -273,7 +273,7 @@ Ext.define('PVE.window.Clone', {
            border: false,
            layout: 'fit',
            buttons: [ {
-               xtype: 'pveHelpButton',
+               xtype: 'proxmoxHelpButton',
                listenToGlobalEvent: false,
                hidden: false,
                onlineHelp: me.onlineHelp

diff --git a/www/manager6/window/Backup.js b/www/manager6/window/Backup.js
index 163c85a83a14f9f26f5e0c8b2681767f5787172a..bb694ba80549d0485c119358177fee3144d0490f 100644 (file)
--- a/www/manager6/window/Backup.js
+++ b/www/manager6/window/Backup.js
@@ -107,7 +107,7 @@ Ext.define('PVE.window.Backup', {
            }
        });
 
-       var helpBtn = Ext.create('PVE.button.Help', {
+       var helpBtn = Ext.create('Proxmox.button.Help', {
            onlineHelp: 'chapter_vzdump',
            listenToGlobalEvent: false,
            hidden: false

diff --git a/www/manager6/window/Migrate.js b/www/manager6/window/Migrate.js
index be4f667662a260f6316344255086899b65820551..9395a97fb0bbfd7ba4e1bbcfab1871b2c9eb47c0 100644 (file)
--- a/www/manager6/window/Migrate.js
+++ b/www/manager6/window/Migrate.js
@@ -92,8 +92,8 @@ Ext.define('PVE.window.Migrate', {
     ],
     buttons: [
        {
-           xtype: 'pveHelpButton',
-           reference: 'pveHelpButton',
+           xtype: 'proxmoxHelpButton',
+           reference: 'proxmoxHelpButton',
            onlineHelp: 'pct_migration',
            listenToGlobalEvent: false,
            hidden: false
@@ -127,7 +127,7 @@ Ext.define('PVE.window.Migrate', {
        me.liveMode = 'restart';
 
        if (me.vmtype === 'qemu') {
-           me.lookup('pveHelpButton').setHelpConfig({
+           me.lookup('proxmoxHelpButton').setHelpConfig({
                onlineHelp: 'qm_migration'
            });
            title = gettext('Migrate') + (' VM ') + me.vmid;

diff --git a/www/manager6/window/Settings.js b/www/manager6/window/Settings.js
index cac31ccd2369cd5481180944a767a000b703f7dd..9a33850f14674a41fad4cabb593cc22faf7a5a75 100644 (file)
--- a/www/manager6/window/Settings.js
+++ b/www/manager6/window/Settings.js
@@ -161,7 +161,7 @@ Ext.define('PVE.window.Settings', {
                },
                {
                    xtype: 'button',
-                   cls: 'x-btn-default-toolbar-small pve-inline-button',
+                   cls: 'x-btn-default-toolbar-small proxmox-inline-button',
                    text: gettext('Clear User name'),
                    width: 'auto',
                    name: 'clear-username'
@@ -178,7 +178,7 @@ Ext.define('PVE.window.Settings', {
                },
                {
                    xtype: 'button',
-                   cls: 'x-btn-default-toolbar-small pve-inline-button',
+                   cls: 'x-btn-default-toolbar-small proxmox-inline-button',
                    text: gettext('Reset Layout'),
                    width: 'auto',
                    name: 'reset'

diff --git a/www/manager6/window/Wizard.js b/www/manager6/window/Wizard.js
index 1903a099143e19f6b9a091056721a93c5e0e43eb..fe5f8dd02d1e2621d71c98f062a4a9a69964939d 100644 (file)
--- a/www/manager6/window/Wizard.js
+++ b/www/manager6/window/Wizard.js
@@ -68,7 +68,7 @@ Ext.define('PVE.window.Wizard', {
            margins: '0 5 5 5',
            items: [  
                {
-                   xtype: 'pveHelpButton',
+                   xtype: 'proxmoxHelpButton',
                    itemId: 'help'
                },
                '->',