Merge pull request #588 from Abyss777/extended_notifications2

Implement Notifications per device

1 files changed, 6 insertions, 17 deletions

diff --git a/web/app/view/edit/Devices.js b/web/app/view/edit/Devices.js
index 5ec452b8..d2ba0f3d 100644
--- a/web/app/view/edit/Devices.js
+++ b/web/app/view/edit/Devices.js
@@ -23,7 +23,8 @@ Ext.define('Traccar.view.edit.Devices', {
         'Ext.grid.filters.Filters',
         'Traccar.AttributeFormatter',
         'Traccar.view.edit.DevicesController',
-        'Traccar.view.ArrayListFilter'
+        'Traccar.view.ArrayListFilter',
+        'Traccar.view.DeviceMenu'
     ],
 
     controller: 'devices',
@@ -65,26 +66,14 @@ Ext.define('Traccar.view.edit.Devices', {
             glyph: 'xf00d@FontAwesome',
             tooltip: Strings.sharedRemove
         }, {
-            handler: 'onGeofencesClick',
-            reference: 'toolbarGeofencesButton',
-            glyph: 'xf21d@FontAwesome',
-            tooltip: Strings.sharedGeofences
-        }, {
-            handler: 'onAttributesClick',
-            reference: 'toolbarAttributesButton',
-            glyph: 'xf0ae@FontAwesome',
-            tooltip: Strings.sharedComputedAttributes
-        }, {
-            xtype: 'button',
-            handler: 'onDriversClick',
-            reference: 'toolbarDriversButton',
-            glyph: 'xf2c2@FontAwesome',
-            tooltip: Strings.sharedDrivers
-        }, {
             handler: 'onCommandClick',
             reference: 'deviceCommandButton',
             glyph: 'xf093@FontAwesome',
             tooltip: Strings.deviceCommand
+        }, {
+            xtype: 'deviceMenu',
+            reference: 'toolbarDeviceMenu',
+            enableToggle: false
         }]
     },