From 62ba568e0541c86d6d8ade741c5e37f40ee94713 Mon Sep 17 00:00:00 2001
From: Imesh Chandrasiri <dimal.chandrasiri@gmail.com>
Date: Tue, 17 Jan 2017 17:34:51 +0530
Subject: [PATCH 1/2] Fixed android type view notification pane message
 inconsistancy issue

---
 .../public/js/type-view.js                                   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/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.type-view/public/js/type-view.js b/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.type-view/public/js/type-view.js
index 5f33fdb5b..7d9c77921 100755
--- a/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.type-view/public/js/type-view.js
+++ b/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.type-view/public/js/type-view.js
@@ -131,7 +131,10 @@ function loadNewNotifications() {
                                 viewModel["appContext"] = context;
                                 $(messageSideBar).html(template(viewModel));
                             } else {
-                                $(messageSideBar).html('<div class="alert alert-info" role="alert"><i class="icon fw fw-info"></i>No new notifications found...</div>');
+                                $(messageSideBar).html("<h4 class='text-center'>No New Notifications</h4>" +
+                                    "<h5 class='text-center text-muted'>" +
+                                    "Check this section for error notifications<br>related to device operations" +
+                                    "</h5>");
                             }
                         } else {
                             $(messageSideBar).html("<h4 class ='message-danger'>Unexpected error " +

From dc840c389a006345d9f450c9ce4127acf3b445b7 Mon Sep 17 00:00:00 2001
From: Imesh Chandrasiri <dimal.chandrasiri@gmail.com>
Date: Tue, 17 Jan 2017 17:48:12 +0530
Subject: [PATCH 2/2] Fix for inconsistant notification message

---
 .../public/js/type-view.js                                   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/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.type-view/public/js/type-view.js b/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.type-view/public/js/type-view.js
index cd364ebbd..9d6bcd266 100644
--- a/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.type-view/public/js/type-view.js
+++ b/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.type-view/public/js/type-view.js
@@ -131,7 +131,10 @@ function loadNewNotifications() {
                                 viewModel["appContext"] = context;
                                 $(messageSideBar).html(template(viewModel));
                             } else {
-                                $(messageSideBar).html('<div class="alert alert-info" role="alert"><i class="icon fw fw-info"></i>No new notifications found...</div>');
+                                $(messageSideBar).html("<h4 class='text-center'>No New Notifications</h4>" +
+                                    "<h5 class='text-center text-muted'>" +
+                                    "Check this section for error notifications<br>related to device operations" +
+                                    "</h5>");
                             }
                         } else {
                             $(messageSideBar).html("<h4 class ='message-danger'>Unexpected error " +