diff options
author | Abyss777 <abyss@fox5.ru> | 2017-03-29 10:59:51 +0500 |
---|---|---|
committer | Abyss777 <abyss@fox5.ru> | 2017-03-29 10:59:51 +0500 |
commit | e37d175f5bb0613a9b64bc34368fa14e60bdb800 (patch) | |
tree | 77bd639583cb828fbebad1ea719c2218e3abc240 /web/app/view | |
parent | c6a1dc961500b62379b70b8629fc5c8da688db0b (diff) | |
download | trackermap-web-e37d175f5bb0613a9b64bc34368fa14e60bdb800.tar.gz trackermap-web-e37d175f5bb0613a9b64bc34368fa14e60bdb800.tar.bz2 trackermap-web-e37d175f5bb0613a9b64bc34368fa14e60bdb800.zip |
Move edit windows to edit subdirectory
Diffstat (limited to 'web/app/view')
-rw-r--r-- | web/app/view/Main.js | 2 | ||||
-rw-r--r-- | web/app/view/MainMobile.js | 2 | ||||
-rw-r--r-- | web/app/view/SettingsMenuController.js | 10 | ||||
-rw-r--r-- | web/app/view/dialog/BaseEditController.js | 2 | ||||
-rw-r--r-- | web/app/view/edit/AttributeAliases.js (renamed from web/app/view/AttributeAliases.js) | 10 | ||||
-rw-r--r-- | web/app/view/edit/AttributeAliasesController.js (renamed from web/app/view/AttributeAliasesController.js) | 4 | ||||
-rw-r--r-- | web/app/view/edit/Attributes.js (renamed from web/app/view/Attributes.js) | 8 | ||||
-rw-r--r-- | web/app/view/edit/AttributesController.js (renamed from web/app/view/AttributesController.js) | 4 | ||||
-rw-r--r-- | web/app/view/edit/Calendars.js (renamed from web/app/view/Calendars.js) | 10 | ||||
-rw-r--r-- | web/app/view/edit/CalendarsController.js (renamed from web/app/view/CalendarsController.js) | 4 | ||||
-rw-r--r-- | web/app/view/edit/Devices.js (renamed from web/app/view/Devices.js) | 5 | ||||
-rw-r--r-- | web/app/view/edit/DevicesController.js (renamed from web/app/view/DevicesController.js) | 4 | ||||
-rw-r--r-- | web/app/view/edit/Geofences.js (renamed from web/app/view/Geofences.js) | 6 | ||||
-rw-r--r-- | web/app/view/edit/GeofencesController.js (renamed from web/app/view/GeofencesController.js) | 4 | ||||
-rw-r--r-- | web/app/view/edit/Groups.js (renamed from web/app/view/Groups.js) | 8 | ||||
-rw-r--r-- | web/app/view/edit/GroupsController.js (renamed from web/app/view/GroupsController.js) | 4 | ||||
-rw-r--r-- | web/app/view/edit/Toolbar.js (renamed from web/app/view/EditToolbar.js) | 4 | ||||
-rw-r--r-- | web/app/view/edit/ToolbarController.js (renamed from web/app/view/EditToolbarController.js) | 4 | ||||
-rw-r--r-- | web/app/view/edit/Users.js (renamed from web/app/view/Users.js) | 6 | ||||
-rw-r--r-- | web/app/view/edit/UsersController.js (renamed from web/app/view/UsersController.js) | 4 |
20 files changed, 52 insertions, 53 deletions
diff --git a/web/app/view/Main.js b/web/app/view/Main.js index c186efd0..333928a5 100644 --- a/web/app/view/Main.js +++ b/web/app/view/Main.js @@ -20,7 +20,7 @@ Ext.define('Traccar.view.Main', { alias: 'widget.main', requires: [ - 'Traccar.view.Devices', + 'Traccar.view.edit.Devices', 'Traccar.view.State', 'Traccar.view.Report', 'Traccar.view.map.Map' diff --git a/web/app/view/MainMobile.js b/web/app/view/MainMobile.js index b0d4223b..3fdcb4f2 100644 --- a/web/app/view/MainMobile.js +++ b/web/app/view/MainMobile.js @@ -22,7 +22,7 @@ Ext.define('Traccar.view.MainMobile', { id: 'rootPanel', requires: [ - 'Traccar.view.Devices', + 'Traccar.view.edit.Devices', 'Traccar.view.State', 'Traccar.view.Report', 'Traccar.view.map.Map' diff --git a/web/app/view/SettingsMenuController.js b/web/app/view/SettingsMenuController.js index 8147bbe6..e7f5f3b9 100644 --- a/web/app/view/SettingsMenuController.js +++ b/web/app/view/SettingsMenuController.js @@ -23,14 +23,14 @@ Ext.define('Traccar.view.SettingsMenuController', { 'Traccar.view.dialog.LoginController', 'Traccar.view.dialog.User', 'Traccar.view.dialog.Server', - 'Traccar.view.Users', - 'Traccar.view.Groups', - 'Traccar.view.Geofences', + 'Traccar.view.edit.Users', + 'Traccar.view.edit.Groups', + 'Traccar.view.edit.Geofences', 'Traccar.view.Notifications', - 'Traccar.view.AttributeAliases', + 'Traccar.view.edit.AttributeAliases', 'Traccar.view.Statistics', 'Traccar.view.dialog.DeviceDistance', - 'Traccar.view.Calendars', + 'Traccar.view.edit.Calendars', 'Traccar.view.BaseWindow' ], diff --git a/web/app/view/dialog/BaseEditController.js b/web/app/view/dialog/BaseEditController.js index 287893b0..71832148 100644 --- a/web/app/view/dialog/BaseEditController.js +++ b/web/app/view/dialog/BaseEditController.js @@ -21,7 +21,7 @@ Ext.define('Traccar.view.dialog.BaseEditController', { requires: [ 'Traccar.view.BaseWindow', - 'Traccar.view.Attributes' + 'Traccar.view.edit.Attributes' ], onSaveClick: function (button) { diff --git a/web/app/view/AttributeAliases.js b/web/app/view/edit/AttributeAliases.js index d760b85b..6e110169 100644 --- a/web/app/view/AttributeAliases.js +++ b/web/app/view/edit/AttributeAliases.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,13 +16,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -Ext.define('Traccar.view.AttributeAliases', { +Ext.define('Traccar.view.edit.AttributeAliases', { extend: 'Ext.grid.Panel', xtype: 'attributeAliasesView', requires: [ - 'Traccar.view.AttributeAliasesController', - 'Traccar.view.EditToolbar' + 'Traccar.view.edit.AttributeAliasesController', + 'Traccar.view.edit.Toolbar' ], controller: 'attributeAliases', diff --git a/web/app/view/AttributeAliasesController.js b/web/app/view/edit/AttributeAliasesController.js index 3ebbc9af..fc2b57f2 100644 --- a/web/app/view/AttributeAliasesController.js +++ b/web/app/view/edit/AttributeAliasesController.js @@ -16,8 +16,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -Ext.define('Traccar.view.AttributeAliasesController', { - extend: 'Traccar.view.EditToolbarController', +Ext.define('Traccar.view.edit.AttributeAliasesController', { + extend: 'Traccar.view.edit.ToolbarController', alias: 'controller.attributeAliases', requires: [ diff --git a/web/app/view/Attributes.js b/web/app/view/edit/Attributes.js index 12fed6d0..93e5a3a7 100644 --- a/web/app/view/Attributes.js +++ b/web/app/view/edit/Attributes.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,13 +15,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -Ext.define('Traccar.view.Attributes', { +Ext.define('Traccar.view.edit.Attributes', { extend: 'Ext.grid.Panel', xtype: 'attributesView', requires: [ - 'Traccar.view.AttributesController', - 'Traccar.view.EditToolbar' + 'Traccar.view.edit.AttributesController', + 'Traccar.view.edit.Toolbar' ], controller: 'attributes', diff --git a/web/app/view/AttributesController.js b/web/app/view/edit/AttributesController.js index fe0c3153..1ae32c78 100644 --- a/web/app/view/AttributesController.js +++ b/web/app/view/edit/AttributesController.js @@ -15,8 +15,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -Ext.define('Traccar.view.AttributesController', { - extend: 'Traccar.view.EditToolbarController', +Ext.define('Traccar.view.edit.AttributesController', { + extend: 'Traccar.view.edit.ToolbarController', alias: 'controller.attributes', requires: [ diff --git a/web/app/view/Calendars.js b/web/app/view/edit/Calendars.js index 98d9a028..92ffa06d 100644 --- a/web/app/view/Calendars.js +++ b/web/app/view/edit/Calendars.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,13 +16,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -Ext.define('Traccar.view.Calendars', { +Ext.define('Traccar.view.edit.Calendars', { extend: 'Ext.grid.Panel', xtype: 'calendarsView', requires: [ - 'Traccar.view.CalendarsController', - 'Traccar.view.EditToolbar' + 'Traccar.view.edit.CalendarsController', + 'Traccar.view.edit.Toolbar' ], controller: 'calendars', diff --git a/web/app/view/CalendarsController.js b/web/app/view/edit/CalendarsController.js index 668fbd0c..f5822279 100644 --- a/web/app/view/CalendarsController.js +++ b/web/app/view/edit/CalendarsController.js @@ -16,8 +16,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -Ext.define('Traccar.view.CalendarsController', { - extend: 'Traccar.view.EditToolbarController', +Ext.define('Traccar.view.edit.CalendarsController', { + extend: 'Traccar.view.edit.ToolbarController', alias: 'controller.calendars', requires: [ diff --git a/web/app/view/Devices.js b/web/app/view/edit/Devices.js index eee214ee..d4970eb5 100644 --- a/web/app/view/Devices.js +++ b/web/app/view/edit/Devices.js @@ -15,14 +15,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -Ext.define('Traccar.view.Devices', { +Ext.define('Traccar.view.edit.Devices', { extend: 'Ext.grid.Panel', xtype: 'devicesView', requires: [ 'Ext.grid.filters.Filters', - 'Traccar.view.DevicesController', - 'Traccar.view.EditToolbar' + 'Traccar.view.edit.DevicesController' ], controller: 'devices', diff --git a/web/app/view/DevicesController.js b/web/app/view/edit/DevicesController.js index 51fd3786..895f0fbd 100644 --- a/web/app/view/DevicesController.js +++ b/web/app/view/edit/DevicesController.js @@ -15,8 +15,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -Ext.define('Traccar.view.DevicesController', { - extend: 'Traccar.view.EditToolbarController', +Ext.define('Traccar.view.edit.DevicesController', { + extend: 'Traccar.view.edit.ToolbarController', alias: 'controller.devices', requires: [ diff --git a/web/app/view/Geofences.js b/web/app/view/edit/Geofences.js index aebc1434..8ca9c31c 100644 --- a/web/app/view/Geofences.js +++ b/web/app/view/edit/Geofences.js @@ -15,13 +15,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -Ext.define('Traccar.view.Geofences', { +Ext.define('Traccar.view.edit.Geofences', { extend: 'Ext.grid.Panel', xtype: 'geofencesView', requires: [ - 'Traccar.view.GeofencesController', - 'Traccar.view.EditToolbar' + 'Traccar.view.edit.GeofencesController', + 'Traccar.view.edit.Toolbar' ], controller: 'geofences', diff --git a/web/app/view/GeofencesController.js b/web/app/view/edit/GeofencesController.js index 80bb6718..73d367ac 100644 --- a/web/app/view/GeofencesController.js +++ b/web/app/view/edit/GeofencesController.js @@ -15,8 +15,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -Ext.define('Traccar.view.GeofencesController', { - extend: 'Traccar.view.EditToolbarController', +Ext.define('Traccar.view.edit.GeofencesController', { + extend: 'Traccar.view.edit.ToolbarController', alias: 'controller.geofences', requires: [ diff --git a/web/app/view/Groups.js b/web/app/view/edit/Groups.js index 1b2f30d7..43ae8774 100644 --- a/web/app/view/Groups.js +++ b/web/app/view/edit/Groups.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,13 +15,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -Ext.define('Traccar.view.Groups', { +Ext.define('Traccar.view.edit.Groups', { extend: 'Ext.grid.Panel', xtype: 'groupsView', requires: [ - 'Traccar.view.GroupsController', - 'Traccar.view.EditToolbar' + 'Traccar.view.edit.GroupsController', + 'Traccar.view.edit.Toolbar' ], controller: 'groups', diff --git a/web/app/view/GroupsController.js b/web/app/view/edit/GroupsController.js index 871fb729..36154b4e 100644 --- a/web/app/view/GroupsController.js +++ b/web/app/view/edit/GroupsController.js @@ -15,8 +15,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -Ext.define('Traccar.view.GroupsController', { - extend: 'Traccar.view.EditToolbarController', +Ext.define('Traccar.view.edit.GroupsController', { + extend: 'Traccar.view.edit.ToolbarController', alias: 'controller.groups', requires: [ diff --git a/web/app/view/EditToolbar.js b/web/app/view/edit/Toolbar.js index dc7bb43d..6999030b 100644 --- a/web/app/view/EditToolbar.js +++ b/web/app/view/edit/Toolbar.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.EditToolbar', { +Ext.define('Traccar.view.edit.Toolbar', { extend: 'Ext.toolbar.Toolbar', xtype: 'editToolbar', diff --git a/web/app/view/EditToolbarController.js b/web/app/view/edit/ToolbarController.js index 5ce50172..fdbaa7e4 100644 --- a/web/app/view/EditToolbarController.js +++ b/web/app/view/edit/ToolbarController.js @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -Ext.define('Traccar.view.EditToolbarController', { +Ext.define('Traccar.view.edit.ToolbarController', { extend: 'Ext.app.ViewController', - alias: 'controller.editToolbarController', + alias: 'controller.toolbarController', onAddClick: function () { var dialog, objectInstance = Ext.create(this.objectModel); diff --git a/web/app/view/Users.js b/web/app/view/edit/Users.js index 96fe96fb..312ebe24 100644 --- a/web/app/view/Users.js +++ b/web/app/view/edit/Users.js @@ -16,14 +16,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -Ext.define('Traccar.view.Users', { +Ext.define('Traccar.view.edit.Users', { extend: 'Ext.grid.Panel', xtype: 'usersView', requires: [ 'Ext.grid.filters.Filters', - 'Traccar.view.UsersController', - 'Traccar.view.EditToolbar' + 'Traccar.view.edit.UsersController', + 'Traccar.view.edit.Toolbar' ], controller: 'users', diff --git a/web/app/view/UsersController.js b/web/app/view/edit/UsersController.js index 6c44216d..88f39fbf 100644 --- a/web/app/view/UsersController.js +++ b/web/app/view/edit/UsersController.js @@ -16,8 +16,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -Ext.define('Traccar.view.UsersController', { - extend: 'Traccar.view.EditToolbarController', +Ext.define('Traccar.view.edit.UsersController', { + extend: 'Traccar.view.edit.ToolbarController', alias: 'controller.users', requires: [ |