From eb7a83bcc8835e68a6504d86bdfd00e8fde32f7c Mon Sep 17 00:00:00 2001
From: kamidu <sachithsn@gmail.com>
Date: Wed, 5 Apr 2017 17:02:38 +0530
Subject: [PATCH] fixing location and operation loading ui issues

---
 .../operation-bar.hbs                                  |  7 +++----
 .../public/js/operation-bar.js                         | 10 ++++------
 2 files changed, 7 insertions(+), 10 deletions(-)

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.operation-bar/operation-bar.hbs 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.operation-bar/operation-bar.hbs
index b25fdf5586..5e46d0009e 100644
--- 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.operation-bar/operation-bar.hbs
+++ 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.operation-bar/operation-bar.hbs
@@ -65,8 +65,6 @@
                                 {{description}}
                                 <br>
                             </h4>
-                            <div style="height:200px" class="hidden" data-toggle="loading" data-loading-inverse="false"
-                                 data-loading-text="Sending to device"></div>
                             <div id="operation-form">
                                 <form action="{{params.0.uri}}" method="{{params.0.method}}"
                                       style="padding-bottom: 20px;"
@@ -106,12 +104,13 @@
                                         {{/equal}}
                                     {{/each}}
                                     <button id="btnSend" type="button" onclick="submitForm('form-{{operation}}')"
-                                            class="btn btn-default">&nbsp;&nbsp;&nbsp;&nbsp;Send
-                                        to Device&nbsp;&nbsp;&nbsp;&nbsp;</button>
+                                            class="btn btn-default">Send
+                                        to Device</button>
                                     <label id="lblSending" class="wr-input-label hidden"><i
                                             class="fw fw-lifecycle fw-spin fw-2x"></i> Sending..</label>
                                     <label id="lblSent" class="wr-input-label hidden"><i
                                             class="fw fw-check fw-2x"></i> Sent</label>
+                                    <i id="lbl-execution" class="fw fw-wso2-logo fw-pulse fw-2x hidden"> Executing Operation </i>
                                 </form>
                             </div>
                         </div>
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.operation-bar/public/js/operation-bar.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.operation-bar/public/js/operation-bar.js
index 4ab3a2271e..8b621e931f 100644
--- 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.operation-bar/public/js/operation-bar.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.operation-bar/public/js/operation-bar.js
@@ -28,10 +28,8 @@ function operationSelect(selection) {
 }
 
 function submitForm(formId) {
-    $("#operation-form").addClass("hidden");
-    $('[data-toggle="loading"]').removeClass("hidden");
-    $('[data-toggle="loading"]').loading('show');
-
+    $("#btnSend").addClass("hidden");
+    $("#lbl-execution").removeClass("hidden");
     var form = $("#" + formId);
     var uri = form.attr("action");
     var deviceId = form.data("device-id");
@@ -75,8 +73,8 @@ function submitForm(formId) {
     description.html("");
 
     var resetLoader = function () {
-        $("#operation-form").removeClass("hidden");
-        $('[data-toggle="loading"]').addClass("hidden");
+        $("#btnSend").removeClass("hidden");
+        $('#lbl-execution').addClass("hidden");
     };
 
     var successCallBack = function (response) {