aboutsummaryrefslogtreecommitdiff
path: root/web/app/view
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-07-03 13:00:03 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2016-07-03 13:00:03 +1200
commit7ae587d430e793bbd9afd5607f7d266816af127a (patch)
tree537ab0d4fa2f2e144ea5ae082fc559d08dc206ad /web/app/view
parentbac0d9090c1a8906f7d3c0a56da58c33495fd6db (diff)
downloadtraccar-server-7ae587d430e793bbd9afd5607f7d266816af127a.tar.gz
traccar-server-7ae587d430e793bbd9afd5607f7d266816af127a.tar.bz2
traccar-server-7ae587d430e793bbd9afd5607f7d266816af127a.zip
Add dialog for geofence area selection
Diffstat (limited to 'web/app/view')
-rw-r--r--web/app/view/BaseMap.js1
-rw-r--r--web/app/view/GeofenceDialog.js22
-rw-r--r--web/app/view/GeofenceDialogController.js33
-rw-r--r--web/app/view/Map.js2
4 files changed, 53 insertions, 5 deletions
diff --git a/web/app/view/BaseMap.js b/web/app/view/BaseMap.js
index c2a889188..7f508cbe8 100644
--- a/web/app/view/BaseMap.js
+++ b/web/app/view/BaseMap.js
@@ -18,7 +18,6 @@ Ext.define('Traccar.view.BaseMap', {
extend: 'Ext.form.Panel',
xtype: 'baseMapView',
- title: Strings.mapTitle,
layout: 'fit',
getMap: function () {
diff --git a/web/app/view/GeofenceDialog.js b/web/app/view/GeofenceDialog.js
index a3100a797..fa3bbe87f 100644
--- a/web/app/view/GeofenceDialog.js
+++ b/web/app/view/GeofenceDialog.js
@@ -15,13 +15,13 @@
*/
Ext.define('Traccar.view.GeofenceDialog', {
- extend: 'Traccar.view.BaseEditDialog',
+ extend: 'Traccar.view.BaseDialog',
requires: [
- 'Traccar.view.BaseEditDialogController'
+ 'Traccar.view.GeofenceDialogController'
],
- controller: 'baseEditDialog',
+ controller: 'geofenceDialog',
title: Strings.sharedGeofence,
items: {
@@ -35,5 +35,19 @@ Ext.define('Traccar.view.GeofenceDialog', {
name: 'description',
fieldLabel: Strings.sharedDescription
}]
- }
+ },
+
+ buttons: [{
+ text: Strings.sharedArea,
+ glyph: 'xf21d@FontAwesome',
+ handler: 'onAreaClick'
+ }, {
+ xtype: 'tbfill'
+ }, {
+ text: Strings.sharedSave,
+ handler: 'onSaveClick'
+ }, {
+ text: Strings.sharedCancel,
+ handler: 'closeView'
+ }]
});
diff --git a/web/app/view/GeofenceDialogController.js b/web/app/view/GeofenceDialogController.js
new file mode 100644
index 000000000..96be0d3a5
--- /dev/null
+++ b/web/app/view/GeofenceDialogController.js
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+Ext.define('Traccar.view.GeofenceDialogController', {
+ extend: 'Traccar.view.BaseEditDialogController',
+ alias: 'controller.geofenceDialog',
+
+ requires: [
+ 'Traccar.view.BaseMap'
+ ],
+
+ onAreaClick: function (button) {
+ Ext.create('Traccar.view.BaseWindow', {
+ title: Strings.sharedArea,
+ items: {
+ xtype: 'baseMapView'
+ }
+ }).show();
+ }
+});
diff --git a/web/app/view/Map.js b/web/app/view/Map.js
index d06630e38..8ff57c06a 100644
--- a/web/app/view/Map.js
+++ b/web/app/view/Map.js
@@ -24,6 +24,8 @@ Ext.define('Traccar.view.Map', {
controller: 'map',
+ title: Strings.mapTitle,
+
getLatestSource: function () {
return this.latestSource;
},