Commit cc4e92fb0cf87f2a9cfc7bb1be798fe967d40ef6
Merge branch 'labdisabledmodels' into Develop-IPAD-MAC
Showing
2 changed files
with
7 additions
and
2 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
| @@ -816,6 +816,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -816,6 +816,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
| 816 | } | 816 | } |
| 817 | $("#annotationToolBarOptions").removeClass("disableMenuoption"); | 817 | $("#annotationToolBarOptions").removeClass("disableMenuoption"); |
| 818 | $("#optionsListManagerTab").removeClass("disableMenuoption"); | 818 | $("#optionsListManagerTab").removeClass("disableMenuoption"); |
| 819 | + $("#optiontSetting").removeClass("disableSubMenu"); | ||
| 819 | 820 | ||
| 820 | 821 | ||
| 821 | if (($location.url() == "/da-body-view")) { | 822 | if (($location.url() == "/da-body-view")) { |
| @@ -863,6 +864,10 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -863,6 +864,10 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
| 863 | } | 864 | } |
| 864 | if ($rootScope.menuLabExer == 1) { | 865 | if ($rootScope.menuLabExer == 1) { |
| 865 | $rootScope.disableMenuoption = " "; | 866 | $rootScope.disableMenuoption = " "; |
| 867 | + $("#annotationToolBarOptions").addClass("disableSubMenu"); | ||
| 868 | + $("#optionsListManagerTab").addClass("disableSubMenu"); | ||
| 869 | + $("#optionsCurriculum").addClass("disableSubMenu"); | ||
| 870 | + $("#optiontSetting").addClass("disableSubMenu"); | ||
| 866 | } | 871 | } |
| 867 | $rootScope.disableFileMenu = "disableFileMenu"; | 872 | $rootScope.disableFileMenu = "disableFileMenu"; |
| 868 | } | 873 | } |
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
| @@ -34,8 +34,8 @@ | @@ -34,8 +34,8 @@ | ||
| 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 ng-class="disableSubMenu"><a href="#">Add to Existing Curriculum</a></li> | ||
| 38 | - <li><a ng-click="ShowSettingWindow()" class="cursor-pointer">Settings</a></li> | 37 | + <li ng-class="disableSubMenu" id="optionsCurriculum"><a href="#">Add to Existing Curriculum</a></li> |
| 38 | + <li id="optiontSetting"><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 ng-class="disableSubMenu"><a href="#">Lab Exercises PDF</a></li> | 40 | <li ng-class="disableSubMenu"><a href="#">Lab Exercises PDF</a></li> |
| 41 | </ul> | 41 | </ul> |