Merge branch 'Develop' into QA

Amrita Vishnoi
2 parents d1722f7a d88fa2c9
Showing 5 changed files with 137 additions and 84 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
400-SOURCECODE/AIAHTML5.Web/index.html
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
@@ -68,7 +68,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     $rootScope.shapestyleFillBorderColor = "black";
     $rootScope.shapestyleborderWidth = 2;
     $rootScope.shapestyleborderStyles = "solid";
-    $rootScope.errorMassage = '';
+    //$rootScope.errorMessage = ''; // Commented initialization to retain message when coming to login after password reset success screen
     $rootScope.disableFileMenu = "disableFileMenu";
     $rootScope.userInfo = {
@@ -82,11 +82,22 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     };
     $rootScope.userData;
     $rootScope.userModules;
-    $rootScope.errorMesaage;
+    $rootScope.passwordMismatchMessage;
     $rootScope.isVisibleLogin;
     $rootScope.haveRoleAdmin;
     var isfilloptionChecked = "";
     var isOutlineOptionChecked = "";
+    $rootScope.forgotPwdModalShow = function ()
+    {
+        $("#forgotPwdModal").modal("show");
+        $(".modal-backdrop").css("opacity",".5");
+    }
+    $rootScope.forgotUserModalShow=function()
+    {
+        $("#forgotUserModal").modal("show");
+        $(".modal-backdrop").css("opacity", ".5");
+        
+    }
     $rootScope.initializeAIA = function () {
         $rootScope.isLoading = false;
@@ -100,7 +111,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         if (userInfo.username == "" || userInfo.username == null || userInfo.password == "" || userInfo.password == null) {
             // alert(LoginMessageConstants.USER_CREDENTIALS_MISSING);
-            $rootScope.errorMassage = LoginMessageConstants.USER_CREDENTIALS_MISSING;
+            $rootScope.errorMessage = LoginMessageConstants.USER_CREDENTIALS_MISSING;
             $("#messageModal").modal('show');
         }
         else {
@@ -117,14 +128,14 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                      if (result == LoginConstants.USER_NOT_FOUND) {
                          $rootScope.isVisibleLogin = true;
                          // alert(LoginMessageConstants.USER_OR_PASSWORD_INCORRECT);
-                         $rootScope.errorMassage = LoginMessageConstants.USER_OR_PASSWORD_INCORRECT;
+                         $rootScope.errorMessage = LoginMessageConstants.USER_OR_PASSWORD_INCORRECT;
                          $("#messageModal").modal('show');
                      }
                      else if (result == LoginConstants.ERROR_IN_FECTHING_DETAILS) {
                          //alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS);
                          $rootScope.isVisibleLogin = true;
-                         $rootScope.errorMassage = LoginMessageConstants.ERROR_IN_FECTHING_DETAILS;
+                         $rootScope.errorMessage = LoginMessageConstants.ERROR_IN_FECTHING_DETAILS;
                          $("#messageModal").modal('show');
                      }
                      else {
@@ -156,7 +167,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                  console.log(' Error in authentication = ' + error.statusText);
                  // alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS);
                  $rootScope.isVisibleLogin = true;
-                 $rootScope.errorMassage = LoginMessageConstants.ERROR_IN_FECTHING_DETAILS;
+                 $rootScope.errorMessage = LoginMessageConstants.ERROR_IN_FECTHING_DETAILS;
                  $("#messageModal").modal('show');
              });
         }
