Mercurial > lada > lada-client
changeset 778:db85bafd383f
Merged Heads
| author | Dustin Demuth <dustin@intevation.de> |
|---|---|
| date | Tue, 12 May 2015 17:00:57 +0200 |
| parents | 5a153d36ed4e (current diff) 882a1a13ea96 (diff) |
| children | 3309db91b8c1 |
| files | |
| diffstat | 3 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/app/view/grid/Messmethoden.js Tue May 12 17:00:22 2015 +0200 +++ b/app/view/grid/Messmethoden.js Tue May 12 17:00:57 2015 +0200 @@ -22,7 +22,7 @@ viewConfig: { deferEmptyText: false }, - margin: '0, 5, 5, 0', + margin: '0, 5, 5, 5', recordId: null, allowDeselect: true,
--- a/app/view/grid/Nuklide.js Tue May 12 17:00:22 2015 +0200 +++ b/app/view/grid/Nuklide.js Tue May 12 17:00:57 2015 +0200 @@ -23,7 +23,7 @@ deferEmptyText: false, markDirty: false //Remove Dirty-Flags }, - margin: '0, 0, 5, 5', + margin: '0, 5, 5, 5', recordId: null, allowDeselect: true,
--- a/app/view/window/Messprogramm.js Tue May 12 17:00:22 2015 +0200 +++ b/app/view/window/Messprogramm.js Tue May 12 17:00:57 2015 +0200 @@ -78,23 +78,25 @@ autoScroll: true, items: [{ xtype: 'messprogrammform', - recordId: this.record? this.record.get('id') : null + recordId: this.record ? this.record.get('id') : null }, { //Messmethoden xtype: 'fieldset', + padding: '5, 5', title: i18n.getMsg('mmtmessprogramm.form.fieldset.title'), - autoScroll: true, margin: 5, layout: { - type: 'hbox', + type: 'column' }, items: [{ xtype: 'messmethodengrid', - recordId: this.record? this.record.get('id') : null, + columnWidth: 0.5, + recordId: this.record ? this.record.get('id') : null, flex: 1 }, { xtype: 'nuklidegrid', - recordId: this.record? this.record.get('id') : null, + columnWidth: 0.5, + recordId: this.record ? this.record.get('id') : null, flex: 1 }] }] @@ -150,7 +152,6 @@ }, scope: this }); - } // Create a Create Window else {