aboutsummaryrefslogtreecommitdiff
path: root/web/app
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2017-03-12 15:40:26 +0500
committerAbyss777 <abyss@fox5.ru>2017-03-12 15:40:26 +0500
commite4fb4c63fe14179be94f08211ea14256f70f35e3 (patch)
treeb4c76ee0464cb39855b747a730d423b52e5e54f5 /web/app
parent5a48ac8baf4e5ad214f622ceb1e130cceec99594 (diff)
downloadtrackermap-web-e4fb4c63fe14179be94f08211ea14256f70f35e3.tar.gz
trackermap-web-e4fb4c63fe14179be94f08211ea14256f70f35e3.tar.bz2
trackermap-web-e4fb4c63fe14179be94f08211ea14256f70f35e3.zip
Group fields in Group and Calendar dialog
Diffstat (limited to 'web/app')
-rw-r--r--web/app/view/CalendarDialog.js42
-rw-r--r--web/app/view/GroupDialog.js32
2 files changed, 44 insertions, 30 deletions
diff --git a/web/app/view/CalendarDialog.js b/web/app/view/CalendarDialog.js
index 795c2c62..93c2d429 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 01fdc85e..95102302 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'
+ }]
}]
}
});