@@ -215,17 +226,17 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                 .then(function (result) {
                     if (result == LoginConstants.USER_NOT_FOUND) {
                         //  alert(LoginMessageConstants.INCORRECT_EMAIL_ID);
-                        $rootScope.errorMassage = LoginMessageConstants.INCORRECT_EMAIL_ID;
+                        $rootScope.errorMessage = LoginMessageConstants.INCORRECT_EMAIL_ID;
                         $("#messageModal").modal('show');
                     }
                     else if (result == LoginConstants.ERROR_IN_FECTHING_DETAILS) {
                         //  alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS);
-                        $rootScope.errorMassage = LoginMessageConstants.ERROR_IN_FECTHING_DETAILS;
+                        $rootScope.errorMessage = LoginMessageConstants.ERROR_IN_FECTHING_DETAILS;
                         $("#messageModal").modal('show');
                     }
                     else if (result == LoginConstants.MAIL_NOT_SENT) {
                         // alert(LoginMessageConstants.MAIL_NOT_SENT);
-                        $rootScope.errorMassage = LoginMessageConstants.MAIL_NOT_SENT;
+                        $rootScope.errorMessage = LoginMessageConstants.MAIL_NOT_SENT;
                         $("#messageModal").modal('show');
                     }
                     else {
@@ -244,7 +255,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                             else
                                 message = LoginMessageConstants.USERID_SENT_IN_EMAIL
                             //alert(message);
-                            $rootScope.errorMassage = message;
+                            $rootScope.errorMessage = message;
                             $("#messageModal").modal('show');
@@ -255,31 +266,25 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                 function (error) {
                     console.log(' Error in authentication = ' + error.statusText);
                     // alert(LoginConstants.ERROR_IN_FECTHING_DETAILS);
-                    $rootScope.errorMassage = LoginConstants.ERROR_IN_FECTHING_DETAILS;
+                    $rootScope.errorMessage = LoginConstants.ERROR_IN_FECTHING_DETAILS;
                     $("#messageModal").modal('show');
                 });
             }
             else {
                 // alert(LoginMessageConstants.INCORRECT_EMAIL_ID);
-                $rootScope.errorMassage = LoginMessageConstants.INCORRECT_EMAIL_ID;
+                $rootScope.errorMessage = LoginMessageConstants.INCORRECT_EMAIL_ID;
                 $("#messageModal").modal('show');
             }
         }
         else {
             //alert(LoginMessageConstants.BLANK_EMAIL_ID);
-            $rootScope.errorMassage = LoginMessageConstants.BLANK_EMAIL_ID;
+            $rootScope.errorMessage = LoginMessageConstants.BLANK_EMAIL_ID;
             $("#messageModal").modal('show');
         }
     };
-    $rootScope.closeResetPasswordPopup = function () {
-        $("#passwordReset").fadeOut();
-        $("#passwordReset").modal('hide');
-        $location.url("/");
-        $rootScope.isVisibleResetPass = false;
-        $rootScope.isVisibleLogin = true;
-    }
+    
     function validateEmail(email) {
@@ -294,28 +299,30 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             userInfo.emailId = split[1];
         }
