ADAM / AIAHTML5

Commit 0a8da17f92270fd61c3ca63aebf4b31277e360e2

Authored by unknown
2 parents 4796657b df2bbe02

Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into erasedFunctionalityIssue

Inline Side-by-side
Showing 5 changed files with 36 additions and 41 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @0a8da17
... ... @@ -559,7 +559,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
559 559  
560 560 $('#daBodyview').css("width", $(window).outerWidth());
561 561  
562   - }, 250);
  562 + }, 350);
563 563 }
564 564  
565 565 }
... ... @@ -8609,6 +8609,8 @@ function OnIdentityClick() {
8609 8609  
8610 8610 function OnZoom()
8611 8611 {
  8612 + if ($(".btn-annotation").hasClass("activebtncolor")) //Bug #14928
  8613 + $(".btn-annotation").removeClass("activebtncolor");
8612 8614 //Dissectible Anatomy > Extract and Annotations displays apart on the page after click on Zoom-in.
8613 8615 $(".com").remove();
8614 8616 $("#bord").remove();
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @0a8da17
... ... @@ -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,
... ... @@ -411,8 +412,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
411 412 if (($location.url() == "/da-body-view")) {
412 413 $rootScope.disableMenuannotation = " ";
413 414 $rootScope.disableMenuoption = " ";
414   - $("#annotationToolBarOptions").removeClass("disableSubMenu");
415   -
  415 + $rootScope.disableSubMenu = "disableSubMenu";
  416 + $rootScope.disableFileMenu = " ";
416 417 }
417 418 else if ($location.url() == "/clinical-illustrations-detail")
418 419 {
... ... @@ -420,6 +421,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
420 421 $rootScope.disableMenuoption = " ";
421 422 $rootScope.disableSubMenu = "disableSubMenu";
422 423 $("#annotationToolBarOptions").removeClass("disableSubMenu");
  424 + $rootScope.disableFileMenu = " ";
423 425 }
424 426 else if($location.url() == "/clinical-animations-detail")
425 427 {
... ... @@ -427,6 +429,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
427 429 $rootScope.disableMenuoption = " ";
428 430 $rootScope.disableSubMenu = "disableSubMenu";
429 431 $("#annotationToolBarOptions").addClass("disableSubMenu");
  432 + $rootScope.disableFileMenu = " ";
430 433 }
431 434 else {
432 435 $("#annotationToolBarOptions").removeClass("disableSubMenu");
... ... @@ -443,7 +446,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
443 446 if ($rootScope.menuLabExer == 1) {
444 447 $rootScope.disableMenuoption = " ";
445 448 }
446   -
  449 + $rootScope.disableFileMenu = "disableFileMenu";
447 450 }
448 451  
449 452 });
... ... @@ -2812,8 +2815,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
2812 2815 //$("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
2813 2816 //$('#termList option[value="' + $rootScope.SelectedTermList + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" });
2814 2817  
2815   - $("#optionsListManagerTab").addClass("active");
  2818 +
2816 2819 }
  2820 + $("#optionsListManagerTab").addClass("active");
2817 2821 }
2818 2822  
2819 2823 $rootScope.CloseListManager = function () {
... ... @@ -3108,9 +3112,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3108 3112 $('#snipImage').attr('src', dataURL);
3109 3113  
3110 3114 $('#spnModule').text($rootScope.currentActiveModuleTitle);
3111   - $('#spnPosture').text(localStorage.getItem('currentViewTitle'));
  3115 + $('#spnBodyViewTitle').text(localStorage.getItem('currentViewTitle'));
3112 3116  
3113   - PrintDIVContent('printBox'); // Open Print Window
  3117 + PrintDivContentByID('printBox'); // Open Print Window
3114 3118 }
3115 3119 });
3116 3120 };
... ... @@ -3143,7 +3147,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3143 3147 document.getElementById('spnBodyViewTitlePor').innerHTML = curPosture;
3144 3148 document.getElementById('spnModuleLan').innerHTML = curModule;
3145 3149 document.getElementById('spnBodyViewTitleLan').innerHTML = curPosture;
3146   - }, 100);
  3150 + }, 320);
3147 3151 }
3148 3152  
3149 3153 $('#fileMenuAnchor').addClass('disableMenuannotation');
... ... @@ -3259,7 +3263,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3259 3263 window.frames["frame1"].focus();
3260 3264 window.frames["frame1"].print();
3261 3265 frame1.remove();
3262   - }, 250);
  3266 + }, 320);
3263 3267  
3264 3268 console.log('close')
3265 3269 }
... ... @@ -3271,21 +3275,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3271 3275 console.log('close')
3272 3276 });
3273 3277  
3274   - $rootScope.ShowPrintWindow = function () { // Print Active Viewer
3275   - html2canvas($("#canvasDiv"), {
3276   - onrendered: function (canvas) {
3277   - var dataURL = canvas.toDataURL("image/jpeg");
3278   - var imageToPrint = new Image();
3279   - imageToPrint.src = dataURL;
3280   - $('#snipImage').attr('src', dataURL);
3281   -
3282   - $('#spnModule').text($rootScope.currentActiveModuleTitle);
3283   - $('#spnBodyViewTitle').text(localStorage.getItem('currentViewTitle'));
3284   -
3285   - PrintDivContentByID('printBox'); // Open Print Window
3286   - }
3287   - });
3288   - };
3289 3278 $rootScope.restrictBodySystemList = function () {
3290 3279 var RestrictListDiv = document.getElementById("restrictListDiv");
3291 3280 if (RestrictListDiv.style.display == 'block') {
... ...
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
  View file @0a8da17
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   - <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
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @0a8da17
... ... @@ -557,7 +557,7 @@
557 557 </div>
558 558 <div class="">
559 559 <div class="col-sm-6">
560   - <h5 class="font13 bolder">Modesty Setting</h5>
  560 + <h5 class="font13 bolder">Modesty Settings</h5>
561 561 <img src="~/../content/images/common/adam-leaf.png" alt="" class="pull-left marginR5">
562 562 <div class="radio">
563 563 <label>
... ...
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @0a8da17
... ... @@ -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 {
... ...