Minor change to clarify shared folder creation.

[omvzfs.git] / gui / js / omv / module / admin / storage / zfs / Overview.js

diff --git a/gui/js/omv/module/admin/storage/zfs/Overview.js b/gui/js/omv/module/admin/storage/zfs/Overview.js
index 9db8915221f4ce396ea2fb1738f7607a7cf9b2e2..3c0f25f8c16eecd6904e6e0be7314be1b4cd0df0 100644 (file)
--- a/gui/js/omv/module/admin/storage/zfs/Overview.js
+++ b/gui/js/omv/module/admin/storage/zfs/Overview.js
@@ -29,7 +29,9 @@ Ext.define("OMV.module.admin.storage.zfs.ShowDetails", {
                        name: "details",
                        grow: true,
                        anchor: '100%',
-                       readOnly: true
+                       readOnly: true,
+                       preventScrollbars: true,
+                       growMax: "2000"
                }];
 
        }
@@ -177,6 +179,14 @@ Ext.define("OMV.module.admin.storage.zfs.AddPool", {
                                ptype: "fieldinfo",
                                text: _("Optional mountpoint for the pool. Default is to use pool name.")
                        }]
+               },{
+                       xtype: "checkbox",
+                       name: "diskpath",
+                       fieldLabel: _("Disk-by-path"),
+                       plugins: [{
+                               ptype: "fieldinfo",
+                               text: _("Use /dev/disk/by-path when creating the pool. Recommended.")
+                       }]
                },{
                        xtype: "checkbox",
                        name: "force",
@@ -261,23 +271,33 @@ Ext.define("OMV.module.admin.storage.zfs.AddObject", {
                                        var sizeField = this.findField("size");
                                        var cloneField = this.findField("clonename");
                                        var nameField = this.findField("name");
+                                       var mountField = this.findField("mountpoint");
                                        switch(value) {
+                                               case "filesystem":
+                                                       sizeField.hide();
+                                                       sizeField.allowBlank = true;
+                                                       cloneField.hide();
+                                                       nameField.show();
+                                                       mountField.show();
                                                case "volume":
                                                        sizeField.show();
                                                        sizeField.allowBlank = false;
                                                        cloneField.hide();
                                                        nameField.show();
+                                                       mountField.hide();
                                                break;
                                                case "clone":
                                                        sizeField.hide();
                                                        sizeField.allowBlank = true;
                                                        cloneField.show();
                                                        nameField.hide();
+                                                       mountField.hide();
                                                default:
                                                        sizeField.hide();
                                                        sizeField.allowBlank = true;
                                                        cloneField.hide();
                                                        nameField.show();
+                                                       mountField.hide();
                                                break;
                                        }
                                        sizeField.validate();
@@ -324,6 +344,26 @@ Ext.define("OMV.module.admin.storage.zfs.AddObject", {
                                        }
                                }
                        }
+               },{
+                       xtype: "textfield",
+                       name: "mountpoint",
+                       fieldLabel: _("Mountpoint"),
+                       allowBlank: true,
+                       plugins: [{
+                               ptype: "fieldinfo",
+                               text: _("Optional mountpoint of the filesystem. If left blank parent mountpoint will be prepended to name of the filesystem.")
+                       }],
+                       listeners: {
+                               scope: me,
+                               beforerender: function(e, eOpts) {
+                                       var mountField = this.findField("mountpoint");
+                                       if (combodata[0][0] === "filesystem") {
+                                               mountField.show();
+                                       } else {
+                                               mountField.hide();
+                                       }
+                               }
+                       }
                },{
                        xtype: "textfield",
                        name: "clonename",
@@ -497,6 +537,14 @@ Ext.define("OMV.module.admin.storage.zfs.ExpandPool", {
                                        flex: 1
                                }]
                        }
+               },{
+                       xtype: "checkbox",
+                       name: "diskpath",
+                       fieldLabel: _("Disk-by-path"),
+                       plugins: [{
+                               ptype: "fieldinfo",
+                               text: _("Use /dev/disk/by-path when creating the vdev. Recommended.")
+                       }]
                },{
                        xtype: "checkbox",
                        name: "force",
@@ -839,11 +887,11 @@ Ext.define("OMV.module.admin.storage.zfs.Overview", {
                flex: 1,
                stateId: 'mountpoint'
        },{
-               text: _("Share"),
+               text: _("Share folder"),
                xtype: 'actioncolumn',
                tooltip: 'Create shared folder',
                align: 'center',
-               icon: 'images/checkmark.png',
+               icon: 'images/share.png',
                handler: function(view, rowIndex, colIndex, item, e, record, row) {
                        var me = this;
                        Ext.create("OMV.module.admin.storage.zfs.CreateShare", {