24 files changed, 62 insertions, 62 deletions
diff --git a/web/app/view/dialog/AttributeDialog.js b/web/app/view/dialog/Attribute.js
index 2dc851fd..993c2b12 100644
--- a/web/app/view/dialog/AttributeDialog.js
+++ b/web/app/view/dialog/Attribute.js
@@ -15,14 +15,14 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.dialog.AttributeDialog', {
-    extend: 'Traccar.view.dialog.BaseDialog',
+Ext.define('Traccar.view.dialog.Attribute', {
+    extend: 'Traccar.view.dialog.Base',
 
     requires: [
         'Traccar.view.dialog.AttributeController'
     ],
 
-    controller: 'attributeDialog',
+    controller: 'attribute',
     title: Strings.sharedAttribute,
 
     items: {
diff --git a/web/app/view/dialog/AttributeAliasDialog.js b/web/app/view/dialog/AttributeAlias.js
index a8a6b82c..6072a306 100644
--- a/web/app/view/dialog/AttributeAliasDialog.js
+++ b/web/app/view/dialog/AttributeAlias.js
@@ -16,14 +16,14 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.dialog.AttributeAliasDialog', {
-    extend: 'Traccar.view.dialog.BaseDialog',
+Ext.define('Traccar.view.dialog.AttributeAlias', {
+    extend: 'Traccar.view.dialog.Base',
 
     requires: [
         'Traccar.view.dialog.AttributeController'
     ],
 
-    controller: 'attributeDialog',
+    controller: 'attribute',
     title: Strings.sharedAttributeAlias,
 
     items: {
diff --git a/web/app/view/dialog/AttributeController.js b/web/app/view/dialog/AttributeController.js
index cd6fc61e..365a0df5 100644
--- a/web/app/view/dialog/AttributeController.js
+++ b/web/app/view/dialog/AttributeController.js
@@ -17,7 +17,7 @@
 
 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/dialog/BaseDialog.js b/web/app/view/dialog/Base.js
index 71fa6b32..5aad254d 100644
--- a/web/app/view/dialog/BaseDialog.js
+++ b/web/app/view/dialog/Base.js
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.dialog.BaseDialog', {
+Ext.define('Traccar.view.dialog.Base', {
     extend: 'Ext.window.Window',
 
     bodyPadding: Traccar.Style.normalPadding,
diff --git a/web/app/view/dialog/BaseEditDialog.js b/web/app/view/dialog/BaseEdit.js
index f1314a96..362823e3 100644
--- a/web/app/view/dialog/BaseEditDialog.js
+++ b/web/app/view/dialog/BaseEdit.js
@@ -15,14 +15,14 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.dialog.BaseEditDialog', {
-    extend: 'Traccar.view.dialog.BaseDialog',
+Ext.define('Traccar.view.dialog.BaseEdit', {
+    extend: 'Traccar.view.dialog.Base',
 
     requires: [
-        'Traccar.view.dialog.BaseEditDialogController'
+        'Traccar.view.dialog.BaseEditController'
     ],
 
-    controller: 'baseEditDialog',
+    controller: 'baseEdit',
 
     buttons: [{
         text: Strings.sharedAttributes,
diff --git a/web/app/view/dialog/BaseEditDialogController.js b/web/app/view/dialog/BaseEditController.js
index cc92c6f8..287893b0 100644
--- a/web/app/view/dialog/BaseEditDialogController.js
+++ b/web/app/view/dialog/BaseEditController.js
@@ -15,9 +15,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.dialog.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/dialog/CalendarDialog.js b/web/app/view/dialog/Calendar.js
index 7b233404..9880d4e6 100644
--- a/web/app/view/dialog/CalendarDialog.js
+++ b/web/app/view/dialog/Calendar.js
@@ -16,14 +16,14 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.dialog.CalendarDialog', {
-    extend: 'Traccar.view.dialog.BaseEditDialog',
+Ext.define('Traccar.view.dialog.Calendar', {
+    extend: 'Traccar.view.dialog.BaseEdit',
 
     requires: [
-        'Traccar.view.dialog.CalendarDialogController'
+        'Traccar.view.dialog.CalendarController'
     ],
 
-    controller: 'calendarDialog',
+    controller: 'calendar',
     title: Strings.sharedCalendar,
 
     items: {
diff --git a/web/app/view/dialog/CalendarDialogController.js b/web/app/view/dialog/CalendarController.js
index b041c85e..14d8294a 100644
--- a/web/app/view/dialog/CalendarDialogController.js
+++ b/web/app/view/dialog/CalendarController.js
@@ -16,9 +16,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.dialog.CalendarDialogController', {
-    extend: 'Traccar.view.dialog.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/dialog/CommandDialog.js b/web/app/view/dialog/Command.js
index e02e1277..ec98b29f 100644
--- a/web/app/view/dialog/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.dialog.CommandDialog', {
-    extend: 'Traccar.view.dialog.BaseDialog',
+Ext.define('Traccar.view.dialog.Command', {
+    extend: 'Traccar.view.dialog.Base',
 
     requires: [
-        'Traccar.view.dialog.CommandDialogController'
+        'Traccar.view.dialog.CommandController'
     ],
 
-    controller: 'commandDialog',
+    controller: 'command',
     title: Strings.commandTitle,
 
     items: {
diff --git a/web/app/view/dialog/CommandDialogController.js b/web/app/view/dialog/CommandController.js
index a4b6c0d3..be6245b0 100644
--- a/web/app/view/dialog/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.dialog.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/dialog/DeviceDialog.js b/web/app/view/dialog/Device.js
index d1b067fd..bd4a1286 100644
--- a/web/app/view/dialog/DeviceDialog.js
+++ b/web/app/view/dialog/Device.js
@@ -15,8 +15,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.dialog.DeviceDialog', {
-    extend: 'Traccar.view.dialog.BaseEditDialog',
+Ext.define('Traccar.view.dialog.Device', {
+    extend: 'Traccar.view.dialog.BaseEdit',
 
     title: Strings.sharedDevice,
 
diff --git a/web/app/view/dialog/DeviceDistanceDialog.js b/web/app/view/dialog/DeviceDistance.js
index 29738463..14a795ad 100644
--- a/web/app/view/dialog/DeviceDistanceDialog.js
+++ b/web/app/view/dialog/DeviceDistance.js
@@ -16,14 +16,14 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.dialog.DeviceDistanceDialog', {
-    extend: 'Traccar.view.dialog.BaseDialog',
+Ext.define('Traccar.view.dialog.DeviceDistance', {
+    extend: 'Traccar.view.dialog.Base',
 
     requires: [
         'Traccar.view.dialog.DeviceDistanceController'
     ],
 
-    controller: 'deviceDistanceDialog',
+    controller: 'deviceDistance',
     title: Strings.sharedDeviceDistance,
 
     items: [{
diff --git a/web/app/view/dialog/DeviceDistanceController.js b/web/app/view/dialog/DeviceDistanceController.js
index a7c33b99..fd106a8d 100644
--- a/web/app/view/dialog/DeviceDistanceController.js
+++ b/web/app/view/dialog/DeviceDistanceController.js
@@ -18,7 +18,7 @@
 
 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/dialog/GeofenceDialog.js b/web/app/view/dialog/Geofence.js
index bf93e7c1..93f17de5 100644
--- a/web/app/view/dialog/GeofenceDialog.js
+++ b/web/app/view/dialog/Geofence.js
@@ -15,14 +15,14 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.dialog.GeofenceDialog', {
-    extend: 'Traccar.view.dialog.BaseEditDialog',
+Ext.define('Traccar.view.dialog.Geofence', {
+    extend: 'Traccar.view.dialog.BaseEdit',
 
     requires: [
-        'Traccar.view.dialog.GeofenceDialogController'
+        'Traccar.view.dialog.GeofenceController'
     ],
 
-    controller: 'geofenceDialog',
+    controller: 'geofence',
     title: Strings.sharedGeofence,
 
     items: {
diff --git a/web/app/view/dialog/GeofenceDialogController.js b/web/app/view/dialog/GeofenceController.js
index b38dd15f..9fdad61b 100644
--- a/web/app/view/dialog/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.dialog.GeofenceDialogController', {
-    extend: 'Traccar.view.dialog.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/dialog/GroupDialog.js b/web/app/view/dialog/Group.js
index 366bb43f..1f351a54 100644
--- a/web/app/view/dialog/GroupDialog.js
+++ b/web/app/view/dialog/Group.js
@@ -15,8 +15,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.dialog.GroupDialog', {
-    extend: 'Traccar.view.dialog.BaseEditDialog',
+Ext.define('Traccar.view.dialog.Group', {
+    extend: 'Traccar.view.dialog.BaseEdit',
 
     title: Strings.groupDialog,
 
diff --git a/web/app/view/dialog/Login.js b/web/app/view/dialog/Login.js
index fbdc2b16..5a0695ee 100644
--- a/web/app/view/dialog/Login.js
+++ b/web/app/view/dialog/Login.js
@@ -16,7 +16,7 @@
  */
 
 Ext.define('Traccar.view.dialog.Login', {
-    extend: 'Traccar.view.dialog.BaseDialog',
+    extend: 'Traccar.view.dialog.Base',
     alias: 'widget.login',
 
     requires: [
diff --git a/web/app/view/dialog/MapPickerDialogController.js b/web/app/view/dialog/MapPickerController.js
index 689449b1..23f60ece 100644
--- a/web/app/view/dialog/MapPickerDialogController.js
+++ b/web/app/view/dialog/MapPickerController.js
@@ -16,9 +16,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.dialog.MapPickerDialogController', {
-    extend: 'Traccar.view.dialog.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/dialog/Register.js b/web/app/view/dialog/Register.js
index 235e4805..f4f5a395 100644
--- a/web/app/view/dialog/Register.js
+++ b/web/app/view/dialog/Register.js
@@ -16,7 +16,7 @@
  */
 
 Ext.define('Traccar.view.dialog.Register', {
-    extend: 'Traccar.view.dialog.BaseDialog',
+    extend: 'Traccar.view.dialog.Base',
 
     requires: [
         'Traccar.view.dialog.RegisterController'
diff --git a/web/app/view/dialog/ReportConfigDialog.js b/web/app/view/dialog/ReportConfig.js
index b63e88cd..b8493cbb 100644
--- a/web/app/view/dialog/ReportConfigDialog.js
+++ b/web/app/view/dialog/ReportConfig.js
@@ -16,15 +16,15 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.dialog.ReportConfigDialog', {
-    extend: 'Traccar.view.dialog.BaseDialog',
+Ext.define('Traccar.view.dialog.ReportConfig', {
+    extend: 'Traccar.view.dialog.Base',
 
     requires: [
         'Traccar.view.dialog.ReportConfigController',
         'Traccar.view.CustomTimeField'
     ],
 
-    controller: 'reportConfigDialog',
+    controller: 'reportConfig',
     title: Strings.reportConfigure,
 
     items: [{
diff --git a/web/app/view/dialog/ReportConfigController.js b/web/app/view/dialog/ReportConfigController.js
index ccf78987..7233562b 100644
--- a/web/app/view/dialog/ReportConfigController.js
+++ b/web/app/view/dialog/ReportConfigController.js
@@ -18,7 +18,7 @@
 
 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/dialog/ServerDialog.js b/web/app/view/dialog/Server.js
index 015335b5..a86b7b77 100644
--- a/web/app/view/dialog/ServerDialog.js
+++ b/web/app/view/dialog/Server.js
@@ -15,14 +15,14 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.dialog.ServerDialog', {
-    extend: 'Traccar.view.dialog.BaseEditDialog',
+Ext.define('Traccar.view.dialog.Server', {
+    extend: 'Traccar.view.dialog.BaseEdit',
 
     requires: [
-        'Traccar.view.dialog.MapPickerDialogController'
+        'Traccar.view.dialog.MapPickerController'
     ],
 
-    controller: 'mapPickerDialog',
+    controller: 'mapPicker',
     title: Strings.serverTitle,
 
     items: {
diff --git a/web/app/view/dialog/UserDialog.js b/web/app/view/dialog/User.js
index 3c7518f0..344a8f6d 100644
--- a/web/app/view/dialog/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.dialog.UserDialog', {
-    extend: 'Traccar.view.dialog.BaseEditDialog',
+Ext.define('Traccar.view.dialog.User', {
+    extend: 'Traccar.view.dialog.BaseEdit',
 
     requires: [
-        'Traccar.view.dialog.UserDialogController'
+        'Traccar.view.dialog.UserController'
     ],
 
-    controller: 'userDialog',
+    controller: 'user',
     title: Strings.settingsUser,
 
     items: {
diff --git a/web/app/view/dialog/UserDialogController.js b/web/app/view/dialog/UserController.js
index c334df7c..89b0bc83 100644
--- a/web/app/view/dialog/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.dialog.UserDialogController', {
-    extend: 'Traccar.view.dialog.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')) {