From efedea1c5d80532f5b1180d57c8dafce5dcb302a Mon Sep 17 00:00:00 2001
From: Ofir Sonsino <os0695@att.com>
Date: Tue, 20 Feb 2018 18:03:30 +0200
Subject: org.onap migration

Change-Id: I5e2d01a6da21d4003c910b5fe0702b35c2089a77
Issue-ID: VID-86
Signed-off-by: Ofir Sonsino <os0695@intl.att.com>
---
 .../ds2-profile/profile_searchDS2.html             |  9 ++---
 .../DS2-view-models/ds2-profile/self_profile.html  | 41 +++++++++++-----------
 .../ds2-samplePages/samplePage.html                |  3 +-
 .../scripts/DS2-view-models/header-logo.html       |  2 ++
 4 files changed, 30 insertions(+), 25 deletions(-)
 create mode 100644 epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-view-models/header-logo.html

(limited to 'epsdk-app-onap/src/main/webapp/app/fusion/scripts')

diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/profile_searchDS2.html b/epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/profile_searchDS2.html
index 79e85e92..72b3a82a 100755
--- a/epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/profile_searchDS2.html
+++ b/epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/profile_searchDS2.html
@@ -17,7 +17,7 @@
 						<th>User ID</th>
 						<th>Manager User ID</th>
 						<th>Edit</th>
-						<th>Active?</th>
+						<th ng-show="(isAppCentralized=='false')">Active?</th>
 					</tr>
 				</thead>
 				<tbody type="body" ng-repeat="rowData in tableData">
@@ -31,11 +31,12 @@
 						<!--  Include an edit image with respective redirection -->
 						<td><a href="#/profile/{{rowData.id}}" class="icon-misc-pen"
 							style="color: #888; font-size: 20px;"></a></td>
-						<td>
+						<td ng-show="(isAppCentralized=='false')">
 							<div class="form-row">
 								<label class="btn-switch-label" tabindex="0" role="option">
-									<input type="checkbox" b2b-switches ng-model="rowData.active"
-									ng-disabled="allDisabled" aria-disabled="{{allDisabled}}">
+									<input type="checkbox" b2b-switches 
+										ng-model="rowData.active" ng-click="toggleProfileActive(rowData)"
+										ng-disabled="allDisabled" aria-disabled="{{allDisabled}}" />
 									<div class="sr-text hidden-spoken" ng-if="!allDisabled">Double
 										tap to turn</div>
 								</label>
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/self_profile.html b/epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/self_profile.html
index 54c17233..8caf38af 100755
--- a/epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/self_profile.html
+++ b/epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/self_profile.html
@@ -4,14 +4,15 @@
 		<div ng-show="showLoader" class="span loader-container">
 			<i class="icon-primary-spinner" role="img"	aria-label="Please wait while we load your content"></i>
 		</div>
-		<div ng-hide="showLoader" >	
-			<h3 class="heading-small">Please edit the profile details below:</h3>
+		<div ng-hide="showLoader" >
+		    <h3  class="heading-small" ng-show="isAppCentralized=='true'" style="color:red;">Please use Portal for access management</h3>	
+			<h3 class="heading-small" ng-show="isAppCentralized=='false'">Please edit the profile details below:</h3>
 			<div class="row-nowrap">
 				<div class="span12">
 					<div class="form-row">
 						<label for="textinputID-2a">*First Name</label>
 						<div class="field-group">
-							<input id="textinputID-2a" b2b-reset="" class="span12" type="text" data-ng-model="profile.lastName">
+							<input id="textinputID-2a" b2b-reset="" class="span12" type="text" data-ng-model="profile.firstName" ng-disabled="(isAppCentralized == 'true')">
 						</div>
 					</div>
 				</div>
@@ -19,7 +20,7 @@
 					<div class="form-row">
 						<label for="textinputID-3a">*Last Name</label>
 						<div class="field-group">
-							<input id="textinputID-3a" b2b-reset="" class="span12" type="text" data-ng-model="profile.firstName">
+							<input id="textinputID-3a" b2b-reset="" class="span12" type="text" data-ng-model="profile.lastName" ng-disabled="(isAppCentralized == 'true')">
 						</div>
 					</div>
 				</div>
