ADAM / AIAHTML5

Commit a00dbc7de6a1e796ff99a54c2ba5dfb04727fdcc

Authored by Amrita Vishnoi
2 parents d1722f7a d88fa2c9

Merge branch 'Develop' into QA

Inline Side-by-side
Showing 5 changed files with 137 additions and 84 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @a00dbc7
... ... @@ -68,7 +68,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
68 68 $rootScope.shapestyleFillBorderColor = "black";
69 69 $rootScope.shapestyleborderWidth = 2;
70 70 $rootScope.shapestyleborderStyles = "solid";
71   - $rootScope.errorMassage = '';
  71 + //$rootScope.errorMessage = ''; // Commented initialization to retain message when coming to login after password reset success screen
72 72 $rootScope.disableFileMenu = "disableFileMenu";
73 73  
74 74 $rootScope.userInfo = {
... ... @@ -82,11 +82,22 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
82 82 };
83 83 $rootScope.userData;
84 84 $rootScope.userModules;
85   - $rootScope.errorMesaage;
  85 + $rootScope.passwordMismatchMessage;
86 86 $rootScope.isVisibleLogin;
87 87 $rootScope.haveRoleAdmin;
88 88 var isfilloptionChecked = "";
89 89 var isOutlineOptionChecked = "";
  90 + $rootScope.forgotPwdModalShow = function ()
  91 + {
  92 + $("#forgotPwdModal").modal("show");
  93 + $(".modal-backdrop").css("opacity",".5");
  94 + }
  95 + $rootScope.forgotUserModalShow=function()
  96 + {
  97 + $("#forgotUserModal").modal("show");
  98 + $(".modal-backdrop").css("opacity", ".5");
  99 +
  100 + }
