From dcc062faad4efcc35282567c08d0965871c87bb7 Mon Sep 17 00:00:00 2001 From: kamidu Date: Tue, 23 Aug 2016 17:19:41 +0530 Subject: [PATCH] Device management theam changed to follow the patten introdused in policy management --- .../app/pages/mdm.page.devices/devices.hbs | 22 ++++++++++++++++++- .../public/js/device-listing.js | 3 +-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs index e8bae6a540..21917011c8 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs @@ -107,7 +107,7 @@ - +
{{unit "mdm.unit.device.operation-bar"}} @@ -136,6 +136,26 @@ By Ownership
+ {{/zone}} {{#zone "bottomJs"}} diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js index 423cdbd15a..da5d4182c2 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js @@ -451,8 +451,7 @@ function initPage() { } else { $("#loading-content").remove(); $("#device-table").remove(); - $("#device-listing-status-msg").text("No enrolled device is found."); - $("#device-listing-status").removeClass(' hidden'); + $("#no-device-view").removeClass(' hidden'); } } }, function (message) {