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>
---
 .../contact-us-manage.controller.less              |  46 ++++
 .../contact-us-manage/contact-us-manage.html       | 255 ++++++++-------------
 .../support/contact-us/contact-us.controller.js    |  33 +--
 .../app/views/support/contact-us/contact-us.less   |  40 ++++
 .../views/support/contact-us/contact-us.tpl.html   |  22 +-
 5 files changed, 216 insertions(+), 180 deletions(-)

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

diff --git a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us-manage/contact-us-manage.controller.less b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us-manage/contact-us-manage.controller.less
index 2625f32c..8dc97447 100644
--- a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us-manage/contact-us-manage.controller.less
+++ b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us-manage/contact-us-manage.controller.less
@@ -168,3 +168,49 @@ background-color: transparent;
  padding-bottom: 11px;
 
 }
+
+.contactus-manage-table {
+	height: 300px;
+}
+
+.contactus-addWidgetHeader {
+	margin-top: 15px; 
+	margin-left: -78px;
+} 
+
+.contactus-addWidgetHeader-txt {
+	font-size: 18px;
+}
+
+.mots-property-label-spn {
+	color: Red;
+}
+
+.property-label-desc-txtarea {
+	margin-top: 0px; 
+	margin-bottom: 0px; 
+	height: 100px;
+}
+
+.btn-ht {
+	height: 50px;
+}
+
+.btn-ht-href {
+	float: right; 
+	margin-top: 20px;
+}
+
+.close-btn-ht-href {
+	float: right; 
+	margin-right: -230px !important;
+}
+
+.manage-contactus-home {
+	margin-top: 25px;
+}
+
+.manage-contactus-top {
+	margin-top: 10px; 
+	margin-bottom: 10px;
+}
\ No newline at end of file
diff --git a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us-manage/contact-us-manage.html b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us-manage/contact-us-manage.html
index 4c8f6dee..c85618e2 100644
--- a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us-manage/contact-us-manage.html
+++ b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us-manage/contact-us-manage.html
@@ -17,165 +17,112 @@
   limitations under the License.
   ================================================================================
   -->
