From b2134d34d37e7ab540884249b735fdf97d1c0603 Mon Sep 17 00:00:00 2001
From: thusithakalugamage <thusitha32@yahoo.com>
Date: Fri, 7 Oct 2016 12:31:05 +0530
Subject: [PATCH 1/2] [EMM-1685] - fix and few other related improvements

---
 .../templates/hidden-operations-android.hbs   | 17 ++++++++------
 .../templates/hidden-operations-android.hbs   | 23 ++++++++++++-------
 .../templates/hidden-operations-android.hbs   |  9 ++++----
 3 files changed, 29 insertions(+), 20 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.policy.create/public/templates/hidden-operations-android.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs
index 0756465ed4..a032462b97 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs
@@ -925,7 +925,10 @@
                         <br>
                     </label>
                     <select id="app-restriction-type" class="form-control operationDataKeys" data-key="restrictionType">
-                        <option value="black-list" selected="selected">Black List</option>
+                        <option value="" selected="selected">
+                            None
+                        </option>
+                        <option value="black-list">Black List</option>
                         <option value="white-list">White List</option>
                     </select>
 
@@ -935,16 +938,16 @@
                             <span class="helper" title="Add an application to restrict.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                            <br>
-                            <a href="#restricted-applications-grid" class="grid-input-add" data-click-event="add-form">
+                        </label>
+                        <br/>
+                        <a href="#restricted-applications-grid" class="btn btn-secondary grid-input-add " data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                &nbsp;
-                                Add Application
-                            </a>
-                        </label>
+                            &nbsp;
+                            Add Application
+                        </a>
                         <div id="restricted-applications"
                              class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
                              data-key="restrictedApplications" data-column-count="2">
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.policy.edit/public/templates/hidden-operations-android.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android.hbs
index fbe1a8558a..21a720d80f 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android.hbs
@@ -62,7 +62,7 @@
                     <i class="fw fw-application fw-stack-1x"></i>
                     <i class="fw fw-block fw-stack-2x"></i>
                 </span>
-            Applications Restrictions
+            Application Restrictions
             <span id="app-restriction-configured" class="has-configured status-icon hidden"><i
                     class="fw fw-ok"></i></span>
             <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
@@ -941,6 +941,13 @@
                         <i class="icon fw fw-error"></i><span></span>
                     </div>
 
+                    <label class="wr-input-label" for="app-restriction-type">
+                        Select type
+                        <span class="helper" title="Select a type to proceed.">
+                            <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                        </span>
+                        <br>
+                    </label>
                     <select id="app-restriction-type" class="form-control operationDataKeys" data-key="restrictionType">
                         <option value="" selected="selected">
                             None
@@ -951,20 +958,20 @@
 
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="restricted-applications">
-                            Restricted Application List
+                            <br><br>Restricted Application List
                             <span class="helper" title="Add an application to restrict.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                            <br>
-                            <a href="#restricted-applications-grid" class="grid-input-add" data-click-event="add-form">
+                        </label>
+                        <br/>
+                        <a href="#restricted-applications-grid" class="btn btn-secondary grid-input-add " data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                &nbsp;
-                                Add Application
-                            </a>
-                        </label>
+                            &nbsp;
+                            Add Application
+                        </a>
                         <div id="restricted-applications"
                              class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
                              data-key="restrictedApplications" data-column-count="2">
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.policy.view/public/templates/hidden-operations-android.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-android.hbs
index 15df45f594..2017870949 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-android.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-android.hbs
@@ -911,13 +911,13 @@
             <br>
             <div class="wr-input-control">
                 <label class="wr-input-label" for="restricted-applications">
-                    Restricted Application List
+                    <br><br>Restricted Application List
                             <span class="helper" title="Add an application to restrict.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                    <br>
-                    <br>
-                    <a href="#restricted-applications-grid" class="grid-input-add hidden" data-click-event="add-form">
+                </label>
+                <br/>
+                    <a href="#restricted-applications-grid" class="btn btn-secondary grid-input-add hidden" data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
@@ -925,7 +925,6 @@
                         &nbsp;
                         Add Application
                     </a>
-                </label>
                 <div id="restricted-applications" class="operationDataKeys grouped-array-input multi-column-key-value-pair-array" data-key="restrictedApplications" data-column-count="2">
                     <table class="table table-responsive table-striped">
                         <thead>

From 058c96e87cb00852743d37fb0b135ba3bc4895f9 Mon Sep 17 00:00:00 2001
From: kamidu <sachithp@wso2.com>
Date: Fri, 7 Oct 2016 13:08:29 +0530
Subject: [PATCH 2/2] Fix for EMM-1468

---
 .../public/js/device-detail.js                    |  6 +++---
 .../app/units/mdm.unit.device.view/view.hbs       | 15 ++++++++-------
 2 files changed, 11 insertions(+), 10 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.device.view/public/js/device-detail.js b/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
index 2e915a8bbe..c22633373b 100644
--- a/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
+++ b/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,10 +311,10 @@ var InitiateViewOption = null;
     $(document).ready(function () {
         $(".device-detail-body").removeClass("hidden");
         $("#loading-content").remove();
-        if ($("#tabs").data("status") !== false) {
-            loadOperationBar(deviceType, ownership, operationBarModeConstants.SINGLE);
+        if ($("#tabs").data("status")) {
+            loadOperationsLog(false);
         }
-        loadOperationsLog(false);
+        loadOperationBar(deviceType, ownership, operationBarModeConstants.SINGLE);
         loadApplicationsList();
         loadPolicyCompliance();
 
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.device.view/view.hbs b/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.hbs
index fe0163522b..da48991dd8 100644
--- a/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.hbs
+++ b/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.hbs
@@ -156,17 +156,19 @@
                                     </a>
                                 </li>
                             {{/if}}
-                            <li role="presentation" class="list-group-item">
-                                <a href="#event_log_tab" role="tab" data-toggle="tab" aria-controls="event_log_tab">
-                                    <i class="icon fw fw-text"></i><span class="hidden-sm">Operations Log</span>
-                                </a>
-                            </li>
+                            {{#if deviceView.isNotRemoved}}
+                                <li role="presentation" class="list-group-item">
+                                    <a href="#event_log_tab" role="tab" data-toggle="tab" aria-controls="event_log_tab">
+                                        <i class="icon fw fw-text"></i><span class="hidden-sm">Operations Log</span>
+                                    </a>
+                                </li>
+                            {{/if}}
                         </ul>
                     </div>
                     {{#defineZone "device-detail-properties"}}
                         <div class="media-body add-padding-left-5x remove-padding-xs">
                             <div class="panel-group tab-content remove-padding" id="tabs" role="tablist"
-                                 aria-multiselectable="true">
+                                 data-status="{{deviceView.isNotRemoved}}" aria-multiselectable="true">
                                 <div class="arrow-left hidden-xs"></div>
 
                                 {{#if deviceView.isNotWindows}}
@@ -428,7 +430,6 @@
                                     </div>
                                     <div class="panel-heading display-none-xs">
                                         Operations Log
-                                        &nbsp;&nbsp;
                                         <span>
                             <a href="javascript:void(0);" id="refresh-operations">
                                 <i class="fw fw-refresh"></i>