Maximize window if it doesn't fit

2 files changed, 16 insertions, 6 deletions

diff --git a/web/app/view/BaseWindow.js b/web/app/view/BaseWindow.js
index ede69b98..689f2057 100644
--- a/web/app/view/BaseWindow.js
+++ b/web/app/view/BaseWindow.js
@@ -21,5 +21,13 @@ Ext.define('Traccar.view.BaseWindow', {
     width: Traccar.Style.windowWidth,
     height: Traccar.Style.windowHeight,
     layout: 'fit',
-    modal: true
+    modal: true,
+
+    initComponent: function () {
+        if (screen.width < Traccar.Style.windowWidth || screen.height < Traccar.Style.windowHeight) {
+            this.maximized = true;
+            this.style = 'border-width: 0';
+        }
+        this.callParent();
+    }
 });
diff --git a/web/app/view/Users.js b/web/app/view/Users.js
index 7a505dd4..5f52d0e3 100644
--- a/web/app/view/Users.js
+++ b/web/app/view/Users.js
@@ -32,6 +32,13 @@ Ext.define('Traccar.view.Users', {
     tbar: {
         xtype: 'editToolbar',
         items: [{
+            disabled: true,
+            handler: 'onGeofencesClick',
+            reference: 'userGeofencesButton',
+            glyph: 'xf21d@FontAwesome',
+            tooltip: Strings.sharedGeofences,
+            tooltipType: 'title'
+        }, {
             text: Strings.deviceTitle,
             disabled: true,
             handler: 'onDevicesClick',
@@ -42,11 +49,6 @@ Ext.define('Traccar.view.Users', {
             handler: 'onGroupsClick',
             reference: 'userGroupsButton'
         }, {
-            text: Strings.sharedGeofences,
-            disabled: true,
-            handler: 'onGeofencesClick',
-            reference: 'userGeofencesButton'
-        }, {
             text: Strings.sharedNotifications,
             disabled: true,
             handler: 'onNotificationsClick',