-<div style="margin-top: 10px; margin-bottom: 10px;"></div>
-<br />
-
-<div style="margin-top: 25px;">
-	<div id="title" class="manage-contactUs-home-title">Manage
-		Contact Us</div>
-	<div class="contact-us-margin">
-		<div class="get-access-table">
-			<div class="table-control">
-				<div class="c-ecomp-portal-abs-table" style="height: 300px">
-					<table b2b-table id="table-main" table-data="contactUsList"
-						current-page="ignoredCurrentPage">
-						<thead b2b-table-row type="header">
-							<tr>
-								<th id="th-users-0" b2b-table-header key="ecomp_function"
-									default-sort="a">App Name</th>
-								<th id="th-users-1" b2b-table-header key="app_name"
-									sortable="true">Contact Name</th>
-								<th id="th-users-2" b2b-table-header key="app_name"
-									sortable="true">Contact Email</th>
-								<th id="th-users-3" b2b-table-header key="role_name"
-									sortable="true">Contact URL</th>
-								<th id="th-users-4" b2b-table-header key="role_name"
-									sortable="true">Description</th>
-								<th id="th-users-5" b2b-table-header key="role_name"
-									sortable="true">Edit</th>
-								<th id="th-users-6" b2b-table-header key="role_name"
-									sortable="true">Delete</th>
-							</tr>
-						</thead>
-						<!-- Use track-by="UNIQUE KEY HERE" or leave out if no unique keys in data -->
-						<tbody b2b-table-row type="body" class="table-body"
-							track-by="$index" row-repeat="rowData in contactUsList">
-							<tr id="tr-rowData" ng-click="">
-								<td b2b-table-body>
-									<div id="users-page-td-appName" ng-bind="rowData.appName"></div>
-								</td>
-								<td b2b-table-body>
-									<div id="users-page-td-name" ng-hide="rowData.showEdit"
-										ng-bind="rowData.contactName"></div> <input
-									class="input-inline-edit-text" type="text"
-									ng-show="rowData.showEdit"
-									ng-model="contactUsList[$index].contactName" />
-								</td>
-								<td b2b-table-body>
-									<div id="users-page-td-email" ng-hide="rowData.showEdit"
-										ng-bind="rowData.contactEmail"></div> <input
-									class="input-inline-edit-text" type="text"
-									ng-show="rowData.showEdit"
-									ng-model="contactUsList[$index].contactEmail" />
-								</td>
-								<td b2b-table-body>
-									<div id="users-page-td-url" ng-hide="rowData.showEdit"
-										ng-bind="rowData.url"></div> <input
-									class="input-inline-edit-text" type="text"
-									ng-show="rowData.showEdit" ng-model="contactUsList[$index].url" />
-								</td>
-								<td b2b-table-body>
-									<div id="users-page-td-descr" ng-hide="rowData.showEdit"
-										ng-bind=" rowData.description"></div> <input
-									class="input-inline-edit-text" type="text"
-									ng-show="rowData.showEdit"
-									ng-model="contactUsList[$index].description" />
-								</td>
-								<td b2b-table-body>
-									<div class="delete-contact-us" ng-hide="rowData.showEdit"
-										ng-click="rowData.showEdit=true">
-										<span class="icon-edit"></span>
-									</div> <span ng-show="rowData.showEdit"> <a
-										btn-type="primary"
-										ng-click="editContactUsFun(rowData); rowData.showEdit=false"
-										class="btn btn-alt btn-small" size="small">Save</a>
-								</span>
-								</td>
-								<td b2b-table-body>
-									<div class="delete-contact-us"
-										ng-click="delContactUsFun(rowData)">
-										<span class="icon-misc-trash"></span>
-									</div>
-								</td>
-							</tr>
-						</tbody>
-					</table>
-				</div>
-
-				<div id="divider-line"></div>
-				<div style="margin-top: 15px; margin-left: -78px;">
-					<div id="addWidgetHeader" class="contact-us-margin">
-						<h1 style="font-size: 18px;">Add Application Contact
-							Information</h1>
-						<!-- <div class="errMsg">{{errMsg}}</div> -->
-					</div>
-					<div id="addWidget" class="contact-us-margin">
-						<div>
-							<div id="add-contact-us-field-appname"
-								class="add-contact-us-field">
-								<div id="mots-property-label" class="property-label"><span ID="required" style="color: Red;"visible="false"> *</span>App	Name</div>
-								<select id="dropdown1" name="dropdown1" b2b-dropdown
-									placeholder-text="Select an App"
-									ng-model="newContactUs.app.value">
-									<option b2b-dropdown-list
-										option-repeat="d in contactUsAllAppList" value="{{d.value}}">{{d.title}}</option>
-								</select>
-								<div id="mots-property-label-required" ng-show="newContactUs.app.title==null || newContactUs.app.title=='' ">
-							<small class="mandatory-categories">App Name is Required</small>
-							</div>
-							</div>
-							<br>
-							<div id="add-contact-us-field-contactname"
-								class="add-contact-us-field">
-								<div id="property-label-name" class="property-label">Contact
-									Name</div>
-								<input id="property-input-name" class="input-text-area"
-									type="text" ng-model="newContactUs.name" />
-							</div>
-							<div id="add-contact-us-field-email" class="add-contact-us-field">
-								<div id="property-label-email" class="property-label">Contact
-									Email</div>
-								<input id="property-input-email" class="input-text-area"
-									type="text" ng-model="newContactUs.email" />
-							</div>
-							<div id="add-contact-us-field-url" class="add-contact-us-field">
-								<div id="property-label-url" class="property-label">Contact
-									URL</div>
-								<input id="property-input-url" class="input-text-area"
-									type="text" ng-model="newContactUs.url" />
-							</div>
-							<div id="add-contact-us-field-desc"
-								class="add-contact-us-field-des">
-								<div id="property-label-desc" class="property-label">Description</div>
-								<textarea id="property-input-desc"
-									style="margin-top: 0px; margin-bottom: 0px; height: 100px"
-									ng-model="newContactUs.desc"></textarea>
-							</div>
-						</div>
-						<div style="height: 50px;">
-							<a style="float: right; margin-top: 20px"
-								class="btn btn-alt btn-small" ng-click="newContactUsFun()" ng-disabled="newContactUs.app.title==null || newContactUs.app.title=='' ">Add
-								New</a>
+<div class="b2b-modal-header" >
+	<h2 id="myModalLabel" b2b-modal-title="" tabindex="-1">Manage Contact Us</h2>
+	<div class="corner-button">
+		<button type="button" class="close" 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"	>
+	<div class="c-ecomp-portal-abs-table contactus-manage-table">
+		<table b2b-table id="table-main" table-data="contactUsList"	current-page="ignoredCurrentPage">
+			<thead b2b-table-row type="header">
+				<tr>
+					<th id="th-users-0" b2b-table-header key="ecomp_function" default-sort="a">App Name</th>
+					<th id="th-users-1" b2b-table-header key="app_name" sortable="true">Contact	Name</th>
+					<th id="th-users-2" b2b-table-header key="app_name" sortable="true">Contact	Email</th>
+					<th id="th-users-3" b2b-table-header key="role_name" sortable="true">Contact URL</th>
+					<th id="th-users-4" b2b-table-header key="role_name" sortable="true">Description</th>
+					<th id="th-users-5" b2b-table-header key="role_name" sortable="true">Edit</th>
+					<th id="th-users-6" b2b-table-header key="role_name" sortable="true">Delete</th>
+				</tr>
+			</thead>
+			<!-- Use track-by="UNIQUE KEY HERE" or leave out if no unique keys in data -->
+			<tbody b2b-table-row type="body" class="table-body" track-by="$index" row-repeat="rowData in contactUsList">
+				<tr id="tr-rowData" ng-click="">
+					<td b2b-table-body>
+						<div id="users-page-td-appName" ng-bind="rowData.appName"></div>
+					</td>
+					<td b2b-table-body>
+						<div id="users-page-td-name" ng-hide="rowData.showEdit" ng-bind="rowData.contactName"></div> 
+						<input	class="input-inline-edit-text" type="text"	ng-show="rowData.showEdit"	ng-model="contactUsList[$index].contactName" />
+					</td>
+					<td b2b-table-body>
+						<div id="users-page-td-email" ng-hide="rowData.showEdit"	ng-bind="rowData.contactEmail"></div> 
+						<input	class="input-inline-edit-text" type="text"	ng-show="rowData.showEdit"	ng-model="contactUsList[$index].contactEmail" />
+					</td>
+					<td b2b-table-body>
+						<div id="users-page-td-url" ng-hide="rowData.showEdit"	ng-bind="rowData.url"></div> 
+						<input		class="input-inline-edit-text" type="text"	ng-show="rowData.showEdit" ng-model="contactUsList[$index].url" />
+					</td>
+					<td b2b-table-body>
+						<div id="users-page-td-descr" ng-hide="rowData.showEdit"		ng-bind=" rowData.description"></div> 
+						<input	class="input-inline-edit-text" type="text"	ng-show="rowData.showEdit"	ng-model="contactUsList[$index].description" />
+					</td>
+					<td b2b-table-body>
+						<div class="delete-contact-us" ng-hide="rowData.showEdit"	ng-click="rowData.showEdit=true">
+							<span class="icon-edit"></span>
+						</div> 
+						<span ng-show="rowData.showEdit"> 
+							<a btn-type="primary"	ng-click="editContactUsFun(rowData); rowData.showEdit=false"	class="btn btn-alt btn-small" size="small">Save</a>
+					</span>
+					</td>
+					<td b2b-table-body>
+						<div class="delete-contact-us" ng-click="delContactUsFun(rowData)">
+							<span class="icon-misc-trash"></span>
 						</div>
