From 550e2a472eff3c7ee9d553d48feee8ed4c1dd4b6 Mon Sep 17 00:00:00 2001 From: thusithakalugamage Date: Mon, 12 Sep 2016 18:10:31 +0530 Subject: [PATCH] [EMM-1549] - Heading defect fix --- .../app/units/mdm.unit.device.view/view.hbs | 596 +++++++++--------- 1 file changed, 293 insertions(+), 303 deletions(-) diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs index 77a10fa48..8345741ac 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs @@ -2,368 +2,358 @@ {{unit "cdmf.unit.lib.qrcode"}} {{unit "mdm.unit.device.qr-modal"}} -{{#zone "contentTitle"}} - {{#if isAuthorized}} -
-
- -
-
- {{/if}} -{{/zone}} - {{#zone "content"}} {{#if isAuthorized}} -
-
-
-
-
-
-
Device Overview
- {{#defineZone "device-detail-properties"}} - - - - - - - {{#if device.viewModel.model}} - - - - - {{/if}} - - - - - {{#if device.viewModel.udid}} +

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

+
+
+
+
+
+
+
Device Overview
+ {{#defineZone "device-detail-properties"}} +
Device{{device.viewModel.vendor}} {{device.properties.model}}
Model{{device.viewModel.model}}
IMEI{{device.viewModel.imei}}
+ - - + + - {{/if}} - {{#if device.viewModel.os_build_date}} + {{#if device.viewModel.model}} + + + + + {{/if}} - - + + - {{/if}} - {{#if device.viewModel.phoneNumber}} + {{#if device.viewModel.udid}} + + + + + {{/if}} + {{#if device.viewModel.os_build_date}} + + + + + {{/if}} + {{#if device.viewModel.phoneNumber}} + + + + + {{/if}} - - + + - {{/if}} - - - - - -
UDID{{device.viewModel.udid}}Device{{device.viewModel.vendor}} {{device.properties.model}}
Model{{device.viewModel.model}}
Firmware Build Date{{device.viewModel.os_build_date}}IMEI{{device.viewModel.imei}}
UDID{{device.viewModel.udid}}
Firmware Build Date{{device.viewModel.os_build_date}}
Phone Number{{device.viewModel.phoneNumber}}
Phone Number{{device.viewModel.phoneNumber}}Status + {{#equal device.status "ACTIVE"}}  Active{{/equal}} + {{#equal device.status "INACTIVE"}}  Inactive{{/equal}} + {{#equal device.status "BLOCKED"}}  Blocked{{/equal}} + {{#equal device.status "REMOVED"}}  Removed{{/equal}} +
Status - {{#equal device.status "ACTIVE"}}  Active{{/equal}} - {{#equal device.status "INACTIVE"}}  Inactive{{/equal}} - {{#equal device.status "BLOCKED"}}  Blocked{{/equal}} - {{#equal device.status "REMOVED"}}  Removed{{/equal}} -
- {{/defineZone}} -
Operations
-
- {{unit "mdm.unit.device.operation-bar" deviceType=device.type}} + + + {{/defineZone}} +
Operations
+
+ {{unit "mdm.unit.device.operation-bar" deviceType=device.type}} +
-
-
- - {{#defineZone "device-detail-properties"}} -
-
- +
+ + {{#defineZone "device-detail-properties"}} +
+
+ -
- - -
- Loading Device Details... -
-
-
-
- - {{#equal device.type "windows"}} -
-

Not available yet

-
- {{/equal}} - {{#if device.viewModel.BatteryLevel}} -
-
-
-
BATTERY
-
-
-
- {{device.viewModel.BatteryLevel}} % +
+ + +
+ Loading Device Details... +
+
+
+
+ + {{#equal device.type "windows"}} +
+

Not available yet

+
+ {{/equal}} + {{#if device.viewModel.BatteryLevel}} +
+
+
+
BATTERY
+
+
+
+ {{device.viewModel.BatteryLevel}} % +
-
- {{/if}} - {{#if device.viewModel.DeviceCapacity}} -
-
-
-
STORAGE
-
-
-
- {{device.viewModel.DeviceCapacityPercentage}} % - - {{device.viewModel.AvailableDeviceCapacity}} GB Free - + {{/if}} + {{#if device.viewModel.DeviceCapacity}} +
+
+
+
STORAGE
+
+
+
+ {{device.viewModel.DeviceCapacityPercentage}} % + + {{device.viewModel.AvailableDeviceCapacity}} GB Free + +
-
- {{/if}} - {{#if device.viewModel.internal_memory.FreeCapacity}} -
-
-
-
LOCAL STORAGE
-
-
-
- {{device.viewModel.internal_memory.DeviceCapacityPercentage}} % - - {{device.viewModel.internal_memory.FreeCapacity}} GB Free - + {{/if}} + {{#if device.viewModel.internal_memory.FreeCapacity}} +
+
+
+
LOCAL STORAGE
+
+
+
+ {{device.viewModel.internal_memory.DeviceCapacityPercentage}} % + + {{device.viewModel.internal_memory.FreeCapacity}} GB Free + +
-
- {{/if}} - {{#if device.viewModel.external_memory.FreeCapacity}} -
-
-
-
EXTERNAL STORAGE
-
-
-
- {{device.viewModel.external_memory.DeviceCapacityPercentage}} % - - {{device.viewModel.external_memory.FreeCapacity}} GB Free - + {{/if}} + {{#if device.viewModel.external_memory.FreeCapacity}} +
+
+
+
EXTERNAL STORAGE
+
+
+
+ {{device.viewModel.external_memory.DeviceCapacityPercentage}} % + + {{device.viewModel.external_memory.FreeCapacity}} GB Free + +
-
- {{/if}} + {{/if}} +
-
-
- - -
-
- +
+ + -
- - -
-
-
-

Device location cannot be retrieved.

-
-
+
+ + +
+
+
+

Device location cannot be retrieved.

+
+
+
-
-
- - -
-
- +
+ + -
- - -
-
- +
+ +
-
- {{/defineZone}} -
-
+ {{/defineZone}} +
+
{{else}}

Permission Denied