[Lada-commits] [PATCH 5 of 5] Merged Heads

[Wald Commits]

# HG changeset patch
# User Dustin Demuth <dustin at intevation.de>
# Date 1431442857 -7200
# Node ID db85bafd383fd59f5353e2850d7c7461f83f0c25
# Parent  5a153d36ed4e79f8ec87bcf5a685448af8ebf4d3
# Parent  882a1a13ea969e28a63ad9ab747ed5a936833ca7
Merged Heads

diff -r 5a153d36ed4e -r db85bafd383f app/view/grid/Messmethoden.js
--- 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,
diff -r 5a153d36ed4e -r db85bafd383f app/view/grid/Nuklide.js
--- 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,
diff -r 5a153d36ed4e -r db85bafd383f app/view/window/Messprogramm.js
--- 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 {