ADAM / AIAHTML5

Commit 532e67d4b6a9e2fe778d7d9c926cf1480b3034dd

Authored by Nikita Kulshreshtha
2 parents e1d83678 09ecfd7d

Merge branch 'CICAMenu' into Develop

Inline Side-by-side
Showing 3 changed files with 15 additions and 6 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @532e67d
@@ -73,16 +73,21 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -73,16 +73,21 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
73 73
74 $rootScope.$on("$locationChangeSuccess", function () { 74 $rootScope.$on("$locationChangeSuccess", function () {
75 75
76 - if (($location.url() == "/da-body-view") || ($location.url() == "/clinical-illustrations-detail") || ($location.url() == "/clinical-animations-detail")) { 76 + if (($location.url() == "/da-body-view")) {
77 $rootScope.disableMenuannotation = " "; 77 $rootScope.disableMenuannotation = " ";
78 $rootScope.disableMenuoption = " "; 78 $rootScope.disableMenuoption = " ";
79 79
80 - 80 + }
  81 + else if (($location.url() == "/clinical-illustrations-detail") || ($location.url() == "/clinical-animations-detail")) {
  82 + $rootScope.disableMenuannotation = " ";
  83 + $rootScope.disableMenuoption = " ";
  84 + $rootScope.disableSubMenu = "disableSubMenu";
81 } 85 }
82 else { 86 else {
83 87
84 $rootScope.disableMenuannotation = "disableMenuannotation"; 88 $rootScope.disableMenuannotation = "disableMenuannotation";
85 $rootScope.disableMenuoption = "disableMenuoption"; 89 $rootScope.disableMenuoption = "disableMenuoption";
  90 + $rootScope.disableSubMenu = "";
86 $rootScope.CloseAnnotationTool(); 91 $rootScope.CloseAnnotationTool();
87 $rootScope.CloseListManager(); 92 $rootScope.CloseListManager();
88 angular.element('#modal-settings').modal('hide'); 93 angular.element('#modal-settings').modal('hide');
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
  View file @532e67d
@@ -30,14 +30,14 @@ @@ -30,14 +30,14 @@
30 <ul class="dropdown-menu"> 30 <ul class="dropdown-menu">
31 <!--<li><a href="#" ng-click="ShowListManager()">List Manager</a></li>--> 31 <!--<li><a href="#" ng-click="ShowListManager()">List Manager</a></li>-->
32 32
33 - <li><a href="#" ng-click="ShowListManager()">List Manager</a></li> 33 + <li ng-class="disableSubMenu"><a href="#" ng-click="ShowListManager()">List Manager</a></li>
34 <!--#7904--> 34 <!--#7904-->
35 <li><a href="#" id="annotationToolBarOptions" ng-click="ShowAnnotationWindow()">Annotation Toolbar</a></li> 35 <li><a href="#" id="annotationToolBarOptions" ng-click="ShowAnnotationWindow()">Annotation Toolbar</a></li>
36 36
37 - <li><a href="#">Add to Existing Curriculum</a></li> 37 + <li ng-class="disableSubMenu"><a href="#">Add to Existing Curriculum</a></li>
38 <li><a ng-click="ShowSettingWindow()" class="cursor-pointer">Settings</a></li> 38 <li><a ng-click="ShowSettingWindow()" class="cursor-pointer">Settings</a></li>
39 <li role="separator" class="divider"></li> 39 <li role="separator" class="divider"></li>
40 - <li><a href="#">Lab Exercises PDF</a></li> 40 + <li ng-class="disableMenuoption"><a href="#">Lab Exercises PDF</a></li>
41 </ul> 41 </ul>
42 </li> 42 </li>
43 <li class="dropdown"> 43 <li class="dropdown">
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @532e67d
@@ -907,6 +907,10 @@ cursor:pointer; @@ -907,6 +907,10 @@ cursor:pointer;
907 opacity:0.6; 907 opacity:0.6;
908 908
909 } 909 }
  910 +.disableSubMenu {
  911 + pointer-events: none;
  912 + opacity: 0.6;
  913 +}
910 914
911 .blankshapediv 915 .blankshapediv
912 { 916 {
@@ -939,4 +943,4 @@ background-size:cover; @@ -939,4 +943,4 @@ background-size:cover;
939 { 943 {
940 background:#4b4b4b !important; 944 background:#4b4b4b !important;
941 border-color:#3f3f3f !important; 945 border-color:#3f3f3f !important;
942 - }  
943 \ No newline at end of file 946 \ No newline at end of file
  947 + }