Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into erasedFunctionalityIssue

unknown
2 parents 4796657b df2bbe02
Showing 5 changed files with 36 additions and 41 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.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
@@ -559,7 +559,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 $('#daBodyview').css("width", $(window).outerWidth());
-            }, 250);
+            }, 350);
     }
     }
@@ -8609,6 +8609,8 @@ function OnIdentityClick() {
 function OnZoom()
 {
+    if ($(".btn-annotation").hasClass("activebtncolor")) //Bug #14928
+        $(".btn-annotation").removeClass("activebtncolor");
     //Dissectible Anatomy > Extract and Annotations displays apart on the page after click on Zoom-in.
     $(".com").remove();
     $("#bord").remove();
@@ -69,6 +69,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     $rootScope.shapestyleborderWidth = 2;
     $rootScope.shapestyleborderStyles = "solid";
     $rootScope.errorMassage = '';
+    $rootScope.disableFileMenu = "disableFileMenu";
     $rootScope.userInfo = {
         username: null,
@@ -411,8 +412,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         if (($location.url() == "/da-body-view")) {
             $rootScope.disableMenuannotation = " ";
             $rootScope.disableMenuoption = " ";
-            $("#annotationToolBarOptions").removeClass("disableSubMenu");
-
+            $rootScope.disableSubMenu = "disableSubMenu";
+            $rootScope.disableFileMenu = " ";
         }
         else if ($location.url() == "/clinical-illustrations-detail")
         {
@@ -420,6 +421,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             $rootScope.disableMenuoption = " ";
             $rootScope.disableSubMenu = "disableSubMenu";
             $("#annotationToolBarOptions").removeClass("disableSubMenu");
+            $rootScope.disableFileMenu = " ";
         }
         else if($location.url() == "/clinical-animations-detail")
         {
@@ -427,6 +429,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             $rootScope.disableMenuoption = " ";
             $rootScope.disableSubMenu = "disableSubMenu";
             $("#annotationToolBarOptions").addClass("disableSubMenu");
+            $rootScope.disableFileMenu = " ";
         }
         else {
             $("#annotationToolBarOptions").removeClass("disableSubMenu");
@@ -443,7 +446,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             if ($rootScope.menuLabExer == 1) {
                 $rootScope.disableMenuoption = " ";
             }
-
+            $rootScope.disableFileMenu = "disableFileMenu";
         }
     });
@@ -2812,8 +2815,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                 //$("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
                 //$('#termList option[value="' + $rootScope.SelectedTermList + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" });
-        $("#optionsListManagerTab").addClass("active");
+       
             }
+            $("#optionsListManagerTab").addClass("active");
     }
     $rootScope.CloseListManager = function () {
@@ -3108,9 +3112,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                 $('#snipImage').attr('src', dataURL);
                 $('#spnModule').text($rootScope.currentActiveModuleTitle);
-                $('#spnPosture').text(localStorage.getItem('currentViewTitle'));
+                $('#spnBodyViewTitle').text(localStorage.getItem('currentViewTitle'));
-                PrintDIVContent('printBox');    // Open Print Window
+                PrintDivContentByID('printBox');    // Open Print Window
             }
         });
     };
@@ -3143,7 +3147,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                         document.getElementById('spnBodyViewTitlePor').innerHTML = curPosture;
                         document.getElementById('spnModuleLan').innerHTML = curModule;
                         document.getElementById('spnBodyViewTitleLan').innerHTML = curPosture;
-                    }, 100);
+                    }, 320);
                 }
                 $('#fileMenuAnchor').addClass('disableMenuannotation');
@@ -3259,7 +3263,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             window.frames["frame1"].focus();
             window.frames["frame1"].print();
             frame1.remove();
-        }, 250);
+        }, 320);
         console.log('close')
     }
@@ -3271,21 +3275,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         console.log('close')
     });
