From 96e2f37ee4dcae98ffad919bd8b857ee9b5438bd Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Wed, 30 Nov 2016 13:01:42 +0530 Subject: [PATCH 1/3] Adding new css class for device type view image --- .../units/cdmf.unit.ui.theme/public/css/custom-desktop.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css index 1a89379d3f..17a486f094 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css @@ -6510,4 +6510,11 @@ select > option:hover { /* Adding style for required fields */ .required:before { content: "*"; +} + +.device-type-img.fw { + font-size: 250px; + color: white; + background: #11375b; + padding: 35px; } \ No newline at end of file From 4283c3ed4d343ccda2247cf574fcd3692b688125 Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Wed, 30 Nov 2016 13:02:34 +0530 Subject: [PATCH 2/3] Adding iOS enrollment path into config.json --- .../main/resources/jaggeryapps/devicemgt/app/conf/config.json | 1 + 1 file changed, 1 insertion(+) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json index 4cdc2b4b6c..b2ef2d9d4f 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json @@ -10,6 +10,7 @@ "dashboardServerURL" : "%https.ip%", "androidEnrollmentDir": "/android-web-agent/enrollment", "windowsEnrollmentDir": "/windows-web-agent/enrollment", + "iOSEnrollmentDir": "/ios-web-agent/enrollment", "iOSConfigRoot" : "%https.ip%/ios-enrollment/", "iOSAPIRoot" : "%https.ip%/ios/", "adminService": "%https.ip%", From 06db0fa7073b1bb2a905da86c144f47015e05e9e Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Thu, 1 Dec 2016 12:14:40 +0530 Subject: [PATCH 3/3] Adding semi-colon on context variable on service invoker Js --- .../service-invoker-utility.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.service-invoker-utility/service-invoker-utility.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.service-invoker-utility/service-invoker-utility.hbs index cd12d80319..b86559e176 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.service-invoker-utility/service-invoker-utility.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.service-invoker-utility/service-invoker-utility.hbs @@ -36,7 +36,7 @@ {{#zone "topJs"}} {{/zone}}