diff --git a/Makefile b/Makefile index 80d511da..dc5f3a51 100644 --- a/Makefile +++ b/Makefile @@ -100,8 +100,8 @@ install: country.dat vznet.conf vzdump.conf vzdump-hook-script.pl pve-apt.conf p install -m 0644 copyright ${DOCDIR} install -m 0644 debian/changelog.Debian ${DOCDIR} install -m 0644 country.dat ${DESTDIR}/usr/share/${PACKAGE} - # temporary: set ExtJS 5 migration devel directory - install -d ${DESTDIR}/usr/share/${PACKAGE}/manager5 + # temporary: set ExtJS 6 migration devel directory + install -d ${DESTDIR}/usr/share/${PACKAGE}/manager6 set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done .PHONY: distclean diff --git a/www/manager5/Parser.js b/www/manager6/Parser.js similarity index 100% rename from www/manager5/Parser.js rename to www/manager6/Parser.js diff --git a/www/manager5/Readme.md b/www/manager6/Readme.md similarity index 91% rename from www/manager5/Readme.md rename to www/manager6/Readme.md index 1c1ccf95..81c3b263 100644 --- a/www/manager5/Readme.md +++ b/www/manager6/Readme.md @@ -9,7 +9,7 @@ unpack the ExtJS 6 sources, and copy them to /usr/share/pve-manager/ext6 symlink the ext6 dir in pve-manager to the manager5 directory cd /usr/share/pve-manager - ln -s PATH_TO_YOUR_GIT_REPO/www/manager5 #this is not a typo + ln -s PATH_TO_YOUR_GIT_REPO/www/manager6 access the PVE proxy with ExtJS 6 diff --git a/www/manager5/StateProvider.js b/www/manager6/StateProvider.js similarity index 100% rename from www/manager5/StateProvider.js rename to www/manager6/StateProvider.js diff --git a/www/manager5/Toolkit.js b/www/manager6/Toolkit.js similarity index 100% rename from www/manager5/Toolkit.js rename to www/manager6/Toolkit.js diff --git a/www/manager5/Utils.js b/www/manager6/Utils.js similarity index 100% rename from www/manager5/Utils.js rename to www/manager6/Utils.js diff --git a/www/manager5/VNCConsole.js b/www/manager6/VNCConsole.js similarity index 100% rename from www/manager5/VNCConsole.js rename to www/manager6/VNCConsole.js diff --git a/www/manager5/Workspace.js b/www/manager6/Workspace.js similarity index 100% rename from www/manager5/Workspace.js rename to www/manager6/Workspace.js diff --git a/www/manager5/button/Button.js b/www/manager6/button/Button.js similarity index 100% rename from www/manager5/button/Button.js rename to www/manager6/button/Button.js diff --git a/www/manager5/button/ConsoleButton.js b/www/manager6/button/ConsoleButton.js similarity index 100% rename from www/manager5/button/ConsoleButton.js rename to www/manager6/button/ConsoleButton.js diff --git a/www/manager5/data/DiffStore.js b/www/manager6/data/DiffStore.js similarity index 100% rename from www/manager5/data/DiffStore.js rename to www/manager6/data/DiffStore.js diff --git a/www/manager5/data/ObjectStore.js b/www/manager6/data/ObjectStore.js similarity index 100% rename from www/manager5/data/ObjectStore.js rename to www/manager6/data/ObjectStore.js diff --git a/www/manager5/data/PVEProxy.js b/www/manager6/data/PVEProxy.js similarity index 100% rename from www/manager5/data/PVEProxy.js rename to www/manager6/data/PVEProxy.js diff --git a/www/manager5/data/ResourceStore.js b/www/manager6/data/ResourceStore.js similarity index 100% rename from www/manager5/data/ResourceStore.js rename to www/manager6/data/ResourceStore.js diff --git a/www/manager5/data/TimezoneStore.js b/www/manager6/data/TimezoneStore.js similarity index 100% rename from www/manager5/data/TimezoneStore.js rename to www/manager6/data/TimezoneStore.js diff --git a/www/manager5/data/UpdateQueue.js b/www/manager6/data/UpdateQueue.js similarity index 100% rename from www/manager5/data/UpdateQueue.js rename to www/manager6/data/UpdateQueue.js diff --git a/www/manager5/data/UpdateStore.js b/www/manager6/data/UpdateStore.js similarity index 100% rename from www/manager5/data/UpdateStore.js rename to www/manager6/data/UpdateStore.js diff --git a/www/manager5/data/reader/JsonObject.js b/www/manager6/data/reader/JsonObject.js similarity index 100% rename from www/manager5/data/reader/JsonObject.js rename to www/manager6/data/reader/JsonObject.js diff --git a/www/manager5/dc/ACLView.js b/www/manager6/dc/ACLView.js similarity index 100% rename from www/manager5/dc/ACLView.js rename to www/manager6/dc/ACLView.js diff --git a/www/manager5/dc/AuthEdit.js b/www/manager6/dc/AuthEdit.js similarity index 100% rename from www/manager5/dc/AuthEdit.js rename to www/manager6/dc/AuthEdit.js diff --git a/www/manager5/dc/AuthView.js b/www/manager6/dc/AuthView.js similarity index 100% rename from www/manager5/dc/AuthView.js rename to www/manager6/dc/AuthView.js diff --git a/www/manager5/dc/Backup.js b/www/manager6/dc/Backup.js similarity index 100% rename from www/manager5/dc/Backup.js rename to www/manager6/dc/Backup.js diff --git a/www/manager5/dc/Config.js b/www/manager6/dc/Config.js similarity index 100% rename from www/manager5/dc/Config.js rename to www/manager6/dc/Config.js diff --git a/www/manager5/dc/GroupEdit.js b/www/manager6/dc/GroupEdit.js similarity index 100% rename from www/manager5/dc/GroupEdit.js rename to www/manager6/dc/GroupEdit.js diff --git a/www/manager5/dc/GroupView.js b/www/manager6/dc/GroupView.js similarity index 100% rename from www/manager5/dc/GroupView.js rename to www/manager6/dc/GroupView.js diff --git a/www/manager5/dc/Log.js b/www/manager6/dc/Log.js similarity index 100% rename from www/manager5/dc/Log.js rename to www/manager6/dc/Log.js diff --git a/www/manager5/dc/OptionView.js b/www/manager6/dc/OptionView.js similarity index 100% rename from www/manager5/dc/OptionView.js rename to www/manager6/dc/OptionView.js diff --git a/www/manager5/dc/PoolEdit.js b/www/manager6/dc/PoolEdit.js similarity index 100% rename from www/manager5/dc/PoolEdit.js rename to www/manager6/dc/PoolEdit.js diff --git a/www/manager5/dc/PoolView.js b/www/manager6/dc/PoolView.js similarity index 100% rename from www/manager5/dc/PoolView.js rename to www/manager6/dc/PoolView.js diff --git a/www/manager5/dc/RoleView.js b/www/manager6/dc/RoleView.js similarity index 100% rename from www/manager5/dc/RoleView.js rename to www/manager6/dc/RoleView.js diff --git a/www/manager5/dc/SecurityGroups.js b/www/manager6/dc/SecurityGroups.js similarity index 100% rename from www/manager5/dc/SecurityGroups.js rename to www/manager6/dc/SecurityGroups.js diff --git a/www/manager5/dc/StorageView.js b/www/manager6/dc/StorageView.js similarity index 100% rename from www/manager5/dc/StorageView.js rename to www/manager6/dc/StorageView.js diff --git a/www/manager5/dc/Summary.js b/www/manager6/dc/Summary.js similarity index 100% rename from www/manager5/dc/Summary.js rename to www/manager6/dc/Summary.js diff --git a/www/manager5/dc/Support.js b/www/manager6/dc/Support.js similarity index 100% rename from www/manager5/dc/Support.js rename to www/manager6/dc/Support.js diff --git a/www/manager5/dc/Tasks.js b/www/manager6/dc/Tasks.js similarity index 100% rename from www/manager5/dc/Tasks.js rename to www/manager6/dc/Tasks.js diff --git a/www/manager5/dc/UserEdit.js b/www/manager6/dc/UserEdit.js similarity index 100% rename from www/manager5/dc/UserEdit.js rename to www/manager6/dc/UserEdit.js diff --git a/www/manager5/dc/UserView.js b/www/manager6/dc/UserView.js similarity index 100% rename from www/manager5/dc/UserView.js rename to www/manager6/dc/UserView.js diff --git a/www/manager5/form/BackupModeSelector.js b/www/manager6/form/BackupModeSelector.js similarity index 100% rename from www/manager5/form/BackupModeSelector.js rename to www/manager6/form/BackupModeSelector.js diff --git a/www/manager5/form/BondModeSelector.js b/www/manager6/form/BondModeSelector.js similarity index 100% rename from www/manager5/form/BondModeSelector.js rename to www/manager6/form/BondModeSelector.js diff --git a/www/manager5/form/Boolean.js b/www/manager6/form/Boolean.js similarity index 100% rename from www/manager5/form/Boolean.js rename to www/manager6/form/Boolean.js diff --git a/www/manager5/form/BridgeSelector.js b/www/manager6/form/BridgeSelector.js similarity index 100% rename from www/manager5/form/BridgeSelector.js rename to www/manager6/form/BridgeSelector.js diff --git a/www/manager5/form/BusTypeSelector.js b/www/manager6/form/BusTypeSelector.js similarity index 100% rename from www/manager5/form/BusTypeSelector.js rename to www/manager6/form/BusTypeSelector.js diff --git a/www/manager5/form/CPUModelSelector.js b/www/manager6/form/CPUModelSelector.js similarity index 100% rename from www/manager5/form/CPUModelSelector.js rename to www/manager6/form/CPUModelSelector.js diff --git a/www/manager5/form/CacheTypeSelector.js b/www/manager6/form/CacheTypeSelector.js similarity index 100% rename from www/manager5/form/CacheTypeSelector.js rename to www/manager6/form/CacheTypeSelector.js diff --git a/www/manager5/form/Checkbox.js b/www/manager6/form/Checkbox.js similarity index 100% rename from www/manager5/form/Checkbox.js rename to www/manager6/form/Checkbox.js diff --git a/www/manager5/form/ComboGrid.js b/www/manager6/form/ComboGrid.js similarity index 100% rename from www/manager5/form/ComboGrid.js rename to www/manager6/form/ComboGrid.js diff --git a/www/manager5/form/CompressionSelector.js b/www/manager6/form/CompressionSelector.js similarity index 100% rename from www/manager5/form/CompressionSelector.js rename to www/manager6/form/CompressionSelector.js diff --git a/www/manager5/form/ContentTypeSelector.js b/www/manager6/form/ContentTypeSelector.js similarity index 100% rename from www/manager5/form/ContentTypeSelector.js rename to www/manager6/form/ContentTypeSelector.js diff --git a/www/manager5/form/ControllerSelector.js b/www/manager6/form/ControllerSelector.js similarity index 100% rename from www/manager5/form/ControllerSelector.js rename to www/manager6/form/ControllerSelector.js diff --git a/www/manager5/form/DayOfWeekSelector.js b/www/manager6/form/DayOfWeekSelector.js similarity index 100% rename from www/manager5/form/DayOfWeekSelector.js rename to www/manager6/form/DayOfWeekSelector.js diff --git a/www/manager5/form/DiskFormatSelector.js b/www/manager6/form/DiskFormatSelector.js similarity index 100% rename from www/manager5/form/DiskFormatSelector.js rename to www/manager6/form/DiskFormatSelector.js diff --git a/www/manager5/form/DisplaySelector.js b/www/manager6/form/DisplaySelector.js similarity index 100% rename from www/manager5/form/DisplaySelector.js rename to www/manager6/form/DisplaySelector.js diff --git a/www/manager5/form/EmailNotificationSelector.js b/www/manager6/form/EmailNotificationSelector.js similarity index 100% rename from www/manager5/form/EmailNotificationSelector.js rename to www/manager6/form/EmailNotificationSelector.js diff --git a/www/manager5/form/FileSelector.js b/www/manager6/form/FileSelector.js similarity index 100% rename from www/manager5/form/FileSelector.js rename to www/manager6/form/FileSelector.js diff --git a/www/manager5/form/FirewallPolicySelector.js b/www/manager6/form/FirewallPolicySelector.js similarity index 100% rename from www/manager5/form/FirewallPolicySelector.js rename to www/manager6/form/FirewallPolicySelector.js diff --git a/www/manager5/form/GroupSelector.js b/www/manager6/form/GroupSelector.js similarity index 100% rename from www/manager5/form/GroupSelector.js rename to www/manager6/form/GroupSelector.js diff --git a/www/manager5/form/HotplugFeatureSelector.js b/www/manager6/form/HotplugFeatureSelector.js similarity index 100% rename from www/manager5/form/HotplugFeatureSelector.js rename to www/manager6/form/HotplugFeatureSelector.js diff --git a/www/manager5/form/IPProtocolSelector.js b/www/manager6/form/IPProtocolSelector.js similarity index 100% rename from www/manager5/form/IPProtocolSelector.js rename to www/manager6/form/IPProtocolSelector.js diff --git a/www/manager5/form/IPRefSelector.js b/www/manager6/form/IPRefSelector.js similarity index 100% rename from www/manager5/form/IPRefSelector.js rename to www/manager6/form/IPRefSelector.js diff --git a/www/manager5/form/KVComboBox.js b/www/manager6/form/KVComboBox.js similarity index 100% rename from www/manager5/form/KVComboBox.js rename to www/manager6/form/KVComboBox.js diff --git a/www/manager5/form/LanguageSelector.js b/www/manager6/form/LanguageSelector.js similarity index 100% rename from www/manager5/form/LanguageSelector.js rename to www/manager6/form/LanguageSelector.js diff --git a/www/manager5/form/MemoryField.js b/www/manager6/form/MemoryField.js similarity index 100% rename from www/manager5/form/MemoryField.js rename to www/manager6/form/MemoryField.js diff --git a/www/manager5/form/NetworkCardSelector.js b/www/manager6/form/NetworkCardSelector.js similarity index 100% rename from www/manager5/form/NetworkCardSelector.js rename to www/manager6/form/NetworkCardSelector.js diff --git a/www/manager5/form/NodeSelector.js b/www/manager6/form/NodeSelector.js similarity index 100% rename from www/manager5/form/NodeSelector.js rename to www/manager6/form/NodeSelector.js diff --git a/www/manager5/form/PoolSelector.js b/www/manager6/form/PoolSelector.js similarity index 100% rename from www/manager5/form/PoolSelector.js rename to www/manager6/form/PoolSelector.js diff --git a/www/manager5/form/RRDTypeSelector.js b/www/manager6/form/RRDTypeSelector.js similarity index 100% rename from www/manager5/form/RRDTypeSelector.js rename to www/manager6/form/RRDTypeSelector.js diff --git a/www/manager5/form/RealmComboBox.js b/www/manager6/form/RealmComboBox.js similarity index 100% rename from www/manager5/form/RealmComboBox.js rename to www/manager6/form/RealmComboBox.js diff --git a/www/manager5/form/RoleSelector.js b/www/manager6/form/RoleSelector.js similarity index 100% rename from www/manager5/form/RoleSelector.js rename to www/manager6/form/RoleSelector.js diff --git a/www/manager5/form/ScsiHwSelector.js b/www/manager6/form/ScsiHwSelector.js similarity index 100% rename from www/manager5/form/ScsiHwSelector.js rename to www/manager6/form/ScsiHwSelector.js diff --git a/www/manager5/form/SecurityGroupSelector.js b/www/manager6/form/SecurityGroupSelector.js similarity index 100% rename from www/manager5/form/SecurityGroupSelector.js rename to www/manager6/form/SecurityGroupSelector.js diff --git a/www/manager5/form/SnapshotSelector.js b/www/manager6/form/SnapshotSelector.js similarity index 100% rename from www/manager5/form/SnapshotSelector.js rename to www/manager6/form/SnapshotSelector.js diff --git a/www/manager5/form/StorageSelector.js b/www/manager6/form/StorageSelector.js similarity index 100% rename from www/manager5/form/StorageSelector.js rename to www/manager6/form/StorageSelector.js diff --git a/www/manager5/form/TextField.js b/www/manager6/form/TextField.js similarity index 100% rename from www/manager5/form/TextField.js rename to www/manager6/form/TextField.js diff --git a/www/manager5/form/UserSelector.js b/www/manager6/form/UserSelector.js similarity index 100% rename from www/manager5/form/UserSelector.js rename to www/manager6/form/UserSelector.js diff --git a/www/manager5/form/VLanField.js b/www/manager6/form/VLanField.js similarity index 100% rename from www/manager5/form/VLanField.js rename to www/manager6/form/VLanField.js diff --git a/www/manager5/form/VMIDSelector.js b/www/manager6/form/VMIDSelector.js similarity index 100% rename from www/manager5/form/VMIDSelector.js rename to www/manager6/form/VMIDSelector.js diff --git a/www/manager5/form/VNCKeyboardSelector.js b/www/manager6/form/VNCKeyboardSelector.js similarity index 100% rename from www/manager5/form/VNCKeyboardSelector.js rename to www/manager6/form/VNCKeyboardSelector.js diff --git a/www/manager5/form/ViewSelector.js b/www/manager6/form/ViewSelector.js similarity index 100% rename from www/manager5/form/ViewSelector.js rename to www/manager6/form/ViewSelector.js diff --git a/www/manager5/form/iScsiProviderSelector.js b/www/manager6/form/iScsiProviderSelector.js similarity index 100% rename from www/manager5/form/iScsiProviderSelector.js rename to www/manager6/form/iScsiProviderSelector.js diff --git a/www/manager5/grid/BackupView.js b/www/manager6/grid/BackupView.js similarity index 100% rename from www/manager5/grid/BackupView.js rename to www/manager6/grid/BackupView.js diff --git a/www/manager5/grid/CheckColumn.js b/www/manager6/grid/CheckColumn.js similarity index 100% rename from www/manager5/grid/CheckColumn.js rename to www/manager6/grid/CheckColumn.js diff --git a/www/manager5/grid/FirewallAliases.js b/www/manager6/grid/FirewallAliases.js similarity index 100% rename from www/manager5/grid/FirewallAliases.js rename to www/manager6/grid/FirewallAliases.js diff --git a/www/manager5/grid/FirewallOptions.js b/www/manager6/grid/FirewallOptions.js similarity index 100% rename from www/manager5/grid/FirewallOptions.js rename to www/manager6/grid/FirewallOptions.js diff --git a/www/manager5/grid/FirewallRules.js b/www/manager6/grid/FirewallRules.js similarity index 100% rename from www/manager5/grid/FirewallRules.js rename to www/manager6/grid/FirewallRules.js diff --git a/www/manager5/grid/ObjectGrid.js b/www/manager6/grid/ObjectGrid.js similarity index 100% rename from www/manager5/grid/ObjectGrid.js rename to www/manager6/grid/ObjectGrid.js diff --git a/www/manager5/grid/PendingObjectGrid.js b/www/manager6/grid/PendingObjectGrid.js similarity index 100% rename from www/manager5/grid/PendingObjectGrid.js rename to www/manager6/grid/PendingObjectGrid.js diff --git a/www/manager5/grid/PoolMembers.js b/www/manager6/grid/PoolMembers.js similarity index 100% rename from www/manager5/grid/PoolMembers.js rename to www/manager6/grid/PoolMembers.js diff --git a/www/manager5/grid/ResourceGrid.js b/www/manager6/grid/ResourceGrid.js similarity index 100% rename from www/manager5/grid/ResourceGrid.js rename to www/manager6/grid/ResourceGrid.js diff --git a/www/manager5/grid/SelectFeature.js b/www/manager6/grid/SelectFeature.js similarity index 100% rename from www/manager5/grid/SelectFeature.js rename to www/manager6/grid/SelectFeature.js diff --git a/www/manager5/panel/ConfigPanel.js b/www/manager6/panel/ConfigPanel.js similarity index 100% rename from www/manager5/panel/ConfigPanel.js rename to www/manager6/panel/ConfigPanel.js diff --git a/www/manager5/panel/Firewall.js b/www/manager6/panel/Firewall.js similarity index 100% rename from www/manager5/panel/Firewall.js rename to www/manager6/panel/Firewall.js diff --git a/www/manager5/panel/IPSet.js b/www/manager6/panel/IPSet.js similarity index 100% rename from www/manager5/panel/IPSet.js rename to www/manager6/panel/IPSet.js diff --git a/www/manager5/panel/InputPanel.js b/www/manager6/panel/InputPanel.js similarity index 100% rename from www/manager5/panel/InputPanel.js rename to www/manager6/panel/InputPanel.js diff --git a/www/manager5/panel/LogView.js b/www/manager6/panel/LogView.js similarity index 100% rename from www/manager5/panel/LogView.js rename to www/manager6/panel/LogView.js diff --git a/www/manager5/panel/NotesView.js b/www/manager6/panel/NotesView.js similarity index 100% rename from www/manager5/panel/NotesView.js rename to www/manager6/panel/NotesView.js diff --git a/www/manager5/panel/RRDView.js b/www/manager6/panel/RRDView.js similarity index 100% rename from www/manager5/panel/RRDView.js rename to www/manager6/panel/RRDView.js diff --git a/www/manager5/panel/StatusPanel.js b/www/manager6/panel/StatusPanel.js similarity index 100% rename from www/manager5/panel/StatusPanel.js rename to www/manager6/panel/StatusPanel.js diff --git a/www/manager5/panel/SubConfigPanel.js b/www/manager6/panel/SubConfigPanel.js similarity index 100% rename from www/manager5/panel/SubConfigPanel.js rename to www/manager6/panel/SubConfigPanel.js diff --git a/www/manager5/pool/Config.js b/www/manager6/pool/Config.js similarity index 100% rename from www/manager5/pool/Config.js rename to www/manager6/pool/Config.js diff --git a/www/manager5/pool/StatusView.js b/www/manager6/pool/StatusView.js similarity index 100% rename from www/manager5/pool/StatusView.js rename to www/manager6/pool/StatusView.js diff --git a/www/manager5/pool/Summary.js b/www/manager6/pool/Summary.js similarity index 100% rename from www/manager5/pool/Summary.js rename to www/manager6/pool/Summary.js diff --git a/www/manager5/tree/ResourceTree.js b/www/manager6/tree/ResourceTree.js similarity index 100% rename from www/manager5/tree/ResourceTree.js rename to www/manager6/tree/ResourceTree.js diff --git a/www/manager5/window/Backup.js b/www/manager6/window/Backup.js similarity index 100% rename from www/manager5/window/Backup.js rename to www/manager6/window/Backup.js diff --git a/www/manager5/window/Edit.js b/www/manager6/window/Edit.js similarity index 100% rename from www/manager5/window/Edit.js rename to www/manager6/window/Edit.js diff --git a/www/manager5/window/LoginWindow.js b/www/manager6/window/LoginWindow.js similarity index 100% rename from www/manager5/window/LoginWindow.js rename to www/manager6/window/LoginWindow.js diff --git a/www/manager5/window/Migrate.js b/www/manager6/window/Migrate.js similarity index 100% rename from www/manager5/window/Migrate.js rename to www/manager6/window/Migrate.js diff --git a/www/manager5/window/MigrateAll.js b/www/manager6/window/MigrateAll.js similarity index 100% rename from www/manager5/window/MigrateAll.js rename to www/manager6/window/MigrateAll.js diff --git a/www/manager5/window/NotesEdit.js b/www/manager6/window/NotesEdit.js similarity index 100% rename from www/manager5/window/NotesEdit.js rename to www/manager6/window/NotesEdit.js diff --git a/www/manager5/window/Restore.js b/www/manager6/window/Restore.js similarity index 100% rename from www/manager5/window/Restore.js rename to www/manager6/window/Restore.js diff --git a/www/manager5/window/TaskViewer.js b/www/manager6/window/TaskViewer.js similarity index 100% rename from www/manager5/window/TaskViewer.js rename to www/manager6/window/TaskViewer.js diff --git a/www/manager5/window/Wizard.js b/www/manager6/window/Wizard.js similarity index 100% rename from www/manager5/window/Wizard.js rename to www/manager6/window/Wizard.js