From 1db0f3fce321a6f22da47998a53f6a5bf7bc7b36 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Mon, 13 Feb 2017 02:54:37 +1300 Subject: Use flex instead of forceFit --- web/app/view/AttributeAliases.js | 3 +-- web/app/view/Attributes.js | 3 +-- web/app/view/Calendars.js | 3 +-- web/app/view/DeviceGeofences.js | 7 ++++--- web/app/view/Devices.js | 3 +-- web/app/view/Geofences.js | 3 +-- web/app/view/GroupGeofences.js | 7 ++++--- web/app/view/Groups.js | 3 +-- web/app/view/Notifications.js | 3 +-- web/app/view/Report.js | 2 +- web/app/view/Statistics.js | 3 +-- web/app/view/UserCalendars.js | 7 ++++--- web/app/view/UserDevices.js | 8 ++++---- web/app/view/UserGeofences.js | 7 ++++--- web/app/view/UserGroups.js | 7 ++++--- web/app/view/UserUsers.js | 7 ++++--- web/app/view/Users.js | 3 +-- 17 files changed, 38 insertions(+), 41 deletions(-) (limited to 'web/app/view') diff --git a/web/app/view/AttributeAliases.js b/web/app/view/AttributeAliases.js index 6408ad3..7ceaff3 100644 --- a/web/app/view/AttributeAliases.js +++ b/web/app/view/AttributeAliases.js @@ -51,10 +51,9 @@ Ext.define('Traccar.view.AttributeAliases', { selectionchange: 'onSelectionChange' }, - forceFit: true, - columns: { defaults: { + flex: 1, minWidth: Traccar.Style.columnWidthNormal }, items: [{ diff --git a/web/app/view/Attributes.js b/web/app/view/Attributes.js index aa2db36..37d28c1 100644 --- a/web/app/view/Attributes.js +++ b/web/app/view/Attributes.js @@ -36,10 +36,9 @@ Ext.define('Traccar.view.Attributes', { selectionchange: 'onSelectionChange' }, - forceFit: true, - columns: { defaults: { + flex: 1, minWidth: Traccar.Style.columnWidthNormal }, items: [{ diff --git a/web/app/view/Calendars.js b/web/app/view/Calendars.js index a905a5b..35d0beb 100644 --- a/web/app/view/Calendars.js +++ b/web/app/view/Calendars.js @@ -38,10 +38,9 @@ Ext.define('Traccar.view.Calendars', { selectionchange: 'onSelectionChange' }, - forceFit: true, - columns: { defaults: { + flex: 1, minWidth: Traccar.Style.columnWidthNormal }, items: [{ diff --git a/web/app/view/DeviceGeofences.js b/web/app/view/DeviceGeofences.js index 986ca3a..96a7abf 100644 --- a/web/app/view/DeviceGeofences.js +++ b/web/app/view/DeviceGeofences.js @@ -36,12 +36,13 @@ Ext.define('Traccar.view.DeviceGeofences', { beforeselect: 'onBeforeSelect' }, - forceFit: true, - columns: { + defaults: { + flex: 1, + minWidth: Traccar.Style.columnWidthNormal + }, items: [{ text: Strings.sharedName, - minWidth: Traccar.Style.columnWidthNormal, dataIndex: 'name' }] } diff --git a/web/app/view/Devices.js b/web/app/view/Devices.js index 6ca4098..664c094 100644 --- a/web/app/view/Devices.js +++ b/web/app/view/Devices.js @@ -145,10 +145,9 @@ Ext.define('Traccar.view.Devices', { selectionchange: 'onSelectionChange' }, - forceFit: true, - columns: { defaults: { + flex: 1, minWidth: Traccar.Style.columnWidthNormal }, items: [{ diff --git a/web/app/view/Geofences.js b/web/app/view/Geofences.js index 3df2160..968dbee 100644 --- a/web/app/view/Geofences.js +++ b/web/app/view/Geofences.js @@ -37,10 +37,9 @@ Ext.define('Traccar.view.Geofences', { selectionchange: 'onSelectionChange' }, - forceFit: true, - columns: { defaults: { + flex: 1, minWidth: Traccar.Style.columnWidthNormal }, items: [{ diff --git a/web/app/view/GroupGeofences.js b/web/app/view/GroupGeofences.js index 12c785f..bf66c62 100644 --- a/web/app/view/GroupGeofences.js +++ b/web/app/view/GroupGeofences.js @@ -36,12 +36,13 @@ Ext.define('Traccar.view.GroupGeofences', { beforeselect: 'onBeforeSelect' }, - forceFit: true, - columns: { + defaults: { + flex: 1, + minWidth: Traccar.Style.columnWidthNormal + }, items: [{ text: Strings.sharedName, - minWidth: Traccar.Style.columnWidthNormal, dataIndex: 'name' }] } diff --git a/web/app/view/Groups.js b/web/app/view/Groups.js index 0c166f1..a75ed8d 100644 --- a/web/app/view/Groups.js +++ b/web/app/view/Groups.js @@ -46,10 +46,9 @@ Ext.define('Traccar.view.Groups', { selectionchange: 'onSelectionChange' }, - forceFit: true, - columns: { defaults: { + flex: 1, minWidth: Traccar.Style.columnWidthNormal }, items: [{ diff --git a/web/app/view/Notifications.js b/web/app/view/Notifications.js index 419d961..8f6ca48 100644 --- a/web/app/view/Notifications.js +++ b/web/app/view/Notifications.js @@ -34,10 +34,9 @@ Ext.define('Traccar.view.Notifications', { markDirty: false }, - forceFit: true, - columns: { defaults: { + flex: 1, minWidth: Traccar.Style.columnWidthNormal }, items: [{ diff --git a/web/app/view/Report.js b/web/app/view/Report.js index 61699bf..1289e6b 100644 --- a/web/app/view/Report.js +++ b/web/app/view/Report.js @@ -75,9 +75,9 @@ Ext.define('Traccar.view.Report', { listeners: { selectionchange: 'onSelectionChange' }, - forceFit: true, columns: { defaults: { + flex: 1, minWidth: Traccar.Style.columnWidthNormal }, items: [ diff --git a/web/app/view/Statistics.js b/web/app/view/Statistics.js index 7232951..4322525 100644 --- a/web/app/view/Statistics.js +++ b/web/app/view/Statistics.js @@ -48,10 +48,9 @@ Ext.define('Traccar.view.Statistics', { handler: 'onShowClick' }], - forceFit: true, - columns: { defaults: { + flex: 1, minWidth: Traccar.Style.columnWidthNormal }, items: [{ diff --git a/web/app/view/UserCalendars.js b/web/app/view/UserCalendars.js index 29bb99c..119e580 100644 --- a/web/app/view/UserCalendars.js +++ b/web/app/view/UserCalendars.js @@ -37,12 +37,13 @@ Ext.define('Traccar.view.UserCalendars', { beforeselect: 'onBeforeSelect' }, - forceFit: true, - columns: { + defaults: { + flex: 1, + minWidth: Traccar.Style.columnWidthNormal + }, items: [{ text: Strings.sharedName, - minWidth: Traccar.Style.columnWidthNormal, dataIndex: 'name' }] } diff --git a/web/app/view/UserDevices.js b/web/app/view/UserDevices.js index 1f68a29..92f569e 100644 --- a/web/app/view/UserDevices.js +++ b/web/app/view/UserDevices.js @@ -36,16 +36,16 @@ Ext.define('Traccar.view.UserDevices', { beforeselect: 'onBeforeSelect' }, - forceFit: true, - columns: { + defaults: { + flex: 1, + minWidth: Traccar.Style.columnWidthNormal + }, items: [{ text: Strings.sharedName, - minWidth: Traccar.Style.columnWidthNormal, dataIndex: 'name' }, { text: Strings.deviceIdentifier, - minWidth: Traccar.Style.columnWidthNormal, dataIndex: 'uniqueId' }] } diff --git a/web/app/view/UserGeofences.js b/web/app/view/UserGeofences.js index c960acc..c595ec7 100644 --- a/web/app/view/UserGeofences.js +++ b/web/app/view/UserGeofences.js @@ -36,12 +36,13 @@ Ext.define('Traccar.view.UserGeofences', { beforeselect: 'onBeforeSelect' }, - forceFit: true, - columns: { + defaults: { + flex: 1, + minWidth: Traccar.Style.columnWidthNormal + }, items: [{ text: Strings.sharedName, - minWidth: Traccar.Style.columnWidthNormal, dataIndex: 'name' }] } diff --git a/web/app/view/UserGroups.js b/web/app/view/UserGroups.js index 6b53dd9..aca9853 100644 --- a/web/app/view/UserGroups.js +++ b/web/app/view/UserGroups.js @@ -36,12 +36,13 @@ Ext.define('Traccar.view.UserGroups', { beforeselect: 'onBeforeSelect' }, - forceFit: true, - columns: { + defaults: { + flex: 1, + minWidth: Traccar.Style.columnWidthNormal + }, items: [{ text: Strings.sharedName, - minWidth: Traccar.Style.columnWidthNormal, dataIndex: 'name' }] } diff --git a/web/app/view/UserUsers.js b/web/app/view/UserUsers.js index 265acc8..733c137 100644 --- a/web/app/view/UserUsers.js +++ b/web/app/view/UserUsers.js @@ -37,12 +37,13 @@ Ext.define('Traccar.view.UserUsers', { beforeselect: 'onBeforeSelect' }, - forceFit: true, - columns: { + defaults: { + flex: 1, + minWidth: Traccar.Style.columnWidthNormal + }, items: [{ text: Strings.sharedName, - minWidth: Traccar.Style.columnWidthNormal, dataIndex: 'name' }] } diff --git a/web/app/view/Users.js b/web/app/view/Users.js index 2c0bbef..bdff8d7 100644 --- a/web/app/view/Users.js +++ b/web/app/view/Users.js @@ -81,10 +81,9 @@ Ext.define('Traccar.view.Users', { selectionchange: 'onSelectionChange' }, - forceFit: true, - columns: { defaults: { + flex: 1, minWidth: Traccar.Style.columnWidthNormal }, items: [{ -- cgit v1.2.3