From 938a3373b086f23dacebd3318386314bf3dfa66c Mon Sep 17 00:00:00 2001
From: jiazhong <jiazhong@ebay.com>
Date: Mon, 15 Dec 2014 11:11:25 +0800
Subject: [PATCH] import html template of cube result to index.html

---
 webapp/app/index.html                          | 21 +++++++++++++++++++++
 webapp/app/js/controllers/admin.js             |  5 ++++-
 webapp/app/partials/cubeDesigner/overview.html | 18 ------------------
 webapp/app/partials/cubes/cube_json_edit.html  | 17 -----------------
 webapp/grunt.json                              |  2 +-
 5 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/webapp/app/index.html b/webapp/app/index.html
index 0473e46..8b90b8c 100644
--- a/webapp/app/index.html
+++ b/webapp/app/index.html
@@ -119,5 +119,26 @@
 <!-- ref:remove -->
 <script src="components/less.js/dist/less-1.4.0.min.js"></script>
 <!-- endref -->
+
+<!--template-->
+<!-- static template for cube save/update result notification -->
+<script type="text/ng-template" id="cubeResultError.html">
+    <div class="callout callout-danger">
+        <h4>Error Message</h4>
+        <p>{{text}}</p>
+    </div>
+    <div class="callout callout-info">
+        <h4>Cube Schema</h4>
+        <pre>{{schema}}</pre>
+    </div>
+</script>
+
+<script type="text/ng-template" id="cubeResultSuccess.html">
+    <div class="callout callout-info">
+        <p>{{text}}</p>
+    </div>
+</script>
+
+
 </body>
 </html>
diff --git a/webapp/app/js/controllers/admin.js b/webapp/app/js/controllers/admin.js
index a613152..f61fed9 100644
--- a/webapp/app/js/controllers/admin.js
+++ b/webapp/app/js/controllers/admin.js
@@ -1,6 +1,6 @@
 'use strict';
 
-KylinApp.controller('AdminCtrl', function ($scope,AdminService, CacheService, TableService, MessageService, $modal,SweetAlert) {
+KylinApp.controller('AdminCtrl', function ($scope,AdminService, CacheService, TableService,loadingRequest, MessageService, $modal,SweetAlert) {
     $scope.configStr = "";
     $scope.envStr = "";
 
@@ -149,9 +149,12 @@ KylinApp.controller('AdminCtrl', function ($scope,AdminService, CacheService, Ta
         };
         $scope.calculate = function () {
             $modalInstance.dismiss();
+            loadingRequest.show();
             TableService.genCardinality({tableName: $scope.tableName}, {delimiter: $scope.delimiter, format: $scope.format}, function (result) {
+                loadingRequest.hide();
                 SweetAlert.swal('Success!', 'Cardinality job was calculated successfully. . Click Refresh button ...', 'success');
             },function(e){
+                loadingRequest.hide();
                 console.log(e);
                 if(e.data&& e.data.exception){
                     var message =e.data.exception;
diff --git a/webapp/app/partials/cubeDesigner/overview.html b/webapp/app/partials/cubeDesigner/overview.html
index 2f76f97..050442b 100644
--- a/webapp/app/partials/cubeDesigner/overview.html
+++ b/webapp/app/partials/cubeDesigner/overview.html
@@ -56,21 +56,3 @@ <h4 class="smaller">
         </div>
     </div>
 </div>
-
-<!-- static template for cube save/update result notification -->
-<script type="text/ng-template" id="cubeResultError.html">
-    <div class="callout callout-danger">
-        <h4>Error Message</h4>
-        <p>{{text}}</p>
-    </div>
-    <div class="callout callout-info">
-        <h4>Cube Schema</h4>
-        <pre>{{schema}}</pre>
-    </div>
-</script>
-
-<script type="text/ng-template" id="cubeResultSuccess.html">
-    <div class="callout callout-info">
-        <p>{{text}}</p>
-    </div>
-</script>
diff --git a/webapp/app/partials/cubes/cube_json_edit.html b/webapp/app/partials/cubes/cube_json_edit.html
index 4293a55..9769b4b 100644
--- a/webapp/app/partials/cubes/cube_json_edit.html
+++ b/webapp/app/partials/cubes/cube_json_edit.html
@@ -40,21 +40,4 @@
     </div>
 </div>
 
-<!-- static template for cube save/update result notification -->
-<script type="text/ng-template" id="cubeResultError.html">
-    <div class="callout callout-danger">
-        <h4>Error Message</h4>
-        <p>{{text}}</p>
-    </div>
-    <div class="callout callout-info">
-        <h4>Cube Schema</h4>
-        <pre>{{schema}}</pre>
-    </div>
-</script>
-
-<script type="text/ng-template" id="cubeResultSuccess.html">
-    <div class="callout callout-info">
-        <p>{{text}}</p>
-    </div>
-</script>
 
diff --git a/webapp/grunt.json b/webapp/grunt.json
index 6ecf097..2b5733a 100644
--- a/webapp/grunt.json
+++ b/webapp/grunt.json
@@ -49,7 +49,7 @@
                 "app/components/angular-tree-control/css/tree-control-attribute.css",
                 "app/components/animate.css/animate.min.css",
                 "app/components/messenger/build/css/messenger.css",
-                "app/components/messenger/build/css/messenger-theme-air.css",
+                "app/components/messenger/build/css/messenger-theme-ice.css",
                 "app/components/chosen/chosen.css",
                 "app/components/angular-chosen-localytics/chosen-spinner.css",
                 "app/components/nvd3/nv.d3.min.css",