Merge remote-tracking branch 'upstream/master'

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

@@ -311,7 +311,9 @@ var InitiateViewOption = null;
     $(document).ready(function () {
         $(".device-detail-body").removeClass("hidden");
         $("#loading-content").remove();
+        if ($("#tabs").data("status") !=== false) {
             loadOperationBar(deviceType, ownership, operationBarModeConstants.SINGLE);
+        }
         loadOperationsLog(false);
         loadApplicationsList();
         loadPolicyCompliance();

components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.js

@@ -50,9 +50,13 @@ function onRequest(context) {
                 if (filteredDeviceData["enrolmentInfo"]["status"]) {
                     viewModel["status"] = filteredDeviceData["enrolmentInfo"]["status"];
                     viewModel.isActive = false ;
+                    viewModel.isNotRemoved = true;
                     if (filteredDeviceData["enrolmentInfo"]["status"]== "ACTIVE") {
                         viewModel.isActive = true ;
                     }
+                    if (filteredDeviceData["enrolmentInfo"]["status"]== "REMOVED") {
+                        viewModel.isNotRemoved = false ;
+                    }
                 }
                 if (filteredDeviceData["enrolmentInfo"]["owner"]) {
                     viewModel["owner"] = filteredDeviceData["enrolmentInfo"]["owner"];

components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/edit.hbs

@@ -87,6 +87,9 @@
                                         <br class="c-both"/>
                                     </div>
                                 </div>
+                            </div>
+                        </div>
+                            <div>
                                 <div class="wr-input-control wr-btn-grp">
                                     <a href="#" class="wr-btn wizard-stepper" data-is-back-btn="true"
                                        data-current="policy-naming" data-next="policy-criteria">
@@ -100,7 +103,6 @@
                                        data-next="policy-message" data-validate="true">
                                         Save
                                     </a>
-
                                 </div>
                             </div>
                         </div>

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

@@ -78,7 +78,7 @@
 
 {{#zone "navbarCollapsableRightItems"}}
     <ul id="notification-bubble-wrapper" class="nav navbar-nav navbar-right">
-        <li class="visible-inline-block">
+        <li>
             <!--<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">