-						<div id="divider-line-bottom"></div>
+					</td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
 
-						<div style="height: 50px;">
-							<a style="float: right; margin-right: -230px !important;"
-								class="btn btn-alt btn-small" ng-click="closeDialog()">Close</a>
-						</div>
+	<div id="divider-line"></div>
 
-					</div>
 
+	<div class="contactus-addWidgetHeader">
+		<div id="addWidgetHeader" class="contact-us-margin">
+			<h1 class="contactus-addWidgetHeader-txt">Add Application Contact Information</h1>
+		</div>
+		<div id="addWidget" class="contact-us-margin">
+			<div>
+				<div id="add-contact-us-field-appname" class="add-contact-us-field">
+					<div id="mots-property-label" class="property-label">
+						<span ID="required" class="mots-property-label-spn"	visible="false"> *</span>App Name
+					</div>
+					<select id="dropdown1" name="dropdown1" b2b-dropdown	placeholder-text="Select an App" ng-model="newContactUs.app.value">
+						<option b2b-dropdown-list option-repeat="d in contactUsAllAppList"	value="{{d.value}}">{{d.title}}</option>
+					</select>
+					<div id="mots-property-label-required"	ng-show="newContactUs.app.title==null || newContactUs.app.title=='' ">
+						<small class="mandatory-categories">App Name is Required</small>
+					</div>
 				</div>
