Move BaseDialog, subclasses and their controllers to dialog subfolder

37 files changed, 118 insertions, 118 deletions

diff --git a/web/app/controller/Root.js b/web/app/controller/Root.js
index 673f7fb3..3bcc7bc5 100644
--- a/web/app/controller/Root.js
+++ b/web/app/controller/Root.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@ Ext.define('Traccar.controller.Root', {
     extend: 'Ext.app.Controller',
 
     requires: [
-        'Traccar.view.Login',
+        'Traccar.view.dialog.Login',
         'Traccar.view.Main',
         'Traccar.view.MainMobile',
         'Traccar.model.Position'
diff --git a/web/app/view/AttributeAliasesController.js b/web/app/view/AttributeAliasesController.js
index f5348301..36684077 100644
--- a/web/app/view/AttributeAliasesController.js
+++ b/web/app/view/AttributeAliasesController.js
@@ -21,12 +21,12 @@ Ext.define('Traccar.view.AttributeAliasesController', {
     alias: 'controller.attributeAliases',
 
     requires: [
-        'Traccar.view.AttributeAliasDialog',
+        'Traccar.view.dialog.AttributeAliasDialog',
         'Traccar.model.AttributeAlias'
     ],
 
     objectModel: 'Traccar.model.AttributeAlias',
-    objectDialog: 'Traccar.view.AttributeAliasDialog',
+    objectDialog: 'Traccar.view.dialog.AttributeAliasDialog',
     removeTitle: Strings.sharedAttributeAlias,
 
     init: function () {
@@ -48,7 +48,7 @@ Ext.define('Traccar.view.AttributeAliasesController', {
         attributeAlias.store = Ext.getStore('AttributeAliases');
         deviceId = this.lookupReference('deviceField').getValue();
         attributeAlias.set('deviceId', deviceId);
-        dialog = Ext.create('Traccar.view.AttributeAliasDialog');
+        dialog = Ext.create('Traccar.view.dialog.AttributeAliasDialog');
         dialog.down('form').loadRecord(attributeAlias);
         dialog.show();
     },
diff --git a/web/app/view/AttributesController.js b/web/app/view/AttributesController.js
index 1c5f5b4b..96efee71 100644
--- a/web/app/view/AttributesController.js
+++ b/web/app/view/AttributesController.js
@@ -20,13 +20,13 @@ Ext.define('Traccar.view.AttributesController', {
     alias: 'controller.attributes',
 
     requires: [
-        'Traccar.view.AttributeDialog',
+        'Traccar.view.dialog.AttributeDialog',
         'Traccar.store.Attributes',
         'Traccar.model.Attribute'
     ],
 
     objectModel: 'Traccar.model.Attribute',
-    objectDialog: 'Traccar.view.AttributeDialog',
+    objectDialog: 'Traccar.view.dialog.AttributeDialog',
     removeTitle: Strings.stateName,
 
     init: function () {
diff --git a/web/app/view/CalendarsController.js b/web/app/view/CalendarsController.js
index bfa7569d..7cb3fe5a 100644
--- a/web/app/view/CalendarsController.js
+++ b/web/app/view/CalendarsController.js
@@ -21,12 +21,12 @@ Ext.define('Traccar.view.CalendarsController', {
     alias: 'controller.calendars',
 
     requires: [
-        'Traccar.view.CalendarDialog',
+        'Traccar.view.dialog.CalendarDialog',
         'Traccar.model.Calendar'
     ],
 
     objectModel: 'Traccar.model.Calendar',
-    objectDialog: 'Traccar.view.CalendarDialog',
+    objectDialog: 'Traccar.view.dialog.CalendarDialog',
     removeTitle: Strings.sharedCalendar
 
 });
diff --git a/web/app/view/DevicesController.js b/web/app/view/DevicesController.js
index 742077b2..5442f545 100644
--- a/web/app/view/DevicesController.js
+++ b/web/app/view/DevicesController.js
@@ -20,8 +20,8 @@ Ext.define('Traccar.view.DevicesController', {
     alias: 'controller.devices',
 
     requires: [
-        'Traccar.view.CommandDialog',
-        'Traccar.view.DeviceDialog',
+        'Traccar.view.dialog.CommandDialog',
+        'Traccar.view.dialog.DeviceDialog',
         'Traccar.view.DeviceGeofences',
         'Traccar.view.BaseWindow',
         'Traccar.model.Device',
@@ -48,7 +48,7 @@ Ext.define('Traccar.view.DevicesController', {
     },
 
     objectModel: 'Traccar.model.Device',
-    objectDialog: 'Traccar.view.DeviceDialog',
+    objectDialog: 'Traccar.view.dialog.DeviceDialog',
     removeTitle: Strings.sharedDevice,
 
     init: function () {
@@ -83,7 +83,7 @@ Ext.define('Traccar.view.DevicesController', {
         command.set('deviceId', deviceId);
         command.set('textChannel', !online);
 
-        dialog = Ext.create('Traccar.view.CommandDialog');
+        dialog = Ext.create('Traccar.view.dialog.CommandDialog');
 
         typesStore = dialog.lookupReference('commandType').getStore();
         typesStore.getProxy().setExtraParam('deviceId', deviceId);
diff --git a/web/app/view/GeofencesController.js b/web/app/view/GeofencesController.js
index 4ee06e81..17fb6665 100644
--- a/web/app/view/GeofencesController.js
+++ b/web/app/view/GeofencesController.js
@@ -20,11 +20,11 @@ Ext.define('Traccar.view.GeofencesController', {
     alias: 'controller.geofences',
 
     requires: [
-        'Traccar.view.GeofenceDialog',
+        'Traccar.view.dialog.GeofenceDialog',
         'Traccar.model.Geofence'
     ],
 
     objectModel: 'Traccar.model.Geofence',
-    objectDialog: 'Traccar.view.GeofenceDialog',
+    objectDialog: 'Traccar.view.dialog.GeofenceDialog',
     removeTitle: Strings.sharedGeofence
 });
diff --git a/web/app/view/GroupsController.js b/web/app/view/GroupsController.js
index 98568db5..3e44329e 100644
--- a/web/app/view/GroupsController.js
+++ b/web/app/view/GroupsController.js
@@ -20,14 +20,14 @@ Ext.define('Traccar.view.GroupsController', {
     alias: 'controller.groups',
 
     requires: [
-        'Traccar.view.GroupDialog',
+        'Traccar.view.dialog.GroupDialog',
         'Traccar.view.GroupGeofences',
         'Traccar.view.BaseWindow',
         'Traccar.model.Group'
     ],
 
     objectModel: 'Traccar.model.Group',
-    objectDialog: 'Traccar.view.GroupDialog',
+    objectDialog: 'Traccar.view.dialog.GroupDialog',
     removeTitle: Strings.groupDialog,
 
     onGeofencesClick: function () {
diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js
index c02964e7..7dc5f654 100644
--- a/web/app/view/ReportController.js
+++ b/web/app/view/ReportController.js
@@ -24,7 +24,7 @@ Ext.define('Traccar.view.ReportController', {
         'Traccar.AttributeFormatter',
         'Traccar.model.Position',
         'Traccar.model.ReportTrip',
-        'Traccar.view.ReportConfigDialog',
+        'Traccar.view.dialog.ReportConfigDialog',
         'Traccar.store.ReportEventTypes'
     ],
 
@@ -65,7 +65,7 @@ Ext.define('Traccar.view.ReportController', {
     },
 
     onConfigureClick: function () {
-        var dialog = Ext.create('Traccar.view.ReportConfigDialog');
+        var dialog = Ext.create('Traccar.view.dialog.ReportConfigDialog');
         dialog.lookupReference('eventTypeField').setHidden(this.lookupReference('reportTypeField').getValue() !== 'events');
         dialog.lookupReference('chartTypeField').setHidden(this.lookupReference('reportTypeField').getValue() !== 'chart');
         dialog.callingPanel = this;
diff --git a/web/app/view/SettingsMenuController.js b/web/app/view/SettingsMenuController.js
index 8d1e5634..8e818d77 100644
--- a/web/app/view/SettingsMenuController.js
+++ b/web/app/view/SettingsMenuController.js
@@ -20,16 +20,16 @@ Ext.define('Traccar.view.SettingsMenuController', {
     alias: 'controller.settings',
 
     requires: [
-        'Traccar.view.LoginController',
-        'Traccar.view.UserDialog',
-        'Traccar.view.ServerDialog',
+        'Traccar.view.dialog.LoginController',
+        'Traccar.view.dialog.UserDialog',
+        'Traccar.view.dialog.ServerDialog',
         'Traccar.view.Users',
         'Traccar.view.Groups',
         'Traccar.view.Geofences',
         'Traccar.view.Notifications',
         'Traccar.view.AttributeAliases',
         'Traccar.view.Statistics',
-        'Traccar.view.DeviceDistanceDialog',
+        'Traccar.view.dialog.DeviceDistanceDialog',
         'Traccar.view.Calendars',
         'Traccar.view.BaseWindow'
     ],
@@ -61,7 +61,7 @@ Ext.define('Traccar.view.SettingsMenuController', {
     },
 
     onUserClick: function () {
-        var dialog = Ext.create('Traccar.view.UserDialog', {
+        var dialog = Ext.create('Traccar.view.dialog.UserDialog', {
             selfEdit: true
         });
         dialog.down('form').loadRecord(Traccar.app.getUser());
@@ -90,7 +90,7 @@ Ext.define('Traccar.view.SettingsMenuController', {
     },
 
     onServerClick: function () {
-        var dialog = Ext.create('Traccar.view.ServerDialog');
+        var dialog = Ext.create('Traccar.view.dialog.ServerDialog');
         dialog.down('form').loadRecord(Traccar.app.getServer());
         dialog.show();
     },
@@ -138,7 +138,7 @@ Ext.define('Traccar.view.SettingsMenuController', {
     },
 
     onDeviceDistanceClick: function () {
-        var dialog = Ext.create('Traccar.view.DeviceDistanceDialog');
+        var dialog = Ext.create('Traccar.view.dialog.DeviceDistanceDialog');
         dialog.show();
     },
 
diff --git a/web/app/view/StateController.js b/web/app/view/StateController.js
index 661bc961..40362e85 100644
--- a/web/app/view/StateController.js
+++ b/web/app/view/StateController.js
@@ -24,7 +24,7 @@ Ext.define('Traccar.view.StateController', {
        'Traccar.model.Attribute',
        'Traccar.model.AttributeAlias',
        'Traccar.model.Position',
-       'Traccar.view.AttributeAliasDialog'
+       'Traccar.view.dialog.AttributeAliasDialog'
 
     ],
 
@@ -192,7 +192,7 @@ Ext.define('Traccar.view.StateController', {
             });
             attributeAlias.store = this.aliasesStore;
         }
-        dialog = Ext.create('Traccar.view.AttributeAliasDialog');
+        dialog = Ext.create('Traccar.view.dialog.AttributeAliasDialog');
         dialog.down('form').loadRecord(attributeAlias);
         dialog.show();
     },
diff --git a/web/app/view/UsersController.js b/web/app/view/UsersController.js
index a79f9586..365b3583 100644
--- a/web/app/view/UsersController.js
+++ b/web/app/view/UsersController.js
@@ -21,7 +21,7 @@ Ext.define('Traccar.view.UsersController', {
     alias: 'controller.users',
 
     requires: [
-        'Traccar.view.UserDialog',
+        'Traccar.view.dialog.UserDialog',
         'Traccar.view.UserDevices',
         'Traccar.view.UserGroups',
         'Traccar.view.UserGeofences',
@@ -33,7 +33,7 @@ Ext.define('Traccar.view.UsersController', {
     ],
 
     objectModel: 'Traccar.model.User',
-    objectDialog: 'Traccar.view.UserDialog',
+    objectDialog: 'Traccar.view.dialog.UserDialog',
     removeTitle: Strings.settingsUser,
 
     init: function () {
@@ -43,7 +43,7 @@ Ext.define('Traccar.view.UsersController', {
 
     onEditClick: function () {
         var dialog, user = this.getView().getSelectionModel().getSelection()[0];
-        dialog = Ext.create('Traccar.view.UserDialog', {
+        dialog = Ext.create('Traccar.view.dialog.UserDialog', {
             selfEdit: user.get('id') === Traccar.app.getUser().get('id')
         });
         dialog.down('form').loadRecord(user);
diff --git a/web/app/view/AttributeAliasDialog.js b/web/app/view/dialog/AttributeAliasDialog.js
index 74b12490..a8a6b82c 100644
--- a/web/app/view/AttributeAliasDialog.js
+++ b/web/app/view/dialog/AttributeAliasDialog.js
@@ -1,6 +1,6 @@
 /*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
- * Copyright 2016 Andrey Kunitsyn (andrey@traccar.org)
+ * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 Andrey Kunitsyn (andrey@traccar.org)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,11 +16,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.AttributeAliasDialog', {
-    extend: 'Traccar.view.BaseDialog',
+Ext.define('Traccar.view.dialog.AttributeAliasDialog', {
+    extend: 'Traccar.view.dialog.BaseDialog',
 
     requires: [
-        'Traccar.view.AttributeController'
+        'Traccar.view.dialog.AttributeController'
     ],
 
     controller: 'attributeDialog',
diff --git a/web/app/view/AttributeController.js b/web/app/view/dialog/AttributeController.js
index b8914d4e..cd6fc61e 100644
--- a/web/app/view/AttributeController.js
+++ b/web/app/view/dialog/AttributeController.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.AttributeController', {
+Ext.define('Traccar.view.dialog.AttributeController', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.attributeDialog',
 
diff --git a/web/app/view/AttributeDialog.js b/web/app/view/dialog/AttributeDialog.js
index 7d4908f9..2dc851fd 100644
--- a/web/app/view/AttributeDialog.js
+++ b/web/app/view/dialog/AttributeDialog.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,11 +15,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.AttributeDialog', {
-    extend: 'Traccar.view.BaseDialog',
+Ext.define('Traccar.view.dialog.AttributeDialog', {
+    extend: 'Traccar.view.dialog.BaseDialog',
 
     requires: [
-        'Traccar.view.AttributeController'
+        'Traccar.view.dialog.AttributeController'
     ],
 
     controller: 'attributeDialog',
diff --git a/web/app/view/BaseDialog.js b/web/app/view/dialog/BaseDialog.js
index aa9782f1..71fa6b32 100644
--- a/web/app/view/BaseDialog.js
+++ b/web/app/view/dialog/BaseDialog.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.BaseDialog', {
+Ext.define('Traccar.view.dialog.BaseDialog', {
     extend: 'Ext.window.Window',
 
     bodyPadding: Traccar.Style.normalPadding,
diff --git a/web/app/view/BaseEditDialog.js b/web/app/view/dialog/BaseEditDialog.js
index 18cfcf50..f1314a96 100644
--- a/web/app/view/BaseEditDialog.js
+++ b/web/app/view/dialog/BaseEditDialog.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,11 +15,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.BaseEditDialog', {
-    extend: 'Traccar.view.BaseDialog',
+Ext.define('Traccar.view.dialog.BaseEditDialog', {
+    extend: 'Traccar.view.dialog.BaseDialog',
 
     requires: [
-        'Traccar.view.BaseEditDialogController'
+        'Traccar.view.dialog.BaseEditDialogController'
     ],
 
     controller: 'baseEditDialog',
diff --git a/web/app/view/BaseEditDialogController.js b/web/app/view/dialog/BaseEditDialogController.js
index 8b74fbba..cc92c6f8 100644
--- a/web/app/view/BaseEditDialogController.js
+++ b/web/app/view/dialog/BaseEditDialogController.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.BaseEditDialogController', {
+Ext.define('Traccar.view.dialog.BaseEditDialogController', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.baseEditDialog',
 
diff --git a/web/app/view/CalendarDialog.js b/web/app/view/dialog/CalendarDialog.js
index 93c2d429..7b233404 100644
--- a/web/app/view/CalendarDialog.js
+++ b/web/app/view/dialog/CalendarDialog.js
@@ -1,6 +1,6 @@
 /*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
- * Copyright 2016 Andrey Kunitsyn (andrey@traccar.org)
+ * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 Andrey Kunitsyn (andrey@traccar.org)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,11 +16,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.CalendarDialog', {
-    extend: 'Traccar.view.BaseEditDialog',
+Ext.define('Traccar.view.dialog.CalendarDialog', {
+    extend: 'Traccar.view.dialog.BaseEditDialog',
 
     requires: [
-        'Traccar.view.CalendarDialogController'
+        'Traccar.view.dialog.CalendarDialogController'
     ],
 
     controller: 'calendarDialog',
diff --git a/web/app/view/CalendarDialogController.js b/web/app/view/dialog/CalendarDialogController.js
index a111ded6..b041c85e 100644
--- a/web/app/view/CalendarDialogController.js
+++ b/web/app/view/dialog/CalendarDialogController.js
@@ -1,6 +1,6 @@
 /*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
- * Copyright 2016 Andrey Kunitsyn (andrey@traccar.org)
+ * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 Andrey Kunitsyn (andrey@traccar.org)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,8 +16,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.CalendarDialogController', {
-    extend: 'Traccar.view.BaseEditDialogController',
+Ext.define('Traccar.view.dialog.CalendarDialogController', {
+    extend: 'Traccar.view.dialog.BaseEditDialogController',
     alias: 'controller.calendarDialog',
 
     onFileChange: function (fileField) {
diff --git a/web/app/view/CommandDialog.js b/web/app/view/dialog/CommandDialog.js
index ef486c41..e02e1277 100644
--- a/web/app/view/CommandDialog.js
+++ b/web/app/view/dialog/CommandDialog.js
@@ -15,11 +15,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.CommandDialog', {
-    extend: 'Traccar.view.BaseDialog',
+Ext.define('Traccar.view.dialog.CommandDialog', {
+    extend: 'Traccar.view.dialog.BaseDialog',
 
     requires: [
-        'Traccar.view.CommandDialogController'
+        'Traccar.view.dialog.CommandDialogController'
     ],
 
     controller: 'commandDialog',
diff --git a/web/app/view/CommandDialogController.js b/web/app/view/dialog/CommandDialogController.js
index c2859d0a..a4b6c0d3 100644
--- a/web/app/view/CommandDialogController.js
+++ b/web/app/view/dialog/CommandDialogController.js
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.CommandDialogController', {
+Ext.define('Traccar.view.dialog.CommandDialogController', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.commandDialog',
 
diff --git a/web/app/view/DeviceDialog.js b/web/app/view/dialog/DeviceDialog.js
index 38b0c080..d1b067fd 100644
--- a/web/app/view/DeviceDialog.js
+++ b/web/app/view/dialog/DeviceDialog.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,8 +15,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.DeviceDialog', {
-    extend: 'Traccar.view.BaseEditDialog',
+Ext.define('Traccar.view.dialog.DeviceDialog', {
+    extend: 'Traccar.view.dialog.BaseEditDialog',
 
     title: Strings.sharedDevice,
 
diff --git a/web/app/view/DeviceDistanceController.js b/web/app/view/dialog/DeviceDistanceController.js
index eca82c4f..a7c33b99 100644
--- a/web/app/view/DeviceDistanceController.js
+++ b/web/app/view/dialog/DeviceDistanceController.js
@@ -1,6 +1,6 @@
 /*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
- * Copyright 2016 Andrey Kunitsyn (andrey@traccar.org)
+ * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 Andrey Kunitsyn (andrey@traccar.org)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.DeviceDistanceController', {
+Ext.define('Traccar.view.dialog.DeviceDistanceController', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.deviceDistanceDialog',
 
diff --git a/web/app/view/DeviceDistanceDialog.js b/web/app/view/dialog/DeviceDistanceDialog.js
index 25b1ca32..29738463 100644
--- a/web/app/view/DeviceDistanceDialog.js
+++ b/web/app/view/dialog/DeviceDistanceDialog.js
@@ -1,6 +1,6 @@
 /*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
- * Copyright 2016 Andrey Kunitsyn (andrey@traccar.org)
+ * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 Andrey Kunitsyn (andrey@traccar.org)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,11 +16,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.DeviceDistanceDialog', {
-    extend: 'Traccar.view.BaseDialog',
+Ext.define('Traccar.view.dialog.DeviceDistanceDialog', {
+    extend: 'Traccar.view.dialog.BaseDialog',
 
     requires: [
-        'Traccar.view.DeviceDistanceController'
+        'Traccar.view.dialog.DeviceDistanceController'
     ],
 
     controller: 'deviceDistanceDialog',
diff --git a/web/app/view/GeofenceDialog.js b/web/app/view/dialog/GeofenceDialog.js
index 4c2781e5..bf93e7c1 100644
--- a/web/app/view/GeofenceDialog.js
+++ b/web/app/view/dialog/GeofenceDialog.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,11 +15,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.GeofenceDialog', {
-    extend: 'Traccar.view.BaseEditDialog',
+Ext.define('Traccar.view.dialog.GeofenceDialog', {
+    extend: 'Traccar.view.dialog.BaseEditDialog',
 
     requires: [
-        'Traccar.view.GeofenceDialogController'
+        'Traccar.view.dialog.GeofenceDialogController'
     ],
 
     controller: 'geofenceDialog',
diff --git a/web/app/view/GeofenceDialogController.js b/web/app/view/dialog/GeofenceDialogController.js
index e6bb753b..b38dd15f 100644
--- a/web/app/view/GeofenceDialogController.js
+++ b/web/app/view/dialog/GeofenceDialogController.js
@@ -15,8 +15,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.GeofenceDialogController', {
-    extend: 'Traccar.view.BaseEditDialogController',
+Ext.define('Traccar.view.dialog.GeofenceDialogController', {
+    extend: 'Traccar.view.dialog.BaseEditDialogController',
     alias: 'controller.geofenceDialog',
 
     requires: [
diff --git a/web/app/view/GroupDialog.js b/web/app/view/dialog/GroupDialog.js
index 95102302..366bb43f 100644
--- a/web/app/view/GroupDialog.js
+++ b/web/app/view/dialog/GroupDialog.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,8 +15,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.GroupDialog', {
-    extend: 'Traccar.view.BaseEditDialog',
+Ext.define('Traccar.view.dialog.GroupDialog', {
+    extend: 'Traccar.view.dialog.BaseEditDialog',
 
     title: Strings.groupDialog,
 
diff --git a/web/app/view/Login.js b/web/app/view/dialog/Login.js
index 5d0da0f5..fbdc2b16 100644
--- a/web/app/view/Login.js
+++ b/web/app/view/dialog/Login.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,12 +15,12 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.Login', {
-    extend: 'Traccar.view.BaseDialog',
+Ext.define('Traccar.view.dialog.Login', {
+    extend: 'Traccar.view.dialog.BaseDialog',
     alias: 'widget.login',
 
     requires: [
-        'Traccar.view.LoginController'
+        'Traccar.view.dialog.LoginController'
     ],
 
     controller: 'login',
diff --git a/web/app/view/LoginController.js b/web/app/view/dialog/LoginController.js
index 9e8e8352..1b5cd072 100644
--- a/web/app/view/LoginController.js
+++ b/web/app/view/dialog/LoginController.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,12 +15,12 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.LoginController', {
+Ext.define('Traccar.view.dialog.LoginController', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.login',
 
     requires: [
-        'Traccar.view.Register'
+        'Traccar.view.dialog.Register'
     ],
 
     init: function () {
@@ -114,6 +114,6 @@ Ext.define('Traccar.view.LoginController', {
     },
 
     onRegisterClick: function () {
-        Ext.create('Traccar.view.Register').show();
+        Ext.create('Traccar.view.dialog.Register').show();
     }
 });
diff --git a/web/app/view/MapPickerDialogController.js b/web/app/view/dialog/MapPickerDialogController.js
index 1dc48ea0..689449b1 100644
--- a/web/app/view/MapPickerDialogController.js
+++ b/web/app/view/dialog/MapPickerDialogController.js
@@ -1,6 +1,6 @@
 /*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
- * Copyright 2016 Andrey Kunitsyn (andrey@traccar.org)
+ * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 Andrey Kunitsyn (andrey@traccar.org)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,8 +16,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.MapPickerDialogController', {
-    extend: 'Traccar.view.BaseEditDialogController',
+Ext.define('Traccar.view.dialog.MapPickerDialogController', {
+    extend: 'Traccar.view.dialog.BaseEditDialogController',
     alias: 'controller.mapPickerDialog',
 
     config: {
diff --git a/web/app/view/Register.js b/web/app/view/dialog/Register.js
index 5fb80020..235e4805 100644
--- a/web/app/view/Register.js
+++ b/web/app/view/dialog/Register.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,11 +15,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.Register', {
-    extend: 'Traccar.view.BaseDialog',
+Ext.define('Traccar.view.dialog.Register', {
+    extend: 'Traccar.view.dialog.BaseDialog',
 
     requires: [
-        'Traccar.view.RegisterController'
+        'Traccar.view.dialog.RegisterController'
     ],
 
     controller: 'register',
diff --git a/web/app/view/RegisterController.js b/web/app/view/dialog/RegisterController.js
index 0b9d534f..46ec4b9b 100644
--- a/web/app/view/RegisterController.js
+++ b/web/app/view/dialog/RegisterController.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.RegisterController', {
+Ext.define('Traccar.view.dialog.RegisterController', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.register',
 
diff --git a/web/app/view/ReportConfigController.js b/web/app/view/dialog/ReportConfigController.js
index 5ede1830..ccf78987 100644
--- a/web/app/view/ReportConfigController.js
+++ b/web/app/view/dialog/ReportConfigController.js
@@ -1,6 +1,6 @@
 /*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
- * Copyright 2016 Andrey Kunitsyn (andrey@traccar.org)
+ * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 Andrey Kunitsyn (andrey@traccar.org)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.ReportConfigController', {
+Ext.define('Traccar.view.dialog.ReportConfigController', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.reportConfigDialog',
 
diff --git a/web/app/view/ReportConfigDialog.js b/web/app/view/dialog/ReportConfigDialog.js
index 04be648c..b63e88cd 100644
--- a/web/app/view/ReportConfigDialog.js
+++ b/web/app/view/dialog/ReportConfigDialog.js
@@ -1,6 +1,6 @@
 /*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
- * Copyright 2016 Andrey Kunitsyn (andrey@traccar.org)
+ * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 Andrey Kunitsyn (andrey@traccar.org)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,11 +16,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.ReportConfigDialog', {
-    extend: 'Traccar.view.BaseDialog',
+Ext.define('Traccar.view.dialog.ReportConfigDialog', {
+    extend: 'Traccar.view.dialog.BaseDialog',
 
     requires: [
-        'Traccar.view.ReportConfigController',
+        'Traccar.view.dialog.ReportConfigController',
         'Traccar.view.CustomTimeField'
     ],
 
diff --git a/web/app/view/ServerDialog.js b/web/app/view/dialog/ServerDialog.js
index 13ddcb31..015335b5 100644
--- a/web/app/view/ServerDialog.js
+++ b/web/app/view/dialog/ServerDialog.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,11 +15,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.ServerDialog', {
-    extend: 'Traccar.view.BaseEditDialog',
+Ext.define('Traccar.view.dialog.ServerDialog', {
+    extend: 'Traccar.view.dialog.BaseEditDialog',
 
     requires: [
-        'Traccar.view.MapPickerDialogController'
+        'Traccar.view.dialog.MapPickerDialogController'
     ],
 
     controller: 'mapPickerDialog',
diff --git a/web/app/view/UserDialog.js b/web/app/view/dialog/UserDialog.js
index 8df7f2ff..3c7518f0 100644
--- a/web/app/view/UserDialog.js
+++ b/web/app/view/dialog/UserDialog.js
@@ -15,11 +15,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.UserDialog', {
-    extend: 'Traccar.view.BaseEditDialog',
+Ext.define('Traccar.view.dialog.UserDialog', {
+    extend: 'Traccar.view.dialog.BaseEditDialog',
 
     requires: [
-        'Traccar.view.UserDialogController'
+        'Traccar.view.dialog.UserDialogController'
     ],
 
     controller: 'userDialog',
diff --git a/web/app/view/UserDialogController.js b/web/app/view/dialog/UserDialogController.js
index f001dead..c334df7c 100644
--- a/web/app/view/UserDialogController.js
+++ b/web/app/view/dialog/UserDialogController.js
@@ -15,8 +15,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.UserDialogController', {
-    extend: 'Traccar.view.MapPickerDialogController',
+Ext.define('Traccar.view.dialog.UserDialogController', {
+    extend: 'Traccar.view.dialog.MapPickerDialogController',
     alias: 'controller.userDialog',
 
     init: function () {