diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-03-12 23:55:40 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-12 23:55:40 +1300 |
| commit | 0b5e524dc21b0a29234ba9e7c60393c0ab95dfb2 (patch) | |
| tree | b4c76ee0464cb39855b747a730d423b52e5e54f5 | |
| parent | 5a48ac8baf4e5ad214f622ceb1e130cceec99594 (diff) | |
| parent | e4fb4c63fe14179be94f08211ea14256f70f35e3 (diff) | |
| download | etbsa-traccar-web-0b5e524dc21b0a29234ba9e7c60393c0ab95dfb2.tar.gz etbsa-traccar-web-0b5e524dc21b0a29234ba9e7c60393c0ab95dfb2.tar.bz2 etbsa-traccar-web-0b5e524dc21b0a29234ba9e7c60393c0ab95dfb2.zip | |
Merge pull request #435 from Abyss777/group_group_calendar
Group fields in Group and Calendar dialog
| -rw-r--r-- | web/app/view/CalendarDialog.js | 42 | ||||
| -rw-r--r-- | web/app/view/GroupDialog.js | 32 |
2 files changed, 44 insertions, 30 deletions
diff --git a/web/app/view/CalendarDialog.js b/web/app/view/CalendarDialog.js index 795c2c6..93c2d42 100644 --- a/web/app/view/CalendarDialog.js +++ b/web/app/view/CalendarDialog.js @@ -29,25 +29,29 @@ Ext.define('Traccar.view.CalendarDialog', { items: { xtype: 'form', items: [{ - xtype: 'textfield', - name: 'name', - fieldLabel: Strings.sharedName, - allowBlank: false - }, { - xtype: 'filefield', - name: 'file', - fieldLabel: Strings.sharedFile, - allowBlank: false, - buttonConfig: { - glyph: 'xf093@FontAwesome', - text: '', - tooltip: Strings.sharedSelectFile, - tooltipType: 'title', - minWidth: 0 - }, - listeners: { - change: 'onFileChange' - } + xtype: 'fieldset', + title: Strings.sharedRequired, + items: [{ + xtype: 'textfield', + name: 'name', + fieldLabel: Strings.sharedName, + allowBlank: false + }, { + xtype: 'filefield', + name: 'file', + fieldLabel: Strings.sharedFile, + allowBlank: false, + buttonConfig: { + glyph: 'xf093@FontAwesome', + text: '', + tooltip: Strings.sharedSelectFile, + tooltipType: 'title', + minWidth: 0 + }, + listeners: { + change: 'onFileChange' + } + }] }, { xtype: 'hiddenfield', name: 'data', diff --git a/web/app/view/GroupDialog.js b/web/app/view/GroupDialog.js index 01fdc85..9510230 100644 --- a/web/app/view/GroupDialog.js +++ b/web/app/view/GroupDialog.js @@ -23,18 +23,28 @@ Ext.define('Traccar.view.GroupDialog', { items: { xtype: 'form', items: [{ - xtype: 'textfield', - name: 'name', - fieldLabel: Strings.sharedName, - allowBlank: false + xtype: 'fieldset', + title: Strings.sharedRequired, + items: [{ + xtype: 'textfield', + name: 'name', + fieldLabel: Strings.sharedName, + allowBlank: false + }] }, { - xtype: 'combobox', - name: 'groupId', - fieldLabel: Strings.groupParent, - store: 'Groups', - queryMode: 'local', - displayField: 'name', - valueField: 'id' + xtype: 'fieldset', + title: Strings.sharedExtra, + collapsible: true, + collapsed: true, + items: [{ + xtype: 'combobox', + name: 'groupId', + fieldLabel: Strings.groupParent, + store: 'Groups', + queryMode: 'local', + displayField: 'name', + valueField: 'id' + }] }] } }); |