From ddea023fc28fd272ae6973763d918bd6c1f926eb Mon Sep 17 00:00:00 2001 From: dilanua Date: Fri, 23 Sep 2016 19:46:48 +0530 Subject: [PATCH] Fixing the alignment issue of policy compliance listing of device view page --- .../public/js/device-detail.js | 32 +---- .../public/templates/policy-compliance.hbs | 114 +++++++++--------- .../app/units/mdm.unit.device.view/view.hbs | 19 ++- 3 files changed, 77 insertions(+), 88 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/public/js/device-detail.js 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/public/js/device-detail.js index b63799b1e..f6e8ea048 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/public/js/device-detail.js +++ 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/public/js/device-detail.js @@ -23,32 +23,6 @@ var InitiateViewOption = null; var deviceIdentifier = deviceId.data("deviceid"); var deviceType = deviceId.data("type"); var operationTable; - // var payload = [deviceIdentifier]; - // var serviceUrl; - -// if (deviceType == "ios") { -// serviceUrl = "/ios/operation/deviceinfo"; -// } else if (deviceType == "android") { -// //var serviceUrl = "/mdm-android-agent/operation/device-info"; -// serviceUrl = "/api/device-mgt/android/v1.0/admin/devices/info"; -// } -// -// if (serviceUrl) { -// invokerUtil.post( -// serviceUrl, -// payload, -// // success-callback -// function () { -// $(".panel-body").show(); -// }, -// // error-callback -// function () { -// var defaultInnerHTML = -// "

 Device data may not have been updated. Please refresh to try again.

"; -// $(".panel-body").append(defaultInnerHTML); -// } -// ); -// } $(".media.tab-responsive [data-toggle=tab]").on("shown.bs.tab", function (e) { var activeTabPane = $(e.target).attr("href"); @@ -260,12 +234,12 @@ var InitiateViewOption = null; if (data["complianceData"]) { if (data["complianceData"]["complianceFeatures"] && data["complianceData"]["complianceFeatures"].length > 0) { - viewModel["compliance"] = "NON-COMPLIANT"; + viewModel["complianceStatus"] = "NON-COMPLIANT"; viewModel["complianceFeatures"] = data["complianceData"]["complianceFeatures"]; content = template(viewModel); $("#policy-list-container").html(content); } else { - viewModel["compliance"] = "COMPLIANT"; + viewModel["complianceStatus"] = "COMPLIANT"; content = template(viewModel); $("#policy-list-container").html(content); $("#policy-compliance-table").addClass("hidden"); @@ -287,7 +261,7 @@ var InitiateViewOption = null; ); } } else if ((jqXHR.status == 200 && !data)) { - //$("#policy-spinner").addClass("hidden"); + $("#policy-spinner").addClass("hidden"); $("#policy-list-container"). html("

" + "

" + 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/public/templates/policy-compliance.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/public/templates/policy-compliance.hbs index d20ca7a9c..bdee09f26 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/public/templates/policy-compliance.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/public/templates/policy-compliance.hbs @@ -1,61 +1,67 @@
- -
-
- - {{#equal deviceType "android"}} - - {{/equal}} - {{#equal deviceType "ios"}} - - {{/equal}} - {{#equal deviceType "windows"}} - - {{/equal}} - - -

{{policy.policyName}}

- {{deviceType}} - -
-
-
-
-
- Ownership Type : {{policy.ownershipType}} + +
+
+ + {{#equal deviceType "android"}} + + {{/equal}} + {{#equal deviceType "ios"}} + + {{/equal}} + {{#equal deviceType "windows"}} + + {{/equal}} + + +

{{policy.policyName}}

+ {{deviceType}} + +
+
+
+
+
+ Ownership Type +
+ {{policy.ownershipType}} +
-
-
-
- Compliance Type : {{policy.compliance}} +
+
+ Compliance Type +
+ {{policy.compliance}} +
-
-
-
- Compliance : - {{#equal compliance "COMPLIANT"}} - Compliant - {{/equal}} - {{#equal compliance "NON-COMPLIANT"}} - Not Compliant - {{/equal}} +
+
+ Compliance Status +
+ {{#equal complianceStatus "COMPLIANT"}} +   Compliant + {{/equal}} + {{#equal complianceStatus "NON-COMPLIANT"}} +   Not Compliant + {{/equal}} +
+
+ + + + + + + +  View + + +
-
- - - - - - - View - - -
-
- +
@@ -68,9 +74,9 @@ {{#each complianceFeatures}} - {{/each}} 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 939946803..f835d6263 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 @@ -312,7 +312,10 @@
{{featureCode}} - {{#equal compliance true}} Compliant{{/equal}} - {{#equal compliance false}} Not Compliant{{/equal}} + + {{#equal complianceStatus true}}  Compliant{{/equal}} + {{#equal complianceStatus false}}  Not Compliant{{/equal}}