diff --git a/150-DOCUMENTATION/AIA-TimelinesForIPAD-MAC.xlsx b/150-DOCUMENTATION/AIA-TimelinesForIPAD-MAC.xlsx new file mode 100644 index 0000000..20b6778 --- /dev/null +++ b/150-DOCUMENTATION/AIA-TimelinesForIPAD-MAC.xlsx diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js index 6e6b73b..cd09c64 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js @@ -1,12 +1,20 @@ AIA.controller("3dAController", ["$scope", "$rootScope", "pages", "$log", '$http', 'DataService', '$filter', '$location', '$document', '$sce', "$compile", function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location, $document, $sce, $compile) { - $rootScope.currentActiveModuleTitle = pages[5].name; + $scope.showTabButton = false; $scope.threeDAnatomyData; $scope.Id; $scope.$on('$viewContentLoaded', function (event) { - + var currentURL = $location.path(); + var selectedModuleName = ''; + //set module title + angular.forEach($rootScope.userModules, function (value, key) { + if (value.slug === currentURL.replace('/', '')) { + selectedModuleName = value.name; + } + $rootScope.currentActiveModuleTitle = selectedModuleName; + }) if ($rootScope.refreshcheck == null) { $location.path('/'); } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js index c8f8f6a..a94d6d2 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js @@ -605,9 +605,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout if (clickedCIImage.length > 0 && clickedCISummary.length > 0) { - $rootScope.isLoading = false; - $('#spinner').css('visibility', 'hidden'); - $.jsPanel({ id: 'ciImagePanel', selector: '.ciView', @@ -633,6 +630,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout }); + + $('#canvasDiv img').load(function () { + + $rootScope.isLoading = false; + $('#spinner').css('visibility', 'hidden'); + }); + $rootScope.currentSlug = 'clinical-illustrations-detail'; $rootScope.openViews.push( diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 806a0a3..24b6740 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -4944,7 +4944,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l canvasModesty.style.left = X + 'px'; canvasModesty.style.top = Y + 'px'; canvasModesty.style.visibility = 'visible'; - if($rootScope.currentBodyViewId=="11"){ + if ($rootScope.voId == "11") { canvasModesty.style.zIndex = 11000; } @@ -7828,7 +7828,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.OnViewChange = function (event) { // alert(event.target.title); // alert($("[title*='" + event.target.title + "']").parent().hasClass("active")); - if ($("[title*='" + event.target.title + "']").parent().hasClass("active") == true) { + if ($("[title='" + event.target.title + "']").parent().hasClass("active") == true) { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index 3fbd43e..6b640f7 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -4377,6 +4377,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic function OpenJSPanel() { $("#daImagePanel").css({ "pointer-events": "none", "opacity": ".5" }); $("#ciImagePanel").css({ "pointer-events": "none", "opacity": ".5" }); + $("#ImagePanel").css({ "pointer-events": "none", "opacity": ".5" }); $.jsPanel({ id: 'jsPanel-1', selector: '#dvPrintPreview', @@ -4427,34 +4428,34 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $(document).on('change', '#printPSOptions', function () { var option = $('#printPSOptions').find(":selected").text(); switch (option) { - case (option = "10%"): + case ("10%"): ResizeImage(0.1); break; - case (option = "25%"): + case ("25%"): ResizeImage(0.25); break; - case (option = "50%"): + case ("50%"): ResizeImage(0.5); break; - case (option = "75%"): + case ("75%"): ResizeImage(.75); break; - case (option = "65%"): + case ("65%"): ResizeImage(0.65); break; - case (option = "100%"): + case ("100%"): ResizeImage(1); break; - case (option = "150%"): + case ("150%"): ResizeImage(1.5); break; - case (option = "200%"): + case ("200%"): ResizeImage(2); break; - case (option = "500%"): + case ("500%"): ResizeImage(5); break; - case (option = "Auto"): + case ("Auto"): ResizeImage(0); break; default: @@ -4504,6 +4505,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $(document).on('click', '#jsPanel-1 .jsglyph-remove', function () { $("#daImagePanel").css({ "pointer-events": "auto", "opacity": "1" }); $("#ciImagePanel").css({ "pointer-events": "auto", "opacity": "1" }); + $("#ImagePanel").css({ "pointer-events": "auto", "opacity": "1" }); $("#annotationButton").parent().removeClass("disableMenuannotation"); $("#annotationToolBarOptions").removeClass("disableMenuoption"); $("#optionsListManagerTab").removeClass("disableMenuoption"); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index 881987c..78ed12c 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -1358,7 +1358,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } $rootScope.hidePins = function () { - $rootScope.isshowAllPinsBtnAfterHideClicked = false; + $("#dropdownMenu221").addClass("aaSystemDisable"); $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); $scope.hideSpeechBubble(); @@ -1387,6 +1387,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } $scope.showAllPinsAfterHide = function (event) { + if ($("#dropdownMenu221").hasClass("aaSystemDisable")) { + $("#dropdownMenu221").removeClass("aaSystemDisable"); + } $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); $scope.isHidePinBtnClicked = false; @@ -1413,7 +1416,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $scope.showSelectedPins = function () { - $rootScope.isshowAllPinsBtnAfterHideClicked = false; + if ($("#dropdownMenu221").hasClass("aaSystemDisable")) { + $("#dropdownMenu221").removeClass("aaSystemDisable"); + } $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html b/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html index 69c183b..a226654 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html @@ -26,7 +26,7 @@
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html index 8848fff..be65386 100644 --- a/400-SOURCECODE/AIAHTML5.Web/index.html +++ b/400-SOURCECODE/AIAHTML5.Web/index.html @@ -1272,9 +1272,7 @@
• Complementary and Alternative Medicine
-
-
• A.D.A.M Images
-
+
• Body Guide
@@ -1301,6 +1299,9 @@
• Lab Exercises
+
+
• A.D.A.M Images
+
diff --git a/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css b/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css index ee41c26..509993a 100644 --- a/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css +++ b/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css @@ -1104,4 +1104,11 @@ li[disabled], a[disabled] { } a[disabled] { color: #aaa !important; -} \ No newline at end of file +} + + +.aaSystemDisable + { + pointer-events : none; + opacity : 0.5; +}