X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-FE-common%2Fclient%2Fapp%2Fviews%2Fadmins%2Fadd-admin-dialogs%2Fnew-admin.modal.html;h=70134b453c1fdf7c946645318335469ed712da85;hb=21a8761f684745bb300e075c7e98ad897ace9eed;hp=a18b8f607e216e21878cd5996d8eb65a801ec38c;hpb=627badaf69987c01811c477219fd943757a635f5;p=portal.git

diff --git a/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.modal.html b/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.modal.html
index a18b8f60..70134b45 100644
--- a/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.modal.html
+++ b/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.modal.html
@@ -1,75 +1,136 @@
 <!--
-  ================================================================================
-  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============================================
+ 
+  ECOMP is a trademark and service mark of AT&T Intellectual Property.
   -->
-<div class="new-admin-modal">
+ <style>
+	.title{
+		border-bottom: none !important;  
+	  }
+	  
+	.b2b-modal-footer .cta-button-group {
+     border-top: 0px solid #d2d2d2;
+	}
+	
+</style>
+
+<div>
+	<div ng-if="newAdmin.dialogState===1">
+
+		<div class="b2b-modal-header">
+			<h2 class="heading-medium" id="newAdmin">New Admin</h2>
 
-    <div class="search-users" ng-show="newAdmin.dialogState===1">
+			<div class="corner-button in">
+				<button type="button" class="close" aria-label="Close" id="admin-button-cancel" 
+					ng-click="$dismiss('cancel')"></button>
+			</div>
+		</div>
 
-        <search-users search-title="New Admin"
-                      selected-user="newAdmin.selectedUser"></search-users>
+		<div class="b2b-modal-body" tabindex="0"
+			aria-label="Modal header text content" role="region">
+			<search-users search-title="" selected-user="newAdmin.selectedUser"></search-users>
+		</div>
 
-        <div class="dialog-control">
-              <button id="search-users-button-next" class="btn btn-alt btn-small" ng-click="newAdmin.selectedUser && newAdmin.getAdminAppsRoles()"
-                 ng-class="{disabled: !newAdmin.selectedUser}">Next
-            </button>
-            <button id="search-users-button-cancel" class="btn btn-alt btn-small" ng-click="closeThisDialog()">Cancel</button>
-        </div>
-    </div>
- <br>
-    <div id="div-admin-app-roles" class="admin-app-roles" ng-show="newAdmin.dialogState===2">
-        <div class="title" id="title"
-             ng-bind="newAdmin.selectedUser.firstName + ' ' + newAdmin.selectedUser.lastName + ' (' + newAdmin.selectedUser.orgUserId + ')'"></div>
-        <div class="app-roles-main">
-            <div id="div-app-roles-main-title" class="app-roles-main-title">
-                <span class="left">Administrates:</span>
-                <!--<span class="right" ng-click="newAdmin.addAdministratedApp()">+Add</span>-->
-            </div>
+		<div class="b2b-modal-footer">
+			<div class="cta-button-group in">
+				<button id="search-users-button-next" class="btn btn-alt btn-small"
+					ng-click="newAdmin.selectedUser && newAdmin.getAdminAppsRoles()"
+					ng-class="{disabled: !newAdmin.selectedUser}">Next</button>
+				<button id="search-users-button-cancel"
+					class="btn btn-alt btn-small" id="div-cancel-button" ng-click="$dismiss('cancel')">Cancel</button>
+			</div>
+		</div>
 
+	</div>
+	
+	<div id="div-admin-app-roles" class="app-roles-main" ng-if="newAdmin.dialogState===2">
+			<div class="b2b-modal-header">
+				<div class="title" id="title"
+					ng-bind="newAdmin.selectedUser.firstName + ' ' + newAdmin.selectedUser.lastName + ' (' + newAdmin.selectedUser.orgUserId + ')'">
+				</div>
 
