aboutsummaryrefslogtreecommitdiff
path: root/web
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-09-06 09:24:33 +0500
committerAbyss777 <abyss@fox5.ru>2016-09-06 09:24:33 +0500
commit0affb8110de3c53942c85a220babc859e2a7727d (patch)
tree05520c0a818bc0c7beaedacdd8c24c24e7d12d21 /web
parentb7403aaadd130bf1496b97c07667842813d99550 (diff)
downloadtrackermap-server-0affb8110de3c53942c85a220babc859e2a7727d.tar.gz
trackermap-server-0affb8110de3c53942c85a220babc859e2a7727d.tar.bz2
trackermap-server-0affb8110de3c53942c85a220babc859e2a7727d.zip
Move button to bottom bar
Diffstat (limited to 'web')
-rw-r--r--web/app/Style.js4
-rw-r--r--web/app/view/ServerDialog.js30
-rw-r--r--web/app/view/UserDialog.js30
-rw-r--r--web/l10n/en.json1
4 files changed, 43 insertions, 22 deletions
diff --git a/web/app/Style.js b/web/app/Style.js
index 034d2fb0b..b3b296b75 100644
--- a/web/app/Style.js
+++ b/web/app/Style.js
@@ -75,7 +75,5 @@ Ext.define('Traccar.Style', {
coordinatePrecision: 6,
numberPrecision: 2,
- reportTagfieldWidth: 375,
-
- inFormButtonMargin: '0 0 9 0'
+ reportTagfieldWidth: 375
});
diff --git a/web/app/view/ServerDialog.js b/web/app/view/ServerDialog.js
index 0f8dbd2eb..83f9c47f2 100644
--- a/web/app/view/ServerDialog.js
+++ b/web/app/view/ServerDialog.js
@@ -66,9 +66,8 @@ Ext.define('Traccar.view.ServerDialog', {
displayField: 'name',
valueField: 'key'
}, {
- xtype: 'fieldset',
+ xtype: 'fieldcontainer',
reference: 'mapCenter',
- title: Strings.sharedMapCenter,
defaultType: 'numberfield',
items: [{
name: 'latitude',
@@ -81,12 +80,6 @@ Ext.define('Traccar.view.ServerDialog', {
}, {
name: 'zoom',
fieldLabel: Strings.serverZoom
- }, {
- xtype: 'button',
- margin: Traccar.Style.inFormButtonMargin,
- enableToggle: false,
- text: Strings.sharedGetFromMap,
- handler: 'getFromMap'
}]
}, {
xtype: 'checkboxfield',
@@ -94,5 +87,24 @@ Ext.define('Traccar.view.ServerDialog', {
fieldLabel: Strings.settingsTwelveHourFormat,
allowBlank: false
}]
- }
+ },
+
+ buttons: [{
+ text: Strings.sharedAttributes,
+ handler: 'showAttributesView'
+ }, {
+ glyph: 'xf276@FontAwesome',
+ minWidth: 0,
+ handler: 'getFromMap',
+ tooltip: Strings.sharedGetFromMap,
+ tooltipType: 'title'
+ }, {
+ xtype: 'tbfill'
+ }, {
+ text: Strings.sharedSave,
+ handler: 'onSaveClick'
+ }, {
+ text: Strings.sharedCancel,
+ handler: 'closeView'
+ }]
});
diff --git a/web/app/view/UserDialog.js b/web/app/view/UserDialog.js
index c6b732513..46b86dd5d 100644
--- a/web/app/view/UserDialog.js
+++ b/web/app/view/UserDialog.js
@@ -24,7 +24,7 @@ Ext.define('Traccar.view.UserDialog', {
controller: 'userDialog',
title: Strings.settingsUser,
- items: [{
+ items: {
xtype: 'form',
items: [{
xtype: 'textfield',
@@ -70,9 +70,8 @@ Ext.define('Traccar.view.UserDialog', {
displayField: 'name',
valueField: 'key'
}, {
- xtype: 'fieldset',
+ xtype: 'fieldcontainer',
reference: 'mapCenter',
- title: Strings.sharedMapCenter,
defaultType: 'numberfield',
items: [{
name: 'latitude',
@@ -85,12 +84,6 @@ Ext.define('Traccar.view.UserDialog', {
}, {
name: 'zoom',
fieldLabel: Strings.serverZoom
- }, {
- xtype: 'button',
- margin: Traccar.Style.inFormButtonMargin,
- enableToggle: false,
- text: Strings.sharedGetFromMap,
- handler: 'getFromMap'
}]
}, {
xtype: 'checkboxfield',
@@ -98,5 +91,24 @@ Ext.define('Traccar.view.UserDialog', {
fieldLabel: Strings.settingsTwelveHourFormat,
allowBlank: false
}]
+ },
+
+ buttons: [{
+ text: Strings.sharedAttributes,
+ handler: 'showAttributesView'
+ }, {
+ glyph: 'xf276@FontAwesome',
+ minWidth: 0,
+ handler: 'getFromMap',
+ tooltip: Strings.sharedGetFromMap,
+ tooltipType: 'title'
+ }, {
+ xtype: 'tbfill'
+ }, {
+ text: Strings.sharedSave,
+ handler: 'onSaveClick'
+ }, {
+ text: Strings.sharedCancel,
+ handler: 'closeView'
}]
});
diff --git a/web/l10n/en.json b/web/l10n/en.json
index e06daad93..88f572e33 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -28,7 +28,6 @@
"sharedDistance": "Distance",
"sharedHourAbbreviation": "h",
"sharedMinuteAbbreviation": "m",
- "sharedMapCenter": "Map Center",
"sharedGetFromMap": "Get from Map",
"errorTitle": "Error",
"errorUnknown": "Unknown error",