Commit ebd733ce3ecaf1eb3aea6bfe3037a44d1564b346
1 parent
96550534
Exists in
master
and in
112 other branches
epntap: Reorder filter UI elements
Showing
2 changed files
with
17 additions
and
22 deletions
Show diff stats
js/app/controllers/InteropModule.js
js/app/views/EpnTapUI.js
| ... | ... | @@ -197,29 +197,25 @@ Ext.define('amdaUI.EpnTapUI', { |
| 197 | 197 | defaults: { margin: 5 }, |
| 198 | 198 | items: [{ // Left part |
| 199 | 199 | xtype : 'container', |
| 200 | - flex: 3, | |
| 200 | + flex: 1, | |
| 201 | 201 | items: [ |
| 202 | 202 | this.createTargetNameCB(), |
| 203 | - this.createProductTypeCB(), | |
| 204 | - { | |
| 205 | - xtype: 'panel', | |
| 206 | - layout: { type: 'hbox', pack: 'start', align: 'stretch' }, | |
| 207 | - border: false, | |
| 208 | - items: [ | |
| 209 | - this.createRowPerPageNf(), | |
| 210 | - this.createNavigationPanel() | |
| 211 | - ] | |
| 212 | - } | |
| 203 | + this.createProductTypeCB() | |
| 213 | 204 | ] |
| 214 | - }, { // Right part | |
| 215 | - xtype : 'form', | |
| 216 | - id: 'epnTapIntervalSelector', | |
| 217 | - layout: 'form', | |
| 218 | - border: 'false', | |
| 219 | - flex: 2, | |
| 205 | + }, { // Middle part | |
| 206 | + xtype : 'container', | |
| 207 | + flex: 1, | |
| 220 | 208 | items: [ |
| 221 | 209 | this.createTimeSelector() |
| 222 | 210 | ] |
| 211 | + }, { // Right part | |
| 212 | + xtype : 'container', | |
| 213 | + flex: 1, | |
| 214 | + items: [ | |
| 215 | + this.createRowPerPageNf(), | |
| 216 | + this.createNavigationPanel() | |
| 217 | + ] | |
| 218 | + | |
| 223 | 219 | }] |
| 224 | 220 | }; |
| 225 | 221 | }, |
| ... | ... | @@ -242,7 +238,7 @@ Ext.define('amdaUI.EpnTapUI', { |
| 242 | 238 | valueField: 'id', |
| 243 | 239 | multiSelect: true, |
| 244 | 240 | displayField: 'name', |
| 245 | - maxWidth: 100, | |
| 241 | + labelWidth: 80, | |
| 246 | 242 | editable: false, |
| 247 | 243 | listeners: { |
| 248 | 244 | select: function(combo, records) { |
| ... | ... | @@ -279,7 +275,8 @@ Ext.define('amdaUI.EpnTapUI', { |
| 279 | 275 | queryParam: 'input', |
| 280 | 276 | displayField: 'name', |
| 281 | 277 | valueField: 'id', |
| 282 | - maxWidth: 100, | |
| 278 | + labelWidth: 80, | |
| 279 | + minWidth: 20, | |
| 283 | 280 | minChars: 2, |
| 284 | 281 | hideTrigger: true, |
| 285 | 282 | listConfig: { |
| ... | ... | @@ -363,9 +360,6 @@ Ext.define('amdaUI.EpnTapUI', { |
| 363 | 360 | margin: '2 0 2 50', |
| 364 | 361 | defaults: { margin: '0 5 0 5', width: 20, xtype: 'button', disabled: true}, |
| 365 | 362 | items: [{ |
| 366 | - xtype: 'label', | |
| 367 | - text: 'Page:' | |
| 368 | - }, { | |
| 369 | 363 | id: 'epnTapFirstPageBtn', |
| 370 | 364 | text: '|<', |
| 371 | 365 | tooltip: 'First page' |
| ... | ... |