-
-			</div>
+				<br>
+				<div id="add-contact-us-field-contactname"	class="add-contact-us-field">
+					<div id="property-label-name" class="property-label">Contact Name</div>
+					<input id="property-input-name" class="input-text-area" type="text"	ng-model="newContactUs.name" />
+				</div>
+				<div id="add-contact-us-field-email" class="add-contact-us-field">
+					<div id="property-label-email" class="property-label">Contact Email</div>
+					<input id="property-input-email" class="input-text-area" type="text" ng-model="newContactUs.email" />
+				</div>
+				<div id="add-contact-us-field-url" class="add-contact-us-field">
+					<div id="property-label-url" class="property-label">Contact	URL</div>
+					<input id="property-input-url" class="input-text-area" type="text" ng-model="newContactUs.url" />
+				</div>
+				<div id="add-contact-us-field-desc" class="add-contact-us-field-des">
+					<div id="property-label-desc" class="property-label">Description</div>
+					<textarea id="property-input-desc"	class="property-label-desc-txtarea" ng-model="newContactUs.desc"></textarea>
+				</div>
+			</div>		
 		</div>
 	</div>
 </div>
-
-<script type="application/javascript">
-    $(document).ready(function(){
-        $(".ngdialog-content").css("width","85%");
-        $(".ngdialog-close").attr('id','dialog-close');
-    });
-</script>
+<div class="b2b-modal-footer ng-scope ng-isolate-scope">
+	<div class="cta-button-group cta-modal-footer-flex">
+		<div>
+			<button class="btn btn-clear btn-medium pull-left" type="button" ng-click="$dismiss('cancel')">Close</button>
+			<button class="btn btn-alt btn-medium" type="button" ng-click="newContactUsFun()" ng-disabled="newContactUs.app.title==null || newContactUs.app.title=='' ">Add New</button>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.controller.js b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.controller.js
index eddde0d9..770f85e6 100644
--- a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.controller.js
+++ b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.controller.js
@@ -105,21 +105,24 @@
             
             updateContactUsTable();
             this.editContactUsModalPopup = () => {
-                 // $log.debug('ContactUsCtrl::editContactUsModalPopup updating table data...');               
-                 var modalInstance = ngDialog.open({
-                     templateUrl: 'app/views/support/contact-us/contact-us-manage/contact-us-manage.html',
-                     controller: 'ContactUsManageController',
-                     resolve: {
-                         message: function message() {
-                             var message = {
-                                 type: 'Contact',
-                             };
-                             return message;
-                         }
-                     }
-                 }).closePromise.then(needUpdate => {	              	 
-                	 updateContactUsTable();
-	             });       
+            	var modalInstance = $modal.open({
+                    templateUrl: 'app/views/support/contact-us/contact-us-manage/contact-us-manage.html',
+                    controller: 'ContactUsManageController',
+                    windowClass: 'modal-docked',
+                    resolve: {
+                        message: function message() {
+                            var message = {
+                                type: 'Contact',
+                            };
+                            return message;
+                        }
+                    }
+                });
+            	
+            	modalInstance.result.finally(function (needUpdate) {
+                 	updateContactUsTable();            
+      	        });
+                    
              };
              
              this.goToSection = (id) => {
diff --git a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.less b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.less
index 6fd0a420..9b463e40 100644
--- a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.less
+++ b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.less
@@ -12,6 +12,7 @@
 
   .w-ecomp-main-view-title{
   	 font-family: Omnes-ECOMP-W02,Arial;
+  	 font-size: 20px;
   }
   
   #title{
@@ -30,6 +31,8 @@
     padding-left: 0;
     padding-bottom: 32px;
     width: 100%;
+    height:100%;
+    overflow:auto;
    
 
     .contactUs-general-div {
@@ -89,5 +92,42 @@
 	padding-top: 5px;
 	padding-bottom: 5px;
 }
+
+.contactUs-table-ht {
+	height:60px;
+}
+
+.contactUs-table-spn {
+	top:20px;
+}
+
+.contactUs-table-title-spn {
+	float: right; 
+	margin-right: 30px; 
+	margin-top:20px;
+}
+
+.contactUs-collapsible-panel-spn {
+	margin-bottom: 20px;
+}
 	
+.contactUs-main-table {
+	border-spacing: 10px 5px; 
+	max-width:950px; 
+	margin:10px;
+}	
+	
+.contactUs-main-panel-labels {
+	width: 120px;
+}
+
+.contactUs-main-panel-value {
+	width: 830px;
+}
+
+.contactUs-table-ht {
+	height:auto;
+}
+
+
 }
