From c8802a60b74b44570f758ed3fc0d703d6ee6877e Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Thu, 13 Oct 2016 11:26:06 +0200 Subject: [PATCH] use auto-generated block IDs to reference online docu. --- www/manager6/Makefile | 10 +++-- www/manager6/Utils.js | 66 ------------------------------ www/manager6/Workspace.js | 2 +- www/manager6/button/HelpButton.js | 29 ++++++++++--- www/manager6/dc/ACLView.js | 2 +- www/manager6/dc/Config.js | 40 +++++++++--------- www/manager6/ha/GroupEdit.js | 2 +- www/manager6/lxc/Config.js | 26 ++++++------ www/manager6/lxc/CreateWizard.js | 6 +-- www/manager6/lxc/Network.js | 2 +- www/manager6/lxc/ResourceEdit.js | 2 +- www/manager6/node/Config.js | 30 +++++++------- www/manager6/pool/Config.js | 4 +- www/manager6/qemu/Config.js | 20 ++++----- www/manager6/qemu/CreateWizard.js | 2 +- www/manager6/qemu/HDEdit.js | 2 +- www/manager6/qemu/HDEfi.js | 2 +- www/manager6/qemu/MemoryEdit.js | 2 +- www/manager6/qemu/NetworkEdit.js | 2 +- www/manager6/qemu/OSTypeEdit.js | 2 +- www/manager6/qemu/ProcessorEdit.js | 2 +- www/manager6/qemu/QemuBiosEdit.js | 2 +- www/manager6/storage/Browser.js | 4 +- 23 files changed, 109 insertions(+), 152 deletions(-) diff --git a/www/manager6/Makefile b/www/manager6/Makefile index 558ddfd0..80058674 100644 --- a/www/manager6/Makefile +++ b/www/manager6/Makefile @@ -207,8 +207,12 @@ JSSRC= \ lint: ${JSSRC} jslint ${JSSRC} -pvemanagerlib.js: ${JSSRC} - cat ${JSSRC} >$@.tmp +pvemanagerlib.js: OnlineHelpInfo.js ${JSSRC} + cat OnlineHelpInfo.js ${JSSRC} >$@.tmp + mv $@.tmp $@ + +OnlineHelpInfo.js: /usr/bin/asciidoc-pve + /usr/bin/asciidoc-pve scan-extjs ${JSSRC} >$@.tmp mv $@.tmp $@ all: pvemanagerlib.js @@ -222,7 +226,7 @@ install: pvemanagerlib.js .PHONY: clean clean: find . -name '*~' -exec rm {} ';' - rm -rf pvemanagerlib.js + rm -rf pvemanagerlib.js OnlineHelpInfo.js diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index 4ec7d5bd..011308ac 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -1277,72 +1277,6 @@ Ext.define('PVE.Utils', { statics: { } menu.showAt(event.getXY()); - }, - - DocsPages: { - 'pve-admin-guide.html':'Proxmox VE Administration Guide', - 'chapter-sysadmin.html':'Host System Administration', - 'chapter-pvecm.html':'Cluster Manager', - 'chapter-pmxcfs.html':'Proxmox Cluster File System (pmxcfs)', - 'chapter-pvesm.html':'Proxmox VE Storage', - 'chapter-qm.html': 'Qemu/KVM Virtual Machines', - 'chapter-pve-firewall.html': 'Proxmox VE Firewall', - 'chapter-pveum.html': 'User Management', - 'chapter-pct.html': 'Proxmox Container Toolkit', - 'chapter-ha-manager.html': 'High Availability', - 'chapter-vzdump.html': 'Backup and Restore', - 'chapter-pve-faq.html': 'Frequently Asked Questions', - 'chapter-pve-bibliography.html': 'Bibliography', - 'qm.1.html': 'Qemu/KVM Virtual Machine Manager', - 'qmrestore.1.html': 'Restore QemuServer vzdump Backups', - 'pct.1.html': 'Tool to manage Linux Containers (LXC) on Proxmox VE', - 'pveam.1.html': 'Proxmox VE Appliance Manager', - 'pveceph.1.html': 'Manage CEPH Services on Proxmox VE Nodes', - 'pvecm.1.html': 'Proxmox VE Cluster Manager', - 'pveum.1.html': 'Proxmox VE User Manager', - 'pvesm.1.html': 'Proxmox VE Storage Manager', - 'pvesubscription.1.html': 'Proxmox VE Subscription Manager', - 'vzdump.1.html': 'Backup Utility for VMs and Containers', - 'ha-manager.1.html': 'Proxmox VE HA Manager', - 'index.html':'', - 'datacenter.cfg.5.html':'Proxmox VE Datacenter Configuration' - }, - - DocsSubTitles: { - '_vm_container_configuration':'VM/Container configuration', - '_ip_aliases':'IP Aliases', - '_ip_sets':'IP Sets' - }, - - mapDocsUrlToTitle: function(url) { - var title, subtitle; - - // if there is a subtitle - if (url.indexOf('#') !== -1) { - title = PVE.Utils.DocsPages[url.split('#')[0]] || ''; - subtitle = PVE.Utils.DocsSubTitles[url.split('#')[1]]; - - // if we do not find the subtitle, - // capitalize the beginning of every word - // and replace '_' with ' ' - // e.g.: - // '_my_text' -> 'My Text' - if (!subtitle) { - subtitle = url.split('#')[1].replace(/_(\w)/gi, function(match,p1){ - return ' ' + p1.toUpperCase(); - }).slice(1); - } - - if (title !== '') { - title += ' - '; - } - - title += subtitle; - } else { - title = PVE.Utils.DocsPages[url] || ''; - } - - return title; } }}); diff --git a/www/manager6/Workspace.js b/www/manager6/Workspace.js index 7f5a4c10..4769d660 100644 --- a/www/manager6/Workspace.js +++ b/www/manager6/Workspace.js @@ -405,7 +405,7 @@ Ext.define('PVE.StdWorkspace', { hidden: false, iconCls: 'fa fa-info-circle x-btn-icon-el-default-toolbar-small ', listenToGlobalEvent: false, - onlineHelp: 'index.html', + onlineHelp: 'pve_documentation_index', margin: '0 5 0 0' }, createVM, diff --git a/www/manager6/button/HelpButton.js b/www/manager6/button/HelpButton.js index 5afed1fb..e038a32d 100644 --- a/www/manager6/button/HelpButton.js +++ b/www/manager6/button/HelpButton.js @@ -1,6 +1,9 @@ /* 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', @@ -35,16 +38,32 @@ Ext.define('PVE.button.Help', { // this sets the link and // sets the tooltip text - setOnlineHelp:function(link) { + setOnlineHelp:function(blockid) { var me = this; - me.onlineHelp = link; - me.setTooltip(PVE.Utils.mapDocsUrlToTitle(link)); + + var info = pveOnlineHelpInfo[blockid]; + if (info) { + me.onlineHelp = blockid; + var title = info.title; + if (info.subtitle) { + title += ' - ' + info.subtitle; + } + me.setTooltip(title); + } }, handler: function() { var me = this; + var docsURI; + if (me.onlineHelp) { - var docsURI = window.location.origin + '/pve-docs/' + 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/dc/ACLView.js b/www/manager6/dc/ACLView.js index 989aa99a..11fff564 100644 --- a/www/manager6/dc/ACLView.js +++ b/www/manager6/dc/ACLView.js @@ -57,7 +57,7 @@ Ext.define('PVE.dc.ACLAdd', { var ipanel = Ext.create('PVE.panel.InputPanel', { items: items, - onlineHelp: 'chapter-pveum.html#_terms_and_definitions' + onlineHelp: 'pveum_permission_management' }); Ext.apply(me, { diff --git a/www/manager6/dc/Config.js b/www/manager6/dc/Config.js index 94143ed0..d4dbdcf3 100644 --- a/www/manager6/dc/Config.js +++ b/www/manager6/dc/Config.js @@ -6,7 +6,7 @@ Ext.define('PVE.dc.Config', { extend: 'PVE.panel.Config', alias: 'widget.PVE.dc.Config', - onlineHelp: 'pve-admin-guide.html', + onlineHelp: 'pve_admin_guide', initComponent: function() { var me = this; @@ -31,7 +31,7 @@ Ext.define('PVE.dc.Config', { me.items.push({ xtype: 'pveDcOptionView', title: gettext('Options'), - onlineHelp: 'datacenter.cfg.5.html', + onlineHelp: 'datacenter_configuration_file', iconCls: 'fa fa-gear', itemId: 'options' }); @@ -41,7 +41,7 @@ Ext.define('PVE.dc.Config', { me.items.push({ xtype: 'pveStorageView', title: gettext('Storage'), - onlineHelp: 'chapter-pvesm.html', + onlineHelp: 'chapter_storage', iconCls: 'fa fa-database', itemId: 'storage' }); @@ -51,7 +51,7 @@ Ext.define('PVE.dc.Config', { me.items.push({ xtype: 'pveDcBackupView', iconCls: 'fa fa-floppy-o', - onlineHelp: 'chapter-vzdump.html', + onlineHelp: 'chapter_vzdump', title: gettext('Backup'), itemId: 'backup' }, @@ -59,7 +59,7 @@ Ext.define('PVE.dc.Config', { xtype: 'pveACLView', title: gettext('Permissions'), iconCls: 'fa fa-unlock', - onlineHelp: 'chapter-pveum.html', + onlineHelp: 'chapter_user_management', itemId: 'permissions', expandedOnInit: true }); @@ -69,7 +69,7 @@ Ext.define('PVE.dc.Config', { xtype: 'pveUserView', groups: ['permissions'], iconCls: 'fa fa-user', - onlineHelp: 'chapter-pveum.html#_users', + onlineHelp: 'pveum_users', title: gettext('Users'), itemId: 'users' }); @@ -79,7 +79,7 @@ Ext.define('PVE.dc.Config', { xtype: 'pveGroupView', title: gettext('Groups'), iconCls: 'fa fa-users', - onlineHelp: 'chapter-pveum.html#_groups', + onlineHelp: 'pveum_groups', groups: ['permissions'], itemId: 'groups' }, @@ -87,7 +87,7 @@ Ext.define('PVE.dc.Config', { xtype: 'pvePoolView', title: gettext('Pools'), iconCls: 'fa fa-tags', - onlineHelp: 'chapter-pveum.html#_pools', + onlineHelp: 'pveum_pools', groups: ['permissions'], itemId: 'pools' }, @@ -95,7 +95,7 @@ Ext.define('PVE.dc.Config', { xtype: 'pveRoleView', title: gettext('Roles'), iconCls: 'fa fa-male', - onlineHelp: 'chapter-pveum.html#_roles', + onlineHelp: 'pveum_roles', groups: ['permissions'], itemId: 'roles' }, @@ -103,7 +103,7 @@ Ext.define('PVE.dc.Config', { xtype: 'pveAuthView', title: gettext('Authentication'), groups: ['permissions'], - onlineHelp: 'chapter-pveum.html#_authentication_realms', + onlineHelp: 'pveum_authentication_realms', iconCls: 'fa fa-key', itemId: 'domains' }, @@ -111,14 +111,14 @@ Ext.define('PVE.dc.Config', { xtype: 'pveHAStatusView', title: 'HA', iconCls: 'fa fa-heartbeat', - onlineHelp: 'chapter-ha-manager.html', + onlineHelp: 'chapter_ha_manager', itemId: 'ha' }, { title: gettext('Resources'), groups: ['ha'], iconCls: 'fa fa-th', - onlineHelp: 'chapter-ha-manager.html#_resources', + onlineHelp: 'ha_manager_resources', xtype: 'pveHAResourcesView', itemId: 'resources' }, @@ -126,7 +126,7 @@ Ext.define('PVE.dc.Config', { title: gettext('Groups'), groups: ['ha'], xtype: 'pveHAGroupsView', - onlineHelp: 'chapter-ha-manager.html#_groups', + onlineHelp: 'ha_manager_groups', iconCls: 'fa fa-object-group', itemId: 'ha-groups' }, @@ -134,7 +134,7 @@ Ext.define('PVE.dc.Config', { title: gettext('Fencing'), groups: ['ha'], iconCls: 'fa fa-bolt', - onlineHelp: 'chapter-ha-manager.html#_fencing', + onlineHelp: 'ha_manager_fencing', xtype: 'pveFencingView', itemId: 'ha-fencing' }, @@ -145,7 +145,7 @@ Ext.define('PVE.dc.Config', { base_url: '/cluster/firewall/rules', list_refs_url: '/cluster/firewall/refs', iconCls: 'fa fa-shield', - onlineHelp: 'chapter-pve-firewall.html', + onlineHelp: 'chapter_pve_firewall', itemId: 'firewall' }, { @@ -154,7 +154,7 @@ Ext.define('PVE.dc.Config', { groups: ['firewall'], iconCls: 'fa fa-gear', base_url: '/cluster/firewall/options', - onlineHelp: 'chapter-pve-firewall.html#_cluster_wide_setup', + onlineHelp: 'pve_firewall_cluster_wide_setup', fwtype: 'dc', itemId: 'firewall-options' }, @@ -163,7 +163,7 @@ Ext.define('PVE.dc.Config', { title: gettext('Security Group'), groups: ['firewall'], iconCls: 'fa fa-group', - onlineHelp: 'chapter-pve-firewall.html#_security_groups', + onlineHelp: 'pve_firewall_security_groups', itemId: 'firewall-sg' }, { @@ -171,7 +171,7 @@ Ext.define('PVE.dc.Config', { title: gettext('Alias'), groups: ['firewall'], iconCls: 'fa fa-external-link', - onlineHelp: 'chapter-pve-firewall.html#_ip_aliases', + onlineHelp: 'pve_firewall_ip_aliases', base_url: '/cluster/firewall/aliases', itemId: 'firewall-aliases' }, @@ -180,7 +180,7 @@ Ext.define('PVE.dc.Config', { title: 'IPSet', groups: ['firewall'], iconCls: 'fa fa-list-ol', - onlineHelp: 'chapter-pve-firewall.html#_ip_sets', + onlineHelp: 'pve_firewall_ip_sets', base_url: '/cluster/firewall/ipset', list_refs_url: '/cluster/firewall/refs', itemId: 'firewall-ipset' @@ -189,7 +189,7 @@ Ext.define('PVE.dc.Config', { xtype: 'pveDcSupport', title: gettext('Support'), itemId: 'support', - onlineHelp: 'chapter-sysadmin.html#_getting_help', + onlineHelp: 'getting_help', iconCls: 'fa fa-comments-o' }); } diff --git a/www/manager6/ha/GroupEdit.js b/www/manager6/ha/GroupEdit.js index 2974af5a..db9cf742 100644 --- a/www/manager6/ha/GroupEdit.js +++ b/www/manager6/ha/GroupEdit.js @@ -1,6 +1,6 @@ Ext.define('PVE.ha.GroupInputPanel', { extend: 'PVE.panel.InputPanel', - onlineHelp: 'chapter-ha-manager.html#_groups', + onlineHelp: 'ha_manager_groups', groupId: undefined, diff --git a/www/manager6/lxc/Config.js b/www/manager6/lxc/Config.js index 672b49a9..5d5285c5 100644 --- a/www/manager6/lxc/Config.js +++ b/www/manager6/lxc/Config.js @@ -2,7 +2,7 @@ Ext.define('PVE.lxc.Config', { extend: 'PVE.panel.Config', alias: 'widget.PVE.lxc.Config', - onlineHelp: 'chapter-pct.html', + onlineHelp: 'chapter_pct', initComponent: function() { var me = this; @@ -153,7 +153,7 @@ Ext.define('PVE.lxc.Config', { { title: gettext('Resources'), itemId: 'resources', - onlineHelp: 'chapter-pct.html#_configuration', + onlineHelp: 'pct_configuration', expandedOnInit: true, iconCls: 'fa fa-cube', xtype: 'pveLxcRessourceView' @@ -161,21 +161,21 @@ Ext.define('PVE.lxc.Config', { { title: gettext('Network'), iconCls: 'fa fa-exchange', - onlineHelp: 'chapter-pct.html#_container_network', + onlineHelp: 'pct_container_network', itemId: 'network', xtype: 'pveLxcNetworkView' }, { title: gettext('DNS'), iconCls: 'fa fa-globe', - onlineHelp: 'chapter-pct.html#_container_network', + onlineHelp: 'pct_container_network', itemId: 'dns', xtype: 'pveLxcDNS' }, { title: gettext('Options'), itemId: 'options', - onlineHelp: 'chapter-pct.html#_options', + onlineHelp: 'pct_options', iconCls: 'fa fa-gear', xtype: 'pveLxcOptions' }, @@ -192,7 +192,7 @@ Ext.define('PVE.lxc.Config', { me.items.push({ title: gettext('Backup'), iconCls: 'fa fa-floppy-o', - onlineHelp: 'chapter-vzdump.html', + onlineHelp: 'chapter_vzdump', xtype: 'pveBackupView', itemId: 'backup' }); @@ -202,7 +202,7 @@ Ext.define('PVE.lxc.Config', { me.items.push({ title: gettext('Snapshots'), iconCls: 'fa fa-history', - onlineHelp: 'chapter-pct.html#_snapshots', + onlineHelp: 'pct_snapshots', xtype: 'pveLxcSnapshotTree', itemId: 'snapshot' }); @@ -213,7 +213,7 @@ Ext.define('PVE.lxc.Config', { { xtype: 'pveFirewallRules', title: gettext('Firewall'), - onlineHelp: 'chapter-pve-firewall.html', + onlineHelp: 'chapter_pve_firewall', iconCls: 'fa fa-shield', allow_iface: true, base_url: base_url + '/firewall/rules', @@ -224,7 +224,7 @@ Ext.define('PVE.lxc.Config', { xtype: 'pveFirewallOptions', groups: ['firewall'], iconCls: 'fa fa-gear', - onlineHelp: 'chapter-pve-firewall.html#_vm_container_configuration', + onlineHelp: 'pve_firewall_vm_container_configuration', title: gettext('Options'), base_url: base_url + '/firewall/options', fwtype: 'vm', @@ -235,7 +235,7 @@ Ext.define('PVE.lxc.Config', { title: gettext('Alias'), groups: ['firewall'], iconCls: 'fa fa-external-link', - onlineHelp: 'chapter-pve-firewall.html#_ip_aliases', + onlineHelp: 'pve_firewall_ip_aliases', base_url: base_url + '/firewall/aliases', itemId: 'firewall-aliases' }, @@ -244,7 +244,7 @@ Ext.define('PVE.lxc.Config', { title: gettext('IPSet'), groups: ['firewall'], iconCls: 'fa fa-list-ol', - onlineHelp: 'chapter-pve-firewall.html#_ip_sets', + onlineHelp: 'pve_firewall_ip_sets', base_url: base_url + '/firewall/ipset', list_refs_url: base_url + '/firewall/refs', itemId: 'firewall-ipset' @@ -253,7 +253,7 @@ Ext.define('PVE.lxc.Config', { title: gettext('Log'), groups: ['firewall'], iconCls: 'fa fa-list', - onlineHelp: 'chapter-pve-firewall.html', + onlineHelp: 'chapter_pve_firewall', itemId: 'firewall-fwlog', xtype: 'pveLogView', url: '/api2/extjs' + base_url + '/firewall/log' @@ -267,7 +267,7 @@ Ext.define('PVE.lxc.Config', { title: gettext('Permissions'), itemId: 'permissions', iconCls: 'fa fa-unlock', - onlineHelp: 'chapter-pveum.html', + onlineHelp: 'chapter_user_management', path: '/vms/' + vmid }); } diff --git a/www/manager6/lxc/CreateWizard.js b/www/manager6/lxc/CreateWizard.js index e2afd666..5e8e4297 100644 --- a/www/manager6/lxc/CreateWizard.js +++ b/www/manager6/lxc/CreateWizard.js @@ -60,7 +60,7 @@ Ext.define('PVE.lxc.CreateWizard', { insideWizard: true, create: true, unused: false, - onlineHelp: 'chapter-pct.html#_container_storage', + onlineHelp: 'pct_container_storage', confid: 'rootfs' }); @@ -68,7 +68,7 @@ Ext.define('PVE.lxc.CreateWizard', { title: gettext('Network'), insideWizard: true, dataCache: {}, - onlineHelp: 'chapter-pct.html#_container_network', + onlineHelp: 'pct_container_network', create: true }); @@ -224,7 +224,7 @@ Ext.define('PVE.lxc.CreateWizard', { { xtype: 'inputpanel', title: gettext('Template'), - onlineHelp: 'chapter-pct.html#_container_images', + onlineHelp: 'pct_container_images', column1: [ tmplstoragesel, tmplsel] }, rootfspanel, diff --git a/www/manager6/lxc/Network.js b/www/manager6/lxc/Network.js index eba4bab2..3c8541a5 100644 --- a/www/manager6/lxc/Network.js +++ b/www/manager6/lxc/Network.js @@ -4,7 +4,7 @@ Ext.define('PVE.lxc.NetworkInputPanel', { insideWizard: false, - onlineHelp: 'chapter-pct.html#_container_network', + onlineHelp: 'pct_container_network', setNodename: function(nodename) { var me = this; diff --git a/www/manager6/lxc/ResourceEdit.js b/www/manager6/lxc/ResourceEdit.js index 3a6719be..0d043cc5 100644 --- a/www/manager6/lxc/ResourceEdit.js +++ b/www/manager6/lxc/ResourceEdit.js @@ -187,7 +187,7 @@ Ext.define('PVE.lxc.MountPointInputPanel', { insideWizard: false, - onlineHelp: 'chapter-pct.html#_container_storage', + onlineHelp: 'pct_container_storage', unused: false, // ADD usused disk imaged diff --git a/www/manager6/node/Config.js b/www/manager6/node/Config.js index f987fa2f..bf9d176e 100644 --- a/www/manager6/node/Config.js +++ b/www/manager6/node/Config.js @@ -2,7 +2,7 @@ Ext.define('PVE.node.Config', { extend: 'PVE.panel.Config', alias: 'widget.PVE.node.Config', - onlineHelp: 'chapter-sysadmin.html', + onlineHelp: 'chapter_system_administration', initComponent: function() { var me = this; @@ -160,7 +160,7 @@ Ext.define('PVE.node.Config', { title: gettext('System'), iconCls: 'fa fa-cogs', itemId: 'services', - onlineHelp: 'index.html#_service_daemons', + onlineHelp: 'pve_service_daemons', expandedOnInit: true, xtype: 'pveNodeServiceView' }, @@ -168,7 +168,7 @@ Ext.define('PVE.node.Config', { title: gettext('Network'), iconCls: 'fa fa-exchange', itemId: 'network', - onlineHelp: 'chapter-sysadmin.html#_network_configuration', + onlineHelp: 'sysadmin_network_configuration', groups: ['services'], xtype: 'pveNodeNetworkView' }, @@ -177,7 +177,7 @@ Ext.define('PVE.node.Config', { iconCls: 'fa fa-globe', groups: ['services'], itemId: 'dns', - onlineHelp: 'chapter-sysadmin.html#_network_configuration', + onlineHelp: 'sysadmin_network_configuration', xtype: 'pveNodeDNSView' }, { @@ -207,7 +207,7 @@ Ext.define('PVE.node.Config', { iconCls: 'fa fa-refresh', disabled: !caps.nodes['Sys.Console'], // do we want to link to system updates instead? - onlineHelp: 'chapter-sysadmin.html#_package_repositories', + onlineHelp: 'sysadmin_package_repositories', itemId: 'apt', xtype: 'pveNodeAPT', nodename: nodename @@ -220,7 +220,7 @@ Ext.define('PVE.node.Config', { { xtype: 'pveFirewallRules', iconCls: 'fa fa-shield', - onlineHelp: 'chapter-pve-firewall.html', + onlineHelp: 'chapter_pve_firewall', title: gettext('Firewall'), allow_iface: true, base_url: '/nodes/' + nodename + '/firewall/rules', @@ -231,7 +231,7 @@ Ext.define('PVE.node.Config', { xtype: 'pveFirewallOptions', title: gettext('Options'), iconCls: 'fa fa-gear', - onlineHelp: 'chapter-pve-firewall.html#_host_specific_configuration', + onlineHelp: 'pve_firewall_host_specific_configuration', groups: ['firewall'], base_url: '/nodes/' + nodename + '/firewall/options', fwtype: 'node', @@ -252,7 +252,7 @@ Ext.define('PVE.node.Config', { { title: 'Ceph', itemId: 'ceph', - onlineHelp: 'pveceph.1.html', + onlineHelp: 'chapter_pveceph', iconCls: 'fa fa-ceph', xtype: 'pveNodeCephStatus' }, @@ -260,7 +260,7 @@ Ext.define('PVE.node.Config', { xtype: 'pveNodeCephConfigCrush', title: gettext('Config'), iconCls: 'fa fa-gear', - onlineHelp: 'pveceph.1.html', + onlineHelp: 'chapter_pveceph', groups: ['ceph'], itemId: 'ceph-config' }, @@ -268,7 +268,7 @@ Ext.define('PVE.node.Config', { xtype: 'pveNodeCephMonList', title: gettext('Monitor'), iconCls: 'fa fa-tv', - onlineHelp: 'pveceph.1.html', + onlineHelp: 'chapter_pveceph', groups: ['ceph'], itemId: 'ceph-monlist' }, @@ -276,7 +276,7 @@ Ext.define('PVE.node.Config', { xtype: 'pveNodeCephOsdTree', title: 'OSD', iconCls: 'fa fa-hdd-o', - onlineHelp: 'pveceph.1.html', + onlineHelp: 'chapter_pveceph', groups: ['ceph'], itemId: 'ceph-osdtree' }, @@ -284,7 +284,7 @@ Ext.define('PVE.node.Config', { xtype: 'pveNodeCephPoolList', title: gettext('Pools'), iconCls: 'fa fa-sitemap', - onlineHelp: 'pveceph.1.html', + onlineHelp: 'chapter_pveceph', groups: ['ceph'], itemId: 'ceph-pools' } @@ -298,7 +298,7 @@ Ext.define('PVE.node.Config', { title: gettext('Log'), iconCls: 'fa fa-list', groups: ['firewall'], - onlineHelp: 'chapter-pve-firewall.html', + onlineHelp: 'chapter_pve_firewall', url: '/api2/extjs/nodes/' + nodename + '/firewall/log', itemId: 'firewall-fwlog' }, @@ -307,7 +307,7 @@ Ext.define('PVE.node.Config', { itemId: 'ceph-log', iconCls: 'fa fa-list', groups: ['ceph'], - onlineHelp: 'pveceph.1.html', + onlineHelp: 'chapter_pveceph', xtype: 'pveLogView', url: "/api2/extjs/nodes/" + nodename + "/ceph/log" }); @@ -324,7 +324,7 @@ Ext.define('PVE.node.Config', { title: gettext('Subscription'), iconCls: 'fa fa-support', itemId: 'support', - onlineHelp: 'chapter-sysadmin.html#_getting_help', + onlineHelp: 'getting_help', xtype: 'pveNodeSubscription', nodename: nodename } diff --git a/www/manager6/pool/Config.js b/www/manager6/pool/Config.js index 66e5defb..57e6829e 100644 --- a/www/manager6/pool/Config.js +++ b/www/manager6/pool/Config.js @@ -2,7 +2,7 @@ Ext.define('PVE.pool.Config', { extend: 'PVE.panel.Config', alias: 'widget.pvePoolConfig', - onlineHelp: 'chapter-pveum.html#_pools', + onlineHelp: 'pveum_pools', initComponent: function() { var me = this; @@ -33,7 +33,7 @@ Ext.define('PVE.pool.Config', { xtype: 'pveACLView', title: gettext('Permissions'), iconCls: 'fa fa-unlock', - onlineHelp: 'chapter-pveum.html', + onlineHelp: 'chapter_user_management', itemId: 'permissions', path: '/pool/' + pool } diff --git a/www/manager6/qemu/Config.js b/www/manager6/qemu/Config.js index e58ddc2b..e3d277a1 100644 --- a/www/manager6/qemu/Config.js +++ b/www/manager6/qemu/Config.js @@ -2,7 +2,7 @@ Ext.define('PVE.qemu.Config', { extend: 'PVE.panel.Config', alias: 'widget.PVE.qemu.Config', - onlineHelp: 'chapter-qm.html', + onlineHelp: 'chapter_virtual_machines', initComponent: function() { var me = this; @@ -162,14 +162,14 @@ Ext.define('PVE.qemu.Config', { { title: gettext('Hardware'), itemId: 'hardware', - onlineHelp: 'chapter-qm.html#_virtual_machines_settings', + onlineHelp: 'qm_virtual_machines_settings', iconCls: 'fa fa-desktop', xtype: 'PVE.qemu.HardwareView' }, { title: gettext('Options'), iconCls: 'fa fa-gear', - onlineHelp: 'chapter-qm.html#_options', + onlineHelp: 'qm_options', itemId: 'options', xtype: 'PVE.qemu.Options' }, @@ -196,7 +196,7 @@ Ext.define('PVE.qemu.Config', { title: gettext('Backup'), iconCls: 'fa fa-floppy-o', xtype: 'pveBackupView', - onlineHelp: 'chapter-vzdump.html', + onlineHelp: 'chapter_vzdump', itemId: 'backup' }); } @@ -216,7 +216,7 @@ Ext.define('PVE.qemu.Config', { xtype: 'pveFirewallRules', title: gettext('Firewall'), iconCls: 'fa fa-shield', - onlineHelp: 'chapter-pve-firewall.html', + onlineHelp: 'chapter_pve_firewall', allow_iface: true, base_url: base_url + '/firewall/rules', list_refs_url: base_url + '/firewall/refs', @@ -226,7 +226,7 @@ Ext.define('PVE.qemu.Config', { xtype: 'pveFirewallOptions', groups: ['firewall'], iconCls: 'fa fa-gear', - onlineHelp: 'chapter-pve-firewall.html#_vm_container_configuration', + onlineHelp: 'pve_firewall_vm_container_configuration', title: gettext('Options'), base_url: base_url + '/firewall/options', fwtype: 'vm', @@ -237,7 +237,7 @@ Ext.define('PVE.qemu.Config', { title: gettext('Alias'), groups: ['firewall'], iconCls: 'fa fa-external-link', - onlineHelp: 'chapter-pve-firewall.html#_ip_aliases', + onlineHelp: 'pve_firewall_ip_aliases', base_url: base_url + '/firewall/aliases', itemId: 'firewall-aliases' }, @@ -246,7 +246,7 @@ Ext.define('PVE.qemu.Config', { title: gettext('IPSet'), groups: ['firewall'], iconCls: 'fa fa-list-ol', - onlineHelp: 'chapter-pve-firewall.html#_ip_sets', + onlineHelp: 'pve_firewall_ip_sets', base_url: base_url + '/firewall/ipset', list_refs_url: base_url + '/firewall/refs', itemId: 'firewall-ipset' @@ -255,7 +255,7 @@ Ext.define('PVE.qemu.Config', { title: gettext('Log'), groups: ['firewall'], iconCls: 'fa fa-list', - onlineHelp: 'chapter-pve-firewall.html', + onlineHelp: 'chapter_pve_firewall', itemId: 'firewall-fwlog', xtype: 'pveLogView', url: '/api2/extjs' + base_url + '/firewall/log' @@ -268,7 +268,7 @@ Ext.define('PVE.qemu.Config', { xtype: 'pveACLView', title: gettext('Permissions'), iconCls: 'fa fa-unlock', - onlineHelp: 'chapter-pveum.html', + onlineHelp: 'chapter_user_management', itemId: 'permissions', path: '/vms/' + vmid }); diff --git a/www/manager6/qemu/CreateWizard.js b/www/manager6/qemu/CreateWizard.js index be9badab..5e0a75c4 100644 --- a/www/manager6/qemu/CreateWizard.js +++ b/www/manager6/qemu/CreateWizard.js @@ -44,7 +44,7 @@ Ext.define('PVE.qemu.CreateWizard', { { xtype: 'inputpanel', title: gettext('General'), - onlineHelp: 'chapter-qm.html#_general_settings', + onlineHelp: 'qm_general_settings', column1: [ { xtype: 'pveNodeSelector', diff --git a/www/manager6/qemu/HDEdit.js b/www/manager6/qemu/HDEdit.js index c86ab440..219fe9db 100644 --- a/www/manager6/qemu/HDEdit.js +++ b/www/manager6/qemu/HDEdit.js @@ -3,7 +3,7 @@ Ext.define('PVE.qemu.HDInputPanel', { extend: 'PVE.panel.InputPanel', alias: 'widget.PVE.qemu.HDInputPanel', - onlineHelp: 'chapter-qm.html#_hard_disk', + onlineHelp: 'qm_hard_disk', insideWizard: false, diff --git a/www/manager6/qemu/HDEfi.js b/www/manager6/qemu/HDEfi.js index 74f49a60..20ef7123 100644 --- a/www/manager6/qemu/HDEfi.js +++ b/www/manager6/qemu/HDEfi.js @@ -126,7 +126,7 @@ Ext.define('PVE.qemu.EFIDiskEdit', { /* because create is a method above..., really jslint? */ me.items = [{ xtype: 'pveEFIDiskInputPanel', - onlineHelp: 'chapter-qm.html#_bios_and_uefi', + onlineHelp: 'qm_bios_and_uefi', confid: me.confid, nodename: nodename, create: true diff --git a/www/manager6/qemu/MemoryEdit.js b/www/manager6/qemu/MemoryEdit.js index 0725eacb..e9ee432a 100644 --- a/www/manager6/qemu/MemoryEdit.js +++ b/www/manager6/qemu/MemoryEdit.js @@ -1,7 +1,7 @@ Ext.define('PVE.qemu.MemoryInputPanel', { extend: 'PVE.panel.InputPanel', alias: 'widget.pveQemuMemoryPanel', - onlineHelp: 'chapter-qm.html#_memory', + onlineHelp: 'qm_memory', insideWizard: false, diff --git a/www/manager6/qemu/NetworkEdit.js b/www/manager6/qemu/NetworkEdit.js index 1d2a16e9..9a4875d3 100644 --- a/www/manager6/qemu/NetworkEdit.js +++ b/www/manager6/qemu/NetworkEdit.js @@ -1,7 +1,7 @@ Ext.define('PVE.qemu.NetworkInputPanel', { extend: 'PVE.panel.InputPanel', alias: 'widget.PVE.qemu.NetworkInputPanel', - onlineHelp: 'chapter-qm.html#_network_device', + onlineHelp: 'qm_network_device', insideWizard: false, diff --git a/www/manager6/qemu/OSTypeEdit.js b/www/manager6/qemu/OSTypeEdit.js index 4c532422..b94aabbd 100644 --- a/www/manager6/qemu/OSTypeEdit.js +++ b/www/manager6/qemu/OSTypeEdit.js @@ -1,7 +1,7 @@ Ext.define('PVE.qemu.OSTypeInputPanel', { extend: 'PVE.panel.InputPanel', alias: 'widget.pveQemuOSTypePanel', - onlineHelp: 'chapter-qm.html#_os_settings', + onlineHelp: 'qm_os_settings', insideWizard: false, controller: { diff --git a/www/manager6/qemu/ProcessorEdit.js b/www/manager6/qemu/ProcessorEdit.js index c3e2bc07..be153540 100644 --- a/www/manager6/qemu/ProcessorEdit.js +++ b/www/manager6/qemu/ProcessorEdit.js @@ -1,7 +1,7 @@ Ext.define('PVE.qemu.ProcessorInputPanel', { extend: 'PVE.panel.InputPanel', alias: 'widget.pveQemuProcessorPanel', - onlineHelp: 'chapter-qm.html#_cpu', + onlineHelp: 'qm_cpu', onGetValues: function(values) { var me = this; diff --git a/www/manager6/qemu/QemuBiosEdit.js b/www/manager6/qemu/QemuBiosEdit.js index ea34812c..55dee111 100644 --- a/www/manager6/qemu/QemuBiosEdit.js +++ b/www/manager6/qemu/QemuBiosEdit.js @@ -17,7 +17,7 @@ Ext.define('PVE.qemu.BiosEdit', { subject: 'BIOS', items: [ { xtype: 'pveQemuBiosSelector', - onlineHelp: 'chapter-qm.html#_bios_and_uefi', + onlineHelp: 'qm_bios_and_uefi', name: 'bios', value: '__default__', fieldLabel: 'BIOS', diff --git a/www/manager6/storage/Browser.js b/www/manager6/storage/Browser.js index fcd5aa7d..0b58265f 100644 --- a/www/manager6/storage/Browser.js +++ b/www/manager6/storage/Browser.js @@ -2,7 +2,7 @@ Ext.define('PVE.storage.Browser', { extend: 'PVE.panel.Config', alias: 'widget.PVE.storage.Browser', - onlineHelp: 'chapter-pvesm.html', + onlineHelp: 'chapter_storage', initComponent: function() { var me = this; @@ -49,7 +49,7 @@ Ext.define('PVE.storage.Browser', { xtype: 'pveACLView', title: gettext('Permissions'), iconCls: 'fa fa-unlock', - onlineHelp: 'chapter-pveum.html', + onlineHelp: 'chapter_user_management', itemId: 'permissions', path: '/storage/' + storeid });