From 135b6e888121c185d74d208fa56fee328ca02715 Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Thu, 13 Oct 2016 08:15:43 +0530 Subject: [PATCH] Fixing device view page --- .../app/units/cdmf.unit.device.view/view.hbs | 624 +++++------------- .../app/units/cdmf.unit.device.view/view.js | 277 +++++--- 2 files changed, 351 insertions(+), 550 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/view.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/view.hbs index 586cad7073a..5a9a302a778 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/view.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/view.hbs @@ -1,481 +1,193 @@ -{{unit "cdmf.unit.lib.qrcode"}} +{{! + Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + + WSO2 Inc. licenses this file to you 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. +}} {{#zone "content"}} {{#if deviceFound}} {{#if isAuthorized}} -

- Device {{deviceView.name}} - {{#if deviceView.model}} +

+ Device {{device.name}} + {{#if device.viewModel.model}} - ( {{deviceView.vendor}} {{deviceView.model}} ) - + ( {{device.viewModel.vendor}} {{device.viewModel.model}} ) + {{/if}}

-
-
-
-
-
Device - Overview -
- {{#defineZone "device-detail-properties"}} - - - {{#if deviceView.deviceIdentifier}} - - - - - {{/if}} - {{#if deviceView.name}} - - - - - {{/if}} - {{#if deviceView.vendor}} - {{#if deviceView.model}} - - - - - {{/if}} - {{/if}} - {{#if deviceView.status}} - - - - - {{/if}} - {{#if deviceView.owner}} - - - - - {{/if}} - {{#if deviceView.ownership}} - - - - - {{/if}} - {{#if deviceView.imei}} - - - - - {{/if}} - {{#if deviceView.udid}} - - - - - {{/if}} - {{#if deviceView.osBuildDate}} - - - - - {{/if}} - {{#if deviceView.phoneNumber}} - - - - - {{/if}} - {{#if deviceView.lastUpdatedTime}} - - - - - {{/if}} - -
Device ID{{deviceView.deviceIdentifier}}
Name{{deviceView.name}}
Model{{deviceView.vendor}} {{deviceView.model}}
Status - {{#equal deviceView.status "ACTIVE"}}Active{{/equal}} - {{#equal deviceView.status "INACTIVE"}}Inactive{{/equal}} - {{#equal deviceView.status "BLOCKED"}}Blocked{{/equal}} - {{#equal deviceView.status "REMOVED"}}Removed{{/equal}} -
Owner{{deviceView.owner}}
Ownership{{deviceView.ownership}}
IMEI{{deviceView.imei}}
UDID{{deviceView.udid}}
Firmware Build - Date - {{deviceView.osBuildDate}}
Phone Number{{deviceView.phoneNumber}}
Last Update{{deviceView.lastUpdatedTime}}
- {{/defineZone}} -
- Operations +
+
+
+ {{#defineZone "device-thumbnail"}} + + {{/defineZone}} +
-
- {{unit "mdm.unit.device.operation-bar" deviceType=deviceView.deviceType ownership=deviceView.ownership}} +
+
+ Device Overview - {{label}}
+ {{unit "cdmf.unit.device.overview-section" device=device}} + {{#defineZone "operation-status"}}{{/defineZone}} + {{#defineZone "device-opetations"}} +
+ Operations +
+
+ {{unit "cdmf.unit.device.operation-bar" device=device}} +
+ {{/defineZone}}
-
- - {{#defineZone "device-detail-properties"}} -
-
- - - {{#if deviceView.isNotWindows}} -
-