From 6cf9dc1c67b4d32fb6ca03ffde00a9f78f3bc21c Mon Sep 17 00:00:00 2001 From: dilanua Date: Wed, 7 Sep 2016 14:15:43 +0530 Subject: [PATCH] Updating emm policy create UI --- .../app/units/mdm.unit.policy.create/create.hbs | 5 ++--- .../devicemgt/app/units/mdm.unit.policy.create/create.js | 9 +++++++-- 2 files changed, 9 insertions(+), 5 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.policy.create/create.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/create.hbs index 8296cccbf..61c0a85ce 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/create.hbs +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/create.hbs @@ -265,8 +265,8 @@ data-next="policy-profile" data-platform="{{name}}" data-validate="false"> - -

+ + {{label}} @@ -295,4 +295,3 @@ type="text/x-handlebars-template"> {{js "/js/policy-create.js"}} {{/zone}} - 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.policy.create/create.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/create.js index 82ae71a83..5072ac956 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/create.js +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/create.js @@ -17,7 +17,7 @@ */ function onRequest() { - var log = new Log("/app/units/mdm.unit.policy.create"); + // var log = new Log("/app/units/mdm.unit.policy.create"); var CONF_DEVICE_TYPE_KEY = "deviceType"; var CONF_DEVICE_TYPE_LABEL_KEY = "label"; @@ -35,6 +35,11 @@ function onRequest() { var content = {}; var deviceType = deviceTypes[i]; content["name"] = deviceType; + if (deviceType == "ios") { + content["deviceTypeIcon"] = "apple"; + } else { + content["deviceTypeIcon"] = deviceType; + } var configs = utility.getDeviceTypeConfig(deviceType); var deviceTypeLabel = deviceType; if (configs && configs[CONF_DEVICE_TYPE_KEY][CONF_DEVICE_TYPE_LABEL_KEY]) { @@ -43,7 +48,7 @@ function onRequest() { var policyWizard = new File("/app/units/" + utility.getTenantedDeviceUnitName(deviceType, "policy-wizard")); if (policyWizard.isExists()) { - content["icon"] = utility.getDeviceThumb(deviceType); + // content["icon"] = utility.getDeviceThumb(deviceType); content["label"] = deviceTypeLabel; viewModelData["types"].push(content); }