aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--web/app/view/UserController.js16
-rw-r--r--web/app/view/UserDeviceDialog.js42
-rw-r--r--web/debug.html2
-rw-r--r--web/release.html2
4 files changed, 50 insertions, 12 deletions
diff --git a/web/app/view/UserController.js b/web/app/view/UserController.js
index 10d1ded85..4ebc0d27c 100644
--- a/web/app/view/UserController.js
+++ b/web/app/view/UserController.js
@@ -19,7 +19,8 @@ Ext.define('Traccar.view.UserController', {
alias: 'controller.user',
requires: [
- 'Traccar.view.UserDialog'
+ 'Traccar.view.UserDialog',
+ 'Traccar.view.UserDeviceDialog'
],
init: function () {
@@ -63,17 +64,8 @@ Ext.define('Traccar.view.UserController', {
},
onDevicesClick: function () {
- // TODO show devices
- /*Ext.create('Ext.window.Window', {
- title: Strings.settingsUsers,
- width: Traccar.Style.windowWidth,
- height: Traccar.Style.windowHeight,
- layout: 'fit',
- modal: true,
- items: {
- xtype: 'userView'
- }
- }).show();*/
+ var dialog = Ext.create('Traccar.view.UserDeviceDialog');
+ dialog.show();
},
onSelectionChange: function (selected) {
diff --git a/web/app/view/UserDeviceDialog.js b/web/app/view/UserDeviceDialog.js
new file mode 100644
index 000000000..7e0b1eb88
--- /dev/null
+++ b/web/app/view/UserDeviceDialog.js
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+Ext.define('Traccar.view.UserDeviceDialog', {
+ extend: 'Traccar.view.BaseEditDialog',
+
+ requires: [
+ 'Traccar.view.BaseEditDialogController'
+ ],
+
+ controller: 'baseEditDialog',
+ title: Strings.deviceTitle,
+
+ width: Traccar.Style.windowWidth,
+
+ items: {
+ xtype: 'form',
+ items: [{
+ xtype: 'itemselectorfield',
+ anchor: '100%',
+ store: 'Languages',
+ displayField: 'name',
+ valueField: 'id',
+ fromTitle: 'Available',
+ toTitle: 'Selected',
+ maxHeight: Traccar.Style.windowHeight
+ }]
+ }
+});
diff --git a/web/debug.html b/web/debug.html
index 9d0f24c6f..ba014f6fb 100644
--- a/web/debug.html
+++ b/web/debug.html
@@ -5,10 +5,12 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<title>Traccar</title>
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/extjs/6.0.0/classic/theme-neptune/resources/theme-neptune-all.css">
+<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/extjs/6.0.0/packages/ux/classic/neptune/resources/ux-all.css">
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/ol3/3.7.0/ol.css">
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.3.0/css/font-awesome.min.css">
<link rel="stylesheet" href="app.css">
<script src="//cdnjs.cloudflare.com/ajax/libs/extjs/6.0.0/ext-all-debug.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/extjs/6.0.0/packages/ux/classic/ux-debug.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/extjs/6.0.0/classic/theme-neptune/theme-neptune.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/ol3/3.7.0/ol-debug.js"></script>
<script src="locale.js"></script>
diff --git a/web/release.html b/web/release.html
index 8acf44445..130e3fceb 100644
--- a/web/release.html
+++ b/web/release.html
@@ -5,10 +5,12 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<title>Traccar</title>
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/extjs/6.0.0/classic/theme-neptune/resources/theme-neptune-all.css">
+<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/extjs/6.0.0/packages/ux/classic/neptune/resources/ux-all.css">
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/ol3/3.7.0/ol.min.css">
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.3.0/css/font-awesome.min.css">
<link rel="stylesheet" href="app.css">
<script src="//cdnjs.cloudflare.com/ajax/libs/extjs/6.0.0/ext-all.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/extjs/6.0.0/packages/ux/classic/ux.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/extjs/6.0.0/classic/theme-neptune/theme-neptune.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/ol3/3.7.0/ol.min.js"></script>
<script src="locale.js"></script>