-    $rootScope.ShowPrintWindow = function () {  // Print Active Viewer
-        html2canvas($("#canvasDiv"), {
-            onrendered: function (canvas) {
-                var dataURL = canvas.toDataURL("image/jpeg");
-                var imageToPrint = new Image();
-                imageToPrint.src = dataURL;
-                $('#snipImage').attr('src', dataURL);
-
-                $('#spnModule').text($rootScope.currentActiveModuleTitle);
-                $('#spnBodyViewTitle').text(localStorage.getItem('currentViewTitle'));
-
-                PrintDivContentByID('printBox');    // Open Print Window
-            }
-        });
-    };
     $rootScope.restrictBodySystemList = function () {
         var RestrictListDiv = document.getElementById("restrictListDiv");
         if (RestrictListDiv.style.display == 'block') {
 <div class="collapse navbar-collapse" id="topFixedNavbar1">
     <ul class="nav navbar-nav toperMenu-spaceleft">
-        <li class="dropdown">
+        <li class="dropdown" 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><a href="#">Open Resources</a></li>
-                <li><a href="#">Open My Pictures</a></li>
-                <li><a href="#">Open My Animations</a></li>
+                <li ng-class="disableSubMenu"><a href="#">Open Resources</a></li>
+                <li ng-class="disableSubMenu"><a href="#">Open My Pictures</a></li>
+                <li ng-class="disableSubMenu"><a href="#">Open My Animations</a></li>
                 <li role="separator" class="divider"></li>
-                <li><a href="#">Test Creator</a></li>
-                <li><a href="#">Open Test</a></li>
-                <li><a href="#">Save Test As</a></li>
+                <li ng-class="disableSubMenu"><a href="#">Test Creator</a></li>
+                <li ng-class="disableSubMenu"><a href="#">Open Test</a></li>
+                <li ng-class="disableSubMenu"><a href="#">Save Test As</a></li>
                 <li role="separator" class="divider"></li>
-                <li><a href="#">New Curriculum</a></li>
-                <li><a href="#">Open Existing Curriculum</a></li>
-                <li><a href="#">Save Curriculum As</a></li>
+                <li ng-class="disableSubMenu"><a href="#">New Curriculum</a></li>
+                <li ng-class="disableSubMenu"><a href="#">Open Existing Curriculum</a></li>
+                <li ng-class="disableSubMenu"><a href="#">Save Curriculum As</a></li>
                 <li role="separator" class="divider"></li>
                 <li><a href="" id="exportImageAnchor" data-toggle="modal" ng-click="ShowExportImageWindow()">Export Image</a></li>
                 <li role="separator" class="divider"></li>
                 <li><a href="" id="printAVAnchor" data-toggle="modal" ng-click="ShowPrintWindow()">Print Active Viewer</a></li>
-                <li><a href="#">Print All Open Viewers</a></li>
+                <li ng-class="disableSubMenu"><a href="#">Print All Open Viewers</a></li>
                 <li><a href="" id="printPreviewAnchor" data-toggle="modal" ng-click="ShowPrintPreviewWindow()">Print Preview</a></li>
             </ul>
         </li>
@@ -30,14 +30,14 @@
             <ul class="dropdown-menu">
                 <!--<li><a href="#" ng-click="ShowListManager()">List Manager</a></li>-->
-                <li ng-class="disableSubMenu" id="optionsListManagerTab"><a href="#" ng-click="ShowListManager()">List Manager</a></li>
+                <li ng-class="" id="optionsListManagerTab"><a href="#" ng-click="ShowListManager()">List Manager</a></li>
                 <!--#7904-->
                 <li><a href="#" id="annotationToolBarOptions" ng-click="ShowAnnotationWindow()">Annotation Toolbar</a></li>
                 <li ng-class="disableSubMenu"><a href="#">Add to Existing Curriculum</a></li>
                 <li><a ng-click="ShowSettingWindow()" class="cursor-pointer">Settings</a></li>
                 <li role="separator" class="divider"></li>
-                <li ng-class="disableMenuoption"><a href="#">Lab Exercises PDF</a></li>
+                <li ng-class="disableSubMenu"><a href="#">Lab Exercises PDF</a></li>
             </ul>
         </li>
         <li class="dropdown">
@@ -52,9 +52,9 @@
         <li><a href="#">Admin</a></li>
     </ul>
     <ul class="nav navbar-nav navbar-right">
-        <li class="visible-xs"><a href="" ng-click="LogoutUser()">Logout</a></li> 
+        <li class="visible-xs"><a href="" ng-click="LogoutUser()">Logout</a></li>
         <li class="hidden-xs marginR5" data-toggle="tooltip" data-placement="top" title="Logout"><a href="" ng-click="LogoutUser()"><i class="fa fa-power-off"></i></a></li>
-      </ul>
+    </ul>
     <div id="imaginary_container">
         <div class="input-group stylish-input-group paddTop5 hidden-sm">
             <input type="text" class="form-control width120" placeholder="Search">
@@ -88,4 +88,4 @@
         </div>
     </div>
-</div>
+</div>
 \ No newline at end of file
@@ -557,7 +557,7 @@
                                             </div>
                                             <div class="">
                                                 <div class="col-sm-6">
-                                                    <h5 class="font13 bolder">Modesty Setting</h5>
+                                                    <h5 class="font13 bolder">Modesty Settings</h5>
                                                     <img src="~/../content/images/common/adam-leaf.png" alt="" class="pull-left marginR5">
                                                     <div class="radio">
                                                         <label>
@@ -916,6 +916,10 @@ cursor:pointer;
     pointer-events: none;
     opacity: 0.6;
 }
+.disableFileMenu {
+    pointer-events: none;
+    opacity: 0.6;
+}
 .blankshapediv
 {