Merge pull request #454 from Abyss777/move_dialog

Move BaseDialog, subclasses and their controllers to dialog subfolder

37 files changed, 138 insertions, 138 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..3ebbc9af 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.AttributeAlias',
         'Traccar.model.AttributeAlias'
     ],
 
     objectModel: 'Traccar.model.AttributeAlias',
-    objectDialog: 'Traccar.view.AttributeAliasDialog',
+    objectDialog: 'Traccar.view.dialog.AttributeAlias',
     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.AttributeAlias');
         dialog.down('form').loadRecord(attributeAlias);
         dialog.show();
     },
diff --git a/web/app/view/AttributesController.js b/web/app/view/AttributesController.js
index 1c5f5b4b..fe0c3153 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.Attribute',
         'Traccar.store.Attributes',
         'Traccar.model.Attribute'
     ],
 
     objectModel: 'Traccar.model.Attribute',
-    objectDialog: 'Traccar.view.AttributeDialog',
+    objectDialog: 'Traccar.view.dialog.Attribute',
     removeTitle: Strings.stateName,
 
     init: function () {
diff --git a/web/app/view/CalendarsController.js b/web/app/view/CalendarsController.js
index bfa7569d..668fbd0c 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.Calendar',
         'Traccar.model.Calendar'
     ],
 
     objectModel: 'Traccar.model.Calendar',
-    objectDialog: 'Traccar.view.CalendarDialog',
+    objectDialog: 'Traccar.view.dialog.Calendar',
     removeTitle: Strings.sharedCalendar
 
 });
diff --git a/web/app/view/DevicesController.js b/web/app/view/DevicesController.js
index 742077b2..9d426911 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.Command',
+        'Traccar.view.dialog.Device',
         '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.Device',
     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.Command');
 
         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..80bb6718 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.Geofence',
         'Traccar.model.Geofence'
     ],
 
     objectModel: 'Traccar.model.Geofence',
-    objectDialog: 'Traccar.view.GeofenceDialog',
+    objectDialog: 'Traccar.view.dialog.Geofence',
     removeTitle: Strings.sharedGeofence
 });
diff --git a/web/app/view/GroupsController.js b/web/app/view/GroupsController.js
index 98568db5..471e4952 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.Group',
         'Traccar.view.GroupGeofences',
         'Traccar.view.BaseWindow',
         'Traccar.model.Group'
     ],
 
     objectModel: 'Traccar.model.Group',
-    objectDialog: 'Traccar.view.GroupDialog',
+    objectDialog: 'Traccar.view.dialog.Group',
     removeTitle: Strings.groupDialog,
 
     onGeofencesClick: function () {
diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js
index c02964e7..e8955a8c 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.ReportConfig',
         '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.ReportConfig');
         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..8147bbe6 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.User',
+        'Traccar.view.dialog.Server',
         'Traccar.view.Users',
         'Traccar.view.Groups',
         'Traccar.view.Geofences',
         'Traccar.view.Notifications',
         'Traccar.view.AttributeAliases',
         'Traccar.view.Statistics',
-        'Traccar.view.DeviceDistanceDialog',
+        'Traccar.view.dialog.DeviceDistance',
         '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.User', {
             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.Server');
         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.DeviceDistance');
         dialog.show();
     },
 
diff --git a/web/app/view/StateController.js b/web/app/view/StateController.js
index 661bc961..f0370f96 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.AttributeAlias'
 
     ],
 
@@ -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.AttributeAlias');
         dialog.down('form').loadRecord(attributeAlias);
         dialog.show();
     },
diff --git a/web/app/view/UsersController.js b/web/app/view/UsersController.js
index a79f9586..eaae230c 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.User',
         '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.User',
     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.User', {
             selfEdit: user.get('id') === Traccar.app.getUser().get('id')
         });
         dialog.down('form').loadRecord(user);
