Deliver centralized role management feature

[portal.git] / ecomp-portal-FE-common / client / app / views / users / new-user-dialogs / bulk-user.modal.html

diff --git a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.modal.html b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.modal.html
index 7945e54..69f2de0 100644 (file)
--- a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.modal.html
+++ b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.modal.html
@@ -17,44 +17,53 @@
   limitations under the License.
   ================================================================================
   -->
-<div class="bulk-user-modal">
-       <div class="title">Bulk User Upload</div>
-       <div class="main">
-               <div ng-show="bulkUser.step1">
-                       <div class="upload-instructions">Select Application:</div>
-                       <div class="c-ecomp-portal-abs-select default">
-
-                             <select id="bulk-user-dropdown-apps" name="dropdown1" b2b-dropdown  ng-model="selectedApplication.value" ng-disabled="isProcessing" ng-class="{disabled: isProcessing}">  
-                                       <option b2b-dropdown-list option-repeat="d in adminApps" value="{{d.value}}">{{d.title}}</option>
-                                               </select>
-
-                       </div>
+<div>
+       <div class="b2b-modal-header">
+               <h2 class="heading-medium" id="newAdmin">Bulk User Upload</h2>
+               <div class="corner-button in">
+                       <button type="button" class="close" aria-label="Close" id="bulkuser-button-close"
+                               ng-click="$dismiss('cancel')"></button>
                </div>
-
-               <div ng-hide="bulkUser.step1">
-                       <div class="upload-instructions">Select Upload File:</div>
-
-                       <!-- input type=file is difficult to style.
-                                Instead use a label styled as a button. -->
-                       <label class="file-label"> 
-                               <input type="file"
-                                       file-change="fileChangeHandler($event,files)" 
-                                       ng-model="fileModel" />
-                                       <span>Browse...</span>
-                       </label>{{selectedFile}}
-                       <div class="upload-instructions">File must have one entry per line with this format:
-                       <pre>orgUserId, role name</pre>
+       </div>
+       <div class="b2b-modal-body">
+               <div class="b2b-modal-body-div">
+                       <div ng-show="bulkUser.step1">
+                               <div class="upload-instructions">Select Application:</div>
+                               <div class="c-ecomp-portal-abs-select default">
+       
+                                     <select id="bulk-user-dropdown-apps" name="dropdown1" b2b-dropdown  ng-model="selectedApplication.value" ng-disabled="isProcessing" ng-class="{disabled: isProcessing}">  
+                                               <option b2b-dropdown-list option-repeat="d in adminApps" value="{{d.value}}">{{d.title}}</option>
+                                                       </select>
+       
+                               </div>
                        </div>
+       
+                       <div ng-hide="bulkUser.step1">
+                               <div class="upload-instructions">Select Upload File:</div>
+       
+                               <!-- input type=file is difficult to style.
+                                        Instead use a label styled as a button. -->
+                               <label class="file-label"> 
+                                       <input type="file"
+                                               file-change="fileChangeHandler($event,files)" 
+                                               ng-model="fileModel" />
+                                               <span>Browse...</span>
+                               </label>{{selectedFile}}
+                               <div class="upload-instructions">File must have one entry per line with this format:
+                               <pre>orgUserId, role name</pre>
+                               </div>
+                       </div>
+       
+                       <!-- progress indicator in middle -->
+                       <div ng-show="isProcessing">
+                               <span class="ecomp-spinner"></span>
+                       </div>
+                       <br>
                </div>
-
-               <!-- progress indicator in middle -->
-               <div ng-show="isProcessing">
-                       <span class="ecomp-spinner"></span>
-               </div>
-
-               <div class="dialog-control">
-                               
-                               <button id="bulk-user-back-button" class="btn btn-alt btn-small"
+       </div>
+       <div class="b2b-modal-footer">
+               <div class="cta-button-group in">               
+                       <button id="bulk-user-back-button" class="btn btn-alt btn-small"
                                ng-hide="bulkUser.step1" ng-click="navigateBack()">Back</button>
                        <button id="bulk-user-next-button" class="btn btn-alt btn-small"
                                ng-hide="!bulkUser.step1" ng-click="!isProcessing && step2()"
@@ -64,7 +73,7 @@
                                ng-click="bulkUser.fileSelected && confirmUpload()"
                                ng-class="{disabled: !bulkUser.fileSelected}">Upload</button>
                        <button id="bulk-user-cancel-button" class="btn btn-alt btn-small"
-                               ng-click="closeThisDialog()">Cancel</button>
+                               ng-click="$dismiss('cancel')">Cancel</button>
                </div>
        </div>
 </div>