@@ -62,7 +63,7 @@
 					<div class="form-row">
 						<label for="textinputID-3a">*Phone</label>
 						<div class="field-group">
-							<input id="textinputID-3a" b2b-reset="" class="span12" type="text" data-ng-model="profile.phone">
+							<input id="textinputID-3a" b2b-reset="" class="span12" type="text" data-ng-model="profile.phone" ng-disabled="(isAppCentralized == 'true')">
 						</div>
 					</div>
 				</div>
@@ -70,7 +71,7 @@
 					<div class="form-row">
 						<label for="textinputID-3a">Fax</label>
 						<div class="field-group">
-							<input id="textinputID-3a" b2b-reset=""  class="span12" type="text" data-ng-model="profile.fax">
+							<input id="textinputID-3a" b2b-reset=""  class="span12" type="text" data-ng-model="profile.fax" ng-disabled="(isAppCentralized == 'true')">
 						</div>
 					</div>
 				</div>
@@ -81,7 +82,7 @@
 					<div class="form-row">
 						<label for="textinputID-2a">Cellular</label>
 						<div class="field-group">
-							<input id="textinputID-2a" b2b-reset=""  class="span12" type="text" data-ng-model="profile.cellular">
+							<input id="textinputID-2a" b2b-reset=""  class="span12" type="text" data-ng-model="profile.cellular" ng-disabled="(isAppCentralized == 'true')">
 						</div>
 					</div>
 				</div>
@@ -89,7 +90,7 @@
 					<div class="form-row">
 						<label for="textinputID-3a">*Email</label>
 						<div class="field-group">
-							<input id="textinputID-3a" b2b-reset=""  class="span12" type="text" data-ng-model="profile.email">
+							<input id="textinputID-3a" b2b-reset=""  class="span12" type="text" data-ng-model="profile.email" ng-disabled="(isAppCentralized == 'true')">
 						</div>
 					</div>
 				</div>
@@ -97,7 +98,7 @@
 					<div class="form-row">
 						<label for="textinputID-3a">Address 1</label>
 						<div class="field-group">
-							<input id="textinputID-3a" b2b-reset="" class="span12" type="text" data-ng-model="profile.address1">
+							<input id="textinputID-3a" b2b-reset="" class="span12" type="text" data-ng-model="profile.address1" ng-disabled="(isAppCentralized == 'true')">
 						</div>
 					</div>
 				</div>
@@ -105,7 +106,7 @@
 					<div class="form-row">
 						<label for="textinputID-3a">Address 2</label>
 						<div class="field-group">
-							<input id="textinputID-3a" b2b-reset=""  class="span12" type="text" data-ng-model="profile.address2">
+							<input id="textinputID-3a" b2b-reset=""  class="span12" type="text" data-ng-model="profile.address2" ng-disabled="(isAppCentralized == 'true')">
 						</div>
 					</div>
 				</div>
@@ -116,14 +117,14 @@
 					<div class="form-row">
 						<label for="textinputID-2a">City</label>
 						<div class="field-group">
-							<input id="textinputID-2a" b2b-reset=""  class="span12" type="text" data-ng-model="profile.city">
+							<input id="textinputID-2a" b2b-reset=""  class="span12" type="text" data-ng-model="profile.city" ng-disabled="(isAppCentralized == 'true')">
 						</div>
 					</div>
 				</div>
 				<div class="span12">
 					<div class="form-row">
 						<label for="textinputID-3a">State</label>
-						<select name="dropdown1" b2b-dropdown ng-model="stateList.selected.value"> 
+						<select name="dropdown1" b2b-dropdown ng-model="stateList.selected.value" ng-disabled="(isAppCentralized == 'true')"> 
 							<option b2b-dropdown-list option-repeat="d in stateList.options" value="{{d.value}}" init-value="{{stateList.selected.title}}">{{d.title}}</option>
 						</select>  
 					</div>
@@ -132,14 +133,14 @@
 					<div class="form-row">
 						<label for="textinputID-3a">Zip Code</label>
 						<div class="field-group">
