X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-FE-common%2Fclient%2Fapp%2Fviews%2Fusers%2Fnew-user-dialogs%2Fnew-user.modal.html;h=eab95f464ec528fa3fa667014fb6b3813b691c7a;hb=53c92344af793a671019038c8ff21302c7bc2a73;hp=5fec021a4ab5cce15f583e5f6be53b5eb9700b42;hpb=627badaf69987c01811c477219fd943757a635f5;p=portal.git

diff --git a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.modal.html b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.modal.html
index 5fec021a..eab95f46 100644
--- a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.modal.html
+++ b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.modal.html
@@ -1,85 +1,156 @@
 <!--
-  ================================================================================
-  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.
+  ============LICENSE_START==========================================
+  ONAP Portal
+  ===================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  ===================================================================
+ 
+  Unless otherwise specified, all software contained herein is licensed
+  under the Apache License, Version 2.0 (the "License");
+  you may not use this software except in compliance with the License.
   You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
+ 
+              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.
-  ================================================================================
+ 
+  Unless otherwise specified, all documentation contained herein is licensed
+  under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+  you may not use this documentation except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+              https://creativecommons.org/licenses/by/4.0/
+ 
+  Unless required by applicable law or agreed to in writing, documentation
+  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.
+ 
+  ============LICENSE_END============================================
+ 
+  
   -->
-<div class="new-user-modal">
+<style>
+	.title {
+		border-bottom: none !important;
+	}
+	
+	.b2b-modal-footer .cta-button-group {
+		border-top: 0px solid #d2d2d2;
+	}
+	
+	.multiple-select {
+		width: 250px;
+	}
+</style>
 
-    <div class="search-users" ng-show="newUser.dialogState===1">
+ <div >
+ 
+<div ng-if="newUser.dialogState===1">
 
-        <search-users search-title="New User"
-                      selected-user="newUser.selectedUser"></search-users>
+		<div class="b2b-modal-header">
+			<h2 class="heading-medium" id="newAdmin">New User</h2>
+			
+			<div class="corner-button in">
+				<button type="button" class="close" aria-label="Close" id="user-button-close" 
+					ng-click="$dismiss('cancel')"></button>
+			</div>
+		</div>
+				
+				<fieldset style="height: 75px;" role="radiogroup"
+						b2b-radio-group-accessibility aria-labelledby="radiolabel2">
+						<div class="form-row" role="radio"
+							ng-repeat="radioObj in ngRepeatDemo">
+							<label style="margin-top: 10px;" for="{{radioObj.id}}"
+								class="radio"> <input type="radio"
+								ng-model="selectedvalueradioButtonGroup.type"
+								id="{{radioObj.id}}"
+								name="nameradioButton" value="{{radioObj.value}}"> <i
+								style= "margin-top: 10px; margin-left: 38px;" class="skin"></i> <span
+								style="margin-top: 10px; margin-left: 70px;">{{radioObj.labelvalue}}</span>
+							</label>
+						</div>
+					</fieldset>
+		  <div class="systemUser" ng-show="selectedvalueradioButtonGroup.type =='false'" style="color: #5a5a5a;
+        font-family: Omnes-ECOMP-W02, Arial;font-size: 14px;margin-bottom: 8px; padding-left: 30px;">Enter system userId</div>
+          <div ng-show="selectedvalueradioButtonGroup.type =='false'">
+				<input id="action-property-input"
+					class="adminForm-name-property-input" placeholder="xxxxxx@org.com"
+					ng-model="newUser.selectedUser.orgUserId"
+					type="text" maxlength="60" style="padding: 20px;
+                  margin-left: 30px; width: 60%;"/>
+			</div>
+		<div class="b2b-modal-body" tabindex="0" ng-show="selectedvalueradioButtonGroup.type =='true'"
+			aria-label="Modal header text content" role="region">
+			<search-users search-title="" selected-user="newUser.selectedUser"></search-users>
+		</div>		
+		<div class="b2b-modal-footer">
+			<div class="cta-button-group in">
+				<button class="btn btn-alt btn-small" id="next-button"  ng-click="newUser.selectedUser && newUser.getUserAppsRoles()"
+	                 ng-disabled = "(!newUser.selectedUser && selectedvalueradioButtonGroup.type =='true' ) || (selectedvalueradioButtonGroup.type =='false' && !newUser.selectedUser) ||(newUser.selectedUser && newUser.selectedUser.orgUserId.length <1)">Next
+	            	</button>
+				<button id="search-users-button-cancel"
+					class="btn btn-alt btn-small" ng-click="$dismiss('cancel')">Cancel</button>
+			</div>
+		</div>
 
