[Lada-commits] [PATCH 1 of 2] some reorg of filterpanal and messprogramm form
Wald Commits
scm-commit at wald.intevation.org
Wed May 11 11:47:48 CEST 2016
# HG changeset patch
# User Michael Stanko <mstanko at bfs.de>
# Date 1462949860 -7200
# Node ID 414f7c9908d67f89396ac9b41d6b937ef8f10793
# Parent db9297e559ab824f540b5b243962d28e5d7684be
some reorg of filterpanal and messprogramm form
diff -r db9297e559ab -r 414f7c9908d6 app/view/FilterPanel.js
--- a/app/view/FilterPanel.js Wed May 11 08:55:04 2016 +0200
+++ b/app/view/FilterPanel.js Wed May 11 08:57:40 2016 +0200
@@ -44,11 +44,21 @@
margin: '0 0 0 10'
}]
}, {
- xtype: 'checkbox',
- name: 'favorites',
- boxLabel: 'nur Favoriten',
- margin: '0, 0, 0, 5',
- checked: true
+ layout: {
+ type: 'hbox',
+ },
+ border: false,
+ items: [{
+ xtype: 'checkbox',
+ name: 'favorites',
+ boxLabel: 'nur Favoriten',
+ checked: true
+ }, {
+ xtype: 'button',
+ action: 'manage',
+ text: 'Filterauswahl bearbeiten',
+ margin: '0 0 0 20'
+ }]
}, {
xtype: 'displayfield',
name: 'description',
@@ -58,6 +68,22 @@
}, {
xtype: 'panel',
border: false,
+ margin: '10 0 10 0',
+ items: [{
+ xtype: 'button',
+ action: 'search',
+ text: 'Suchen',
+ margin: '0 10 0 0'
+ }, {
+ xtype: 'button',
+ action: 'reset',
+ text: 'Zurücksetzen',
+ margin: '0 10 0 0'
+ }],
+ hidden: false
+ }, {
+ xtype: 'panel',
+ border: false,
name: 'filtervariables',
hidden: true,
margin: '10, 0, 10, 0',
@@ -67,7 +93,6 @@
name: 'filtervalues',
items: []
}, {
-
layout: {
type: 'hbox',
pack: 'end'
@@ -84,26 +109,6 @@
text: 'Vorbelegung zurücksetzen'
}]
}]
- }, {
- xtype: 'panel',
- border: false,
- margin: '10 0 10 0',
- items: [{
- xtype: 'button',
- action: 'search',
- text: 'Suchen',
- margin: '0 10 0 0'
- }, {
- xtype: 'button',
- action: 'reset',
- text: 'Zurücksetzen',
- margin: '0 10 0 0'
- }, {
- xtype: 'button',
- action: 'manage',
- text: 'Filterauswahl bearbeiten'
- }],
- hidden: false
}];
this.callParent(arguments);
var combo = me.down('combobox[name=filter]');
diff -r db9297e559ab -r 414f7c9908d6 app/view/form/Messprogramm.js
--- a/app/view/form/Messprogramm.js Wed May 11 08:55:04 2016 +0200
+++ b/app/view/form/Messprogramm.js Wed May 11 08:57:40 2016 +0200
@@ -207,7 +207,6 @@
fieldLabel: i18n.getMsg('probenintervall'),
margin: '0, 10, 5, 5',
labelWidth: 50,
-// anchor: '100%',
width: '40%',
name: 'probenintervall'
}, {
@@ -215,7 +214,6 @@
fieldLabel: i18n.getMsg('teilintervallVon'),
margin: '0, 10, 5, 10',
labelWidth: 90,
- // anchor: '100%',
width: '28%',
name: 'teilintervallVon',
period: 'start'
@@ -224,7 +222,6 @@
fieldLabel: i18n.getMsg('teilintervallBis'),
margin: '0, 15, 5, 5',
labelWidth: 18,
-// anchor: '100%',
width: '12%',
name: 'teilintervallBis',
period: 'end'
@@ -233,7 +230,6 @@
margin: '0, 10, 5, 5',
fieldLabel: i18n.getMsg('offset'),
labelWidth: 45,
-// anchor: '100%',
width: '18%',
name: 'intervallOffset'
}]
@@ -244,7 +240,6 @@
pack: 'center',
width: '70%',
margin: '0, 40, 10, 40',
-// anchor: '950%',
values: [0, 0]
//this will be overridden
// by setRecord
@@ -261,7 +256,6 @@
fieldLabel: i18n.getMsg('gueltigVon'),
margin: '0, 30, 5, 5',
labelWidth: 90,
-// anchor: '100%',
name: 'gueltigVon',
format: 'd.m.Y',
period: 'start'
@@ -270,7 +264,6 @@
fieldLabel: i18n.getMsg('gueltigBis'),
margin: '0, 5, 5, 5',
labelWidth: 40,
-// anchor: '100%',
name: 'gueltigBis',
format: 'd.m.Y',
period: 'end'
@@ -358,7 +351,6 @@
title: 'Ort',
layout: {
type: 'hbox',
-// pack: 'center',
align: 'stretch'
},
width: '100%',
@@ -524,8 +516,6 @@
});
this.down('messstellelabor').setValue(items.getAt(0));
}
- // set media field
-// this.down('media').setValue('XXXX');
},
setMediaDesk: function(record) {
More information about the Lada-commits
mailing list