From 24c7705d7fa5aa7393dc7def4d9cd6c16ad8fc8d Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Tue, 22 Sep 2015 11:20:12 +1200 Subject: Move main layouts to view folder --- web/app/controller/Root.js | 10 ++----- web/app/view/Main.js | 62 ++++++++++++++++++++++++++++++++++++++++ web/app/view/MainMobile.js | 48 +++++++++++++++++++++++++++++++ web/app/view/main/Main.js | 63 ----------------------------------------- web/app/view/main/MainMobile.js | 49 -------------------------------- 5 files changed, 113 insertions(+), 119 deletions(-) create mode 100644 web/app/view/Main.js create mode 100644 web/app/view/MainMobile.js delete mode 100644 web/app/view/main/Main.js delete mode 100644 web/app/view/main/MainMobile.js (limited to 'web') diff --git a/web/app/controller/Root.js b/web/app/controller/Root.js index 9eef35dc0..9ae7fa761 100644 --- a/web/app/controller/Root.js +++ b/web/app/controller/Root.js @@ -18,10 +18,7 @@ Ext.define('Traccar.controller.Root', { extend: 'Ext.app.Controller', requires: [ - 'Traccar.LoginManager', - 'Traccar.view.login.Login', - 'Traccar.view.main.Main', - 'Traccar.view.main.MainMobile' + 'Traccar.LoginManager' ], init: function() { @@ -68,10 +65,9 @@ Ext.define('Traccar.controller.Root', { Ext.getStore('Devices').load(); Ext.getBody().empty(); if (this.isPhone) { - Ext.create('Traccar.view.main.MainMobile'); + Ext.create('Traccar.view.MainMobile'); } else { - Ext.create('Traccar.view.main.Main'); + Ext.create('Traccar.view.Main'); } } - }); diff --git a/web/app/view/Main.js b/web/app/view/Main.js new file mode 100644 index 000000000..814e5c1d5 --- /dev/null +++ b/web/app/view/Main.js @@ -0,0 +1,62 @@ +/* + * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +Ext.define('Traccar.view.Main', { + extend: 'Ext.container.Viewport', + + requires: [ + 'Traccar.view.device.Device', + 'Traccar.view.state.State', + 'Traccar.view.report.Report', + 'Traccar.view.map.Map' + ], + + layout: 'border', + + defaults: { + header: false, + collapsible: true, + split: true + }, + + items: [{ + region:'west', + layout: 'border', + width: styles.deviceWidth, + + defaults: { + split: true, + flex: 1 + }, + + items: [{ + region: 'center', + xtype: 'deviceView' + }, { + region: 'south', + xtype: 'stateView' + }] + }, { + region: 'south', + xtype: 'reportView', + height: styles.reportHeight + }, { + region: 'center', + xtype: 'mapView', + header: true, + collapsible: false + }] +}); diff --git a/web/app/view/MainMobile.js b/web/app/view/MainMobile.js new file mode 100644 index 000000000..dc39a037c --- /dev/null +++ b/web/app/view/MainMobile.js @@ -0,0 +1,48 @@ +/* + * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +Ext.define('Traccar.view.MainMobile', { + extend: 'Ext.container.Viewport', + + requires: [ + 'Traccar.view.device.Device', + 'Traccar.view.state.State', + 'Traccar.view.map.Map' + ], + + layout: 'border', + + defaults: { + header: false, + collapsible: true, + split: true + }, + + items: [{ + region: 'east', + xtype: 'stateView', + flex: 4 + }, { + region: 'center', + xtype: 'mapView', + collapsible: false, + flex: 2 + }, { + region: 'south', + xtype: 'deviceView', + flex: 1 + }] +}); diff --git a/web/app/view/main/Main.js b/web/app/view/main/Main.js deleted file mode 100644 index cb09abad2..000000000 --- a/web/app/view/main/Main.js +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -Ext.define('Traccar.view.main.Main', { - extend: 'Ext.container.Viewport', - - requires: [ - 'Traccar.view.device.Device', - 'Traccar.view.state.State', - 'Traccar.view.report.Report', - 'Traccar.view.map.Map' - ], - - layout: 'border', - - defaults: { - collapsible: true, - split: true - }, - - items: [{ - region:'west', - layout: 'border', - width: styles.deviceWidth, - header: false, - defaults: { - split: true - }, - items: [{ - collapsible: false, - region: 'center', - xtype: 'deviceView', - flex: 1 - }, { - region: 'south', - xtype: 'stateView', - flex: 1 - }] - }, { - region: 'south', - xtype: 'reportView', - header: false, - height: styles.reportHeight - }, { - region: 'center', - xtype: 'mapView', - collapsible: false - }] - -}); diff --git a/web/app/view/main/MainMobile.js b/web/app/view/main/MainMobile.js deleted file mode 100644 index 0fd39ed26..000000000 --- a/web/app/view/main/MainMobile.js +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -Ext.define('Traccar.view.main.MainMobile', { - extend: 'Ext.container.Viewport', - - requires: [ - 'Traccar.view.device.Device', - 'Traccar.view.state.State', - 'Traccar.view.map.Map' - ], - - layout: 'border', - - defaults: { - header: false, - collapsible: true, - split: true - }, - - items: [{ - xtype: 'stateView', - region: 'east', - collapsed:true, - flex: 4 - }, { - xtype: 'mapView', - region: 'center', - collapsible: false, - flex: 2 - }, { - xtype: 'deviceView', - region: 'south', - flex: 1 - }] -}); -- cgit v1.2.3