From 3f9bcd50ea70fbaca4ed50fa35551a3b2fed4f86 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Mon, 26 Sep 2016 19:17:05 +0530
Subject: [PATCH] Correcting appContext=>@app.context,
 self.publicUri=>@unit.publicUri/@page.publicUri,
 currentUser.username=>@user.username

---
 .../devicemgt/app/pages/mdm.page.devices/devices.hbs      | 2 +-
 .../app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs    | 6 +++---
 .../app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs    | 8 ++++----
 3 files changed, 8 insertions(+), 8 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 fa4688cda..f0199e6e0 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
@@ -50,7 +50,7 @@
     {{/if}}
     {{#if permissions.ADVANCED_SEARCH}}
         <li id="advanced-search-btn" class="hidden">
-            <a href="{{appContext}}devices/search">
+            <a href="{{@app.context}}/devices/search">
                 <span class="fw-stack">
                     <i class="fw fw-ring fw-stroke fw-stack-2x"></i>
                     <i class="fw fw-search fw-stack-1x"></i>
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 102d71cf9..f2ac8085b 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
@@ -79,7 +79,7 @@
 {{#zone "navbarCollapsableRightItems"}}
     <ul id="notification-bubble-wrapper" class="nav navbar-nav navbar-right">
         <li class="visible-inline-block">
-            <!--<a href="{{appContext}}notification-listing" title="Failures of operations on the device side will be listed here">-->
+            <!--<a href="{{@app.context}}notification-listing" title="Failures of operations on the device side will be listed here">-->
             <a data-toggle="sidebar" data-target="#right-sidebar" data-container=".page-content"
                 aria-expanded="false" rel="notifications-sidebar">
                 <span id="notification-bubble" class="badge notifications hidden"></span>
@@ -100,7 +100,7 @@
         <ul class="sidebar-messages"></ul>
         <br>
         <div class="text-center">
-            <a href="{{appContext}}notification-listing" class="btn-operations btn-default">
+            <a href="{{@app.context}}/notification-listing" class="btn-operations btn-default">
                 <span class="fw-stack">
                     <i class="fw fw-ring fw-stroke fw-stack-2x"></i>
                     <i class="fw fw-notification fw-stack-1x"></i>
@@ -112,7 +112,7 @@
 {{/zone}}
 {{#zone "bottomJs"}}
     <!--suppress HtmlUnknownTarget -->
-    <script id="notifications" data-current-user="{{currentUser.username}}"
+    <script id="notifications" data-current-user="{{@user.username}}"
             data-image-resource="{{@unit.publicUri}}/images/" src="{{@unit.publicUri}}/templates/notifications.hbs"
             type="text/x-handlebars-template"></script>
     {{js "js/nav-menu.js"}}
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/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/emm-web-agent/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs
index 4aa6a9fdb..07aec34c2 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/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/emm-web-agent/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs
@@ -87,7 +87,7 @@
 {{#zone "navbarCollapsableRightItems"}}
     <ul id="notification-bubble-wrapper" class="nav navbar-nav navbar-right">
         <li class="visible-inline-block">
-            <!--<a href="{{appContext}}notification-listing" title="Failures of operations on the device side will be listed here">-->
+            <!--<a href="{{@app.context}}notification-listing" title="Failures of operations on the device side will be listed here">-->
             <a data-toggle="sidebar" data-target="#right-sidebar" data-container=".page-content"
                aria-expanded="false" rel="notifications-sidebar">
                                 <span class="icon fw-stack">
@@ -105,13 +105,13 @@
          data-offset-top="80">
         <ul class="sidebar-messages">
         </ul>
-        <h4 class="text-center"><a href="{{appContext}}notification-listing" class="text-center">Show all notifications</a>
+        <h4 class="text-center"><a href="{{@app.context}}notification-listing" class="text-center">Show all notifications</a>
         </h4>
     </div>
 {{/zone}}
 {{#zone "bottomJs"}}
-    <script id="notifications" data-current-user="{{currentUser.username}}"
-            data-image-resource="{{self.publicURL}}/images/" src="{{self.publicURL}}/templates/notifications.hbs"
+    <script id="notifications" data-current-user="{{@user.username}}"
+            data-image-resource="{{@unit.publicUri}}/images/" src="{{@unit.publicUri}}/templates/notifications.hbs"
             type="text/x-handlebars-template"></script>
     {{js "js/nav-menu.js"}}
 {{/zone}}