ADAM / AIAHTML5

Commit f601412fa1c5ab387c137209ba70b4e10f198b0d

Authored by Amrita Vishnoi
2 parents cbc6c9d0 139e5803

Merge branch 'removecanclebutton' into Develop

Inline Side-by-side
Showing 2 changed files with 1 additions and 8 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @f601412
... ... @@ -284,13 +284,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
284 284 }
285 285 };
286 286  
287   - $rootScope.closeResetPasswordPopup = function () {
288   - $("#passwordReset").fadeOut();
289   - $("#passwordReset").modal('hide');
290   - $location.url("/");
291   - $rootScope.isVisibleResetPass = false;
292   - $rootScope.isVisibleLogin = true;
293   - }
  287 +
294 288  
295 289  
296 290 function validateEmail(email) {
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @f601412
... ... @@ -1137,7 +1137,6 @@
1137 1137 <tr>
1138 1138 <td>
1139 1139 <button type="submit" ng-click="ResetUserPassword(userInfo)" ng-submit="submitForm(resetPwdForm.$valid)" style="background: #0072a7; border: 1px solid #005076; cursor: pointer; color: #fff; padding: 5px 10px; font-size: 16px; text-transform: uppercase; text-align: center; text-decoration: none; font-family: gotham, 'Helvetica Neue', helvetica, arial, sans-serif; " id="btnUpdatePassword">Submit</button>
1140   - <button type="submit" id="close-resetPasswordForm" ng-click="closeResetPasswordPopup()" style="color:#423030; background:#666; border:1px solid #999; cursor:pointer; color:#fff; padding:5px 10px; font-size:16px; text-transform:uppercase; text-align:center; text-decoration:none; font-family:Gotham, 'Helvetica Neue', Helvetica, Arial, sans-serif" data-dismiss="modal">Close</button>
1141 1140 </td>
1142 1141 </tr>
1143 1142 </tbody>
... ...