@@ -59,7 +59,7 @@ Ext.define('Traccar.view.UsersController', {
         if (Traccar.app.getUser().get('expirationTime')) {
             user.set('expirationTime', Traccar.app.getUser().get('expirationTime'));
         }
-        dialog = Ext.create('Traccar.view.UserDialog');
+        dialog = Ext.create('Traccar.view.dialog.User');
         dialog.down('form').loadRecord(user);
         dialog.show();
     },
diff --git a/web/app/view/AttributeDialog.js b/web/app/view/dialog/Attribute.js
index 7d4908f9..993c2b12 100644
--- a/web/app/view/AttributeDialog.js
+++ b/web/app/view/dialog/Attribute.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,14 +15,14 @@
  * 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.Attribute', {
+    extend: 'Traccar.view.dialog.Base',
 
     requires: [
-        'Traccar.view.AttributeController'
+        'Traccar.view.dialog.AttributeController'
     ],
 
-    controller: 'attributeDialog',
+    controller: 'attribute',
     title: Strings.sharedAttribute,
 
     items: {
diff --git a/web/app/view/AttributeAliasDialog.js b/web/app/view/dialog/AttributeAlias.js
index 74b12490..6072a306 100644
--- a/web/app/view/AttributeAliasDialog.js
+++ b/web/app/view/dialog/AttributeAlias.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,14 +16,14 @@
  * 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.AttributeAlias', {
+    extend: 'Traccar.view.dialog.Base',
 
     requires: [
-        'Traccar.view.AttributeController'
+        'Traccar.view.dialog.AttributeController'
     ],
 
-    controller: 'attributeDialog',
+    controller: 'attribute',
     title: Strings.sharedAttributeAlias,
 
     items: {
diff --git a/web/app/view/AttributeController.js b/web/app/view/dialog/AttributeController.js
index b8914d4e..365a0df5 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,9 +15,9 @@
  * 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',
+    alias: 'controller.attribute',
 
     onSaveClick: function (button) {
         var dialog, store, record;
diff --git a/web/app/view/BaseDialog.js b/web/app/view/dialog/Base.js
index aa9782f1..5aad254d 100644
--- a/web/app/view/BaseDialog.js
+++ b/web/app/view/dialog/Base.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.Base', {
     extend: 'Ext.window.Window',
 
     bodyPadding: Traccar.Style.normalPadding,
diff --git a/web/app/view/BaseEditDialog.js b/web/app/view/dialog/BaseEdit.js
index 18cfcf50..362823e3 100644
--- a/web/app/view/BaseEditDialog.js
+++ b/web/app/view/dialog/BaseEdit.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,14 +15,14 @@
  * 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.BaseEdit', {
+    extend: 'Traccar.view.dialog.Base',
 
     requires: [
-        'Traccar.view.BaseEditDialogController'
+        'Traccar.view.dialog.BaseEditController'
     ],
 
-    controller: 'baseEditDialog',
+    controller: 'baseEdit',
 
     buttons: [{
         text: Strings.sharedAttributes,
diff --git a/web/app/view/BaseEditDialogController.js b/web/app/view/dialog/BaseEditController.js
index 8b74fbba..287893b0 100644
--- a/web/app/view/BaseEditDialogController.js
+++ b/web/app/view/dialog/BaseEditController.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,9 +15,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.BaseEditDialogController', {
+Ext.define('Traccar.view.dialog.BaseEditController', {
     extend: 'Ext.app.ViewController',
-    alias: 'controller.baseEditDialog',
+    alias: 'controller.baseEdit',
 
     requires: [
         'Traccar.view.BaseWindow',
diff --git a/web/app/view/CalendarDialog.js b/web/app/view/dialog/Calendar.js
index 93c2d429..9880d4e6 100644
--- a/web/app/view/CalendarDialog.js
+++ b/web/app/view/dialog/Calendar.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,14 +16,14 @@
  * 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.Calendar', {
+    extend: 'Traccar.view.dialog.BaseEdit',
 
     requires: [
-        'Traccar.view.CalendarDialogController'
+        'Traccar.view.dialog.CalendarController'
     ],
 
-    controller: 'calendarDialog',
+    controller: 'calendar',
     title: Strings.sharedCalendar,
 
     items: {
diff --git a/web/app/view/CalendarDialogController.js b/web/app/view/dialog/CalendarController.js
index a111ded6..14d8294a 100644
--- a/web/app/view/CalendarDialogController.js
+++ b/web/app/view/dialog/CalendarController.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,9 +16,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.CalendarDialogController', {
-    extend: 'Traccar.view.BaseEditDialogController',
-    alias: 'controller.calendarDialog',
+Ext.define('Traccar.view.dialog.CalendarController', {
+    extend: 'Traccar.view.dialog.BaseEditController',
+    alias: 'controller.calendar',
 
     onFileChange: function (fileField) {
         var reader;
diff --git a/web/app/view/CommandDialog.js b/web/app/view/dialog/Command.js
index ef486c41..ec98b29f 100644
--- a/web/app/view/CommandDialog.js
+++ b/web/app/view/dialog/Command.js
@@ -15,14 +15,14 @@
  * 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.Command', {
+    extend: 'Traccar.view.dialog.Base',
 
     requires: [
-        'Traccar.view.CommandDialogController'
+        'Traccar.view.dialog.CommandController'
     ],
 
-    controller: 'commandDialog',
+    controller: 'command',
     title: Strings.commandTitle,
 
     items: {
diff --git a/web/app/view/CommandDialogController.js b/web/app/view/dialog/CommandController.js
index c2859d0a..be6245b0 100644
--- a/web/app/view/CommandDialogController.js
+++ b/web/app/view/dialog/CommandController.js
@@ -15,9 +15,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.CommandDialogController', {
+Ext.define('Traccar.view.dialog.CommandController', {
     extend: 'Ext.app.ViewController',
-    alias: 'controller.commandDialog',
+    alias: 'controller.command',
 
     onSelect: function (selected) {
         this.lookupReference('paramPositionPeriodic').setHidden(
diff --git a/web/app/view/DeviceDialog.js b/web/app/view/dialog/Device.js
index 38b0c080..bd4a1286 100644
--- a/web/app/view/DeviceDialog.js
+++ b/web/app/view/dialog/Device.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.Device', {
+    extend: 'Traccar.view.dialog.BaseEdit',
 
     title: Strings.sharedDevice,
 
diff --git a/web/app/view/DeviceDistanceDialog.js b/web/app/view/dialog/DeviceDistance.js
index 25b1ca32..14a795ad 100644
--- a/web/app/view/DeviceDistanceDialog.js
+++ b/web/app/view/dialog/DeviceDistance.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,14 +16,14 @@
  * 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.DeviceDistance', {
+    extend: 'Traccar.view.dialog.Base',
 
     requires: [
-        'Traccar.view.DeviceDistanceController'
+        'Traccar.view.dialog.DeviceDistanceController'
     ],
 
-    controller: 'deviceDistanceDialog',
+    controller: 'deviceDistance',
     title: Strings.sharedDeviceDistance,
 
     items: [{
diff --git a/web/app/view/DeviceDistanceController.js b/web/app/view/dialog/DeviceDistanceController.js
index eca82c4f..fd106a8d 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,9 +16,9 @@
  * 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',
+    alias: 'controller.deviceDistance',
 
     onDeviceChange: function (combobox, newValue) {
         this.lookupReference('setButton').setDisabled(newValue === null);
diff --git a/web/app/view/GeofenceDialog.js b/web/app/view/dialog/Geofence.js
index 4c2781e5..93f17de5 100644
--- a/web/app/view/GeofenceDialog.js
+++ b/web/app/view/dialog/Geofence.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,14 +15,14 @@
  * 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.Geofence', {
+    extend: 'Traccar.view.dialog.BaseEdit',
 
     requires: [
-        'Traccar.view.GeofenceDialogController'
+        'Traccar.view.dialog.GeofenceController'
     ],
 
-    controller: 'geofenceDialog',
+    controller: 'geofence',
     title: Strings.sharedGeofence,
 
     items: {
diff --git a/web/app/view/GeofenceDialogController.js b/web/app/view/dialog/GeofenceController.js
index e6bb753b..9fdad61b 100644
--- a/web/app/view/GeofenceDialogController.js
+++ b/web/app/view/dialog/GeofenceController.js
@@ -15,9 +15,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.GeofenceDialogController', {
-    extend: 'Traccar.view.BaseEditDialogController',
-    alias: 'controller.geofenceDialog',
+Ext.define('Traccar.view.dialog.GeofenceController', {
+    extend: 'Traccar.view.dialog.BaseEditController',
+    alias: 'controller.geofence',
 
     requires: [
         'Traccar.view.BaseWindow',
diff --git a/web/app/view/GroupDialog.js b/web/app/view/dialog/Group.js
index 95102302..1f351a54 100644
--- a/web/app/view/GroupDialog.js
+++ b/web/app/view/dialog/Group.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.Group', {
+    extend: 'Traccar.view.dialog.BaseEdit',
 
     title: Strings.groupDialog,
 
diff --git a/web/app/view/Login.js b/web/app/view/dialog/Login.js
index 5d0da0f5..5a0695ee 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.Base',
     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/MapPickerController.js
index 1dc48ea0..23f60ece 100644
--- a/web/app/view/MapPickerDialogController.js
+++ b/web/app/view/dialog/MapPickerController.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,9 +16,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.MapPickerDialogController', {
-    extend: 'Traccar.view.BaseEditDialogController',
-    alias: 'controller.mapPickerDialog',
+Ext.define('Traccar.view.dialog.MapPickerController', {
+    extend: 'Traccar.view.dialog.BaseEditController',
+    alias: 'controller.mapPicker',
 
     config: {
         listen: {
diff --git a/web/app/view/Register.js b/web/app/view/dialog/Register.js
index 5fb80020..f4f5a395 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.Base',
 
     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/ReportConfigDialog.js b/web/app/view/dialog/ReportConfig.js
index 04be648c..b8493cbb 100644
--- a/web/app/view/ReportConfigDialog.js
+++ b/web/app/view/dialog/ReportConfig.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,15 +16,15 @@
  * 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.ReportConfig', {
+    extend: 'Traccar.view.dialog.Base',
 
     requires: [
-        'Traccar.view.ReportConfigController',
+        'Traccar.view.dialog.ReportConfigController',
         'Traccar.view.CustomTimeField'
     ],
 
-    controller: 'reportConfigDialog',
+    controller: 'reportConfig',
     title: Strings.reportConfigure,
 
     items: [{
diff --git a/web/app/view/ReportConfigController.js b/web/app/view/dialog/ReportConfigController.js
index 5ede1830..7233562b 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,9 +16,9 @@
  * 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',
+    alias: 'controller.reportConfig',
 
     requires: [
         'Traccar.store.ReportEventTypes',
diff --git a/web/app/view/ServerDialog.js b/web/app/view/dialog/Server.js
index 13ddcb31..a86b7b77 100644
--- a/web/app/view/ServerDialog.js
+++ b/web/app/view/dialog/Server.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,14 +15,14 @@
  * 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.Server', {
+    extend: 'Traccar.view.dialog.BaseEdit',
 
     requires: [
-        'Traccar.view.MapPickerDialogController'
+        'Traccar.view.dialog.MapPickerController'
     ],
 
-    controller: 'mapPickerDialog',
+    controller: 'mapPicker',
     title: Strings.serverTitle,
 
     items: {
diff --git a/web/app/view/UserDialog.js b/web/app/view/dialog/User.js
index 8df7f2ff..344a8f6d 100644
--- a/web/app/view/UserDialog.js
+++ b/web/app/view/dialog/User.js
@@ -15,14 +15,14 @@
  * 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.User', {
+    extend: 'Traccar.view.dialog.BaseEdit',
 
     requires: [
-        'Traccar.view.UserDialogController'
+        'Traccar.view.dialog.UserController'
     ],
 
-    controller: 'userDialog',
+    controller: 'user',
     title: Strings.settingsUser,
 
     items: {
diff --git a/web/app/view/UserDialogController.js b/web/app/view/dialog/UserController.js
index f001dead..89b0bc83 100644
--- a/web/app/view/UserDialogController.js
+++ b/web/app/view/dialog/UserController.js
@@ -15,9 +15,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.UserDialogController', {
-    extend: 'Traccar.view.MapPickerDialogController',
-    alias: 'controller.userDialog',
+Ext.define('Traccar.view.dialog.UserController', {
+    extend: 'Traccar.view.dialog.MapPickerController',
+    alias: 'controller.user',
 
     init: function () {
         if (Traccar.app.getUser().get('admin')) {