ADAM / AIAHTML5

Commit 13266c6c5cac4a46b96e6f5ed90746d168a190ae

Authored by Mukul Rajput
1 parent fd7f8ec9

this is for bug #7875 and #7873

Inline Side-by-side
Showing 4 changed files with 52 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @13266c6
... ... @@ -43,9 +43,43 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
43 43 $rootScope.isModestyOn;
44 44 $rootScope.isModestyOff;
45 45 $rootScope.SetSettingActiveTab;
  46 + $rootScope.disableMenuannotation = "disableMenuannotation";
  47 + $rootScope.disableMenuoption = "disableMenuoption";
  48 + $rootScope.menuLabExer;
  49 + $rootScope.menuLabExer = 0;
  50 +
  51 + $rootScope.$on("$locationChangeSuccess", function () {
  52 +
  53 + if (($location.url() == "/da-body-view") || ($location.url() == "/clinical-illustrations-detail") || ($location.url() == "/clinical-animations-detail")) {
  54 + $rootScope.disableMenuannotation = " ";
  55 + $rootScope.disableMenuoption = " ";
  56 +
  57 +
  58 + }
  59 + else {
  60 +
  61 + $rootScope.disableMenuannotation = "disableMenuannotation";
  62 + $rootScope.disableMenuoption = "disableMenuoption";
  63 + $rootScope.CloseAnnotationTool();
  64 + $rootScope.CloseListManager();
  65 + angular.element('#modal-settings').modal('hide');
  66 + if ($location.url() == "/lab-exercises") {
  67 +
  68 + $rootScope.menuLabExer = 0;
  69 + }
  70 + if($rootScope.menuLabExer==1)
  71 + {
  72 + $rootScope.disableMenuoption = " ";
  73 + }
  74 +
  75 + }
  76 +
  77 + });
46 78  
47 79 //jspanel functionality..
48 80  
  81 +
  82 +
49 83 $rootScope.openParent = function (slug) {
50 84 // debugger;
51 85 var openViews = $rootScope.openViews;
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
  View file @13266c6
... ... @@ -35,6 +35,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
35 35 $scope.IsVisible = function () {
36 36 // $scope.scroll();
37 37  
  38 +
38 39 }
39 40  
40 41 $scope.scroll = function () {
... ... @@ -63,7 +64,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
63 64 }
64 65  
65 66 $scope.getLabExerciseTitle = function (title) {
66   -
  67 + $rootScope.menuLabExer = 1;
67 68  
68 69 if (title != null) {
69 70 $scope.LabExerciseQuiz = title;
... ...
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
  View file @13266c6
... ... @@ -23,13 +23,13 @@
23 23 </ul>
24 24 </li>
25 25 <!--#7904-->
26   - <li><a href="#" data-toggle="modal" id="annotationButton" data-target=".bs-example-modal-sm" ng-click="ShowAnnotationWindow()">Annotation</a></li>
  26 + <li 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">
  28 + <li class="dropdown" 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>-->
32   -
  32 +
33 33 <li><a href="#" ng-click="ShowListManager()">List Manager</a></li>
34 34 <!--#7904-->
35 35 <li><a href="#" id="annotationToolBarOptions" ng-click="ShowAnnotationWindow()">Annotation Toolbar</a></li>
... ...
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @13266c6
... ... @@ -863,4 +863,17 @@ cursor:pointer;
863 863 .annotationtoolbartab
864 864 {
865 865 background:#626c34 !important;
  866 +}
  867 +
  868 +.disableMenuannotation
  869 +{
  870 + pointer-events:none;
  871 + opacity:0.6;
  872 +
  873 +}
  874 +.disableMenuoption
  875 +{
  876 + pointer-events:none;
  877 + opacity:0.6;
  878 +
866 879 }
867 880 \ No newline at end of file
... ...