-							<input id="textinputID-3a" b2b-reset="" class="span12" type="text" data-ng-model="profile.zipCode">
+							<input id="textinputID-3a" b2b-reset="" class="span12" type="text" data-ng-model="profile.zipCode" ng-disabled="(isAppCentralized == 'true')">
 						</div>
 					</div>
 				</div>
 				<div class="span12">
 					<div class="form-row">
 						<label for="textinputID-3a">Country</label>
-						<select name="dropdown1" b2b-dropdown ng-model="selectedCountry.value"> 
+						<select name="dropdown1" b2b-dropdown ng-model="selectedCountry.value" ng-disabled="(isAppCentralized == 'true')"> 
 							<option b2b-dropdown-list option-repeat="d in countries" value="{{d.value}}" init-value="{{selectedCountry.title}}">{{d.title}}</option>
 						</select>  
 					</div>
@@ -148,17 +149,17 @@
 			<div class="span3">
 				<div class="form-row">
 					<label for="textinputID-3a">Time Zone</label>
-					<select name="dropdown1" b2b-dropdown ng-model="selectedTimeZone.value"> 
+					<select name="dropdown1" b2b-dropdown ng-model="selectedTimeZone.value" ng-disabled="(isAppCentralized == 'true')"> 
 						<option b2b-dropdown-list option-repeat="d in timeZones" value="{{d.value}}" init-value="{{selectedTimeZone.title}}">{{d.title}}</option>
 					</select>  
 				</div>
 			</div>
 			
-			<div>
-				<button class="btn btn-alt btn-small" type="button" ng-click="saveProfile()">Save</button>
+			<div class="form-row">
+				<button class="btn btn-alt btn-small" type="button" ng-click="saveProfile()" ng-show="(isAppCentralized=='false')">Save</button>
 			</div>
 			<br>
-			<div>
+			<div ng-show="(isAppCentralized=='false')">
 				Role
 				<a ng-click="addNewRoleFunctionModalPopup(role.roleFunctions,role.name, role);" class="icon-primary-accordion-plus" size="small"></a>
 			</div>
@@ -168,14 +169,14 @@
 					<thead>
 						<tr>
 							<th>Name</th>				
-							<th>Delete</th>
+							<th ng-show="(isAppCentralized=='false')">Delete</th>
 						</tr>
 					</thead>
 					<tbody type="body" ng-repeat="rowData in profile.roles">
 						<tr>
 							<td ng-bind="rowData['name']"></td>
 							
-							<td>
+							<td ng-show="(isAppCentralized=='false')">
 								<div style="font-size: 20px;">
 									<a href="javascript:void(0)" ng-click="removeRole(rowData);" 	class="icon-misc-trash"></a>
 								</div>
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/samplePage.html b/epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/samplePage.html
index d8ae146d..078a0564 100755
--- a/epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/samplePage.html
+++ b/epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/samplePage.html
@@ -11,6 +11,8 @@
 	
 	<!-- icons in open source -->
 	<link rel="stylesheet" type="text/css" href="app/fusion/external/ds2/css/digital-ng-library/ionicons.css">
+	<link rel="stylesheet" type="text/css" href="app/fusion/external/ds2/css/digital-ng-library/ecomp-ionicons.css">
+	
 	<link rel="stylesheet" type="text/css" href="app/fusion/styles/ecomp.css">
 	
 	<!-- Common scripts -->
@@ -37,7 +39,6 @@
 	<script src="app/fusion/scripts/DS2-directives/ds2Header.js"></script>
 	<script src="app/fusion/scripts/DS2-directives/ds2LeftMenu.js"></script>
 	<script src="app/fusion/scripts/DS2-directives/b2b-leftnav-ext.js"></script> 
-	<script src="app/fusion/external/ds2/js/digital-ng-library/digital-design-library.js"></script>	
 	<script src="app/fusion/external/utils/js/browserCheck.js"></script>	 
 	
 	<!-- Page-specific items -->	
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-view-models/header-logo.html b/epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-view-models/header-logo.html
new file mode 100644
index 00000000..2eec0cfb
--- /dev/null
+++ b/epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-view-models/header-logo.html
@@ -0,0 +1,2 @@
+<img src="app/fusionapp/icons/logo_onap_transbg.png" class="header-image">
+<span class="globe-text">ONAP Portal</span>
\ No newline at end of file
-- 
cgit 1.2.3-korg