diff options
Diffstat (limited to 'web/app/view')
-rw-r--r-- | web/app/view/BaseDialog.js | 2 | ||||
-rw-r--r-- | web/app/view/DeviceController.js | 4 | ||||
-rw-r--r-- | web/app/view/Main.js | 4 | ||||
-rw-r--r-- | web/app/view/Map.js | 8 | ||||
-rw-r--r-- | web/app/view/MapController.js | 16 | ||||
-rw-r--r-- | web/app/view/Report.js | 12 | ||||
-rw-r--r-- | web/app/view/UserController.js | 4 |
7 files changed, 25 insertions, 25 deletions
diff --git a/web/app/view/BaseDialog.js b/web/app/view/BaseDialog.js index 2a8084698..f5cb8ca1d 100644 --- a/web/app/view/BaseDialog.js +++ b/web/app/view/BaseDialog.js @@ -19,7 +19,7 @@ Ext.define('Traccar.view.BaseDialog', { extend: 'Ext.window.Window', - bodyPadding: styles.panelPadding, + bodyPadding: Traccar.Style.panelPadding, resizable: false, modal: true }); diff --git a/web/app/view/DeviceController.js b/web/app/view/DeviceController.js index 1d0ebc545..045ac426f 100644 --- a/web/app/view/DeviceController.js +++ b/web/app/view/DeviceController.js @@ -122,8 +122,8 @@ onUsersClick: function () { Ext.create('Ext.window.Window', { title: strings.settingsUsers, - width: styles.windowWidth, - height: styles.windowHeight, + width: Traccar.Style.windowWidth, + height: Traccar.Style.windowHeight, layout: 'fit', modal: true, items: { diff --git a/web/app/view/Main.js b/web/app/view/Main.js index 1ad61d73f..04ad5ea48 100644 --- a/web/app/view/Main.js +++ b/web/app/view/Main.js @@ -38,7 +38,7 @@ items: [{ region: 'west', layout: 'border', - width: styles.deviceWidth, + width: Traccar.Style.deviceWidth, defaults: { split: true, @@ -55,7 +55,7 @@ }, { region: 'south', xtype: 'reportView', - height: styles.reportHeight + height: Traccar.Style.reportHeight }, { region: 'center', xtype: 'mapView', diff --git a/web/app/view/Map.js b/web/app/view/Map.js index e356c4678..92cab1421 100644 --- a/web/app/view/Map.js +++ b/web/app/view/Map.js @@ -70,14 +70,14 @@ source: this.vectorSource }); - var lat = user.get('latitude') || server.get('latitude') || styles.mapDefaultLat; - var lon = user.get('longitude') || server.get('longitude') || styles.mapDefaultLon; - var zoom = user.get('zoom') || server.get('zoom') || styles.mapDefaultZoom; + var lat = user.get('latitude') || server.get('latitude') || Traccar.Style.mapDefaultLat; + var lon = user.get('longitude') || server.get('longitude') || Traccar.Style.mapDefaultLon; + var zoom = user.get('zoom') || server.get('zoom') || Traccar.Style.mapDefaultZoom; this.mapView = new ol.View({ center: ol.proj.fromLonLat([lon, lat]), zoom: zoom, - maxZoom: styles.mapMaxZoom + maxZoom: Traccar.Style.mapMaxZoom }); this.map = new ol.Map({ diff --git a/web/app/view/MapController.js b/web/app/view/MapController.js index 7ce61e794..7bb878241 100644 --- a/web/app/view/MapController.js +++ b/web/app/view/MapController.js @@ -68,7 +68,7 @@ if (data[i].deviceId in this.liveData) { this.liveData[data[i].deviceId].setGeometry(geometry); } else { - var style = this.getMarkerStyle(styles.mapLiveRadius, styles.mapLiveColor); + var style = this.getMarkerStyle(Traccar.Style.mapLiveRadius, Traccar.Style.mapLiveColor); var marker = new ol.Feature({ geometry: geometry, originalStyle: style @@ -90,8 +90,8 @@ getLineStyle: function () { return new ol.style.Style({ stroke: new ol.style.Stroke({ - color: styles.mapStrokeColor, - width: styles.mapRouteWidth + color: Traccar.Style.mapStrokeColor, + width: Traccar.Style.mapRouteWidth }) }); }, @@ -118,8 +118,8 @@ color: color }), stroke: new ol.style.Stroke({ - color: styles.mapStrokeColor, - width: styles.mapMarkerStroke + color: Traccar.Style.mapStrokeColor, + width: Traccar.Style.mapMarkerStroke }) }) }); @@ -143,7 +143,7 @@ ]); positions.push(point); - var style = this.getMarkerStyle(styles.mapReportRadius, styles.mapReportColor); + var style = this.getMarkerStyle(Traccar.Style.mapReportRadius, Traccar.Style.mapReportColor); var feature = new ol.Feature({ geometry: new ol.geom.Point(positions[index]), originalStyle: style @@ -189,10 +189,10 @@ } if (feature !== undefined) { - feature.setStyle(this.getMarkerStyle(styles.mapSelectRadius, styles.mapSelectColor)); + feature.setStyle(this.getMarkerStyle(Traccar.Style.mapSelectRadius, Traccar.Style.mapSelectColor)); var pan = ol.animation.pan({ - duration: styles.mapDelay, + duration: Traccar.Style.mapDelay, source: this.getView().mapView.getCenter() }); this.getView().map.beforeRender(pan); diff --git a/web/app/view/Report.js b/web/app/view/Report.js index 73ba6e12b..b930dd3b0 100644 --- a/web/app/view/Report.js +++ b/web/app/view/Report.js @@ -46,13 +46,13 @@ }, { xtype: 'datefield', reference: 'fromDateField', - startDay: styles.weekStartDay, + startDay: Traccar.Style.weekStartDay, value: new Date(new Date().getTime() - 30 * 60 * 1000) }, { xtype: 'timefield', reference: 'fromTimeField', - maxWidth: styles.reportTime, - format: styles.timeFormat, + maxWidth: Traccar.Style.reportTime, + format: Traccar.Style.timeFormat, value: new Date(new Date().getTime() - 30 * 60 * 1000) }, '-', { xtype: 'tbtext', @@ -60,13 +60,13 @@ }, { xtype: 'datefield', reference: 'toDateField', - startDay: styles.weekStartDay, + startDay: Traccar.Style.weekStartDay, value: new Date() }, { xtype: 'timefield', reference: 'toTimeField', - maxWidth: styles.reportTime, - format: styles.timeFormat, + maxWidth: Traccar.Style.reportTime, + format: Traccar.Style.timeFormat, value: new Date() }, '-', { text: strings.reportShow, diff --git a/web/app/view/UserController.js b/web/app/view/UserController.js index 670565dcb..cd0a4bd0b 100644 --- a/web/app/view/UserController.js +++ b/web/app/view/UserController.js @@ -66,8 +66,8 @@ // TODO show devices /*Ext.create('Ext.window.Window', { title: strings.settingsUsers, - width: styles.windowWidth, - height: styles.windowHeight, + width: Traccar.Style.windowWidth, + height: Traccar.Style.windowHeight, layout: 'fit', modal: true, items: { |