90 101 $rootScope.initializeAIA = function () {
91 102  
92 103 $rootScope.isLoading = false;
... ... @@ -100,7 +111,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
100 111 if (userInfo.username == "" || userInfo.username == null || userInfo.password == "" || userInfo.password == null) {
101 112  
102 113 // alert(LoginMessageConstants.USER_CREDENTIALS_MISSING);
103   - $rootScope.errorMassage = LoginMessageConstants.USER_CREDENTIALS_MISSING;
  114 + $rootScope.errorMessage = LoginMessageConstants.USER_CREDENTIALS_MISSING;
104 115 $("#messageModal").modal('show');
105 116 }
106 117 else {
... ... @@ -117,14 +128,14 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
117 128 if (result == LoginConstants.USER_NOT_FOUND) {
118 129 $rootScope.isVisibleLogin = true;
119 130 // alert(LoginMessageConstants.USER_OR_PASSWORD_INCORRECT);
120   - $rootScope.errorMassage = LoginMessageConstants.USER_OR_PASSWORD_INCORRECT;
  131 + $rootScope.errorMessage = LoginMessageConstants.USER_OR_PASSWORD_INCORRECT;
121 132 $("#messageModal").modal('show');
122 133  
123 134 }
124 135 else if (result == LoginConstants.ERROR_IN_FECTHING_DETAILS) {
125 136 //alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS);
126 137 $rootScope.isVisibleLogin = true;
127   - $rootScope.errorMassage = LoginMessageConstants.ERROR_IN_FECTHING_DETAILS;
  138 + $rootScope.errorMessage = LoginMessageConstants.ERROR_IN_FECTHING_DETAILS;
128 139 $("#messageModal").modal('show');
129 140 }
130 141 else {
... ... @@ -156,7 +167,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
156 167 console.log(' Error in authentication = ' + error.statusText);
157 168 // alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS);
158 169 $rootScope.isVisibleLogin = true;
159   - $rootScope.errorMassage = LoginMessageConstants.ERROR_IN_FECTHING_DETAILS;
  170 + $rootScope.errorMessage = LoginMessageConstants.ERROR_IN_FECTHING_DETAILS;
160 171 $("#messageModal").modal('show');
161 172 });
162 173 }
... ... @@ -215,17 +226,17 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
215 226 .then(function (result) {
216 227 if (result == LoginConstants.USER_NOT_FOUND) {
217 228 // alert(LoginMessageConstants.INCORRECT_EMAIL_ID);
218   - $rootScope.errorMassage = LoginMessageConstants.INCORRECT_EMAIL_ID;
  229 + $rootScope.errorMessage = LoginMessageConstants.INCORRECT_EMAIL_ID;
219 230 $("#messageModal").modal('show');
220 231 }
221 232 else if (result == LoginConstants.ERROR_IN_FECTHING_DETAILS) {
222 233 // alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS);
223   - $rootScope.errorMassage = LoginMessageConstants.ERROR_IN_FECTHING_DETAILS;
  234 + $rootScope.errorMessage = LoginMessageConstants.ERROR_IN_FECTHING_DETAILS;
224 235 $("#messageModal").modal('show');
225 236 }
226 237 else if (result == LoginConstants.MAIL_NOT_SENT) {
227 238 // alert(LoginMessageConstants.MAIL_NOT_SENT);
228   - $rootScope.errorMassage = LoginMessageConstants.MAIL_NOT_SENT;
  239 + $rootScope.errorMessage = LoginMessageConstants.MAIL_NOT_SENT;
229 240 $("#messageModal").modal('show');
230 241 }
231 242 else {
... ... @@ -244,7 +255,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
244 255 else
245 256 message = LoginMessageConstants.USERID_SENT_IN_EMAIL
246 257 //alert(message);
247   - $rootScope.errorMassage = message;
  258 + $rootScope.errorMessage = message;
248 259 $("#messageModal").modal('show');
249 260  
250 261  
... ... @@ -255,31 +266,25 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
255 266 function (error) {
256 267 console.log(' Error in authentication = ' + error.statusText);
257 268 // alert(LoginConstants.ERROR_IN_FECTHING_DETAILS);
258   - $rootScope.errorMassage = LoginConstants.ERROR_IN_FECTHING_DETAILS;
  269 + $rootScope.errorMessage = LoginConstants.ERROR_IN_FECTHING_DETAILS;
259 270 $("#messageModal").modal('show');
260 271 });
261 272 }
262 273 else {
263 274 // alert(LoginMessageConstants.INCORRECT_EMAIL_ID);
264   - $rootScope.errorMassage = LoginMessageConstants.INCORRECT_EMAIL_ID;
  275 + $rootScope.errorMessage = LoginMessageConstants.INCORRECT_EMAIL_ID;
265 276 $("#messageModal").modal('show');
266 277 }
267 278 }
268 279 else {
269 280 //alert(LoginMessageConstants.BLANK_EMAIL_ID);
270   - $rootScope.errorMassage = LoginMessageConstants.BLANK_EMAIL_ID;
  281 + $rootScope.errorMessage = LoginMessageConstants.BLANK_EMAIL_ID;
271 282 $("#messageModal").modal('show');
272 283  
273 284 }
274 285 };
275 286  
276   - $rootScope.closeResetPasswordPopup = function () {
277   - $("#passwordReset").fadeOut();
278   - $("#passwordReset").modal('hide');
279   - $location.url("/");
280   - $rootScope.isVisibleResetPass = false;
281   - $rootScope.isVisibleLogin = true;
282   - }
  287 +
