Commit df2bbe02fe100148c75c482569f32bd83e7412b9

Authored by Amrita Vishnoi
2 parents 73f93d33 ea24a473

Merge branch 'US_15281_Changes' into Develop

400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
... ... @@ -69,6 +69,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
69 69 $rootScope.shapestyleborderWidth = 2;
70 70 $rootScope.shapestyleborderStyles = "solid";
71 71 $rootScope.errorMassage = '';
  72 + $rootScope.disableFileMenu = "disableFileMenu";
72 73  
73 74 $rootScope.userInfo = {
74 75 username: null,
... ... @@ -412,6 +413,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
412 413 $rootScope.disableMenuannotation = " ";
413 414 $rootScope.disableMenuoption = " ";
414 415 $rootScope.disableSubMenu = "disableSubMenu";
  416 + $rootScope.disableFileMenu = " ";
415 417 }
416 418 else if ($location.url() == "/clinical-illustrations-detail")
417 419 {
... ... @@ -419,6 +421,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
419 421 $rootScope.disableMenuoption = " ";
420 422 $rootScope.disableSubMenu = "disableSubMenu";
421 423 $("#annotationToolBarOptions").removeClass("disableSubMenu");
  424 + $rootScope.disableFileMenu = " ";
422 425 }
423 426 else if($location.url() == "/clinical-animations-detail")
424 427 {
... ... @@ -426,6 +429,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
426 429 $rootScope.disableMenuoption = " ";
427 430 $rootScope.disableSubMenu = "disableSubMenu";
428 431 $("#annotationToolBarOptions").addClass("disableSubMenu");
  432 + $rootScope.disableFileMenu = " ";
429 433 }
430 434 else {
431 435 $("#annotationToolBarOptions").removeClass("disableSubMenu");
... ... @@ -442,7 +446,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
442 446 if ($rootScope.menuLabExer == 1) {
443 447 $rootScope.disableMenuoption = " ";
444 448 }
445   -
  449 + $rootScope.disableFileMenu = "disableFileMenu";
446 450 }
447 451  
448 452 });
... ...
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
1 1 <div class="collapse navbar-collapse" id="topFixedNavbar1">
2 2 <ul class="nav navbar-nav toperMenu-spaceleft">
3   - <li class="dropdown">
  3 + <li class="dropdown" ng-class="disableFileMenu">
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 6 <li ng-class="disableSubMenu"><a href="#">Open Resources</a></li>
... ...
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
... ... @@ -916,6 +916,10 @@ cursor:pointer;
916 916 pointer-events: none;
917 917 opacity: 0.6;
918 918 }
  919 +.disableFileMenu {
  920 + pointer-events: none;
  921 + opacity: 0.6;
  922 +}
919 923  
920 924 .blankshapediv
921 925 {
... ...