From 978dbcf0a196acbafad72fe1e2478ec0e384f02f Mon Sep 17 00:00:00 2001
From: "Christopher Lott (cl778h)" <clott@research.att.com>
Date: Wed, 23 Aug 2017 18:27:19 -0400
Subject: Deliver centralized role management feature

Repair multiple defects also.
Revise deployment to use docker-compose.
Remove all zip archives.

Issue: PORTAL-21, PORTAL-25, PORTAL-28, PORTAL-52, PORTAL-69,
    PORTAL-74, PORTAL-76, PORTAL-80, PORTAL-82
Change-Id: Ie72fec7d35ba78beb162bba6ed27b2caee340c61
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
---
 .../admin-confirmation-box.tpl.html                | 27 +++++++++-------
 .../confirmation-box.controller.js                 | 22 +++++++------
 .../confirmation-box/confirmation-box.tpl.html     | 26 ++++++++++------
 .../dragdrop-confirmation-box.tpl.html             | 27 +++++++++-------
 .../confirmation-box/information-box.tpl.html      | 22 ++++++++-----
 .../confirmation-box/reload-page-confirm.html      | 36 ++++++++++++++++++++++
 6 files changed, 113 insertions(+), 47 deletions(-)
 create mode 100644 ecomp-portal-FE-common/client/app/views/confirmation-box/reload-page-confirm.html

(limited to 'ecomp-portal-FE-common/client/app/views/confirmation-box')

diff --git a/ecomp-portal-FE-common/client/app/views/confirmation-box/admin-confirmation-box.tpl.html b/ecomp-portal-FE-common/client/app/views/confirmation-box/admin-confirmation-box.tpl.html
index 69f9af84..3d5e8cc2 100644
--- a/ecomp-portal-FE-common/client/app/views/confirmation-box/admin-confirmation-box.tpl.html
+++ b/ecomp-portal-FE-common/client/app/views/confirmation-box/admin-confirmation-box.tpl.html
@@ -17,15 +17,20 @@
   limitations under the License.
   ================================================================================
   -->
-<div class="confirmation-box-container">
-    <div class="confirmation-title-wrap">
-        <div class="confirmation-title" ng-bind="confirmBox.title"></div>
-    </div>
-    <div class="confirmation-message-wrap">
-        <div class="confirmation-message" ng-bind="confirmBox.message"></div>
-    </div>
-    <div class="dialog-control">
-        <div id="confirm-admin-update" class="btn btn-alt btn-small"  ng-click="confirmBox.closeBox(true)">Confirm</div>
-        <div id="cancel-admin-update" class="btn btn-alt btn-small" ng-click="confirmBox.closeBox(false)">Cancel</div>
-    </div>
+<div>
+	<div class="b2b-modal-header ng-scope in">
+		<h2 id="myModalLabel" modal-title="">{{message.title}}</h2>
+		<div class="corner-button in">
+			<button type="button" class="close" id="admin-div-close-button" aria-label="Close" ng-click="$dismiss('cancel')"></button>
+		</div>
+	</div>
+	<div class="b2b-modal-body" tabindex="0" role="region" aria-label="Modal header text content">
+		{{message.content}}
+	</div>
+	<div class="b2b-modal-footer ng-scope ng-isolate-scope in">
+		<div class="cta-button-group in">
+			<button class="btn btn-alt btn-small" id="admin-div-ok-button" type="button"	ng-click="ok(true)">OK</button>
+			<button class="btn btn-alt btn-small" id="admin-div-cancel-button" type="button"	ng-click="$dismiss('cancel')">Cancel</button>
+		</div>
+	</div>
 </div>
