ui: move disks/directory stuff to tab panel

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/docs/storage.rst b/docs/storage.rst
index ea3129820d1a177945cf3ed99d12041f68aebf9f..45807b214baa1977caebe9323ce70c8efa63e5a3 100644 (file)
--- a/docs/storage.rst
+++ b/docs/storage.rst
@@ -1,6 +1,8 @@
 Storage
 =======
 
+.. _storage_disk_management:
+
 Disk Management
 ---------------
 
@@ -121,6 +123,8 @@ number of backups to keep in that store. :ref:`backup-pruning` and
 periodically based on a configured schedule (see :ref:`calendar-events`) per datastore.
 
 
+.. _storage_datastore_create:
+
 Creating a Datastore
 ^^^^^^^^^^^^^^^^^^^^
 .. image:: images/screenshots/pbs-gui-datastore-create-general.png

diff --git a/www/Makefile b/www/Makefile
index 192341ec7f91ada0314c3d634b18c917794258ea..bfea32fa6ea91e692985dcc62e90839de1df5412 100644 (file)
--- a/www/Makefile
+++ b/www/Makefile
@@ -43,6 +43,7 @@ JSSRC=                                                        \
        panel/Tasks.js                                  \
        panel/XtermJsConsole.js                         \
        panel/AccessControl.js                          \
+       panel/StorageAndDisks.js                        \
        ZFSList.js                                      \
        DirectoryList.js                                \
        LoginView.js                                    \

diff --git a/www/NavigationTree.js b/www/NavigationTree.js
index e02704393fc5d738f7a5462f061bf96791395561..e013318a34f1e4072b14a78b3db80c8d163652f2 100644 (file)
--- a/www/NavigationTree.js
+++ b/www/NavigationTree.js
@@ -62,24 +62,10 @@ Ext.define('PBS.store.NavigationStore', {
                        leaf: true,
                    },
                    {
-                       text: gettext('Disks'),
+                       text: gettext('Storage / Disks'),
                        iconCls: 'fa fa-hdd-o',
-                       path: 'pmxDiskList',
-                       leaf: false,
-                       children: [
-                           {
-                               text: Proxmox.Utils.directoryText,
-                               iconCls: 'fa fa-folder',
-                               path: 'pbsDirectoryList',
-                               leaf: true,
-                           },
-                           {
-                               text: "ZFS",
-                               iconCls: 'fa fa-th-large',
-                               path: 'pbsZFSList',
-                               leaf: true,
-                           },
-                       ],
+                       path: 'pbsStorageAndDiskPanel',
+                       leaf: true,
                    },
                ],
            },

diff --git a/www/OnlineHelpInfo.js b/www/OnlineHelpInfo.js
index 8b251ff48f3c096fbce3e19bcf63d9889d897be7..b206e47ce54e6274121b1174e2967c782f5b6fbc 100644 (file)
--- a/www/OnlineHelpInfo.js
+++ b/www/OnlineHelpInfo.js
@@ -31,6 +31,10 @@ const proxmoxOnlineHelpInfo = {
     "link": "/docs/managing-remotes.html#syncjobs",
     "title": "Sync Jobs"
   },
+  "storage-disk-management": {
+    "link": "/docs/storage.html#storage-disk-management",
+    "title": "Disk Management"
+  },
   "datastore-intro": {
     "link": "/docs/storage.html#datastore-intro",
     "title": "Datastore"

diff --git a/www/panel/StorageAndDisks.js b/www/panel/StorageAndDisks.js
new file mode 100644 (file)
index 0000000..5fd6faf
--- /dev/null
+++ b/www/panel/StorageAndDisks.js
@@ -0,0 +1,37 @@
+Ext.define('PBS.StorageAndDiskPanel', {
+    extend: 'Ext.tab.Panel',
+    alias: 'widget.pbsStorageAndDiskPanel',
+    mixins: ['Proxmox.Mixin.CBind'],
+
+    title: gettext('Storage / Disks'),
+
+    tools: [PBS.Utils.get_help_tool("storage-disk-management")],
+
+    border: false,
+    defaults: {
+       border: false,
+    },
+
+    items: [
+       {
+           xtype: 'pmxDiskList',
+           title: gettext('Disks'),
+           itemId: 'disks',
+           iconCls: 'fa fa-hdd-o',
+       },
+       {
+           xtype: 'pbsDirectoryList',
+           title: Proxmox.Utils.directoryText,
+           itemId: 'directorystorage',
+           iconCls: 'fa fa-folder',
+       },
+       {
+           xtype: 'pbsZFSList',
+           title: "ZFS",
+           nodename: 'localhost',
+           iconCls: 'fa fa-th-large',
+           itemId: 'zfsstorage',
+       },
+    ],
+
+});