diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index d5d027a..da6c7b8 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -43,9 +43,43 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", $rootScope.isModestyOn; $rootScope.isModestyOff; $rootScope.SetSettingActiveTab; + $rootScope.disableMenuannotation = "disableMenuannotation"; + $rootScope.disableMenuoption = "disableMenuoption"; + $rootScope.menuLabExer; + $rootScope.menuLabExer = 0; + + $rootScope.$on("$locationChangeSuccess", function () { + + if (($location.url() == "/da-body-view") || ($location.url() == "/clinical-illustrations-detail") || ($location.url() == "/clinical-animations-detail")) { + $rootScope.disableMenuannotation = " "; + $rootScope.disableMenuoption = " "; + + + } + else { + + $rootScope.disableMenuannotation = "disableMenuannotation"; + $rootScope.disableMenuoption = "disableMenuoption"; + $rootScope.CloseAnnotationTool(); + $rootScope.CloseListManager(); + angular.element('#modal-settings').modal('hide'); + if ($location.url() == "/lab-exercises") { + + $rootScope.menuLabExer = 0; + } + if($rootScope.menuLabExer==1) + { + $rootScope.disableMenuoption = " "; + } + + } + + }); //jspanel functionality.. + + $rootScope.openParent = function (slug) { // debugger; var openViews = $rootScope.openViews; diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js index 717b52b..80bc3bd 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js @@ -35,6 +35,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location $scope.IsVisible = function () { // $scope.scroll(); + } $scope.scroll = function () { @@ -63,7 +64,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location } $scope.getLabExerciseTitle = function (title) { - + $rootScope.menuLabExer = 1; if (title != null) { $scope.LabExerciseQuiz = title; diff --git a/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html index a02f42f..4a9d629 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html @@ -23,13 +23,13 @@ -