Proxmox/pve-manager
5
0
Fork 0
Code Pull Requests Releases Activity

remove displayfield height hack

Browse Source 
this did not work anymore,
instead overwrite css for displayfields to have correct
min-height

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2016-04-06 11:44:03 +02:00 committed by Dietmar Maurer
parent b9722f5292
commit 5ca0c804c6
21 changed files with 5 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
www/css/ext6-pve.css
View File

@ -220,3 +220,8 @@
background-image:url(../images/virt-viewer.png);
}
/* displayfield minheight is wrong */
.x-form-display-field-default {
min-height: 20px;
}

1
www/manager6/dc/AuthEdit.js
View File

@ -24,7 +24,6 @@ Ext.define('PVE.dc.AuthEdit', {
var column1 = [
{
xtype: me.create ? 'textfield' : 'displayfield',
height: 22, // hack: set same height as text fields
name: 'realm',
fieldLabel: gettext('Realm'),
value: me.realm,

1
www/manager6/dc/UserEdit.js
View File

@ -69,7 +69,6 @@ Ext.define('PVE.dc.UserEdit', {
var column1 = [
{
xtype: me.create ? 'textfield' : 'displayfield',
height: 22, // hack: set same height as text fields
name: 'userid',
fieldLabel: gettext('User name'),
value: me.userid,

2
www/manager6/form/Checkbox.js
View File

@ -9,8 +9,6 @@ Ext.define('PVE.form.Checkbox', {
inputValue: '1',
height: 22, // hack: set same height as text fields
getSubmitData: function() {
var me = this,
data = null,

1
www/manager6/form/ControllerSelector.js
View File

@ -59,7 +59,6 @@ Ext.define('PVE.form.ControllerSelector', {
Ext.apply(me, {
fieldLabel: gettext('Bus/Device'),
layout: 'hbox',
height: 22, // hack: set to same height as other fields
defaults: {
flex: 1,
hideLabel: true

4
www/manager6/grid/FirewallRules.js
View File

@ -115,7 +115,6 @@ Ext.define('PVE.FirewallRulePanel', {
me.column1.push({
xtype: 'displayfield',
fieldLabel: '',
height: 22, // hack: set same height as text fields
value: ''
});
}
@ -154,7 +153,6 @@ Ext.define('PVE.FirewallRulePanel', {
xtype: 'pvecheckbox',
name: 'enable',
checked: false,
height: 22, // hack: set same height as text fields
uncheckedValue: 0,
fieldLabel: gettext('Enable')
},
@ -204,7 +202,6 @@ Ext.define('PVE.FirewallRulePanel', {
{
xtype: 'textfield',
name: 'dport',
height: 22, // hack: set same height as text fields
value: '',
fieldLabel: gettext('Dest. port')
}
@ -340,7 +337,6 @@ Ext.define('PVE.FirewallGroupRuleEdit', {
xtype: 'pvecheckbox',
name: 'enable',
checked: false,
height: 22, // hack: set same height as text fields
uncheckedValue: 0,
fieldLabel: gettext('Enable')
}

1
www/manager6/ha/GroupEdit.js
View File

@ -20,7 +20,6 @@ Ext.define('PVE.ha.GroupInputPanel', {
{
xtype: me.create ? 'textfield' : 'displayfield',
name: 'group',
height: 22, // hack: set same height as text fields
value: me.groupId || '',
fieldLabel: 'ID',
vtype: 'StorageId',

3
www/manager6/lxc/Network.js
View File

@ -101,7 +101,6 @@ Ext.define('PVE.lxc.NetworkInputPanel', {
{
xtype: 'textfield',
name: 'name',
height: 22, // hack: set same height as text fields
fieldLabel: gettext('Name') + ' (i.e. eth0)',
allowBlank: false,
value: cdata.name,
@ -171,7 +170,6 @@ Ext.define('PVE.lxc.NetworkInputPanel', {
},
border: false,
margin: '0 0 5 0',
height: 22, // hack: set same height as text fields
items: [
{
xtype: 'label',
@ -230,7 +228,6 @@ Ext.define('PVE.lxc.NetworkInputPanel', {
},
border: false,
margin: '0 0 5 0',
height: 22, // hack: set same height as text fields
items: [
{
xtype: 'label',

3
www/manager6/node/NetworkEdit.js
View File

@ -80,7 +80,6 @@ Ext.define('PVE.node.NetworkEdit', {
} else if (me.iftype === 'OVSPort' || me.iftype === 'OVSIntPort') {
column2.push({
xtype: me.create ? 'PVE.form.BridgeSelector' : 'displayfield',
height: 22, // hack: set same height as text fields
fieldLabel: PVE.Utils.render_network_iface_type('OVSBridge'),
allowBlank: false,
nodename: nodename,
@ -136,7 +135,6 @@ Ext.define('PVE.node.NetworkEdit', {
} else if (me.iftype === 'OVSBond') {
column2.push({
xtype: me.create ? 'PVE.form.BridgeSelector' : 'displayfield',
height: 22, // hack: set same height as text fields
fieldLabel: PVE.Utils.render_network_iface_type('OVSBridge'),
allowBlank: false,
nodename: nodename,
@ -176,7 +174,6 @@ Ext.define('PVE.node.NetworkEdit', {
{
xtype: me.create ? 'textfield' : 'displayfield',
fieldLabel: gettext('Name'),
height: 22, // hack: set same height as text fields
name: 'iface',
value: me.iface,
vtype: iface_vtype,

2
www/manager6/panel/IPSet.js
View File

@ -210,7 +210,6 @@ Ext.define('PVE.IPSetCidrEdit', {
column1.push({
xtype: 'displayfield',
name: 'cidr',
height: 22, // hack: set same height as text fields
value: '',
fieldLabel: gettext('IP/CIDR')
});
@ -224,7 +223,6 @@ Ext.define('PVE.IPSetCidrEdit', {
xtype: 'pvecheckbox',
name: 'nomatch',
checked: false,
height: 22, // hack: set same height as text fields
uncheckedValue: 0,
fieldLabel: 'nomatch'
}

3
www/manager6/qemu/NetworkEdit.js
View File

@ -75,7 +75,6 @@ Ext.define('PVE.qemu.NetworkInputPanel', {
{
xtype: 'radiofield',
name: 'networkmode',
height: 22, // hack: set same height as text fields
inputValue: 'bridge',
boxLabel: gettext('Bridged mode'),
checked: true,
@ -108,7 +107,6 @@ Ext.define('PVE.qemu.NetworkInputPanel', {
{
xtype: 'radiofield',
name: 'networkmode',
height: 22, // hack: set same height as text fields
inputValue: 'nat',
boxLabel: gettext('NAT mode')
}
@ -118,7 +116,6 @@ Ext.define('PVE.qemu.NetworkInputPanel', {
me.column1.push({
xtype: 'radiofield',
name: 'networkmode',
height: 22, // hack: set same height as text fields
inputValue: 'none',
boxLabel: gettext('No network device')
});

2
www/manager6/storage/DirEdit.js
View File

@ -24,7 +24,6 @@ Ext.define('PVE.storage.DirInputPanel', {
{
xtype: me.create ? 'textfield' : 'displayfield',
name: 'storage',
height: 22, // hack: set same height as text fields
value: me.storageId || '',
fieldLabel: 'ID',
vtype: 'StorageId',
@ -32,7 +31,6 @@ Ext.define('PVE.storage.DirInputPanel', {
},
{
xtype: me.create ? 'textfield' : 'displayfield',
height: 22, // hack: set same height as text fields
name: 'path',
value: '',
fieldLabel: gettext('Directory'),

4
www/manager6/storage/GlusterFsEdit.js
View File

@ -81,7 +81,6 @@ Ext.define('PVE.storage.GlusterFsInputPanel', {
{
xtype: me.create ? 'textfield' : 'displayfield',
name: 'storage',
height: 22, // hack: set same height as text fields
value: me.storageId || '',
fieldLabel: 'ID',
vtype: 'StorageId',
@ -89,7 +88,6 @@ Ext.define('PVE.storage.GlusterFsInputPanel', {
},
{
xtype: me.create ? 'textfield' : 'displayfield',
height: 22, // hack: set same height as text fields
name: 'server',
value: '',
fieldLabel: gettext('Server'),
@ -106,7 +104,6 @@ Ext.define('PVE.storage.GlusterFsInputPanel', {
},
{
xtype: me.create ? 'pvetextfield' : 'displayfield',
height: 22, // hack: set same height as text fields
name: 'server2',
value: '',
fieldLabel: gettext('Second Server'),
@ -114,7 +111,6 @@ Ext.define('PVE.storage.GlusterFsInputPanel', {
},
{
xtype: me.create ? 'pveGlusterFsScan' : 'displayfield',
height: 22, // hack: set same height as text fields
name: 'volume',
value: '',
fieldLabel: 'Volume name',

2
www/manager6/storage/IScsiEdit.js
View File

@ -83,7 +83,6 @@ Ext.define('PVE.storage.IScsiInputPanel', {
{
xtype: me.create ? 'textfield' : 'displayfield',
name: 'storage',
height: 22, // hack: set same height as text fields
value: me.storageId || '',
fieldLabel: 'ID',
vtype: 'StorageId',
@ -91,7 +90,6 @@ Ext.define('PVE.storage.IScsiInputPanel', {
},
{
xtype: me.create ? 'textfield' : 'displayfield',
height: 22, // hack: set same height as text fields
name: 'portal',
value: '',
fieldLabel: 'Portal',

2
www/manager6/storage/LVMEdit.js
View File

@ -104,7 +104,6 @@ Ext.define('PVE.storage.LVMInputPanel', {
{
xtype: me.create ? 'textfield' : 'displayfield',
name: 'storage',
height: 22, // hack: set same height as text fields
value: me.storageId || '',
fieldLabel: 'ID',
vtype: 'StorageId',
@ -114,7 +113,6 @@ Ext.define('PVE.storage.LVMInputPanel', {
];
var vgnameField = Ext.createWidget(me.create ? 'textfield' : 'displayfield', {
height: 22, // hack: set same height as text fields
name: 'vgname',
hidden: !!me.create,
disabled: !!me.create,

3
www/manager6/storage/LvmThinEdit.js
View File

@ -114,7 +114,6 @@ Ext.define('PVE.storage.LvmThinInputPanel', {
{
xtype: me.create ? 'textfield' : 'displayfield',
name: 'storage',
height: 22, // hack: set same height as text fields
value: me.storageId || '',
fieldLabel: 'ID',
vtype: 'StorageId',
@ -124,7 +123,6 @@ Ext.define('PVE.storage.LvmThinInputPanel', {
];
var vgnameField = Ext.createWidget(me.create ? 'textfield' : 'displayfield', {
height: 22, // hack: set same height as text fields
name: 'vgname',
hidden: !!me.create,
disabled: !!me.create,
@ -134,7 +132,6 @@ Ext.define('PVE.storage.LvmThinInputPanel', {
});
var thinpoolField = Ext.createWidget(me.create ? 'textfield' : 'displayfield', {
height: 22, // hack: set same height as text fields
name: 'thinpool',
hidden: !!me.create,
disabled: !!me.create,

3
www/manager6/storage/NFSEdit.js
View File

@ -84,7 +84,6 @@ Ext.define('PVE.storage.NFSInputPanel', {
{
xtype: me.create ? 'textfield' : 'displayfield',
name: 'storage',
height: 22, // hack: set same height as text fields
value: me.storageId || '',
fieldLabel: 'ID',
vtype: 'StorageId',
@ -92,7 +91,6 @@ Ext.define('PVE.storage.NFSInputPanel', {
},
{
xtype: me.create ? 'textfield' : 'displayfield',
height: 22, // hack: set same height as text fields
name: 'server',
value: '',
fieldLabel: gettext('Server'),
@ -109,7 +107,6 @@ Ext.define('PVE.storage.NFSInputPanel', {
},
{
xtype: me.create ? 'pveNFSScan' : 'displayfield',
height: 22, // hack: set same height as text fields
name: 'export',
value: '',
fieldLabel: 'Export',

4
www/manager6/storage/RBDEdit.js
View File

@ -24,7 +24,6 @@ Ext.define('PVE.storage.RBDInputPanel', {
{
xtype: me.create ? 'textfield' : 'displayfield',
name: 'storage',
height: 22, // hack: set same height as text fields
value: me.storageId || '',
fieldLabel: 'ID',
vtype: 'StorageId',
@ -32,7 +31,6 @@ Ext.define('PVE.storage.RBDInputPanel', {
},
{
xtype: me.create ? 'textfield' : 'displayfield',
height: 22, // hack: set same height as text fields
name: 'pool',
value: 'rbd',
fieldLabel: gettext('Pool'),
@ -40,7 +38,6 @@ Ext.define('PVE.storage.RBDInputPanel', {
},
{
xtype: me.create ? 'textfield' : 'displayfield',
height: 22, // hack: set same height as text fields
name: 'monhost',
value: '',
fieldLabel: gettext('Monitor Host'),
@ -48,7 +45,6 @@ Ext.define('PVE.storage.RBDInputPanel', {
},
{
xtype: me.create ? 'textfield' : 'displayfield',
height: 22, // hack: set same height as text fields
name: 'username',
value: 'admin',
fieldLabel: gettext('User name'),

2
www/manager6/storage/SheepdogEdit.js
View File

@ -26,7 +26,6 @@ Ext.define('PVE.storage.SheepdogInputPanel', {
{
xtype: me.create ? 'textfield' : 'displayfield',
name: 'storage',
height: 22, // hack: set same height as text fields
value: me.storageId || '',
fieldLabel: 'ID',
vtype: 'StorageId',
@ -35,7 +34,6 @@ Ext.define('PVE.storage.SheepdogInputPanel', {
{
xtype: me.create ? 'textfield' : 'displayfield',
name: 'portal',
height: 22, // hack: set same height as text fields
value: '127.0.0.1:7000',
fieldLabel: gettext('Gateway'),
allowBlank: false

8
www/manager6/storage/ZFSEdit.js
View File

@ -24,7 +24,6 @@ Ext.define('PVE.storage.ZFSInputPanel', {
{
xtype: me.create ? 'textfield' : 'displayfield',
name: 'storage',
height: 22, // hack: set same height as text fields
value: me.storageId || '',
fieldLabel: 'ID',
vtype: 'StorageId',
@ -33,7 +32,6 @@ Ext.define('PVE.storage.ZFSInputPanel', {
{
xtype: me.create ? 'textfield' : 'displayfield',
name: 'portal',
height: 22, // hack: set same height as text fields
value: '',
fieldLabel: gettext('Portal'),
allowBlank: false
@ -41,7 +39,6 @@ Ext.define('PVE.storage.ZFSInputPanel', {
{
xtype: me.create ? 'textfield' : 'displayfield',
name: 'pool',
height: 22, // hack: set same height as text fields
value: '',
fieldLabel: gettext('Pool'),
allowBlank: false
@ -49,7 +46,6 @@ Ext.define('PVE.storage.ZFSInputPanel', {
{
xtype: me.create ? 'textfield' : 'displayfield',
name: 'blocksize',
height: 22, // hack: set same height as text fields
value: '4k',
fieldLabel: gettext('Block Size'),
allowBlank: false
@ -57,7 +53,6 @@ Ext.define('PVE.storage.ZFSInputPanel', {
{
xtype: me.create ? 'textfield' : 'displayfield',
name: 'target',
height: 22, // hack: set same height as text fields
value: '',
fieldLabel: gettext('Target'),
allowBlank: false
@ -65,7 +60,6 @@ Ext.define('PVE.storage.ZFSInputPanel', {
{
xtype: me.create ? 'textfield' : 'displayfield',
name: 'comstar_tg',
height: 22, // hack: set same height as text fields
value: '',
fieldLabel: gettext('Target group'),
allowBlank: true
@ -83,7 +77,6 @@ Ext.define('PVE.storage.ZFSInputPanel', {
{
xtype: me.create ? 'pveiScsiProviderSelector' : 'displayfield',
name: 'iscsiprovider',
height: 22, // hack: set same height as text fields
value: 'comstar',
fieldLabel: gettext('iSCSI Provider'),
allowBlank: false
@ -105,7 +98,6 @@ Ext.define('PVE.storage.ZFSInputPanel', {
{
xtype: me.create ? 'textfield' : 'displayfield',
name: 'comstar_hg',
height: 22, // hack: set same height as text fields
value: '',
fieldLabel: gettext('Host group'),
allowBlank: true

2
www/manager6/storage/ZFSPoolEdit.js
View File

@ -57,7 +57,6 @@ Ext.define('PVE.storage.ZFSPoolInputPanel', {
{
xtype: me.create ? 'textfield' : 'displayfield',
name: 'storage',
height: 22, // hack: set same height as text fields
value: me.storageId || '',
fieldLabel: 'ID',
vtype: 'StorageId',
@ -73,7 +72,6 @@ Ext.define('PVE.storage.ZFSPoolInputPanel', {
}));
} else {
me.column1.push(Ext.createWidget('displayfield', {
height: 22, // hack: set same height as text fields
name: 'pool',
value: '',
fieldLabel: gettext('ZFS Pool'),