Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x

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%",

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"}}
     <script type="text/javascript">
-        var context = "{{@app.context}}"
+        var context = "{{@app.context}}";
     </script>
 {{/zone}}
 

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

@@ -6512,6 +6512,12 @@ select > option:hover {
   content: "*";
 }
 
+.device-type-img.fw {
+    font-size: 250px;
+    color: white;
+    background: #11375b;
+    padding: 35px;
+}
 .table.list-table:not(.grid-view){
   margin: 0px !important;
 }