From 97325fab853b24985831869cf44b4aaa354a73b0 Mon Sep 17 00:00:00 2001 From: thusithakalugamage Date: Fri, 26 Aug 2016 11:52:11 +0530 Subject: [PATCH 1/2] mdm navbar hamburger menu and menu open state icons correction --- .../app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs index b4c15eea3..c9f57d90b 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs @@ -17,7 +17,7 @@ }} {{#zone "navMenu-icon"}} - + {{/zone}} From 910803703cd76654f4d7fe3fa3e9faeeb7010cde Mon Sep 17 00:00:00 2001 From: thusithakalugamage Date: Fri, 26 Aug 2016 15:48:23 +0530 Subject: [PATCH 2/2] mdm notification bar status msg and button markup update --- .../app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs | 3 +-- .../units/mdm.unit.ui.navbar.nav-menu/public/js/nav-menu.js | 2 +- 2 files changed, 2 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/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs index c9f57d90b..18afc371a 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs @@ -98,8 +98,7 @@ data-offset-top="80"> -

Show all notifications -

+ {{/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/units/mdm.unit.ui.navbar.nav-menu/public/js/nav-menu.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/public/js/nav-menu.js index 5015563a9..495ed8870 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/public/js/nav-menu.js +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/public/js/nav-menu.js @@ -129,7 +129,7 @@ function loadNewNotifications() { viewModel["notifications"] = responsePayload["notifications"]; $(messageSideBar).html(template(viewModel)); } else { - $(messageSideBar).html("

No new notifications found...

"); + $(messageSideBar).html('

No new notifications found...

'); } } else { $(messageSideBar).html("

Unexpected error " +