From 1683d7929869d7d5f9bda1ffad0ace619c507ce0 Mon Sep 17 00:00:00 2001
From: "Christopher Lott (cl778h)" <clott@research.att.com>
Date: Wed, 23 Aug 2017 15:46:44 -0400
Subject: Repair role-centralization features in EPSDK

Issue: PORTAL-21
Change-Id: Icf276482609734d3aa24f04ae0a8135021a3d305
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
---
 .../scripts/DS2-view-models/ds2-admin/role.html    | 134 ++++++++-------------
 1 file changed, 49 insertions(+), 85 deletions(-)

(limited to 'ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role.html')

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role.html
index 6268cf6f..f4c9d0c6 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role.html
@@ -2,96 +2,60 @@
 	<div>
 		<h1 class="heading-page" id="Roles">Manage Roles</h1>
 	</div>
-	<div>
-		<h2 class="heading-small-content">Please edit the role details below: </h2>
-	</div>
-	
-	<div>
-		<label>*Name: &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
-			<input type="text" ng-model="role.name"
-				maxlength="300" />
-		</label>
-	</div>
-	
-	<div>
-		<label>Priority: &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
-			<input type="text" ng-model="role.priority"
-				maxlength="30"/>
-		</label>
+	<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>
-		<button style="margin-left: 105px;" class="btn btn-small" onClick="window.location='admin'">Cancel</button>
-		<button class="btn btn-alt btn-small" ng-click="saveRole();">Save</button>
-	</div> 
-	<br/>
-	<div ng-if="routeRoleId != 0">
+	<div ng-hide="showLoader">
 		<div>
-			<h3 class="heading-small-emphasis">Role Functions</h3>    		
-			<button class="btn btn-alt btn-small" ng-click="addNewRoleFunctionModalPopup(role.roleFunctions,role.name, role);">Manage Role Functions</button>
-			
-			<table class="striped" ng-if="role.roleFunctions.length">
-						<thead>
-							<tr>
-								<th>Role Function Name</th>						
-								<th>Remove</th>
-							</tr>
-						</thead>
-						<tbody type="body" ng-repeat="roleFunction in role.roleFunctions">
-							<tr>
-								<td width="70%">{{ roleFunction.name }}</td>						
-								<td width="10%">
-						    		<div ng-click="removeRoleFunction(roleFunction);"><a href="javascript:void(0)" class="icon-misc-trash"></a></div>
-						    	</td>
-							</tr>			  
-						</tbody>
-			</table>
+			<h2 class="heading-small-content">Please edit the role details below: </h2>
 		</div>
-		<br/>
 		
-		<!-- Commented code due to issues with child role activation and deactivation, should be revisited -->
-		<!-- <div>
-			<h4 class="heading-small-emphasis">Child Roles</h4>    
-			<button class="btn btn-alt btn-small" ng-click="addNewChildRoleFunctionModalPopup(role.childRoles,role.name, role);">Manage Child Roles</button>
-			
-			<table class="striped" ng-if="role.childRoles.length">
-						<thead>
-							<tr>
-								<th>Name</th>						
-								<th>Remove?</th>
-							</tr>
-						</thead>
-						<tbody type="body" ng-repeat="role in role.childRoles">
-							<tr>
-								<td width="70%">{{ role.name }}</td>						
-								<td width="10%">
-						    		<div ng-click="removeChildRole(role);"><a href="javascript:void(0)" class="icon-misc-trash"></a></div>
-						    	</td>
-							</tr>					   
-						</tbody>
-			</table>
-		</div> -->
-		<br/>
 		<div>
-			<a href="admin#/role_function_list">Manage Role Functions</a><br><br>
+			<label>*Name: &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
+				<input type="text" ng-model="role.name"
+					maxlength="300" />
+			</label>
+		</div>
+		
+		<div>
+			<label>Priority: &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
+				<input type="text" ng-model="role.priority"
+					maxlength="30"/>
+			</label>
+		</div>
+		
+		<div>
+			<button style="margin-left: 105px;" class="btn btn-small" onClick="window.location='admin'">Cancel</button>
+			<button class="btn btn-alt btn-small" ng-click="saveRole();">Save</button>
+		</div> 
+		<br/>
+		<div ng-if="routeRoleId != 0">
+			<div>
+				<h3 class="heading-small-emphasis">Role Functions</h3>    		
+				<button class="btn btn-alt btn-small" ng-click="addNewRoleFunctionModalPopup(role.roleFunctions,role.name, role);">Manage Role Functions</button>
+				
+				<table class="striped" ng-if="role.roleFunctions.length">
+							<thead>
+								<tr>
+									<th>Role Function Name</th>						
+									<th>Remove</th>
+								</tr>
+							</thead>
+							<tbody type="body" ng-repeat="roleFunction in role.roleFunctions">
+								<tr>
+									<td width="70%">{{ roleFunction.name }}</td>						
+									<td width="10%">
+							    		<div ng-click="removeRoleFunction(roleFunction);"><a href="javascript:void(0)" class="icon-misc-trash"></a></div>
+							    	</td>
+								</tr>			  
+							</tbody>
+				</table>
+			</div>
+			<br/>
+			<br/>
+			<div>
+				<a href="admin#/role_function_list">Manage Role Functions</a><br><br>
+			</div>
 		</div>
-		<!-- <table class="striped" table-data="availableRoles">
-					<thead>
-						<tr>
-							<th></th>						
-							<th>Role</th>
-						</tr>
-					</thead>
-					<tbody type="body" ng-repeat="availableRole in availableRoles">
-						<tr>
-							<td width="70%">
-								<div ng-click="toggleChildRole(availableRole.selected,availableRole);">
-				    				<input type="checkbox" ng-model="availableRole.selected" />
-				    		</div>
-							</td>						
-							<td> {{ availableRole.name }} </td>
-						</tr>					   
-					</tbody>
-		</table> -->
 	</div>
 </div>
\ No newline at end of file
-- 
cgit 1.2.3-korg