From ff9946c9365286e62224552a595c103119711dd7 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Mon, 27 Feb 2017 16:35:22 +0500 Subject: Fix width of checkcolumns --- web/app/view/DeviceGeofences.js | 8 +++----- web/app/view/GroupGeofences.js | 8 +++----- web/app/view/Notifications.js | 1 + web/app/view/UserCalendars.js | 8 +++----- web/app/view/UserDevices.js | 12 ++++++------ web/app/view/UserGeofences.js | 8 +++----- web/app/view/UserGroups.js | 8 +++----- web/app/view/UserUsers.js | 8 +++----- 8 files changed, 25 insertions(+), 36 deletions(-) (limited to 'web') diff --git a/web/app/view/DeviceGeofences.js b/web/app/view/DeviceGeofences.js index 96a7abf7..d52a6d2e 100644 --- a/web/app/view/DeviceGeofences.js +++ b/web/app/view/DeviceGeofences.js @@ -37,13 +37,11 @@ Ext.define('Traccar.view.DeviceGeofences', { }, columns: { - defaults: { - flex: 1, - minWidth: Traccar.Style.columnWidthNormal - }, items: [{ text: Strings.sharedName, - dataIndex: 'name' + dataIndex: 'name', + flex: 1, + minWidth: Traccar.Style.columnWidthNormal }] } }); diff --git a/web/app/view/GroupGeofences.js b/web/app/view/GroupGeofences.js index bf66c621..ee31569c 100644 --- a/web/app/view/GroupGeofences.js +++ b/web/app/view/GroupGeofences.js @@ -37,13 +37,11 @@ Ext.define('Traccar.view.GroupGeofences', { }, columns: { - defaults: { - flex: 1, - minWidth: Traccar.Style.columnWidthNormal - }, items: [{ text: Strings.sharedName, - dataIndex: 'name' + dataIndex: 'name', + flex: 1, + minWidth: Traccar.Style.columnWidthNormal }] } }); diff --git a/web/app/view/Notifications.js b/web/app/view/Notifications.js index 0f6552a7..8e022040 100644 --- a/web/app/view/Notifications.js +++ b/web/app/view/Notifications.js @@ -42,6 +42,7 @@ Ext.define('Traccar.view.Notifications', { items: [{ text: Strings.notificationType, dataIndex: 'type', + flex: 2, renderer: function (value) { return Traccar.app.getEventString(value); } diff --git a/web/app/view/UserCalendars.js b/web/app/view/UserCalendars.js index 119e5805..be9ee298 100644 --- a/web/app/view/UserCalendars.js +++ b/web/app/view/UserCalendars.js @@ -38,13 +38,11 @@ Ext.define('Traccar.view.UserCalendars', { }, columns: { - defaults: { - flex: 1, - minWidth: Traccar.Style.columnWidthNormal - }, items: [{ text: Strings.sharedName, - dataIndex: 'name' + dataIndex: 'name', + flex: 1, + minWidth: Traccar.Style.columnWidthNormal }] } }); diff --git a/web/app/view/UserDevices.js b/web/app/view/UserDevices.js index 92f569e7..e61ca905 100644 --- a/web/app/view/UserDevices.js +++ b/web/app/view/UserDevices.js @@ -37,16 +37,16 @@ Ext.define('Traccar.view.UserDevices', { }, columns: { - defaults: { - flex: 1, - minWidth: Traccar.Style.columnWidthNormal - }, items: [{ text: Strings.sharedName, - dataIndex: 'name' + dataIndex: 'name', + flex: 1, + minWidth: Traccar.Style.columnWidthNormal }, { text: Strings.deviceIdentifier, - dataIndex: 'uniqueId' + dataIndex: 'uniqueId', + flex: 1, + minWidth: Traccar.Style.columnWidthNormal }] } }); diff --git a/web/app/view/UserGeofences.js b/web/app/view/UserGeofences.js index c595ec72..06083349 100644 --- a/web/app/view/UserGeofences.js +++ b/web/app/view/UserGeofences.js @@ -37,13 +37,11 @@ Ext.define('Traccar.view.UserGeofences', { }, columns: { - defaults: { - flex: 1, - minWidth: Traccar.Style.columnWidthNormal - }, items: [{ text: Strings.sharedName, - dataIndex: 'name' + dataIndex: 'name', + flex: 1, + minWidth: Traccar.Style.columnWidthNormal }] } }); diff --git a/web/app/view/UserGroups.js b/web/app/view/UserGroups.js index aca98530..b1b01178 100644 --- a/web/app/view/UserGroups.js +++ b/web/app/view/UserGroups.js @@ -37,13 +37,11 @@ Ext.define('Traccar.view.UserGroups', { }, columns: { - defaults: { - flex: 1, - minWidth: Traccar.Style.columnWidthNormal - }, items: [{ text: Strings.sharedName, - dataIndex: 'name' + dataIndex: 'name', + flex: 1, + minWidth: Traccar.Style.columnWidthNormal }] } }); diff --git a/web/app/view/UserUsers.js b/web/app/view/UserUsers.js index 733c137f..dca3d5ca 100644 --- a/web/app/view/UserUsers.js +++ b/web/app/view/UserUsers.js @@ -38,13 +38,11 @@ Ext.define('Traccar.view.UserUsers', { }, columns: { - defaults: { - flex: 1, - minWidth: Traccar.Style.columnWidthNormal - }, items: [{ text: Strings.sharedName, - dataIndex: 'name' + dataIndex: 'name', + flex: 1, + minWidth: Traccar.Style.columnWidthNormal }] } }); -- cgit v1.2.3