283 288  
284 289  
285 290 function validateEmail(email) {
... ... @@ -294,28 +299,30 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
294 299 userInfo.emailId = split[1];
295 300 }
296 301  
297   - if (userInfo.newPassword === userInfo.confirmPassword) {
298   - $rootScope.errorMesaage = null;
  302 + if (userInfo.newPassword != null) {
  303 +
  304 + if (userInfo.newPassword === userInfo.confirmPassword) {
  305 + $rootScope.passwordMismatchMessage = null;
299 306  
300 307 AuthenticationService.ResetUserPassword(userInfo)
301 308 .then(
302 309 function (result) {
303 310 if (result == LoginConstants.USER_NOT_FOUND) {
304 311 // alert(LoginMessageConstants.USER_OR_PASSWORD_INCORRECT);
305   - $rootScope.errorMassage = LoginMessageConstants.USER_OR_PASSWORD_INCORRECT;
  312 + $rootScope.errorMessage = LoginMessageConstants.USER_OR_PASSWORD_INCORRECT;
306 313 $("#messageModal").modal('show');
307 314  
308 315 }
309 316 else if (result == LoginConstants.ERROR_IN_FECTHING_DETAILS) {
310 317 // alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS);
311   - $rootScope.errorMassage = LoginConstants.ERROR_IN_FECTHING_DETAILS;
  318 + $rootScope.errorMessage = LoginConstants.ERROR_IN_FECTHING_DETAILS;
312 319 $("#messageModal").modal('show');
313 320  
314 321 }
315 322 else {
316 323 if ((result.IsAcknowledged == true) && (result.IsModifiedCountAvailable == true)) {
317 324 // alert(LoginMessageConstants.PASSWORD_RESET_MESSAGE);
318   - $rootScope.errorMassage = LoginMessageConstants.PASSWORD_RESET_MESSAGE;
  325 + $rootScope.errorMessage = LoginMessageConstants.PASSWORD_RESET_MESSAGE;
319 326 $("#messageModal").modal('show');
320 327 $rootScope.isVisibleLogin = true;
321 328 $rootScope.isVisibleResetPass = false;
... ... @@ -326,13 +333,18 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
326 333 function (error) {
327 334 console.log(' Error in authentication = ' + error.statusText);
328 335 // alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS);
329   - $rootScope.errorMassage = LoginMessageConstants.ERROR_IN_FECTHING_DETAILS;
  336 + $rootScope.errorMessage = LoginMessageConstants.ERROR_IN_FECTHING_DETAILS;
330 337 $("#messageModal").modal('show');
331 338  
332 339 });
333 340 }
334 341 else {
335   - $rootScope.errorMesaage = LoginMessageConstants.NEW_AND_OLD_PASSWORD_DONOT_MATCH;
  342 + $rootScope.passwordMismatchMassage = LoginMessageConstants.NEW_AND_OLD_PASSWORD_DONOT_MATCH;
  343 + //$("#messageModal").modal('show');
  344 + }
  345 + }
  346 + else {
  347 + $rootScope.errorMessage = LoginMessageConstants.NEW_PASSWORD_FIELD_IS_EMPTY;
336 348 $("#messageModal").modal('show');
337 349 }
338 350 }
... ... @@ -559,30 +571,34 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
559 571 }
560 572  
561 573 $rootScope.openParent = function (slug) {
  574 + if ($('#jsPanel-1').length > 0) {
562 575  
563   - var openViews = $rootScope.openViews;
564   - if (openViews.length > 0) {
565   - $rootScope.openViews.splice(openViews.length - 1);
566   - }
567   - if (openViews.length > 0) {
568   - var lastOpenMoudle = $rootScope.openViews[openViews.length - 1];
569 576 }
570   - $('#daImagePanel').remove();
571   - if ($('#jsPanel-1').length > 0)
572   - $('#jsPanel-1').remove();
  577 + else {
  578 + var openViews = $rootScope.openViews;
  579 + if (openViews.length > 0) {
  580 + $rootScope.openViews.splice(openViews.length - 1);
  581 + }
  582 + if (openViews.length > 0) {
  583 + var lastOpenMoudle = $rootScope.openViews[openViews.length - 1];
  584 + }
  585 + // $('#daImagePanel').remove();
  586 + if ($('#jsPanel-1').length > 0)
  587 + $('#jsPanel-1').remove();
573 588  
574   - if ($('#3DImagePanel').length > 0)
575   - $('#3DImagePanel').remove();
  589 + if ($('#3DImagePanel').length > 0)
  590 + $('#3DImagePanel').remove();
576 591  
577   - if ($('#ciImagePanel').length > 0)
578   - $('#ciImagePanel').remove();
  592 + if ($('#ciImagePanel').length > 0)
  593 + $('#ciImagePanel').remove();
579 594  
580   - if ($('#caVideoPanel').length > 0)
581   - $('#caVideoPanel').remove();
  595 + if ($('#caVideoPanel').length > 0)
  596 + $('#caVideoPanel').remove();
582 597  
583   - $location.url('/' + slug);
  598 + $location.url('/' + slug);
584 599  
585   - $rootScope.$broadcast('jsPanelCloseEvent', true);
  600 + $rootScope.$broadcast('jsPanelCloseEvent', true);
  601 + }
586 602 }
587 603  
588 604 //called on jsanel minimize
... ... @@ -3382,14 +3398,14 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3382 3398 };
3383 3399  
3384 3400 $rootScope.ShowExportImageWindow = function () {
3385   - $(".export-image").css("display", "block");
3386   - };
  3401 + $(".export-image").modal("show").draggable({ handle: ".modal-header" });
3387 3402  
3388   - $rootScope.CloseExportImageWindow = function () {
3389   - console.log('close')
3390   - $(".export-image").css("display", "none");
  3403 + $(".modal-backdrop").css("opacity", ".5");
  3404 + $(".modal-backdrop").css("z-index", "1200001");
3391 3405 };
3392 3406  
  3407 +
  3408 +
3393 3409 $rootScope.ShowPrintWindow = function () { // Print Active Viewer
3394 3410 html2canvas($("#canvasDiv"), {
3395 3411 onrendered: function (canvas) {
... ... @@ -3431,37 +3447,59 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3431 3447 var curPosture = localStorage.getItem('currentViewTitle');
3432 3448  
3433 3449 if (document.getElementById('jsPanel-1')) { //document.getElementsByClassName('ppImagePanel')) {
3434   - setTimeout(function () {
3435   - document.getElementById('imgPortrait').setAttribute('src', dataURL);
3436   - document.getElementById('imgLandscape').setAttribute('src', dataURL);
3437   - document.getElementById('spnModulePor').innerHTML = curModule;
3438   - document.getElementById('spnBodyViewTitlePor').innerHTML = curPosture;
3439   - document.getElementById('spnModuleLan').innerHTML = curModule;
3440   - document.getElementById('spnBodyViewTitleLan').innerHTML = curPosture;
3441   - if ($('#printcontainer').length > 0) {
3442   - $("#printcontainer").css('width', $(window).outerWidth());
3443   - $("#printcontainer").css('height', $(window).outerHeight());
3444   - }
3445   - }, 320);
  3450 + if (dataURL == "" || dataURL == undefined)
  3451 + {
  3452 +
  3453 + setTimeout(function () {
  3454 + document.getElementById('imgPortrait').setAttribute('src', dataURL);
  3455 + document.getElementById('imgLandscape').setAttribute('src', dataURL);
  3456 + document.getElementById('spnModulePor').innerHTML = curModule;
  3457 + document.getElementById('spnBodyViewTitlePor').innerHTML = curPosture;
  3458 + document.getElementById('spnModuleLan').innerHTML = curModule;
  3459 + document.getElementById('spnBodyViewTitleLan').innerHTML = curPosture;
  3460 + if ($('#printcontainer').length > 0) {
  3461 + $("#printcontainer").css('width', $(window).outerWidth());
  3462 + $("#printcontainer").css('height', $(window).outerHeight());
  3463 + }
  3464 + }, 520);
  3465 + }
  3466 + else
  3467 + {
  3468 + setTimeout(function () {
  3469 + document.getElementById('imgPortrait').setAttribute('src', dataURL);
  3470 + document.getElementById('imgLandscape').setAttribute('src', dataURL);
  3471 + document.getElementById('spnModulePor').innerHTML = curModule;
  3472 + document.getElementById('spnBodyViewTitlePor').innerHTML = curPosture;
  3473 + document.getElementById('spnModuleLan').innerHTML = curModule;
  3474 + document.getElementById('spnBodyViewTitleLan').innerHTML = curPosture;
  3475 + if ($('#printcontainer').length > 0) {
  3476 + $("#printcontainer").css('width', $(window).outerWidth());
  3477 + $("#printcontainer").css('height', $(window).outerHeight());
  3478 + }
  3479 + }, 320);
  3480 + }
  3481 +
3446 3482 }
3447 3483  
3448 3484 $('#fileMenuAnchor').addClass('disableMenuannotation');
3449 3485 if ($('#daImagePanel').length > 0) {
3450 3486 console.log('close')
3451 3487 //$('#daImagePanel').css('display', 'none');
3452   - $('#daImagePanel').remove();
  3488 + // $('#daImagePanel').remove();
3453 3489 }
3454 3490 }
3455 3491 });
3456 3492 };
3457 3493  
3458 3494 function OpenJSPanel() {
  3495 + $("#daImagePanel").css({ "pointer-events": "none", "opacity": ".5" });
  3496 + $("#ciImagePanel").css({ "pointer-events": "none", "opacity": ".5" });
3459 3497 $.jsPanel({
3460 3498 id: 'jsPanel-1',
3461 3499 selector: '#dvPrintPreview',
3462 3500 theme: 'success',
3463 3501 currentController: 'HomeController',
3464   - parentSlug: 'da-view-list', //After closing panel, control moves to here
  3502 + //parentSlug: 'da-view-list', //After closing panel, control moves to here
3465 3503 ajax: {
3466 3504 url: 'app/views/home/printPreview.html'
3467 3505 },
... ... @@ -3564,11 +3602,16 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3564 3602 console.log('close')
3565 3603 }
3566 3604  
3567   - $(document).on('click', '.jsglyph-remove', function () {
  3605 + $(document).on('click', '#jsPanel-1 .jsglyph-remove', function () {
  3606 + $("#daImagePanel").css({ "pointer-events": "auto", "opacity": "1" });
  3607 + $("#ciImagePanel").css({ "pointer-events": "auto", "opacity": "1" });
  3608 + $("#annotationButton").parent().removeClass("disableMenuannotation");
  3609 + $("#annotationToolBarOptions").removeClass("disableMenuoption");
3568 3610 $('#fileMenuAnchor').removeClass('disableMenuannotation');
3569 3611 if ($('#jsPanel-1').length > 0)
3570 3612 $('#jsPanel-1').remove();
3571   - console.log('close')
  3613 + console.log('close');
  3614 +
3572 3615 });
3573 3616  
3574 3617 $rootScope.restrictBodySystemList = function () {
... ... @@ -3603,7 +3646,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3603 3646 AdminService.SendAdminAccessRequestMail(userInfo)
3604 3647 .then(function (result) {
3605 3648 if (result == AdminConstants.MAIL_SENT) {
3606   - $rootScope.errorMassage = AdminConstants.MAIL_SENT_SUCCESS_MESSAGE;
  3649 + $rootScope.errorMessage = AdminConstants.MAIL_SENT_SUCCESS_MESSAGE;
3607 3650 $("#messageModal").modal('show');
3608 3651 }
3609 3652 $("#adminModal").fadeOut();
... ... @@ -3612,7 +3655,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3612 3655 },
3613 3656 function (error) {
3614 3657 console.log(' Error in sending mail to admin support = ' + error.statusText);
3615   - $rootScope.errorMassage = AdminConstants.ERROR_IN_SENDING_MAIL;
  3658 + $rootScope.errorMessage = AdminConstants.ERROR_IN_SENDING_MAIL;
3616 3659 $("#messageModal").modal('show');
3617 3660 });
3618 3661 };
... ...
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
  View file @a00dbc7
... ... @@ -306,6 +306,7 @@ AIA.constant("LoginMessageConstants", {
306 306 "NEW_AND_OLD_PASSWORD_DONOT_MATCH": "Your new password and confirm password not matched!",
307 307 "USER_CREDENTIALS_MISSING": "Please Enter your credentials.",
308 308 "USER_NOT_FOUND": "User not found.",
  309 + "NEW_PASSWORD_FIELD_IS_EMPTY": "Please enter new password to reset your password."
309 310 //"ERROR_IN_FECTHING_DETAILS": "Error in fecthing details.",
310 311 //"MAIL_NOT_SENT": "Mail not sent."
311 312  
... ...
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
  View file @a00dbc7
1 1 <div class="collapse navbar-collapse" id="topFixedNavbar1">
2 2 <ul class="nav navbar-nav toperMenu-spaceleft">
3   - <li class="dropdown" ng-class="disableFileMenu">
  3 + <li class="dropdown navbarDropdownItem" ng-class="disableFileMenu">
4 4 <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="fileMenuAnchor" role="button" aria-haspopup="true" aria-expanded="false">File<span class="caret"></span></a>
5 5 <ul class="dropdown-menu">
6 6 <li ng-class="disableSubMenu"><a href="#">Open Resources</a></li>
... ... @@ -23,9 +23,9 @@
23 23 </ul>
24 24 </li>
25 25 <!--#7904-->
26   - <li ng-class="disableMenuannotation"><a href="#" data-toggle="modal" id="annotationButton" data-target=".bs-example-modal-sm" ng-click="ShowAnnotationWindow()">Annotation</a></li>
  26 + <li class="navbarItem" ng-class=" disablemenuannotation"><a href="#" data-toggle="modal" id="annotationButton" data-target=".bs-example-modal-sm" ng-click="ShowAnnotationWindow()">Annotation</a></li>
27 27  
28   - <li class="dropdown" ng-class="disableMenuoption">
  28 + <li class="dropdown navbarDropdownItem" ng-class="disableMenuoption">
29 29 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Options<span class="caret"></span></a>
30 30 <ul class="dropdown-menu">
31 31 <!--<li><a href="#" ng-click="ShowListManager()">List Manager</a></li>-->
... ... @@ -40,7 +40,7 @@
40 40 <li ng-class="disableSubMenu"><a href="#">Lab Exercises PDF</a></li>
41 41 </ul>
42 42 </li>
43   - <li class="dropdown">
  43 + <li class="dropdown navbarDropdownItem">
44 44 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Help<span class="caret"></span></a>
45 45 <ul class="dropdown-menu">
46 46 <li><a href="http://interactiveanatomy.com/v107/content/en_US/help/guide/AIA_HELP.htm" target="_blank">Help Topics</a></li>
... ... @@ -49,7 +49,7 @@
49 49 <li><a href="http://interactiveanatomy.com/v107/content/en_US/help/about/Adam_Credits_AIA5.html" target="_blank">About A.D.A.M.</a></li>
50 50 </ul>
51 51 </li>
52   - <li><a ng-click="OpenAdminForm()" role="button" data-toggle="modal" class="btn" data-target="#adminModal" ng-hide="haveRoleAdmin">Admin</a></li>
  52 + <li class ="navbarItem"><a ng-click="OpenAdminForm()" role="button" data-toggle="modal" class="btn" data-target="#adminModal" ng-hide="haveRoleAdmin">Admin</a></liclass>
53 53 </ul>
54 54 <ul class="nav navbar-nav navbar-right">
55 55 <li class="visible-xs"><a href="" ng-click="LogoutUser()">Logout</a></li>
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @a00dbc7
... ... @@ -196,7 +196,7 @@
196 196 <span class="input-group-addon"><i class="fa fa-user"></i></span>
197 197 <input type="text" class="form-control" placeholder="Username" ng-model="userInfo.username">
198 198 </div>
199   - <span class="help-block text-right small"><a href="#" class="color-white" id="forgotUserIdAnchor" data-toggle="modal" data-target=".forgot-sm">Forgot User ID?</a></span>
  199 + <span class="help-block text-right small"><a href="#" class="color-white" id="forgotUserIdAnchor" data-toggle="modal" ng-click="forgotUserModalShow()" data-target=".forgot-sm">Forgot User ID?</a></span>
200 200  
201 201  
202 202 </div>
... ... @@ -208,7 +208,7 @@
208 208 <span class="input-group-addon"><i class="fa fa-key"></i></span>
209 209 <input type="password" class="form-control" placeholder="Password" ng-model="userInfo.password">
210 210 </div>
211   - <span class="help-block text-right small "><a class="color-white" style="cursor: pointer;" id="forgotPasswordAnchor" data-toggle="modal" data-target=".forgot-sm1">Forgot Password?</a></span> <!--#resetpass" href="/app/views/Home/resetPwd.html"-->
  211 + <span class="help-block text-right small "><a class="color-white" style="cursor: pointer;" id="forgotPasswordAnchor" data-toggle="modal" ng-click="forgotPwdModalShow();" data-target=".forgot-sm1">Forgot Password?</a></span> <!--#resetpass" href="/app/views/Home/resetPwd.html"-->
212 212 </div>
213 213 <div class="form-group">
214 214 <button class="btn btn-primary pull-right" ng-click="AuthenticateUser(userInfo)">Log In</button>
... ... @@ -230,7 +230,7 @@
230 230 </footer>
231 231 </div>
232 232 <!-- Forgot User ID (Small modal) -->
233   - <div class="modal fade forgot-sm" role="dialog" tabindex="-1" aria-labelledby="exampleModalLabel" data-target=".forgot-sm">
  233 + <div class="modal fade" id="forgotUserModal" role="dialog" tabindex="-1" aria-labelledby="exampleModalLabel" data-target=".forgot-sm">
234 234 <div class="modal-dialog modal-sm" role="document">
235 235 <div class="modal-content">
236 236 <div class="modal-header">
... ... @@ -255,7 +255,7 @@
255 255 </div>
256 256 </div>
257 257 <!-- Forgot Password (Small modal) -->
258   - <div class="modal fade forgot-sm1" role="dialog" tabindex="-1" aria-labelledby="exampleModalLabel" data-target=".forgot-sm1">
  258 + <div class="modal fade" id="forgotPwdModal" role="dialog" tabindex="-1" aria-labelledby="exampleModalLabel" data-target=".forgot-sm1">
259 259 <div class="modal-dialog modal-sm" role="document">
260 260 <div class="modal-content">
261 261 <div class="modal-header">
... ... @@ -1022,11 +1022,12 @@
1022 1022 </div>
1023 1023  
1024 1024 <!--Export Image Modal-->
1025   - <div class="modal fade export-image ui-draggable in" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" style="display: none;">
  1025 + <div class="modal fade export-image ui-draggable in" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
  1026 + style="z-index: 1200002;">
1026 1027 <div class="modal-dialog modal-sm" role="document">
1027 1028 <div class="modal-content">
1028 1029 <div class="modal-header annotation-modal-header ui-draggable-handle">
1029   - <button type="button" class="close" data-dismiss="modal" ng-click="CloseExportImageWindow()" aria-label="Close"><span aria-hidden="true">×</span></button>
  1030 + <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
1030 1031 <h4 class="modal-title" id="">Save As</h4>
1031 1032 </div>
1032 1033 <div class="modal-body">
... ... @@ -1047,7 +1048,7 @@
1047 1048 <div class="row">
1048 1049 <input type="file" id="file1" style="display:none">
1049 1050 <!--<a href="data:application/xml;charset=utf-8,your code here" download="filename.html">Save</a-->
1050   - <div class="col-sm-12"><button id="btnSaveEI" class="btn btn-primary" type="button">Ok</button></div> <!--onclick="makeScreenshot();"--><!--ng-click="dialogs.saveAs()"--><!--ng-click="ShowAlert()"-->
  1051 + <div class="col-sm-12"><button id="btnSaveEI" class="btn btn-primary" data-dismiss="modal" type="button">Ok</button></div> <!--onclick="makeScreenshot();"--><!--ng-click="dialogs.saveAs()"--><!--ng-click="ShowAlert()"-->
1051 1052 </div>
1052 1053 </div>
1053 1054  
... ... @@ -1127,7 +1128,7 @@
1127 1128 <td>
1128 1129 <input class="form-control" name="confirmPassword" value="*****" type="password" style="padding:3px 5px; height:25px; width:98%;" ng-model="userInfo.confirmPassword" required>
1129 1130 <span style="color: maroon; font-weight: bold; " ng-show="resetPasswordForm.confirmPassword.$touched && resetPasswordForm.confirmPassword.$invalid">Confirm password is required.</span>
1130   - <span style="color: maroon; font-weight: bold; " ng-if="errorMesaage">{{errorMesaage}}</span>
  1131 + <span style="color: maroon; font-weight: bold; " ng-if="passwordMismatchMessage">{{passwordMismatchMessage}}</span>
1131 1132 </td>
1132 1133 </tr>
1133 1134 <tr>
... ... @@ -1136,7 +1137,6 @@
1136 1137 <tr>
1137 1138 <td>
1138 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>
1139   - <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>
1140 1140 </td>
1141 1141 </tr>
1142 1142 </tbody>
... ... @@ -1157,7 +1157,7 @@
1157 1157 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
1158 1158 </div>
1159 1159 <div class="modal-title"></div>
1160   - <div class="modal-body">{{errorMassage}}</div>
  1160 + <div class="modal-body">{{errorMessage}}</div>
1161 1161 <div class="modal-footer"> <button type="button" class="btn btn-primary" data-dismiss="modal">OK</button></div>
1162 1162 </div>
1163 1163 </div>
... ...
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @a00dbc7
... ... @@ -542,7 +542,13 @@ pointer-events: auto;
542 542 color: #FFFFFF;
543 543 }
544 544 /*#7904*/
545   -.navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus, .navbar-nav > li > a.active {
  545 +/*.navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus, .navbar-nav > li > a.active {
  546 + color: #2db0f5;
  547 +}*/
  548 +.navbar-inverse .navbar-nav > .navbarDropdownItem > a:hover, .navbar-nav > .navbarDropdownItem > a.active {
  549 + color: #2db0f5;
  550 +}
  551 +.navbar-inverse .navbar-nav > .navbarItem > a:hover, .navbar-inverse .navbar-nav > .navbarItem > a:focus, .navbar-nav > .navbarItem > a.active {
546 552 color: #2db0f5;
547 553 }
548 554  
... ... @@ -998,4 +1004,7 @@ background-size:cover;
998 1004 padding: 20px 10px;
999 1005 text-align:center;
1000 1006 }
1001   -
1002 1007 \ No newline at end of file
  1008 + #jsPanel-1
  1009 + {
  1010 + z-index:11111;
  1011 + }
1003 1012 \ No newline at end of file
... ...