diff --git a/ecomp-portal-FE-common/client/app/views/confirmation-box/confirmation-box.controller.js b/ecomp-portal-FE-common/client/app/views/confirmation-box/confirmation-box.controller.js
index 36eb04a8..ef553e23 100644
--- a/ecomp-portal-FE-common/client/app/views/confirmation-box/confirmation-box.controller.js
+++ b/ecomp-portal-FE-common/client/app/views/confirmation-box/confirmation-box.controller.js
@@ -23,13 +23,13 @@
 'use strict';
 (function () {
     class ConfirmationBoxCtrl {
-        constructor($scope,$state) {
-
-            let init = () => {
-                let item = ($scope.ngDialogData && $scope.ngDialogData.item) || 'this';
-                this.message = $scope.ngDialogData.message ? $scope.ngDialogData.message : `Are you sure you want to delete "${item}"?`;
-                this.title = $scope.ngDialogData.title ? $scope.ngDialogData.title : '';
-            };
+        constructor($scope,$state,message,$modalInstance) {
+        	$scope.message = message;
+        	/*let init = () => {
+                let item = ($scope.message && $scope.message.item) || 'this';
+                message = $scope.message.content ? $scope.message.content : `Are you sure you want to delete "${message.item}"?`;
+                this.title = $scope.message.title ? $scope.message.title : '';
+            };*/
 
             this.closeBox = isConfirmed => {
                 $scope.closeThisDialog(isConfirmed);
@@ -40,10 +40,14 @@
             	$state.go(state,params);
             	
             };
+            
+            $scope.ok =function(confirm){
+            	$modalInstance.close(confirm);
+            }
 
-            init();
+          //  init();
         }
     }
-    ConfirmationBoxCtrl.$inject = ['$scope','$state'];
+    ConfirmationBoxCtrl.$inject = ['$scope','$state','message','$modalInstance'];
     angular.module('ecompApp').controller('ConfirmationBoxCtrl', ConfirmationBoxCtrl);
 })();
diff --git a/ecomp-portal-FE-common/client/app/views/confirmation-box/confirmation-box.tpl.html b/ecomp-portal-FE-common/client/app/views/confirmation-box/confirmation-box.tpl.html
index 8f880ef4..14bc7fda 100644
--- a/ecomp-portal-FE-common/client/app/views/confirmation-box/confirmation-box.tpl.html
+++ b/ecomp-portal-FE-common/client/app/views/confirmation-box/confirmation-box.tpl.html
@@ -17,12 +17,20 @@
   limitations under the License.
   ================================================================================
   -->
-<div class="confirmation-box-container">
-    <div class="confirmation-message-wrap">
-        <div id="confirmation-message" class="confirmation-message" ng-bind="confirmBox.message"></div>
-    </div>
-    <div class="dialog-control">
-        <div id="confirmation-button-next" class="btn btn-alt btn-small" ng-click="confirmBox.closeBox(true)">OK</div>
-        <div id="confirmation-button-cancel" class="btn btn-alt btn-small" ng-click="confirmBox.closeBox(false)">Cancel</div>
-    </div>
-</div>
+<div>
+	<div class="b2b-modal-header ng-scope in">
+		<h2 id="myModalLabel" modal-title="">{{message.title}}</h2>
+		<div class="corner-button in">
+			<button type="button" class="close" id="div-confirm-close-button" aria-label="Close" ng-click="$dismiss('cancel')"></button>
+		</div>
+	</div>
+	<div class="b2b-modal-body" tabindex="0" role="region" aria-label="Modal header text content">
+		{{message.content}}
+	</div>
+	<div class="b2b-modal-footer ng-scope ng-isolate-scope in">
+		<div class="cta-button-group in">
+			<button class="btn btn-alt btn-small" id="div-confirm-ok-button" type="button"	ng-click="ok(true)">OK</button>
+			<button class="btn btn-alt btn-small" id="div-confirm-cancel-button" type="button"	ng-click="ok(false)">Cancel</button>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/ecomp-portal-FE-common/client/app/views/confirmation-box/dragdrop-confirmation-box.tpl.html b/ecomp-portal-FE-common/client/app/views/confirmation-box/dragdrop-confirmation-box.tpl.html
index f6a1a29b..ba05c656 100644
--- a/ecomp-portal-FE-common/client/app/views/confirmation-box/dragdrop-confirmation-box.tpl.html
+++ b/ecomp-portal-FE-common/client/app/views/confirmation-box/dragdrop-confirmation-box.tpl.html
@@ -17,15 +17,20 @@
   limitations under the License.
   ================================================================================
   -->
-<div class="confirmation-box-container">
-    <div class="confirmation-title-wrap">
-        <div class="confirmation-title" ng-bind="confirmBox.title"></div>
-    </div>
-    <div class="confirmation-message-wrap">
-        <div class="confirmation-message" ng-bind="confirmBox.message"></div>
-    </div>
-    <div class="dialog-control">
-        <div class="next-button" ng-click="confirmBox.closeBox(true)">Confirm</div>
-        <div class="cancel-button" ng-click="confirmBox.closeBox(false)">Cancel</div>
-    </div>
+<div>
+	<div class="b2b-modal-header ng-scope in">
+		<h2 id="myModalLabel" modal-title="">{{message.title}}</h2>
+		<div class="corner-button in">
+			<button type="button" class="close"  id="div-dragdrop-close-button" aria-label="Close" ng-click="$dismiss('cancel')"></button>
+		</div>
+	</div>
+	<div class="b2b-modal-body" tabindex="0" role="region" aria-label="Modal header text content"	style="height: 40px;">
+		{{message.content}}
+	</div>
+	<div class="b2b-modal-footer ng-scope ng-isolate-scope in">
+		<div class="cta-button-group in">
+			<button class="btn btn-alt btn-small" id="div-dragdrop-ok-button" type="button"	ng-click="ok(true)">OK</button>
+			<button class="btn btn-alt btn-small" id="div-dragdrop-cancel-button" type="button"	ng-click="$dismiss('cancel')">Cancel</button>
+		</div>
+	</div>
 </div>
diff --git a/ecomp-portal-FE-common/client/app/views/confirmation-box/information-box.tpl.html b/ecomp-portal-FE-common/client/app/views/confirmation-box/information-box.tpl.html
index 1eaa2819..5725fca1 100644
--- a/ecomp-portal-FE-common/client/app/views/confirmation-box/information-box.tpl.html
+++ b/ecomp-portal-FE-common/client/app/views/confirmation-box/information-box.tpl.html
@@ -17,11 +17,19 @@
   limitations under the License.
   ================================================================================
   -->
-<div class="confirmation-box-container">
-    <div class="confirmation-message-wrap">
-        <div class="confirmation-message" >{{confirmBox.message}}</div>
-    </div>
-    <div class="dialog-control" id="dialog-close">
-        <div id="close-button"  class="btn btn-alt btn-small" ng-click="confirmBox.closeBox(false)">Close</div>
-    </div>
+<div>
+	<div class="b2b-modal-header ng-scope in">
+		<h2 id="myModalLabel" modal-title="">{{message.title}}</h2>
+		<div class="corner-button in">
+			<button type="button" class="close" aria-label="Close" id="div-information-close-button" ng-click="$dismiss('cancel')"></button>
+		</div>
+	</div>
+	<div class="b2b-modal-body" tabindex="0" role="region" aria-label="Modal header text content"	style="height: 60px;">
+		{{message.content}}
+	</div>
+	<div class="b2b-modal-footer ng-scope ng-isolate-scope in">
+		<div class="cta-button-group in">
+			<button class="btn btn-alt btn-small" type="button"	id="information-cancel-button" ng-click="$dismiss('cancel')">OK</button>
+		</div>
+	</div>
 </div>
diff --git a/ecomp-portal-FE-common/client/app/views/confirmation-box/reload-page-confirm.html b/ecomp-portal-FE-common/client/app/views/confirmation-box/reload-page-confirm.html
new file mode 100644
index 00000000..0a60edbc
--- /dev/null
+++ b/ecomp-portal-FE-common/client/app/views/confirmation-box/reload-page-confirm.html
@@ -0,0 +1,36 @@
+<!--
+  ================================================================================
+  ECOMP Portal
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ================================================================================
+  -->
+<div>
+	<div class="b2b-modal-header ng-scope in">
+		<h2 id="myModalLabel" modal-title="">Page Reload</h2>
+		<div class="corner-button in">
+			<button type="button" class="close" id="div-confirm-close-button" aria-label="Close" ng-click="$dismiss('cancel')"></button>
+		</div>
+	</div>
+	<div class="b2b-modal-body" tabindex="0" role="region" aria-label="Modal header text content">
+		{{message.content}}
+	</div>
+	<div class="b2b-modal-footer ng-scope ng-isolate-scope in">
+		<div class="cta-button-group in">
+			<button class="btn btn-alt btn-small" id="div-confirm-ok-button" type="button"	ng-click="reload()">Retry</button>
+			<button class="btn btn-alt btn-small" id="div-confirm-cancel-button" type="button"	ng-click="$dismiss('cancel')">Cancel</button>
+		</div>
+	</div>
+</div>
\ No newline at end of file
-- 
cgit 1.2.3-korg