diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-02-28 15:59:39 +1300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-28 15:59:39 +1300 |
commit | bd8fe8735db1ce889adba6027aa2fe9898817338 (patch) | |
tree | 05ff1bb02d7afb4bfe8d1ddc1e2a5fd4bbfc1f2b /web/app | |
parent | 053962fb3c45297f3e5ecfa4e26e61e5c7ab7284 (diff) | |
parent | ff9946c9365286e62224552a595c103119711dd7 (diff) | |
download | etbsa-traccar-web-bd8fe8735db1ce889adba6027aa2fe9898817338.tar.gz etbsa-traccar-web-bd8fe8735db1ce889adba6027aa2fe9898817338.tar.bz2 etbsa-traccar-web-bd8fe8735db1ce889adba6027aa2fe9898817338.zip |
Merge pull request #417 from Abyss777/checkcolumn_width
Fix width of checkcolumns
Diffstat (limited to 'web/app')
-rw-r--r-- | web/app/view/DeviceGeofences.js | 8 | ||||
-rw-r--r-- | web/app/view/GroupGeofences.js | 8 | ||||
-rw-r--r-- | web/app/view/Notifications.js | 1 | ||||
-rw-r--r-- | web/app/view/UserCalendars.js | 8 | ||||
-rw-r--r-- | web/app/view/UserDevices.js | 12 | ||||
-rw-r--r-- | web/app/view/UserGeofences.js | 8 | ||||
-rw-r--r-- | web/app/view/UserGroups.js | 8 | ||||
-rw-r--r-- | web/app/view/UserUsers.js | 8 |
8 files changed, 25 insertions, 36 deletions
diff --git a/web/app/view/DeviceGeofences.js b/web/app/view/DeviceGeofences.js index 96a7abf..d52a6d2 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 bf66c62..ee31569 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 0f6552a..8e02204 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 119e580..be9ee29 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 92f569e..e61ca90 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 c595ec7..0608334 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 aca9853..b1b0117 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 733c137..dca3d5c 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 }] } }); |