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

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/units/mdm.unit.ui.header.logo/logo.hbs

@@ -17,8 +17,8 @@
 }}
 {{#zone "brand"}}
     <a href="{{@app.context}}/">
-        <img src="{{@unit.publicUri}}/img/logo.png" alt="Enterprise Mobility Manager"
-             title="Enterprise Mobility Manager" class="logo" />
-        <h2 class="app-title"><span>Enterprise Mobility Manager</span></h2>
+        <img src="{{@unit.publicUri}}/img/logo.png" alt="WSO2 IoT"
+             title="WSO2 IoT" class="logo" />
+        <h2 class="app-title"><span>WSO2 IoT</span></h2>
     </a>
 {{/zone}}

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs

@@ -1,6 +1,6 @@
 {{unit "cdmf.unit.device.type.android.leaflet"}}
 {{unit "cdmf.unit.lib.qrcode"}}
-{{unit "cdmf.unit.device.type.android.qr-modal"}}
+{{unit "cdmf.unit.device.type.qr-modal"}}
 
 {{#if deviceFound}}
     {{#if isAuthorized}}

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js

@@ -231,6 +231,8 @@ var InitiateViewOption = null;
                             var viewModel = {};
                             viewModel["applications"] = data;
                             viewModel["deviceType"] = deviceType;
+                            viewModel["deviceId"] = deviceId;
+                            viewModel["appContext"] = context;
                             var content = template(viewModel);
                             $("#applications-list-container").html(content);
                         } else {

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/templates/policy-compliance.hbs

@@ -45,7 +45,7 @@
         </div>
         <div class="col-lg-3">
             <span class="list-group-item-actions">
-                <a href="/devicemgt/policies/view?id={{policy.id}}" class="cu-btn-inner
+                <a href="{{appContext}}/policy/effective-policy?type={{deviceType}}&id={{deviceId}}" class="cu-btn-inner
                 policy-view-link" data-id="{{id}}">
                     <span class="fw-stack">
                         <i class="fw fw-ring fw-stack-2x"></i>

components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/js/device-detail.js

@@ -231,6 +231,8 @@ var InitiateViewOption = null;
                             var viewModel = {};
                             viewModel["applications"] = data;
                             viewModel["deviceType"] = deviceType;
+                            viewModel["deviceId"] = deviceId;
+                            viewModel["appContext"] = context;
                             var content = template(viewModel);
                             $("#applications-list-container").html(content);
                         } else {

components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/templates/policy-compliance.hbs

@@ -45,7 +45,7 @@
         </div>
         <div class="col-lg-3">
             <span class="list-group-item-actions">
-                <a href="/emm/policies/view?id={{policy.id}}" class="cu-btn-inner policy-view-link" data-id="{{id}}">
+                <a href="{{appContext}}/policy/effective-policy?type={{deviceType}}&id={{deviceId}}"  class="cu-btn-inner policy-view-link" data-id="{{id}}">
                     <span class="fw-stack">
                         <i class="fw fw-ring fw-stack-2x"></i>
                         <i class="fw fw-view fw-stack-1x"></i>

components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/units/mdm.unit.ui.header.logo/logo.hbs

@@ -17,8 +17,8 @@
 }}
 {{#zone "brand"}}
     <a href="{{@app.context}}/">
-        <img src="{{@unit.publicUri}}/img/logo.png" alt="Enterprise Mobility Manager"
-             title="Enterprise Mobility Manager" class="logo" />
-        <h2 class="app-title"><span>Enterprise Mobility Manager</span></h2>
+        <img src="{{@unit.publicUri}}/img/logo.png" alt="WSO2 IoT"
+             title="WSO2 IoT" class="logo" />
+        <h2 class="app-title"><span>WSO2 IoT</span></h2>
     </a>
 {{/zone}}