-            <div class="adminAppsRoles_dropdown">
-                 <select id="dropdown1" name="dropdown1" b2b-dropdown
-									placeholder-text="Select application"
-									ng-model="newAdmin.selectedNewApp.value">
-							<option b2b-dropdown-list option-repeat="app in (filteredApps = (newAdmin.adminAppsRoles | filter:{isAdmin:'false'})) track by app.id " ng-disabled="!filteredApps.length"  value="{{app}}">{{app.appName}}</option>
-					 </select>
-            </div>
-               <br>
+				<div class="corner-button in">
+					<button type="button" class="close" aria-label="Close"
+						ng-click="$dismiss('cancel')"></button>
+				</div>
+			</div>
 
-            <div class="admin-roles-list">
-                <div ng-repeat="app in (newAdmin.adminAppsRoles | orderBy:newAdmin.orderFilter) track by app.id" ng-show="app.isAdmin">
-                    <div id="select-app-{{app.appName.split(' ').join('-')}}" class="administrated-application" ng-bind="app.appName | elipsis: 57"></div>
-                    <i id="i-delete-application" class="icon-misc-trash" ng-click="newAdmin.unadminApp(app)"> </i>
-                </div>
-            </div>
 
-            <div class="dialog-control">
-                <span class="ecomp-save-spinner" ng-show="newAdmin.isSaving"></span>              
-                 <button id="button-back" ng-show="newAdmin.isShowBack" class="btn btn-alt btn-small" ng-click="newAdmin.navigateBack()">Back</button>
-                <button id="div-updateAdminAppsRoles" class="btn btn-alt btn-small" ng-click="newAdmin.updateAdminAppsRoles()"
-                     ng-class="{disabled: false}">Save
-                </button>
-                <button id="div-cancel-button" class="btn btn-alt btn-small" ng-click="closeThisDialog()">Cancel</button>
-            </div>
+			<div class="b2b-modal-body">
+				<div id="div-app-roles-main-title" class="app-roles-main-title">
+					<span class="left">Administrates:</span>
+					<!--<span class="right" ng-click="newAdmin.addAdministratedApp()">+Add</span>-->
+				</div>
+				<div class="adminAppsRoles_dropdown" id="sort-by-{{newAdmin.selectedNewApp.value}}">
+					<select id="dropdown1" name="dropdown1" b2b-dropdown
+						placeholder-text="Select application"
+						ng-model="newAdmin.selectedNewApp.value">
+						<option b2b-dropdown-list
+							option-repeat="app in (filteredApps = (newAdmin.adminAppsRoles | filter:{isAdmin:'false'})) track by app.id "
+							ng-disabled="!filteredApps.length" value="{{app}}">{{app.appName}}</option>
+					</select>
+				</div>
+				<br>
+				<div class="admin-roles-list">
+					<div
+						ng-repeat="app in (newAdmin.adminAppsRoles | orderBy:newAdmin.orderFilter) track by app.id"
+						ng-show="app.isAdmin">
+						<span id="select-app-{{app.appName.split(' ').join('-')}}"
+							class="administrated-application"
+							ng-bind="app.appName | elipsis: 57"></span> <i
+							id="i-delete-application" class="icon-misc-trash"
+							ng-click="newAdmin.unadminApp(app)"> </i>
+					</div>
+				</div>
+			</div>
+			<br>
+			<div class="b2b-modal-footer">
+				<div class="cta-button-group in">
 
-        </div>
+					<span class="ecomp-save-spinner" ng-show="newAdmin.isSaving"></span>
+					<button id="button-back" ng-show="newAdmin.isShowBack"
+						class="btn btn-alt btn-small" ng-click="newAdmin.navigateBack()">Back</button>
+					<button id="div-updateAdminAppsRoles" class="btn btn-alt btn-small"
+						ng-click="newAdmin.updateAdminAppsRoles()"
+						ng-class="{disabled: false}">Save</button>
+					<button id="div-cancel-button" class="btn btn-alt btn-small"
+						ng-click="$dismiss('cancel')">Cancel</button>
 
-    </div>
+				</div>
+			</div>
+	</div>
 
 </div>