Mercurial > lada > lada-client
changeset 1334:2c5d89886885
Fixed ortszuordnung window layout.
| author | Raimund Renkert <raimund.renkert@intevation.de> |
|---|---|
| date | Fri, 03 Feb 2017 16:17:46 +0100 |
| parents | af169bcb67df |
| children | cba4e0b0e336 |
| files | app/view/form/Ortszuordnung.js app/view/window/Ortszuordnung.js |
| diffstat | 2 files changed, 54 insertions(+), 50 deletions(-) [+] |
line wrap: on
line diff
--- a/app/view/form/Ortszuordnung.js Fri Feb 03 15:43:46 2017 +0100 +++ b/app/view/form/Ortszuordnung.js Fri Feb 03 16:17:46 2017 +0100 @@ -49,7 +49,7 @@ title: i18n.getMsg('ortszuordnung.form.fset.title'), layout: 'fit', items: [{ - layout: 'hbox', + overflowY: 'auto', border: 0, margin: '0, 0, 10, 0', dockedItems: [{ @@ -82,58 +82,64 @@ }] }], items: [{ - layout: 'vbox', - autoscroll: true, + layout: 'hbox', border: 0, + margin: '0, 0, 10, 0', items: [{ layout: 'vbox', border: 0, - margin: '0, 20, 0, 0', items: [{ - xtype: 'tfield', - labelWidth: 125, - maxLength: 100, - name: 'ortszusatztext', - fieldLabel: i18n.getMsg('ortszuordnung.form.field.ortszusatztext') - }, { - xtype: 'cbox', - labelWidth: 125, - maxLength: 1, - allowBlank: false, - editable: true, - name: this.typName, - disableKeyFilter: true, - fieldLabel: i18n.getMsg('ortszuordnung.form.field.ortszuordnungtyp'), - store: Ext.create('Ext.data.Store', { - fields: ['value', 'label'], - //TODO: Meaning of the letters should be added - data : [ - {'value':'U', 'label':'U'}, - {'value':'E', 'label':'E'}, - {'value':'Z', 'label':'Z'}, - {'value':'A', 'label':'A'} - ] - }), - displayField: 'label', - valueField: 'value', - emptyText: 'Bitte geben Sie einen Ortszuordnungstyp ein', - queryMode: 'local' - }, { - // this field is hidden because the user doesn't - // need to know the internal ortID - xtype: 'textfield', - allowBlank: false, - regex: /^[0-9]{1,45}$/, - submitValue: true, - hidden: true, - name: this.ortIdName, - listeners: { - change: me.changed - } - }] - }, - Ext.create('Lada.view.form.OrtInfo') - ] + layout: 'vbox', + border: 0, + margin: '0, 20, 0, 0', + items: [{ + xtype: 'tfield', + labelWidth: 125, + maxLength: 100, + name: 'ortszusatztext', + fieldLabel: i18n.getMsg('ortszuordnung.form.field.ortszusatztext') + }, { + xtype: 'cbox', + labelWidth: 125, + maxLength: 1, + allowBlank: false, + editable: true, + name: this.typName, + disableKeyFilter: true, + fieldLabel: i18n.getMsg('ortszuordnung.form.field.ortszuordnungtyp'), + store: Ext.create('Ext.data.Store', { + fields: ['value', 'label'], + //TODO: Meaning of the letters should be added + data : [ + {'value':'U', 'label':'U'}, + {'value':'E', 'label':'E'}, + {'value':'Z', 'label':'Z'}, + {'value':'A', 'label':'A'} + ] + }), + displayField: 'label', + valueField: 'value', + emptyText: 'Bitte geben Sie einen Ortszuordnungstyp ein', + queryMode: 'local' + }, { + // this field is hidden because the user doesn't + // need to know the internal ortID + xtype: 'textfield', + allowBlank: false, + regex: /^[0-9]{1,45}$/, + submitValue: true, + hidden: true, + name: this.ortIdName, + listeners: { + change: me.changed + } + }] + }, + Ext.create('Lada.view.form.OrtInfo',{ + flex: 1 + }) + ] + }] }] }] }];
--- a/app/view/window/Ortszuordnung.js Fri Feb 03 15:43:46 2017 +0100 +++ b/app/view/window/Ortszuordnung.js Fri Feb 03 16:17:46 2017 +0100 @@ -117,12 +117,10 @@ region: 'center', layout: 'border', margin: '13, 5, 10, 5', - minHeight: 380, externalOrteStore: true }, { xtype: 'ortszuordnungform', region: 'east', - minHeight: 380, type: this.probe? 'probe': 'mpr' }, { region: 'south',