diff --git a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.tpl.html b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.tpl.html
index 444a9820..c2ec02ca 100644
--- a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.tpl.html
+++ b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.tpl.html
@@ -17,7 +17,7 @@
   limitations under the License.
   ================================================================================
   -->
-<div class="w-ecomp-contactUs-home" style=" overflow:auto;''">
+<div class="w-ecomp-contactUs-home">
 	<div class="contactUs-home-container" id="page-content">
 		<div class="admins-page-main">
 			<div id="title" class="w-ecomp-main-view-title">
@@ -28,7 +28,7 @@
 			
 		<br/> 
 		<!-- Function Categories -->		
-		<div id="appFunctionInfo" style="font-size: 20px;" class="w-ecomp-main-view-title"> Application Functions
+		<div id="appFunctionInfo" class="w-ecomp-main-view-title"> Application Functions
 				<div b2b-table table-data="contact.functionalTableData" class="b2b-table-div">
 						<table>
 							<thead b2b-table-row type="header">
@@ -66,17 +66,17 @@
 		<br/>
 		<!-- Display applicationInfo panels -->
 		<div id="allAppInfo">
-			<div style="font-size: 20px;" class="w-ecomp-main-view-title"> All Applications		
+			<div class="w-ecomp-main-view-title"> All Applications		
 			</div>		
 			<div class="contactUs-general-div">
 				<div class="contact-us-table">
-				<div style="height:auto;" class="c-ecomp-portal-abs-table default">
+				<div class="c-ecomp-portal-abs-table default contactUs-table-ht">
 					<div ng-repeat="rowData in contact.appTable"
 						class="contactUs-collapsible-panel">
-						<div id="{{rowData.app_Id}}" style="height:60px; " class="contactUs-panel-header" ng-click="rowData.showFlag = !rowData.showFlag" >
-							<span id="appId{{$index}}" ng-bind="rowData.app_name" style="position:relative; top:20px"></span>
+						<div id="{{rowData.app_Id}}" class="contactUs-table-ht" class="contactUs-panel-header" ng-click="rowData.showFlag = !rowData.showFlag" >
+							<span id="appId{{$index}}" ng-bind="rowData.app_name" class="contactUs-table-spn"></span>
 							
-							<span style="float: right; margin-right: 30px; margin-top:20px;">
+							<span class="contactUs-table-title-sp">
 						 		<span ng-show="rowData.showFlag" title="Collapse app contact section" class="icon-controls-upPRIMARY"></span>
 								<span ng-hide="rowData.showFlag" title="Expand app contact section" class="icon-controls-down"></span>
 							</span>
@@ -85,13 +85,13 @@
 						<div id="collapse{{$index}}" ng-show="rowData.showFlag"
 							class="contactUs-collapsible-panel">
 							<div class="contactUs-txt" ng-hide="rowData.contact_name || rowData.contact_email || rowData.url_Info || rowData.desc"> 
-								<span style="margin-bottom: 20px;"> No application information is available. Please use the links above to contact the ECOMP Portal team. </span>
+								<span class="contactUs-collapsible-panel-spn"> No application information is available. Please use the links above to contact the ECOMP Portal team. </span>
 							</div>
 		 					<div class="contactUs-txt" ng-show="rowData.contact_name || rowData.contact_email || rowData.url_Info || rowData.desc"> 
-							  <table style="border-spacing: 10px 5px; max-width:950px; margin:10px;">
+							  <table class="contactUs-main-table">
 								<tr>
-									<td class="contactUs-panel-labels" style="width: 120px;">Contact:</td>
-									<td class="contactUs-panel-labels" style="width: 830px;">{{rowData.contact_name}}</td>
+									<td class="contactUs-panel-labels contactUs-main-panel-labels">Contact:</td>
+									<td class="contactUs-panel-labels contactUs-main-panel-value">{{rowData.contact_name}}</td>
 								</tr>
 								<tr>
 									<td class="contactUs-panel-labels">Email:</td>
-- 
cgit 1.2.3-korg