-        <div class="dialog-control">   
-            <button class="btn btn-alt btn-small" id="next-button"  ng-click="newUser.selectedUser && newUser.getUserAppsRoles()"
-                 ng-class="{disabled: !newUser.selectedUser}">Next
-            </button>
-             <button class="btn btn-alt btn-small" id="cancel-button" ng-click="closeThisDialog()">Cancel</button>
-            
-        </div>
-    </div>
-
-    <div class="user-apps-roles" ng-show="newUser.dialogState===3">
-        <div class="title"
+	</div>
+		<div ng-if="newUser.dialogState===3" >
+	
+			<div class="b2b-modal-header">
+				<div class="title"
              ng-bind="newUser.selectedUser.firstName + ' ' + newUser.selectedUser.lastName + ' (' + newUser.selectedUser.orgUserId + ')'"></div>
 
-
-        <div class="app-roles-main">
-            <div class="app-roles-main-title">
-                <span class="left">Access and roles:</span>
-            </div>
-
-            <div class="app-roles-list">
-                <div class="app-item" ng-repeat="app in (newUser.adminApps) track by app.id"  id="app-name-{{app.name.split(' ').join('-')}}" ng-show="!app.isDeleted">
-                    <div class="app-item-left" id="div-app-name-{{app.name.split(' ').join('-')}}">{{app.name | elipsis: 27}}</div>
-                    <div class="app-item-right" id="div-app-name-dropdown-{{app.name.split(' ').join('-')}}" ng-show="!app.isError && !app.isLoading && !app.noChanges && !app.isUpdating && !app.isDoneUpdating && !app.isErrorUpdating">
-                        <multiple-select id="app-roles"
-                                         unique-data="{{$index}}"
-                                         placeholder="Select roles"
-                                         ng-model="app.appRoles"
-                                         on-change="newUser.appChanged($index)"
-                                         name-attr="roleName"
-                                         value-attr="isApplied"></multiple-select>
-                    </div>
-                    <div id="app-item-no-contact" class="app-item-right-error" ng-show="app.isError">{{app.errorMessage}}</div>
-                    <div id="app-item-contacting" class="app-item-right-contacting" ng-show="app.isLoading">Contacting application...</div>
-                    <div id="app-item-no-changes" class="app-item-right-contacting" ng-show="app.noChanges">No changes</div>
-                    <div id="app-item-no-updating" class="app-item-right-contacting" ng-show="app.isUpdating">Updating application...</div>
-                    <div id="app-item-done-updating" class="app-item-right-contacting" ng-show="app.isDoneUpdating">Finished updating application</div>
-                    <div id="app-item-cannot-update" class="app-item-right-error" ng-show="app.isErrorUpdating">Could not update application...</div>
-                    <div id="app-item-delete" class="app-item-delete" ng-click="newUser.deleteApp(app)" ng-show="!app.isLoading && !app.isError"></div>
-                    <div id='ecomp-small-spinner' class="ecomp-small-spinner" ng-show="app.isLoading"></div>
-                </div>
-            </div>
-            
-             <div class="dialog-control">
-                <span id="ecomp-save-spinner" class="ecomp-save-spinner" ng-show="newUser.isSaving || newUser.isGettingAdminApps"></span>
-                <button id="new-user-back-button" class="btn btn-alt btn-small"  ng-show="newUser.isShowBack" ng-click="newUser.navigateBack()">Back</button>
-                <button id="new-user-save-button" class="btn btn-alt btn-small" ng-click="newUser.updateUserAppsRoles()"
-                      ng-disabled="(newUser.anyChanges == false)">Save
-                </button>
-                <button id="new-user-cancel-button" class="btn btn-alt btn-small" ng-click="closeThisDialog()">Cancel</button>
-            </div>
-
-        </div>
-
-    </div>
-
-
+	
+				<div class="corner-button in">
+					<button type="button" class="close" aria-label="Close" id="div-cancel-button"
+						ng-click="$dismiss('cancel')"></button>
+				</div>
+			</div>
+	
+			<div class="b2b-modal-body">
+				<div class="app-roles-main-title">
+					<span class="left">Access and roles:</span>
+				</div>
+				<br/>
+				<table  class="app-roles-list">
+					<tr class="app-item" ng-repeat="app in (newUser.adminApps) track by app.id" id="app-name-{{app.name.split(' ').join('-')}}" ng-show="!app.isDeleted">
+						<td class="app-item-left" id="div-app-name-{{app.name.split(' ').join('-')}}">{{app.name | elipsis: 27}}</td>
+						<td class="app-item-right" id="div-app-name-dropdown-{{app.name.split(' ').join('-')}}" ng-show="!app.isError && !app.isLoading && !app.noChanges && !app.isUpdating && !app.isDoneUpdating && !app.isErrorUpdating">
+							<multiple-select id="app-roles-{{app.name}}" unique-data="{{$index}}" placeholder="Select roles"
+										ng-model="app.appRoles" on-change="newUser.appChanged($index)" name-attr="roleName"
+										value-attr="isApplied"></multiple-select>
+						</td>
+						<td id="app-item-no-contact" class="app-item-right-error" ng-show="app.isError">{{app.errorMessage}}</td>
+						<td id="app-item-contacting" class="app-item-right-contacting" ng-show="app.isLoading">Contacting application...</td>
+						<td id="app-item-no-changes" class="app-item-right-contacting" ng-show="app.noChanges">No changes</td>
+						<td id="app-item-no-updating" class="app-item-right-contacting" ng-show="app.isUpdating">Updating application...</td>
+						<td id="app-item-done-updating" class="app-item-right-contacting" ng-show="app.isDoneUpdating">Finished updating application</td>
+						<td id="app-item-cannot-update" class="app-item-right-error" ng-show="app.isErrorUpdating">Could not update application...</td>
+						<td id="app-item-delete" ng-click="newUser.deleteApp(app)" ng-show="!app.isLoading && !app.isError" >
+							<i class="icon-misc-trash"></i>
+						</td> 
+						<td id='ecomp-small-spinner' class="ecomp-small-spinner" ng-show="app.isLoading"></td>
+					</tr>
+				</table >
+			</div>
+	
+			<div class="b2b-modal-footer">
+				<div class="cta-button-group in">
+					<span id="ecomp-save-spinner" class="ecomp-save-spinner" ng-show="newUser.isSaving || newUser.isGettingAdminApps"></span>
+					<button id="new-user-back-button" class="btn btn-alt btn-small" ng-show="newUser.isShowBack" ng-click="newUser.navigateBack()">Back</button>
+					<button id="new-user-save-button" class="btn btn-alt btn-small" ng-click="newUser.updateUserAppsRoles()"
+							ng-disabled="(newUser.anyChanges == false)">Save
+					</button>
+					<button id="new-user-cancel-button" class="btn btn-alt btn-small" ng-click="$dismiss('cancel')">Cancel</button>
+				</div>
+			</div>
+	</div>
 
 </div>
 
@@ -87,4 +158,4 @@
 $(document).ready(function(){
     $(".ngdialog-close").attr('id','dialog-close');
 });
-</script>
+</script>
\ No newline at end of file