Merge branch 'Merge_UA_15281' of http://52.6.196.163/ADAM/AIAHTML5 into US_15281_Changes

Utkarsh Singh
2 parents 50edf87b f5131edd
Showing 2 changed files with 16 additions and 17 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
@@ -411,8 +411,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         if (($location.url() == "/da-body-view")) {
             $rootScope.disableMenuannotation = " ";
             $rootScope.disableMenuoption = " ";
-            $("#annotationToolBarOptions").removeClass("disableSubMenu");
-
+            $rootScope.disableSubMenu = "disableSubMenu";
         }
         else if ($location.url() == "/clinical-illustrations-detail")
         {
@@ -3,22 +3,22 @@
         <li class="dropdown">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="fileMenuAnchor" role="button" aria-haspopup="true" aria-expanded="false">File<span class="caret"></span></a>
             <ul class="dropdown-menu">
-                <li><a href="#">Open Resources</a></li>
-                <li><a href="#">Open My Pictures</a></li>
-                <li><a href="#">Open My Animations</a></li>
+                <li ng-class="disableSubMenu"><a href="#">Open Resources</a></li>
+                <li ng-class="disableSubMenu"><a href="#">Open My Pictures</a></li>
+                <li ng-class="disableSubMenu"><a href="#">Open My Animations</a></li>
                 <li role="separator" class="divider"></li>
-                <li><a href="#">Test Creator</a></li>
-                <li><a href="#">Open Test</a></li>
-                <li><a href="#">Save Test As</a></li>
+                <li ng-class="disableSubMenu"><a href="#">Test Creator</a></li>
+                <li ng-class="disableSubMenu"><a href="#">Open Test</a></li>
+                <li ng-class="disableSubMenu"><a href="#">Save Test As</a></li>
                 <li role="separator" class="divider"></li>
-                <li><a href="#">New Curriculum</a></li>
-                <li><a href="#">Open Existing Curriculum</a></li>
-                <li><a href="#">Save Curriculum As</a></li>
+                <li ng-class="disableSubMenu"><a href="#">New Curriculum</a></li>
+                <li ng-class="disableSubMenu"><a href="#">Open Existing Curriculum</a></li>
+                <li ng-class="disableSubMenu"><a href="#">Save Curriculum As</a></li>
                 <li role="separator" class="divider"></li>
                 <li><a href="" id="exportImageAnchor" data-toggle="modal" ng-click="ShowExportImageWindow()">Export Image</a></li>
                 <li role="separator" class="divider"></li>
                 <li><a href="" id="printAVAnchor" data-toggle="modal" ng-click="ShowPrintWindow()">Print Active Viewer</a></li>
-                <li><a href="#">Print All Open Viewers</a></li>
+                <li ng-class="disableSubMenu"><a href="#">Print All Open Viewers</a></li>
                 <li><a href="" id="printPreviewAnchor" data-toggle="modal" ng-click="ShowPrintPreviewWindow()">Print Preview</a></li>
             </ul>
         </li>
@@ -30,14 +30,14 @@
             <ul class="dropdown-menu">
                 <!--<li><a href="#" ng-click="ShowListManager()">List Manager</a></li>-->
-                <li ng-class="disableSubMenu" id="optionsListManagerTab"><a href="#" ng-click="ShowListManager()">List Manager</a></li>
+                <li ng-class="" id="optionsListManagerTab"><a href="#" ng-click="ShowListManager()">List Manager</a></li>
                 <!--#7904-->
                 <li><a href="#" id="annotationToolBarOptions" ng-click="ShowAnnotationWindow()">Annotation Toolbar</a></li>
                 <li ng-class="disableSubMenu"><a href="#">Add to Existing Curriculum</a></li>
                 <li><a ng-click="ShowSettingWindow()" class="cursor-pointer">Settings</a></li>
                 <li role="separator" class="divider"></li>
-                <li ng-class="disableMenuoption"><a href="#">Lab Exercises PDF</a></li>
+                <li ng-class="disableSubMenu"><a href="#">Lab Exercises PDF</a></li>
             </ul>
         </li>
         <li class="dropdown">
@@ -52,9 +52,9 @@
         <li><a href="#">Admin</a></li>
     </ul>
     <ul class="nav navbar-nav navbar-right">
-        <li class="visible-xs"><a href="" ng-click="LogoutUser()">Logout</a></li> 
+        <li class="visible-xs"><a href="" ng-click="LogoutUser()">Logout</a></li>
         <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>
-      </ul>
+    </ul>
     <div id="imaginary_container">
         <div class="input-group stylish-input-group paddTop5 hidden-sm">
             <input type="text" class="form-control width120" placeholder="Search">
@@ -88,4 +88,4 @@
         </div>
     </div>
-</div>
+</div>
 \ No newline at end of file