Commit 6def3e61b9f6cf33253f8ef0d19cabd4a2122f5e
Merge branch 'Merge_UA_15281' of http://52.6.196.163/ADAM/AIAHTML5 into US_15281_Changes
Showing
2 changed files
with
16 additions
and
17 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
| ... | ... | @@ -411,8 +411,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
| 411 | 411 | if (($location.url() == "/da-body-view")) { |
| 412 | 412 | $rootScope.disableMenuannotation = " "; |
| 413 | 413 | $rootScope.disableMenuoption = " "; |
| 414 | - $("#annotationToolBarOptions").removeClass("disableSubMenu"); | |
| 415 | - | |
| 414 | + $rootScope.disableSubMenu = "disableSubMenu"; | |
| 416 | 415 | } |
| 417 | 416 | else if ($location.url() == "/clinical-illustrations-detail") |
| 418 | 417 | { | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
| ... | ... | @@ -3,22 +3,22 @@ |
| 3 | 3 | <li class="dropdown"> |
| 4 | 4 | <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="fileMenuAnchor" role="button" aria-haspopup="true" aria-expanded="false">File<span class="caret"></span></a> |
| 5 | 5 | <ul class="dropdown-menu"> |
| 6 | - <li><a href="#">Open Resources</a></li> | |
| 7 | - <li><a href="#">Open My Pictures</a></li> | |
| 8 | - <li><a href="#">Open My Animations</a></li> | |
| 6 | + <li ng-class="disableSubMenu"><a href="#">Open Resources</a></li> | |
| 7 | + <li ng-class="disableSubMenu"><a href="#">Open My Pictures</a></li> | |
| 8 | + <li ng-class="disableSubMenu"><a href="#">Open My Animations</a></li> | |
| 9 | 9 | <li role="separator" class="divider"></li> |
| 10 | - <li><a href="#">Test Creator</a></li> | |
| 11 | - <li><a href="#">Open Test</a></li> | |
| 12 | - <li><a href="#">Save Test As</a></li> | |
| 10 | + <li ng-class="disableSubMenu"><a href="#">Test Creator</a></li> | |
| 11 | + <li ng-class="disableSubMenu"><a href="#">Open Test</a></li> | |
| 12 | + <li ng-class="disableSubMenu"><a href="#">Save Test As</a></li> | |
| 13 | 13 | <li role="separator" class="divider"></li> |
| 14 | - <li><a href="#">New Curriculum</a></li> | |
| 15 | - <li><a href="#">Open Existing Curriculum</a></li> | |
| 16 | - <li><a href="#">Save Curriculum As</a></li> | |
| 14 | + <li ng-class="disableSubMenu"><a href="#">New Curriculum</a></li> | |
| 15 | + <li ng-class="disableSubMenu"><a href="#">Open Existing Curriculum</a></li> | |
| 16 | + <li ng-class="disableSubMenu"><a href="#">Save Curriculum As</a></li> | |
| 17 | 17 | <li role="separator" class="divider"></li> |
| 18 | 18 | <li><a href="" id="exportImageAnchor" data-toggle="modal" ng-click="ShowExportImageWindow()">Export Image</a></li> |
| 19 | 19 | <li role="separator" class="divider"></li> |
| 20 | 20 | <li><a href="" id="printAVAnchor" data-toggle="modal" ng-click="ShowPrintWindow()">Print Active Viewer</a></li> |
| 21 | - <li><a href="#">Print All Open Viewers</a></li> | |
| 21 | + <li ng-class="disableSubMenu"><a href="#">Print All Open Viewers</a></li> | |
| 22 | 22 | <li><a href="" id="printPreviewAnchor" data-toggle="modal" ng-click="ShowPrintPreviewWindow()">Print Preview</a></li> |
| 23 | 23 | </ul> |
| 24 | 24 | </li> |
| ... | ... | @@ -30,14 +30,14 @@ |
| 30 | 30 | <ul class="dropdown-menu"> |
| 31 | 31 | <!--<li><a href="#" ng-click="ShowListManager()">List Manager</a></li>--> |
| 32 | 32 | |
| 33 | - <li ng-class="disableSubMenu" id="optionsListManagerTab"><a href="#" ng-click="ShowListManager()">List Manager</a></li> | |
| 33 | + <li ng-class="" id="optionsListManagerTab"><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> |
| 36 | 36 | |
| 37 | 37 | <li ng-class="disableSubMenu"><a href="#">Add to Existing Curriculum</a></li> |
| 38 | 38 | <li><a ng-click="ShowSettingWindow()" class="cursor-pointer">Settings</a></li> |
| 39 | 39 | <li role="separator" class="divider"></li> |
| 40 | - <li ng-class="disableMenuoption"><a href="#">Lab Exercises PDF</a></li> | |
| 40 | + <li ng-class="disableSubMenu"><a href="#">Lab Exercises PDF</a></li> | |
| 41 | 41 | </ul> |
| 42 | 42 | </li> |
| 43 | 43 | <li class="dropdown"> |
| ... | ... | @@ -52,9 +52,9 @@ |
| 52 | 52 | <li><a href="#">Admin</a></li> |
| 53 | 53 | </ul> |
| 54 | 54 | <ul class="nav navbar-nav navbar-right"> |
| 55 | - <li class="visible-xs"><a href="" ng-click="LogoutUser()">Logout</a></li> | |
| 55 | + <li class="visible-xs"><a href="" ng-click="LogoutUser()">Logout</a></li> | |
| 56 | 56 | <li class="hidden-xs marginR5" data-toggle="tooltip" data-placement="top" title="Logout"><a href="" ng-click="LogoutUser()"><i class="fa fa-power-off"></i></a></li> |
| 57 | - </ul> | |
| 57 | + </ul> | |
| 58 | 58 | <div id="imaginary_container"> |
| 59 | 59 | <div class="input-group stylish-input-group paddTop5 hidden-sm"> |
| 60 | 60 | <input type="text" class="form-control width120" placeholder="Search"> |
| ... | ... | @@ -88,4 +88,4 @@ |
| 88 | 88 | </div> |
| 89 | 89 | </div> |
| 90 | 90 | |
| 91 | -</div> | |
| 91 | +</div> | |
| 92 | 92 | \ No newline at end of file | ... | ... |