-        if (userInfo.newPassword === userInfo.confirmPassword) {
-            $rootScope.errorMesaage = null;
+        if (userInfo.newPassword != null) {
+
+            if (userInfo.newPassword === userInfo.confirmPassword) {
+                $rootScope.passwordMismatchMessage = null;
             AuthenticationService.ResetUserPassword(userInfo)
             .then(
                  function (result) {
                      if (result == LoginConstants.USER_NOT_FOUND) {
                          //  alert(LoginMessageConstants.USER_OR_PASSWORD_INCORRECT);
-                         $rootScope.errorMassage = LoginMessageConstants.USER_OR_PASSWORD_INCORRECT;
+                         $rootScope.errorMessage = LoginMessageConstants.USER_OR_PASSWORD_INCORRECT;
                          $("#messageModal").modal('show');
                      }
                      else if (result == LoginConstants.ERROR_IN_FECTHING_DETAILS) {
                          // alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS);
-                         $rootScope.errorMassage = LoginConstants.ERROR_IN_FECTHING_DETAILS;
+                         $rootScope.errorMessage = LoginConstants.ERROR_IN_FECTHING_DETAILS;
                          $("#messageModal").modal('show');
                      }
                      else {
                          if ((result.IsAcknowledged == true) && (result.IsModifiedCountAvailable == true)) {
                              // alert(LoginMessageConstants.PASSWORD_RESET_MESSAGE);
-                             $rootScope.errorMassage = LoginMessageConstants.PASSWORD_RESET_MESSAGE;
+                             $rootScope.errorMessage = LoginMessageConstants.PASSWORD_RESET_MESSAGE;
                              $("#messageModal").modal('show');
                              $rootScope.isVisibleLogin = true;
                              $rootScope.isVisibleResetPass = false;
@@ -326,13 +333,18 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                  function (error) {
                      console.log(' Error in authentication = ' + error.statusText);
                      //  alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS);
-                     $rootScope.errorMassage = LoginMessageConstants.ERROR_IN_FECTHING_DETAILS;
+                     $rootScope.errorMessage = LoginMessageConstants.ERROR_IN_FECTHING_DETAILS;
                      $("#messageModal").modal('show');
                  });
         }
         else {
-            $rootScope.errorMesaage = LoginMessageConstants.NEW_AND_OLD_PASSWORD_DONOT_MATCH;
+            $rootScope.passwordMismatchMassage = LoginMessageConstants.NEW_AND_OLD_PASSWORD_DONOT_MATCH;
+                //$("#messageModal").modal('show');
+            }
+        }
+        else {
+            $rootScope.errorMessage = LoginMessageConstants.NEW_PASSWORD_FIELD_IS_EMPTY;
             $("#messageModal").modal('show');
         }
     }
@@ -559,30 +571,34 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     }
     $rootScope.openParent = function (slug) {
+        if ($('#jsPanel-1').length > 0) {
-        var openViews = $rootScope.openViews;
-        if (openViews.length > 0) {
-            $rootScope.openViews.splice(openViews.length - 1);
-        }
-        if (openViews.length > 0) {
-            var lastOpenMoudle = $rootScope.openViews[openViews.length - 1];
         }
-        $('#daImagePanel').remove();
-        if ($('#jsPanel-1').length > 0)
-            $('#jsPanel-1').remove();
+        else {
+            var openViews = $rootScope.openViews;
+            if (openViews.length > 0) {
+                $rootScope.openViews.splice(openViews.length - 1);
+            }
+            if (openViews.length > 0) {
+                var lastOpenMoudle = $rootScope.openViews[openViews.length - 1];
+            }
+          //  $('#daImagePanel').remove();
+            if ($('#jsPanel-1').length > 0)
+                $('#jsPanel-1').remove();
-        if ($('#3DImagePanel').length > 0)
-            $('#3DImagePanel').remove();
+            if ($('#3DImagePanel').length > 0)
+                $('#3DImagePanel').remove();
-        if ($('#ciImagePanel').length > 0)
-            $('#ciImagePanel').remove();
+            if ($('#ciImagePanel').length > 0)
+                $('#ciImagePanel').remove();
-        if ($('#caVideoPanel').length > 0)
-            $('#caVideoPanel').remove();
+            if ($('#caVideoPanel').length > 0)
+                $('#caVideoPanel').remove();
-        $location.url('/' + slug);
+            $location.url('/' + slug);
-        $rootScope.$broadcast('jsPanelCloseEvent', true);
+            $rootScope.$broadcast('jsPanelCloseEvent', true);
+        }
     }
     //called on jsanel minimize
@@ -3382,14 +3398,14 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     };
     $rootScope.ShowExportImageWindow = function () {
-        $(".export-image").css("display", "block");
-    };
+        $(".export-image").modal("show").draggable({ handle: ".modal-header" });
-    $rootScope.CloseExportImageWindow = function () {
-        console.log('close')
-        $(".export-image").css("display", "none");
+        $(".modal-backdrop").css("opacity", ".5");
+        $(".modal-backdrop").css("z-index", "1200001");
     };
+   
+
     $rootScope.ShowPrintWindow = function () {  // Print Active Viewer
         html2canvas($("#canvasDiv"), {
             onrendered: function (canvas) {
@@ -3431,37 +3447,59 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                 var curPosture = localStorage.getItem('currentViewTitle');
                 if (document.getElementById('jsPanel-1')) { //document.getElementsByClassName('ppImagePanel')) {
-                    setTimeout(function () {
-                        document.getElementById('imgPortrait').setAttribute('src', dataURL);
-                        document.getElementById('imgLandscape').setAttribute('src', dataURL);
-                        document.getElementById('spnModulePor').innerHTML = curModule;
-                        document.getElementById('spnBodyViewTitlePor').innerHTML = curPosture;
-                        document.getElementById('spnModuleLan').innerHTML = curModule;
-                        document.getElementById('spnBodyViewTitleLan').innerHTML = curPosture;
-                        if ($('#printcontainer').length > 0) {
-                            $("#printcontainer").css('width', $(window).outerWidth());
-                            $("#printcontainer").css('height', $(window).outerHeight());
-                        }
-                    }, 320);
+                    if (dataURL == "" || dataURL == undefined)
+                    {
+
+                        setTimeout(function () {
+                            document.getElementById('imgPortrait').setAttribute('src', dataURL);
+                            document.getElementById('imgLandscape').setAttribute('src', dataURL);
+                            document.getElementById('spnModulePor').innerHTML = curModule;
+                            document.getElementById('spnBodyViewTitlePor').innerHTML = curPosture;
+                            document.getElementById('spnModuleLan').innerHTML = curModule;
+                            document.getElementById('spnBodyViewTitleLan').innerHTML = curPosture;
+                            if ($('#printcontainer').length > 0) {
+                                $("#printcontainer").css('width', $(window).outerWidth());
+                                $("#printcontainer").css('height', $(window).outerHeight());
+                            }
+                        }, 520);
+                    }
+                    else
+                    {
+                        setTimeout(function () {
+                            document.getElementById('imgPortrait').setAttribute('src', dataURL);
+                            document.getElementById('imgLandscape').setAttribute('src', dataURL);
+                            document.getElementById('spnModulePor').innerHTML = curModule;
+                            document.getElementById('spnBodyViewTitlePor').innerHTML = curPosture;
+                            document.getElementById('spnModuleLan').innerHTML = curModule;
+                            document.getElementById('spnBodyViewTitleLan').innerHTML = curPosture;
+                            if ($('#printcontainer').length > 0) {
+                                $("#printcontainer").css('width', $(window).outerWidth());
+                                $("#printcontainer").css('height', $(window).outerHeight());
+                            }
+                        }, 320);
+                    }
+                    
                 }
                 $('#fileMenuAnchor').addClass('disableMenuannotation');
                 if ($('#daImagePanel').length > 0) {
                     console.log('close')
                     //$('#daImagePanel').css('display', 'none');
-                    $('#daImagePanel').remove();
+                  //  $('#daImagePanel').remove();
                 }
             }
         });
     };
     function OpenJSPanel() {
+        $("#daImagePanel").css({ "pointer-events": "none", "opacity": ".5" });
+        $("#ciImagePanel").css({ "pointer-events": "none", "opacity": ".5" });
         $.jsPanel({
             id: 'jsPanel-1',
             selector: '#dvPrintPreview',
             theme: 'success',
             currentController: 'HomeController',
-            parentSlug: 'da-view-list',  //After closing panel, control moves to here      
+            //parentSlug: 'da-view-list',  //After closing panel, control moves to here      
             ajax: {
                 url: 'app/views/home/printPreview.html'
             },
@@ -3564,11 +3602,16 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         console.log('close')
     }
-    $(document).on('click', '.jsglyph-remove', function () {
+    $(document).on('click', '#jsPanel-1 .jsglyph-remove', function () {
+        $("#daImagePanel").css({ "pointer-events": "auto", "opacity": "1" }); 
+        $("#ciImagePanel").css({ "pointer-events": "auto", "opacity": "1" });
+        $("#annotationButton").parent().removeClass("disableMenuannotation");
+        $("#annotationToolBarOptions").removeClass("disableMenuoption");
         $('#fileMenuAnchor').removeClass('disableMenuannotation');
         if ($('#jsPanel-1').length > 0)
             $('#jsPanel-1').remove();
-        console.log('close')
+        console.log('close');
+
     });
     $rootScope.restrictBodySystemList = function () {
@@ -3603,7 +3646,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         AdminService.SendAdminAccessRequestMail(userInfo)
             .then(function (result) {
                 if (result == AdminConstants.MAIL_SENT) {
-                    $rootScope.errorMassage = AdminConstants.MAIL_SENT_SUCCESS_MESSAGE;
+                    $rootScope.errorMessage = AdminConstants.MAIL_SENT_SUCCESS_MESSAGE;
                     $("#messageModal").modal('show');
                 }
                 $("#adminModal").fadeOut();
@@ -3612,7 +3655,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             },
             function (error) {
                 console.log(' Error in sending mail to admin support = ' + error.statusText);
-                $rootScope.errorMassage = AdminConstants.ERROR_IN_SENDING_MAIL;
+                $rootScope.errorMessage = AdminConstants.ERROR_IN_SENDING_MAIL;
                 $("#messageModal").modal('show');
             });
     };
@@ -306,6 +306,7 @@ AIA.constant(&quot;LoginMessageConstants&quot;, {
     "NEW_AND_OLD_PASSWORD_DONOT_MATCH": "Your new password and confirm password not matched!",
     "USER_CREDENTIALS_MISSING": "Please Enter your credentials.",
     "USER_NOT_FOUND": "User not found.",
+    "NEW_PASSWORD_FIELD_IS_EMPTY": "Please enter new password to reset your password."
     //"ERROR_IN_FECTHING_DETAILS": "Error in fecthing details.",
     //"MAIL_NOT_SENT": "Mail not sent."
 <div class="collapse navbar-collapse" id="topFixedNavbar1">
     <ul class="nav navbar-nav toperMenu-spaceleft">
-        <li class="dropdown" ng-class="disableFileMenu">
+        <li class="dropdown navbarDropdownItem" ng-class="disableFileMenu">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="fileMenuAnchor" role="button" aria-haspopup="true" aria-expanded="false">File<span class="caret"></span></a>
             <ul class="dropdown-menu">
                 <li ng-class="disableSubMenu"><a href="#">Open Resources</a></li>
@@ -23,9 +23,9 @@
             </ul>
         </li>
         <!--#7904-->
-        <li ng-class="disableMenuannotation"><a href="#" data-toggle="modal" id="annotationButton" data-target=".bs-example-modal-sm" ng-click="ShowAnnotationWindow()">Annotation</a></li>
+        <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>
-        <li class="dropdown" ng-class="disableMenuoption">
+        <li class="dropdown navbarDropdownItem" ng-class="disableMenuoption">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Options<span class="caret"></span></a>
             <ul class="dropdown-menu">
                 <!--<li><a href="#" ng-click="ShowListManager()">List Manager</a></li>-->
@@ -40,7 +40,7 @@
                 <li ng-class="disableSubMenu"><a href="#">Lab Exercises PDF</a></li>
             </ul>
         </li>
-        <li class="dropdown">
+        <li class="dropdown navbarDropdownItem">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Help<span class="caret"></span></a>
             <ul class="dropdown-menu">
                 <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 @@
                 <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>
             </ul>
         </li>
-        <li><a ng-click="OpenAdminForm()" role="button" data-toggle="modal" class="btn" data-target="#adminModal" ng-hide="haveRoleAdmin">Admin</a></li>
+        <li class ="navbarItem"><a ng-click="OpenAdminForm()" role="button" data-toggle="modal" class="btn" data-target="#adminModal" ng-hide="haveRoleAdmin">Admin</a></liclass>
     </ul>
     <ul class="nav navbar-nav navbar-right">
         <li class="visible-xs"><a href="" ng-click="LogoutUser()">Logout</a></li>
@@ -196,7 +196,7 @@
                                             <span class="input-group-addon"><i class="fa fa-user"></i></span>
                                             <input type="text" class="form-control" placeholder="Username" ng-model="userInfo.username">
                                         </div>
-                                        <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>
+                                        <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>
                                     </div>
@@ -208,7 +208,7 @@
                                             <span class="input-group-addon"><i class="fa fa-key"></i></span>
                                             <input type="password" class="form-control" placeholder="Password" ng-model="userInfo.password">
                                         </div>
-                                        <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"-->
+                                        <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"-->
                                     </div>
                                     <div class="form-group">
                                         <button class="btn btn-primary pull-right" ng-click="AuthenticateUser(userInfo)">Log In</button>
@@ -230,7 +230,7 @@
             </footer>
         </div>
         <!-- Forgot User ID (Small modal) -->
-        <div class="modal fade forgot-sm" role="dialog" tabindex="-1" aria-labelledby="exampleModalLabel" data-target=".forgot-sm">
+        <div class="modal fade" id="forgotUserModal" role="dialog" tabindex="-1" aria-labelledby="exampleModalLabel" data-target=".forgot-sm">
             <div class="modal-dialog modal-sm" role="document">
                 <div class="modal-content">
                     <div class="modal-header">
@@ -255,7 +255,7 @@
             </div>
         </div>
         <!-- Forgot Password (Small modal) -->
-        <div class="modal fade forgot-sm1" role="dialog" tabindex="-1" aria-labelledby="exampleModalLabel" data-target=".forgot-sm1">
+        <div class="modal fade" id="forgotPwdModal" role="dialog" tabindex="-1" aria-labelledby="exampleModalLabel" data-target=".forgot-sm1">
             <div class="modal-dialog modal-sm" role="document">
                 <div class="modal-content">
                     <div class="modal-header">
@@ -1022,11 +1022,12 @@
             </div>
             <!--Export Image Modal-->
-            <div class="modal fade export-image ui-draggable in" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" style="display: none;">
+            <div class="modal fade export-image ui-draggable in" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" 
+                 style="z-index: 1200002;">
                 <div class="modal-dialog modal-sm" role="document">
                     <div class="modal-content">
                         <div class="modal-header annotation-modal-header ui-draggable-handle">
-                            <button type="button" class="close" data-dismiss="modal" ng-click="CloseExportImageWindow()" aria-label="Close"><span aria-hidden="true">×</span></button>
+                            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
                             <h4 class="modal-title" id="">Save As</h4>
                         </div>
                         <div class="modal-body">
@@ -1047,7 +1048,7 @@
                             <div class="row">
                                 <input type="file" id="file1" style="display:none">
                                 <!--<a href="data:application/xml;charset=utf-8,your code here" download="filename.html">Save</a-->
-                                <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()"-->
+                                <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()"-->
                             </div>
                         </div>
@@ -1127,7 +1128,7 @@
                                         <td>
                                             <input class="form-control" name="confirmPassword" value="*****" type="password" style="padding:3px 5px; height:25px; width:98%;" ng-model="userInfo.confirmPassword" required>
                                             <span style="color: maroon; font-weight: bold; " ng-show="resetPasswordForm.confirmPassword.$touched && resetPasswordForm.confirmPassword.$invalid">Confirm password is required.</span>
-                                            <span style="color: maroon; font-weight: bold; " ng-if="errorMesaage">{{errorMesaage}}</span>
+                                            <span style="color: maroon; font-weight: bold; " ng-if="passwordMismatchMessage">{{passwordMismatchMessage}}</span>
                                         </td>
                                     </tr>
                                     <tr>
@@ -1136,7 +1137,6 @@
                                     <tr>
                                         <td>
                                             <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>
-                                            <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>
                                         </td>
                                     </tr>
                                 </tbody>
@@ -1157,7 +1157,7 @@
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
                 </div>
                 <div class="modal-title"></div>
-                <div class="modal-body">{{errorMassage}}</div>
+                <div class="modal-body">{{errorMessage}}</div>
                 <div class="modal-footer"> <button type="button" class="btn btn-primary" data-dismiss="modal">OK</button></div>
             </div>
         </div>
@@ -542,7 +542,13 @@ pointer-events: auto;
 	color: #FFFFFF;
 }
 /*#7904*/
-.navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus, .navbar-nav > li > a.active {
+/*.navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus, .navbar-nav > li > a.active {
+	color: #2db0f5;
+}*/
+.navbar-inverse .navbar-nav > .navbarDropdownItem > a:hover, .navbar-nav > .navbarDropdownItem > a.active {
+	color: #2db0f5;
+}
+.navbar-inverse .navbar-nav > .navbarItem > a:hover, .navbar-inverse .navbar-nav > .navbarItem > a:focus, .navbar-nav > .navbarItem > a.active {
 	color: #2db0f5;
 }
@@ -998,4 +1004,7 @@ background-size:cover;
            padding: 20px 10px; 
            text-align:center;
       }
- 
 \ No newline at end of file
+      #jsPanel-1
+        {
+          z-index:11111;
+      }
 \ No newline at end of file