From 6e14691c60ba2258c126af5dfe882021826a5b4e Mon Sep 17 00:00:00 2001
From: seshukm <seshu.kumar.m@huawei.com>
Date: Thu, 6 Apr 2017 17:22:34 +0530
Subject: Integration of Client pages to Main GUI

IssueId : CLIENT-189

Change-Id: I22b5706272b0f6f368ca95c6f8f0f2115dcf7f3a
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
---
 lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js              | 9 ++++++---
 lifecyclemgr/src/main/webapp/lifecyclemgr/templates/home.html    | 4 ++--
 .../src/main/webapp/lifecyclemgr/templates/overlayVPN.html       | 2 +-
 .../src/main/webapp/lifecyclemgr/templates/underlayVPN.html      | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'lifecyclemgr/src/main/webapp')

diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js
index 5155738e..053ee41d 100644
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js
+++ b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js
@@ -238,7 +238,8 @@ var app = angular.module("lcApp", ["ui.router", "ngTable"])/*, 'ui.bootstrap', '
             }, { counts:[5, 10, 15], dataset: $scope.tableData});
 
             $scope.$watch('checkboxes.checked', function(value) {
-                angular.forEach($scope.tableData, function(item) {
+				$scope.checkboxes.items = [];
+                angular.forEach($scope.tableParams.data, function(item) {
                     if (angular.isDefined(item.id)) {
                         $scope.checkboxes.items[item.id] = value;
                     }
@@ -648,7 +649,8 @@ var app = angular.module("lcApp", ["ui.router", "ngTable"])/*, 'ui.bootstrap', '
             $scope.checkboxes = { 'checked': false, items: {} };
 
             $scope.$watch('checkboxes.checked', function(value) {
-                angular.forEach($scope.overlayData, function(item) {
+				$scope.checkboxes.items = [];
+                angular.forEach($scope.tableParams.data, function(item) {
                     if (angular.isDefined(item.id)) {
                         $scope.checkboxes.items[item.id] = value;
                     }
@@ -693,7 +695,8 @@ var app = angular.module("lcApp", ["ui.router", "ngTable"])/*, 'ui.bootstrap', '
             $scope.checkboxes = { 'checked': false, items: {} };
 
             $scope.$watch('checkboxes.checked', function(value) {
-                angular.forEach($scope.underlayVPN.underlayData, function(item) {
+					  $scope.checkboxes.items = [];
+                angular.forEach($scope.tableParams.data, function(item) {
                     if (angular.isDefined(item.id)) {
                         $scope.checkboxes.items[item.id] = value;
                     }
diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/home.html b/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/home.html
index 8030137b..4fc8fd73 100644
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/home.html
+++ b/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/home.html
@@ -43,8 +43,8 @@
             <td title="'Action'">
                 <!--<img src="../images/delete.png" ng-click="editData(lcData.id)" style="cursor: pointer"></img>-->
                 <!--<span class="pull-right glyphicon glyphicon-edit" ng-click="editData(lcData.serviceId)" style="cursor: pointer;margin: 0 5px"></span>-->
-                <span class="pull-right glyphicon glyphicon-trash" ng-click="deleteIndividualData(lcData.serviceId)" style="cursor: pointer;margin: 0 5px"></span>
-                <span class="pull-right glyphicon glyphicon-circle-arrow-right" ng-click="scaleData(lcData.serviceId)" style="cursor: pointer;margin: 0 5px"></span>
+                <span  ng-click="scaleData(lcData.serviceId)" style="cursor: pointer;margin: 0 5px"><img src="/openoui/framework/browser/thirdparty/images/edit.png" height="15" align="left"/></span>
+				<span  ng-click="deleteIndividualData(lcData.serviceId)" style="cursor: pointer;margin: 0 5px"><img src="/openoui/framework/browser/thirdparty/images/delete.png" height="15" align="middle"/></span>
             </td>
         </tr>
     </table>
diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/overlayVPN.html b/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/overlayVPN.html
index 5f484f1a..16719833 100644
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/overlayVPN.html
+++ b/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/overlayVPN.html
@@ -53,7 +53,7 @@
         </td>
         <td title="'Action'">
             <!--<span class="pull-right glyphicon glyphicon-edit" ng-click="editData(overlayData.id)" style="cursor: pointer;margin: 0 5px"></span>-->
-            <span class="pull-right glyphicon glyphicon-trash" ng-click="deleteIndividualData(overlayData.id)" style="cursor: pointer;margin: 0 5px"></span>
+           <span  ng-click="deleteIndividualData(overlayData.id)" style="cursor: pointer;margin: 0 5px"><img src="/openoui/framework/browser/thirdparty/images/delete.png" height="15" align="middle"/></span>
         </td>
     </tr>
 </table>
diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/underlayVPN.html b/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/underlayVPN.html
index 385db8ce..5cd4126d 100644
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/underlayVPN.html
+++ b/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/underlayVPN.html
@@ -41,7 +41,7 @@
         </td>
         <td title="'Action'">
             <!--<span class="pull-right glyphicon glyphicon-edit" ng-click="editData(underlayData.id)" style="cursor: pointer;margin: 0 5px"></span>-->
-            <span class="pull-right glyphicon glyphicon-trash" ng-click="deleteIndividualData(underlayData.id)" style="cursor: pointer;margin: 0 5px"></span>
+        <span ng-click="deleteIndividualData(underlayData.id)" style="cursor: pointer;margin: 0 5px"><img src="/openoui/framework/browser/thirdparty/images/delete.png" height="15" align="middle"/></span>
         </td>
     </tr>
 </table>
-- 
cgit 1.2.3-korg