X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=ecomp-portal-FE-common%2Fclient%2Fapp%2Fviews%2Frole%2Frole.html;h=9febc9780c0de56371da2c2d222e04bb51fb6436;hb=978dbcf0a196acbafad72fe1e2478ec0e384f02f;hp=2356058d056a5a606f1ac3701b7515beea77a448;hpb=bc7350dce5b7b1dcd1c472a3922b42c4ea99809d;p=portal.git

diff --git a/ecomp-portal-FE-common/client/app/views/role/role.html b/ecomp-portal-FE-common/client/app/views/role/role.html
index 2356058d..9febc978 100644
--- a/ecomp-portal-FE-common/client/app/views/role/role.html
+++ b/ecomp-portal-FE-common/client/app/views/role/role.html
@@ -17,6 +17,25 @@
   limitations under the License.
   ================================================================================
   -->
+  <style>
+  .checkbox .skin {
+    left: 112px;
+    top: -8px;
+}
+.checkbox input {
+    margin: 0px;
+    left: 105px;
+    height: 20px;
+    top: -4px;
+    }
+.checkbox span {
+    display: inline-block;
+    margin-left: 1px;
+    margin-top: 0;
+    position: relative;
+    top: -3px;
+}
+  </style>
 <div class="w-ecomp-admins-page-main">
 	<div class="admins-home-container" id="page-content">
 	 	<div id="title" class="w-ecomp-main-view-title">
@@ -26,10 +45,18 @@
 			<div>
 				<br>
 			    <p class="p-info">Please edit the role details below:&nbsp;</p><br>
+			    
+			     <div class="property-label checkbox-label"> 
+					<label for="checkbox-app-is-restricted" class="checkbox"> 
+		                <input type="checkbox" ng-model="isGlobalRoleChecked" id="checkbox-app-is-restricted"  ng-checked="isGlobalRoleChecked" /> 
+		                <i id="checkbox-app-is-restricted" class="skin"></i> 
+		                <span>Global Roles: </span> 
+		            </label> 
+				</div> 
 			     
 				<div id="role-text" >
 					<label id="role-text-name-label" >*Name:</label>
-					<input id="input-name"  class="input-field" maxlength="30"  type="text" data-ng-model="role.name">					 
+					<input id="input-name"  class="input-field" maxlength="300"  type="text" data-ng-model="role.name">					 
 					<br>
 					<label id="role-text-priority-label">Priority:</label>
 					<input id="input-priority" class="input-field" maxlength="30"  type="text" data-ng-model="role.priority">					 	
@@ -40,12 +67,14 @@
 				</div>
 				
 				<br>
+				<div ng-if="routeRoleId!=0">
 				<div id="page-title"  class="pageTitle">
 					<label>Role Functions</label>
 					<a id="add-new-role" ng-click="addNewRoleFunctionModalPopup();" ng-style="{'cursor':'pointer'}" class="icon-primary-accordion-plus" size="small"></a>
 				</div>
 			
 				<div b2b-table table-data="role.roleFunctions"  ng-hide="users.isLoadingTable"	search-string="users.searchString" class="b2b-table-div">
+				<span class="ecomp-spinner" ng-show="isLoadingRoleFunctions"></span>
 					<table>
 						<thead b2b-table-row type="header">
 							<tr >
@@ -57,7 +86,7 @@
 							<tr >
 								<td id="role-function-{{roleFunction.name}}" b2b-table-body id="rowheader_t1_{{$index}}" headers="col1" ng-bind="roleFunction.name"></td>
 								<td b2b-table-body headers="rowheader_t1_{{$index}} col4">
-					    			<div ng-click="removeRoleFunction(roleFunction);" ><a href="javascript:void(0)" class="icon-misc-trash"></a></div>
+					    			<div id="{{$index}}-remove-trash-button" ng-click="removeRoleFunction(roleFunction);" ><a href="javascript:void(0)" class="icon-misc-trash"></a></div>
 								</td>							
 							</tr>
 						</tbody>
@@ -82,7 +111,7 @@
 						<tbody b2b-table-row type="body" 	row-repeat="role in role.childRoles">
 							<tr >
 								<td id="role-function-{{role.name}}" b2b-table-body id="rowheader_t1_{{$index}}" headers="col1" ng-bind="role.name"></td>
-								<td b2b-table-body headers="rowheader_t1_{{$index}} col4">
+								<td b2b-table-body headers="rowheader_t1_{{$index}} col4" id="{{$index}}-button-remove-role" >
 					    			<div ng-click="removeChildRole(role);" ><a href="javascript:void(0)" class="icon-misc-trash"></a></div>
 								</td>							
 							</tr>
@@ -90,7 +119,7 @@
 					</table>
 				</div>					
 			</div>
-	
+			</div>
 		</div>
 	</div>
 </div>