Commit 038462615cf8b3fb2b5a8c734cbc74b547be5687

Authored by Amrita Vishnoi
2 parents 43d2d53f 2b3ceebc

Merge branch 'Develop-IPAD-MAC' into QA-IPAD-MAC

400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -290,6 +290,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -290,6 +290,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
290 } 290 }
291 //to disbale layer change slider 291 //to disbale layer change slider
292 $('.ui-slider').slider('disable'); 292 $('.ui-slider').slider('disable');
  293 +
  294 + $scope.isLoading = true;
  295 + $('#spinner').css('visibility', 'visible');
293 } 296 }
294 297
295 $scope.EnableUI = function () { 298 $scope.EnableUI = function () {
@@ -302,6 +305,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -302,6 +305,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
302 //to enable layer change slider 305 //to enable layer change slider
303 $('.ui-slider').slider('enable'); 306 $('.ui-slider').slider('enable');
304 307
  308 + $scope.isLoading = false;
  309 +
  310 + $('#spinner').css('visibility', 'hidden');
305 } 311 }
306 312
307 $scope.openView = function ($event) { 313 $scope.openView = function ($event) {
@@ -723,6 +729,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -723,6 +729,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
723 $rootScope.selectedBodySystemId = 0; 729 $rootScope.selectedBodySystemId = 0;
724 $rootScope.searchSelectedText = ''; 730 $rootScope.searchSelectedText = '';
725 }); 731 });
  732 +
  733 + var sliderVal = document.getElementById('layerChangeSlider');
  734 +
  735 + console.log('on slider initialize:' + sliderVal);
  736 +
  737 +
726 $("#layerChangeSlider").slider({ 738 $("#layerChangeSlider").slider({
727 orientation: "vertical", 739 orientation: "vertical",
728 range: "max", 740 range: "max",
@@ -730,6 +742,10 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -730,6 +742,10 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
730 value: 0, 742 value: 0,
731 slide: function (event, ui) 743 slide: function (event, ui)
732 { 744 {
  745 + var sliderVal = document.getElementById('layerChangeSlider');
  746 +
  747 + console.log('on slider slide :' + sliderVal);
  748 +
733 var layerNum; 749 var layerNum;
734 var daViewScope = angular.element(document.getElementById("daView")).scope(); 750 var daViewScope = angular.element(document.getElementById("daView")).scope();
735 layerNum = parseInt(daViewScope.totalLayers) //- parseInt(scope.layerNumber); 751 layerNum = parseInt(daViewScope.totalLayers) //- parseInt(scope.layerNumber);
@@ -913,6 +929,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -913,6 +929,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
913 $rootScope.totalLayers = dataLength - 1; 929 $rootScope.totalLayers = dataLength - 1;
914 930
915 $('#txtLayerNumber').attr('max', $rootScope.totalLayers); 931 $('#txtLayerNumber').attr('max', $rootScope.totalLayers);
  932 +
  933 + var layerChangeSliderVal = document.getElementById('layerChangeSlider');
  934 +
  935 + console.log('inside bodyViewWorker.onmessage. $rootScope.totalLayers = ' + $rootScope.totalLayers + ' #layerChangeSlider value: ' + layerChangeSliderVal);
  936 +
916 $('#layerChangeSlider').slider("option", "max", $rootScope.totalLayers); 937 $('#layerChangeSlider').slider("option", "max", $rootScope.totalLayers);
917 938
918 $scope.isBodylayerdataLoaded = true; 939 $scope.isBodylayerdataLoaded = true;
@@ -1332,9 +1353,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -1332,9 +1353,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1332 1353
1333 // $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition) 1354 // $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition)
1334 $('#canvasDiv').scrollTop(50) 1355 $('#canvasDiv').scrollTop(50)
1335 - var abc = $rootScope.BodyRegionCordinatesData; 1356 + //var abc = $rootScope.BodyRegionCordinatesData;
1336 1357
1337 - $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($scope.layerNumber)); 1358 + var sliderVal = parseInt($rootScope.totalLayers) - parseInt($scope.layerNumber);
  1359 +
  1360 + console.log('inside CalculateImageCordinates line no 1350. document.getElementById layerChangeSlider value : ' + document.getElementById('layerChangeSlider') + '$rootScope.totalLayers: ' + $rootScope.totalLayers + '- parseInt($scope.layerNumber)' + parseInt($scope.layerNumber) + 'set value: ' + sliderVal);
  1361 +
  1362 + $('#layerChangeSlider').slider("option", "value",sliderVal );
  1363 +
  1364 +
1338 // $('#spinner').css('visibility', 'hidden'); 1365 // $('#spinner').css('visibility', 'hidden');
1339 $rootScope.isLoading = false; 1366 $rootScope.isLoading = false;
1340 //Dated:16-07-2016 Issue #4957 :While selecting the Zoom-in\Zoom-out button scroll should be go on top. 1367 //Dated:16-07-2016 Issue #4957 :While selecting the Zoom-in\Zoom-out button scroll should be go on top.
@@ -3611,7 +3638,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -3611,7 +3638,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3611 3638
3612 } 3639 }
3613 3640
3614 - 3641 + else {
  3642 + $scope.EnableUI();
  3643 + }
3615 }) 3644 })
3616 3645
3617 } 3646 }
@@ -3659,7 +3688,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -3659,7 +3688,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3659 } 3688 }
3660 } 3689 }
3661 3690
3662 - $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($scope.layerNumber)); 3691 + var sliderVal = parseInt($rootScope.totalLayers) - parseInt($scope.layerNumber);
  3692 +
  3693 + console.log('inside CalculateImageCordinates. document.getElementById layerChangeSlider value : ' + document.getElementById('layerChangeSlider') + '$rootScope.totalLayers: ' + $rootScope.totalLayers + '- parseInt($scope.layerNumber) ' + parseInt($scope.layerNumber) + 'set value: ' + sliderVal);
  3694 +
  3695 +
  3696 + $('#layerChangeSlider').slider("option", "value", sliderVal);
3663 3697
3664 // Annotations Closing Code 3698 // Annotations Closing Code
3665 3699
@@ -4390,8 +4424,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -4390,8 +4424,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
4390 4424
4391 4425
4392 $('#btnTranparency').addClass('tButtonActive'); 4426 $('#btnTranparency').addClass('tButtonActive');
4393 - $('#btnIdentity').removeClass(' btn-primary');  
4394 - $('#btnIdentity').addClass('btn-black'); 4427 + $('#btnIdentify').removeClass(' btn-primary');
  4428 + $('#btnIdentify').addClass('btn-black');
4395 4429
4396 var canvasDiv = document.getElementById('canvasDiv'); 4430 var canvasDiv = document.getElementById('canvasDiv');
4397 $scope.verticalScrollPosition = canvasDiv.scrollTop; 4431 $scope.verticalScrollPosition = canvasDiv.scrollTop;
@@ -4494,8 +4528,13 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -4494,8 +4528,13 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
4494 4528
4495 4529
4496 //Dated:19-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected. 4530 //Dated:19-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected.
4497 - if ($("#txtlayerNumber").val() != 0 && $rootScope.currentLayerNumber != undefined) {  
4498 - $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($rootScope.currentLayerNumber)); 4531 + if ($("#txtlayerNumber").val() != 0 && $rootScope.currentLayerNumber != undefined) {
  4532 +
  4533 + var sliderVal = parseInt($rootScope.totalLayers) - parseInt($rootScope.currentLayerNumber);
  4534 + console.log('inside mouseDownListener. document.getElementById layerChangeSlider value : ' + document.getElementById('layerChangeSlider') + '$rootScope.totalLayers: ' + $rootScope.totalLayers + ' - $rootScope.currentLayerNumber: ' + $rootScope.currentLayerNumber + ' = set value for layerChangeSlider: ' + sliderVal);
  4535 +
  4536 + $('#layerChangeSlider').slider("option", "value", sliderVal);
  4537 +
4499 $("#txtlayerNumber").val(parseInt($rootScope.currentLayerNumber)); 4538 $("#txtlayerNumber").val(parseInt($rootScope.currentLayerNumber));
4500 } 4539 }
4501 4540
@@ -4792,8 +4831,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -4792,8 +4831,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
4792 //Dated:18-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected. 4831 //Dated:18-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected.
4793 $('#btnTranparency').removeClass('tButtonActive'); 4832 $('#btnTranparency').removeClass('tButtonActive');
4794 $('#btnTranparency').addClass('btn-black'); 4833 $('#btnTranparency').addClass('btn-black');
4795 - $('#btnIdentity').removeClass('btn-black');  
4796 - $('#btnIdentity').addClass('btn-primary'); 4834 + $('#btnIdentify').removeClass('btn-black');
  4835 + $('#btnIdentify').addClass('btn-primary');
4797 4836
4798 // clear canvas before drawing transparency box 4837 // clear canvas before drawing transparency box
4799 if ($rootScope.isAnnotationWindowOpen == true) { 4838 if ($rootScope.isAnnotationWindowOpen == true) {
@@ -5903,7 +5942,14 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -5903,7 +5942,14 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
5903 if (TBStartX <= bodyRegionRight && value.X <= TBRight && TBStartY <= bodyRegionBottom && value.Y <= TBBottom) { 5942 if (TBStartX <= bodyRegionRight && value.X <= TBRight && TBStartY <= bodyRegionBottom && value.Y <= TBBottom) {
5904 5943
5905 if ($scope.isTBDrawnOnBodyRegion == false) { 5944 if ($scope.isTBDrawnOnBodyRegion == false) {
5906 - $scope.layerNumber = $scope.layerNumber + 1; 5945 +
  5946 +
  5947 + if ($scope.layerNumber < $rootScope.totalLayers) {
  5948 +
  5949 + $scope.layerNumber = $scope.layerNumber + 1;
  5950 +
  5951 + }
  5952 +
5907 } 5953 }
5908 5954
5909 if (value.bodyRegionId == '3') { 5955 if (value.bodyRegionId == '3') {
@@ -6626,9 +6672,11 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -6626,9 +6672,11 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6626 //txtTransparencyChange.value = 0; 6672 //txtTransparencyChange.value = 0;
6627 // document.getElementById('txtLayerNumber').value = 0; 6673 // document.getElementById('txtLayerNumber').value = 0;
6628 6674
  6675 + var sliderVal = parseInt($rootScope.totalLayers) - parseInt($rootScope.currentLayerNumber);
6629 6676
  6677 + console.log('inside mouseDownListener. document.getElementById layerChangeSlider value : ' + document.getElementById('layerChangeSlider') + '$rootScope.totalLayers: ' + $rootScope.totalLayers + ' - $rootScope.currentLayerNumber: ' + $rootScope.currentLayerNumber + ' = set value for layerChangeSlider: ' + sliderVal);
6630 6678
6631 - $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($rootScope.currentLayerNumber)); 6679 + $('#layerChangeSlider').slider("option", "value", sliderVal);
6632 //if ($scope.isGenderChnage || $rootScope.isViewChange) { 6680 //if ($scope.isGenderChnage || $rootScope.isViewChange) {
6633 // $("#txtlayerNumber").val(parseInt(0)); 6681 // $("#txtlayerNumber").val(parseInt(0));
6634 //} 6682 //}
@@ -6678,9 +6726,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -6678,9 +6726,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6678 // document.getElementById('btnTranparency').className = 't-transparency' 6726 // document.getElementById('btnTranparency').className = 't-transparency'
6679 $('#btnTranparency').removeClass('tButtonActive'); 6727 $('#btnTranparency').removeClass('tButtonActive');
6680 $('#btnTranparency').addClass('btn-black'); 6728 $('#btnTranparency').addClass('btn-black');
6681 - $('#btnIdentity').removeClass('btn-black'); 6729 + $('#btnIdentify').removeClass('btn-black');
6682 6730
6683 - $('#btnIdentity').addClass('btn-primary'); 6731 + $('#btnIdentify').addClass('btn-primary');
6684 6732
6685 document.getElementById('btnTranparency').removeEventListener("click", $scope.createTransparencyBox); 6733 document.getElementById('btnTranparency').removeEventListener("click", $scope.createTransparencyBox);
6686 6734
@@ -6771,14 +6819,14 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -6771,14 +6819,14 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6771 }; 6819 };
6772 6820
6773 6821
6774 - $scope.IdentityClick = function () { 6822 + $scope.IdentifyClick = function () {
6775 6823
6776 6824
6777 //if listanager is visisble then close it 6825 //if listanager is visisble then close it
6778 6826
6779 $rootScope.isListManagerSelected = false; 6827 $rootScope.isListManagerSelected = false;
6780 $rootScope.CloseListManager(); 6828 $rootScope.CloseListManager();
6781 - // $('#btnIdentity').addClass('btn-primary'); 6829 + // $('#btnIdentify').addClass('btn-primary');
6782 6830
6783 if ($scope.isTransparencyBtnClicked == true) { 6831 if ($scope.isTransparencyBtnClicked == true) {
6784 6832
@@ -6792,6 +6840,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -6792,6 +6840,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6792 canvasDiv.removeEventListener("mouseup", mouseUpListener) 6840 canvasDiv.removeEventListener("mouseup", mouseUpListener)
6793 $('#btnTranparency').removeClass('tButtonActive'); 6841 $('#btnTranparency').removeClass('tButtonActive');
6794 $('#btnTranparency').addClass('btn-black'); 6842 $('#btnTranparency').addClass('btn-black');
  6843 +
  6844 + $("#btnExtract").removeClass("disabled");
  6845 + $("#btnExtract").css("pointer-events", "auto");
6795 } 6846 }
6796 6847
6797 } 6848 }
@@ -7510,7 +7561,12 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -7510,7 +7561,12 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
7510 $scope.isLoading = true; 7561 $scope.isLoading = true;
7511 $('#spinner').css('visibility', 'visible'); 7562 $('#spinner').css('visibility', 'visible');
7512 7563
7513 - $scope.HighlightBodyByTermList($scope.AllTerms) 7564 + if ($scope.AllTerms != undefined && $scope.AllTerms.length > 0) {
  7565 + $scope.HighlightBodyByTermList($scope.AllTerms);
  7566 + }
  7567 + else {
  7568 + $scope.EnableUI();
  7569 + }
7514 }, 800); 7570 }, 800);
7515 7571
7516 } 7572 }
@@ -7999,6 +8055,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -7999,6 +8055,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
7999 $rootScope.totalLayers = dataLength - 1; 8055 $rootScope.totalLayers = dataLength - 1;
8000 8056
8001 $('#txtLayerNumber').attr('max', $rootScope.totalLayers); 8057 $('#txtLayerNumber').attr('max', $rootScope.totalLayers);
  8058 +
  8059 + console.log('inside DataService.getJson. document.getElementById layerChangeSlider value : ' + document.getElementById('layerChangeSlider') + 'set value: ' + $rootScope.totalLayers);
  8060 +
8002 $('#layerChangeSlider').slider("option", "max", $rootScope.totalLayers); 8061 $('#layerChangeSlider').slider("option", "max", $rootScope.totalLayers);
8003 8062
8004 //set max for LayerNumber input 8063 //set max for LayerNumber input
@@ -8016,7 +8075,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -8016,7 +8075,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
8016 8075
8017 //if user seelcted any term and serached before gender cnage then itshould be highlighted in chnaged gender 8076 //if user seelcted any term and serached before gender cnage then itshould be highlighted in chnaged gender
8018 8077
8019 - if ((($rootScope.isListManagerSelected == true) || 8078 + if ((($rootScope.isListManagerSelected == true) || $rootScope.isListManagerAlreadySelected == true ||
8020 ($rootScope.isHighLight == true && $rootScope.previousHighlightList != null 8079 ($rootScope.isHighLight == true && $rootScope.previousHighlightList != null
8021 && $rootScope.previousHighlightList.length > 0)) 8080 && $rootScope.previousHighlightList.length > 0))
8022 && (($rootScope.isGenderChnage == true) || $rootScope.isViewChange == true)) { 8081 && (($rootScope.isGenderChnage == true) || $rootScope.isViewChange == true)) {
@@ -8027,8 +8086,21 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -8027,8 +8086,21 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
8027 else if ($rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0 && 8086 else if ($rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0 &&
8028 ($rootScope.isGenderChnage == true || $rootScope.isViewChange == true)) { 8087 ($rootScope.isGenderChnage == true || $rootScope.isViewChange == true)) {
8029 8088
8030 - $rootScope.isHighLight = true  
8031 - $scope.setLayerNumberAndHighlightByTermList(); 8089 + $scope.AllTerms = [];
  8090 + $rootScope.isHighLight = true;
  8091 +
  8092 + if ($rootScope.TermNumberData != undefined) {
  8093 + $scope.TermList = $scope.getTermNumberList($rootScope.actualTermNumber);
  8094 + if ($scope.TermList != null && $scope.TermList.length>0) {
  8095 + $scope.setLayerNumberAndHighlightByTermList();
  8096 + }
  8097 + else {
  8098 + //actual term number is not found in thsi view menas previously selected body part does not exist in this view
  8099 + // $scope.EnableUI();
  8100 + $scope.CalculateImageCordinates($rootScope.viewOrientationId)
  8101 + }
  8102 + }
  8103 +
8032 } 8104 }
8033 8105
8034 else { 8106 else {
@@ -8722,77 +8794,83 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -8722,77 +8794,83 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
8722 8794
8723 8795
8724 $scope.ShowSearch = function () { 8796 $scope.ShowSearch = function () {
8725 -  
8726 - var primaryLexiconIndex;  
8727 - for (var i = 0; i <= $rootScope.vocabTermDataArray.length - 1; i++) {  
8728 - if ($rootScope.vocabTermDataArray[i].language == $rootScope.lexiconLanguageArray[0].language) {  
8729 - primaryLexiconIndex = i; 8797 + if (($rootScope.vocabTermDataArray != null || $rootScope.vocabTermDataArray != undefined) && ($rootScope.vocabTermDataArray.length > 0)) {
  8798 + var primaryLexiconIndex;
  8799 + for (var i = 0; i <= $rootScope.vocabTermDataArray.length - 1; i++) {
  8800 + if ($rootScope.vocabTermDataArray[i].language == $rootScope.lexiconLanguageArray[0].language) {
  8801 + primaryLexiconIndex = i;
  8802 + }
8730 } 8803 }
8731 - }  
8732 - console.log('ShowSearch is called');  
8733 - //this check is for log only because we are writing length so need to check if its not null or undefined  
8734 - if ($rootScope.vocabTermDataArray[primaryLexiconIndex].vocabTermTxt != null || $rootScope.vocabTermDataArray[primaryLexiconIndex].vocabTermTxt != undefined)  
8735 - console.log('$scope.VocabTermTxt.length= ' + $rootScope.vocabTermDataArray[primaryLexiconIndex].vocabTermTxt.length) 8804 + console.log('ShowSearch is called');
  8805 + //this check is for log only because we are writing length so need to check if its not null or undefined
  8806 + if ($rootScope.vocabTermDataArray[primaryLexiconIndex].vocabTermTxt != null || $rootScope.vocabTermDataArray[primaryLexiconIndex].vocabTermTxt != undefined)
  8807 + console.log('$scope.VocabTermTxt.length= ' + $rootScope.vocabTermDataArray[primaryLexiconIndex].vocabTermTxt.length)
8736 8808
8737 - $timeout(function () {  
8738 -  
8739 - if (($rootScope.vocabTermDataArray[primaryLexiconIndex].vocabTermTxt != null || $rootScope.vocabTermDataArray[primaryLexiconIndex].vocabTermTxt != undefined) && ($rootScope.vocabTermDataArray[0].vocabTermTxt.length > 0)) {  
8740 - //This is added as the $scope.VocabTermTxt can change while changing view also the li elements need to be removed  
8741 - //Remove the list and then Repopulate  
8742 - if ($('#searchListDiv').html() != "")  
8743 - $('#searchListDiv').empty()  
8744 - //Delay compile of ul li so that the remove of li is completed.  
8745 - $timeout(function () {  
8746 - console.log("INSIDE WATCH. LIST IS CREATED");  
8747 - $scope.isSearchDataLoaded = true; 8809 + $timeout(function () {
8748 8810
8749 - if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) { 8811 + if (($rootScope.vocabTermDataArray[primaryLexiconIndex].vocabTermTxt != null || $rootScope.vocabTermDataArray[primaryLexiconIndex].vocabTermTxt != undefined) && ($rootScope.vocabTermDataArray[0].vocabTermTxt.length > 0)) {
  8812 + //This is added as the $scope.VocabTermTxt can change while changing view also the li elements need to be removed
  8813 + //Remove the list and then Repopulate
  8814 + if ($('#searchListDiv').html() != "")
  8815 + $('#searchListDiv').empty()
  8816 + //Delay compile of ul li so that the remove of li is completed.
  8817 + $timeout(function () {
  8818 + console.log("INSIDE WATCH. LIST IS CREATED");
  8819 + $scope.isSearchDataLoaded = true;
8750 8820
8751 - if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && ($scope.ColoredImageSRC.length == 9)) {  
8752 - $rootScope.isLoading = false;  
8753 - $('#spinner').css('visibility', 'hidden');  
8754 - }  
8755 - else if ((($rootScope.viewOrientationId == '2') || ($rootScope.viewOrientationId == '3')) && ($scope.ColoredImageSRC.length == 5)) {  
8756 - $rootScope.isLoading = false;  
8757 - $('#spinner').css('visibility', 'hidden');  
8758 - }  
8759 - else if (($rootScope.viewOrientationId == '5') && ($scope.ColoredImageSRC.length == 4)) {  
8760 - $rootScope.isLoading = false;  
8761 - $('#spinner').css('visibility', 'hidden');  
8762 - }  
8763 - else if (($rootScope.viewOrientationId == '6') && ($scope.ColoredImageSRC.length == 1)) {  
8764 - $rootScope.isLoading = false;  
8765 - $('#spinner').css('visibility', 'hidden'); 8821 + if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) {
  8822 +
  8823 + if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && ($scope.ColoredImageSRC.length == 9)) {
  8824 + $rootScope.isLoading = false;
  8825 + $('#spinner').css('visibility', 'hidden');
  8826 + }
  8827 + else if ((($rootScope.viewOrientationId == '2') || ($rootScope.viewOrientationId == '3')) && ($scope.ColoredImageSRC.length == 5)) {
  8828 + $rootScope.isLoading = false;
  8829 + $('#spinner').css('visibility', 'hidden');
  8830 + }
  8831 + else if (($rootScope.viewOrientationId == '5') && ($scope.ColoredImageSRC.length == 4)) {
  8832 + $rootScope.isLoading = false;
  8833 + $('#spinner').css('visibility', 'hidden');
  8834 + }
  8835 + else if (($rootScope.viewOrientationId == '6') && ($scope.ColoredImageSRC.length == 1)) {
  8836 + $rootScope.isLoading = false;
  8837 + $('#spinner').css('visibility', 'hidden');
  8838 + }
8766 } 8839 }
8767 - }  
8768 8840
8769 - }, 500);  
8770 - $scope.IsSearchVisible = true;  
8771 - console.log("s" + $rootScope.vocabTermDataArray[primaryLexiconIndex].language);  
8772 - $rootScope.a = primaryLexiconIndex;  
8773 - var $e2 = $('<ul id="termlistfilter" class="form-control dropdown-menu" style="height:90px;width:100%;overflow-y:scroll;position:absolute;display:none;z-index:60001;"><li ng-repeat="item in vocabTermDataArray[a].vocabTermTxt| filter:{ _TermText: searchFilter}">' +  
8774 - '<a id="{{item._ActualTermNumber}}" href="" onclick="selectTerm(event)">{{item._TermText}}</a>' +  
8775 - ' </li></ul>').appendTo('#searchListDiv')  
8776 - $compile($e2)($scope);  
8777 - document.getElementById("termlistfilter").style.display = "block";  
8778 - $timeout(function () {  
8779 - $rootScope.searchListArray = [];  
8780 - $("#backdrop > #searchListDiv > #termlistfilter > li").each(function (key, value) {  
8781 - $rootScope.searchListArray.push({ "name": $(this).find("a").html(), "id": $(this).find("a").attr("id") });  
8782 - });  
8783 - }, 100);  
8784 -  
8785 - }  
8786 - else {  
8787 - $rootScope.loadSearchData();  
8788 - if ($rootScope.vocabTermDataArray[primaryLexiconIndex].vocabTermTxt.length > 0) {  
8789 - $scope.ShowSearch();  
8790 - }  
8791 - }  
8792 - }, 500); 8841 + }, 500);
  8842 + $scope.IsSearchVisible = true;
  8843 + console.log("s" + $rootScope.vocabTermDataArray[primaryLexiconIndex].language);
  8844 + $rootScope.a = primaryLexiconIndex;
  8845 + var $e2 = $('<ul id="termlistfilter" class="form-control dropdown-menu" style="height:90px;width:100%;overflow-y:scroll;position:absolute;display:none;z-index:60001;"><li ng-repeat="item in vocabTermDataArray[a].vocabTermTxt| filter:{ _TermText: searchFilter}">' +
  8846 + '<a id="{{item._ActualTermNumber}}" href="" onclick="selectTerm(event)">{{item._TermText}}</a>' +
  8847 + ' </li></ul>').appendTo('#searchListDiv')
  8848 + $compile($e2)($scope);
  8849 + document.getElementById("termlistfilter").style.display = "block";
  8850 + $timeout(function () {
  8851 + $rootScope.searchListArray = [];
  8852 + $("#backdrop > #searchListDiv > #termlistfilter > li").each(function (key, value) {
  8853 + $rootScope.searchListArray.push({ "name": $(this).find("a").html(), "id": $(this).find("a").attr("id") });
  8854 + });
  8855 + }, 100);
8793 8856
8794 - 8857 + }
  8858 + else {
  8859 + $rootScope.loadSearchData();
  8860 + if ($rootScope.vocabTermDataArray[primaryLexiconIndex].vocabTermTxt.length > 0) {
  8861 + $scope.ShowSearch();
  8862 + }
  8863 + }
  8864 + }, 500);
8795 8865
  8866 + }
  8867 + else
  8868 + {
  8869 + $rootScope.loadSearchData();
  8870 + $scope.ShowSearch();
  8871 +
  8872 +
  8873 + }
8796 } 8874 }
8797 8875
8798 8876
@@ -9080,6 +9158,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -9080,6 +9158,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9080 } 9158 }
9081 9159
9082 $scope.setLayerNumberAndHighlightByTermList = function () { 9160 $scope.setLayerNumberAndHighlightByTermList = function () {
  9161 +
9083 console.log(' $scope.actualTermNumber insde setLayerNumberAndHighlightByTermList= ' + $rootScope.actualTermNumber) 9162 console.log(' $scope.actualTermNumber insde setLayerNumberAndHighlightByTermList= ' + $rootScope.actualTermNumber)
9084 9163
9085 $scope.TermList = $scope.getTermNumberList($rootScope.actualTermNumber); 9164 $scope.TermList = $scope.getTermNumberList($rootScope.actualTermNumber);
@@ -9094,6 +9173,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -9094,6 +9173,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9094 } 9173 }
9095 9174
9096 internalLayerNumberList.sort(function (a, b) { return a - b }) 9175 internalLayerNumberList.sort(function (a, b) { return a - b })
  9176 +
9097 var internalLayerNumber = internalLayerNumberList[0]//.replace('00', ''); 9177 var internalLayerNumber = internalLayerNumberList[0]//.replace('00', '');
9098 9178
9099 //3. get layer number 9179 //3. get layer number
@@ -9152,7 +9232,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -9152,7 +9232,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9152 //7.get termList 9232 //7.get termList
9153 $scope.fullTermlist = []; 9233 $scope.fullTermlist = [];
9154 $scope.AllTerms = []; 9234 $scope.AllTerms = [];
9155 - 9235 + console.log("initialised");
9156 if (termNo != DA[0].figLeafTermId) { 9236 if (termNo != DA[0].figLeafTermId) {
9157 9237
9158 $scope.getChildTermList(termNo); 9238 $scope.getChildTermList(termNo);
@@ -9180,7 +9260,11 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -9180,7 +9260,11 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9180 } 9260 }
9181 9261
9182 $('#txtlayerNumber').val((parseInt($scope.layerNumber))); 9262 $('#txtlayerNumber').val((parseInt($scope.layerNumber)));
9183 - $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($scope.layerNumber)); 9263 +
  9264 + var sliderVal = parseInt($rootScope.totalLayers) - parseInt($scope.layerNumber);
  9265 + console.log('inside setLayerNumberAndHighlightByTermList. document.getElementById layerChangeSlider value : ' + document.getElementById('layerChangeSlider') + '$rootScope.totalLayers: ' + $rootScope.totalLayers + ' - parseInt($scope.layerNumber): ' + parseInt($scope.layerNumber) + ' = set value for layerChangeSlider: ' + sliderVal);
  9266 +
  9267 + $('#layerChangeSlider').slider("option", "value",sliderVal );
9184 9268
9185 //8.remove current layer canavses 9269 //8.remove current layer canavses
9186 // $scope.flushCanvas(); 9270 // $scope.flushCanvas();
@@ -9238,6 +9322,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -9238,6 +9322,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9238 var isFound = jQuery.inArray(serachTerm, $scope.fullTermlist) 9322 var isFound = jQuery.inArray(serachTerm, $scope.fullTermlist)
9239 if (isFound == -1) { 9323 if (isFound == -1) {
9240 $scope.fullTermlist.push(serachTerm); 9324 $scope.fullTermlist.push(serachTerm);
  9325 + console.log("psudhed in getChildTermList")
9241 $scope.AllTerms.push({ '_TermNumber': serachTerm }) 9326 $scope.AllTerms.push({ '_TermNumber': serachTerm })
9242 $scope.getChildTermList(serachTerm); 9327 $scope.getChildTermList(serachTerm);
9243 } 9328 }
@@ -9265,6 +9350,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -9265,6 +9350,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9265 if ((data2 != null || data2 != undefined) && (data2.length > 0)) { 9350 if ((data2 != null || data2 != undefined) && (data2.length > 0)) {
9266 for (var i = 0; i < data2.length; i++) { 9351 for (var i = 0; i < data2.length; i++) {
9267 $scope.fullTermlist.push(data2[i]._TermNumber); 9352 $scope.fullTermlist.push(data2[i]._TermNumber);
  9353 + console.log("psudhed in getSiblings")
  9354 +
9268 $scope.AllTerms.push({ '_TermNumber': data2[i]._TermNumber }) 9355 $scope.AllTerms.push({ '_TermNumber': data2[i]._TermNumber })
9269 $scope.getChildTermList(data2[i]._TermNumber); 9356 $scope.getChildTermList(data2[i]._TermNumber);
9270 } 9357 }
@@ -9693,11 +9780,11 @@ function OnEnableHighlight() { @@ -9693,11 +9780,11 @@ function OnEnableHighlight() {
9693 }); 9780 });
9694 } 9781 }
9695 9782
9696 -function OnIdentityClick() {  
9697 - console.log('OnIdentityClick is called outside '); 9783 +function OnIdentifyClick() {
  9784 + console.log('OnIdentifyClick is called outside ');
9698 var scope = angular.element(document.getElementById("daView")).scope(); 9785 var scope = angular.element(document.getElementById("daView")).scope();
9699 scope.$apply(function () { 9786 scope.$apply(function () {
9700 - scope.IdentityClick(); 9787 + scope.IdentifyClick();
9701 }); 9788 });
9702 } 9789 }
9703 9790
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -1716,49 +1716,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -1716,49 +1716,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
1716 var btneraseBrushSizeValue = $("#btnBrushSize").val(); 1716 var btneraseBrushSizeValue = $("#btnBrushSize").val();
1717 $('#canvasPaint').sketch(); 1717 $('#canvasPaint').sketch();
1718 $rootScope.eraseshapeSize = parseInt(btneraseBrushSizeValue); 1718 $rootScope.eraseshapeSize = parseInt(btneraseBrushSizeValue);
1719 - $.sketch.tools.marker = {  
1720 - onEvent: function (e) {  
1721 - switch (e.type) {  
1722 - case 'mousedown':  
1723 - case 'touchstart':  
1724 - if (this.painting) {  
1725 - this.stopPainting();  
1726 - }  
1727 - this.startPainting();  
1728 - break;  
1729 - case 'mouseup':  
1730 - case 'mouseout':  
1731 - case 'mouseleave':  
1732 - case 'touchend':  
1733 - case 'touchcancel':  
1734 - this.stopPainting();  
1735 - }  
1736 - if (this.painting) {  
1737 - this.action.events.push({  
1738 - x: e.pageX - this.canvas.offset().left,  
1739 - y: e.pageY - this.canvas.offset().top,  
1740 - event: e.type  
1741 - });  
1742 - return this.redraw();  
1743 - }  
1744 - },  
1745 - draw: function (action) {  
1746 - var event, previous, _i, _len, _ref;  
1747 - this.context.lineJoin = "round";  
1748 - this.context.lineCap = "round";  
1749 - this.context.beginPath();  
1750 - this.context.moveTo(action.events[0].x, action.events[0].y);  
1751 - _ref = action.events;  
1752 - for (_i = 0, _len = _ref.length; _i < _len; _i++) {  
1753 - event = _ref[_i];  
1754 - this.context.lineTo(event.x, event.y);  
1755 - previous = event;  
1756 - }  
1757 - this.context.strokeStyle = action.color;  
1758 - this.context.lineWidth = action.size;  
1759 - return this.context.stroke();  
1760 - }  
1761 - }; 1719 +
1762 $("#annotationpainteraser").attr("data-size", $rootScope.eraseshapeSize); 1720 $("#annotationpainteraser").attr("data-size", $rootScope.eraseshapeSize);
1763 return $.sketch.tools.eraser = { 1721 return $.sketch.tools.eraser = {
1764 onEvent: function (e) { 1722 onEvent: function (e) {
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
@@ -491,10 +491,12 @@ AIA.constant(&quot;UserModules&quot;, [ @@ -491,10 +491,12 @@ AIA.constant(&quot;UserModules&quot;, [
491 "slug": "Link/aod" 491 "slug": "Link/aod"
492 } 492 }
493 ]); 493 ]);
  494 +
494 AIA.constant("AIAConstants", { 495 AIA.constant("AIAConstants", {
495 496
496 "NO_BODY_SYSTEM_AVAILABLE": "Selected body system is not available on this layer.", 497 "NO_BODY_SYSTEM_AVAILABLE": "Selected body system is not available on this layer.",
497 }) 498 })
  499 +
498 AIA.config(function ($routeProvider, pages, $locationProvider) { 500 AIA.config(function ($routeProvider, pages, $locationProvider) {
499 501
500 $locationProvider.html5Mode(true); 502 $locationProvider.html5Mode(true);
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
@@ -139,7 +139,7 @@ @@ -139,7 +139,7 @@
139 <div class="toggle-icon toggleBar toggleHeadingButton" title="Show/Hide Sidebar" style="top:20px;"></div> 139 <div class="toggle-icon toggleBar toggleHeadingButton" title="Show/Hide Sidebar" style="top:20px;"></div>
140 <div class="" style="top:20px"> 140 <div class="" style="top:20px">
141 <div class="col-xs-6"> 141 <div class="col-xs-6">
142 - <button id="btnIdentity" onclick="OnIdentityClick()" class="btn btn-primary btn-sm tooltip-custom" data-toggle="tooltip" data-placement="bottom" title="Identify"> <img src="content/images/icon-identity.png" alt=""></button> 142 + <button id="btnIdentify" onclick="OnIdentifyClick()" class="btn btn-primary btn-sm tooltip-custom" data-toggle="tooltip" data-placement="bottom" title="Identify"> <img src="content/images/icon-identity.png" alt=""></button>
143 </div> 143 </div>
144 <div class="col-xs-6 pull-right"> 144 <div class="col-xs-6 pull-right">
145 <button class="btn btn-black btn-sm pull-right tooltip-custom" onclick="OnZoom()" id="btnZoom" data-toggle="tooltip" data-placement="bottom" title="Zoom-in/Zoom-out"> 145 <button class="btn btn-black btn-sm pull-right tooltip-custom" onclick="OnZoom()" id="btnZoom" data-toggle="tooltip" data-placement="bottom" title="Zoom-in/Zoom-out">
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
53 </ul> 53 </ul>
54 <ul class="nav navbar-nav navbar-right"> 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 - <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> 56 + <li class="hidden-xs marginR5 logOut" 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 <div id="imaginary_container"> 58 <div id="imaginary_container">
59 <div class="input-group stylish-input-group paddTop5 hidden-sm"> 59 <div class="input-group stylish-input-group paddTop5 hidden-sm">
400-SOURCECODE/AIAHTML5.Web/index.html
@@ -605,7 +605,7 @@ @@ -605,7 +605,7 @@
605 </form> 605 </form>
606 </div> 606 </div>
607 </div> 607 </div>
608 - <div id="setting-spinner" style="display:none;position: fixed; top: 50%; left: 50%; margin-left: -50px; z-index: 1234; overflow: auto; width: 100px;"> 608 + <div id="setting-spinner" style="display:none;position: fixed; top: 50%; left: 50%; margin-left: -50px; z-index: 15000; overflow: auto; width: 100px;">
609 <img id="img-spinner" src="content/images/common/loading.gif" alt="Loading"> 609 <img id="img-spinner" src="content/images/common/loading.gif" alt="Loading">
610 </div> 610 </div>
611 <!--Annotation Modal--> 611 <!--Annotation Modal-->
400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js
@@ -1667,7 +1667,7 @@ console.log(&quot;jsPanel version: &quot; + jsPanel.version); @@ -1667,7 +1667,7 @@ console.log(&quot;jsPanel version: &quot; + jsPanel.version);
1667 // jsPanel close 1667 // jsPanel close
1668 $('.jsPanel-btn-close', jsP).on('click', function (e) { 1668 $('.jsPanel-btn-close', jsP).on('click', function (e) {
1669 // alert('2') 1669 // alert('2')
1670 - //e.preventDefault(); 1670 + e.preventDefault();
1671 //if (!jsP.option.controls.confirmClose) { 1671 //if (!jsP.option.controls.confirmClose) {
1672 // jsPanel.close(jsP, jsP.parentElmtTagname); 1672 // jsPanel.close(jsP, jsP.parentElmtTagname);
1673 //} else { 1673 //} else {
400-SOURCECODE/AIAHTML5.Web/libs/sketch.js
@@ -127,7 +127,10 @@ var __slice = Array.prototype.slice; @@ -127,7 +127,10 @@ var __slice = Array.prototype.slice;
127 onEvent: function(e) { 127 onEvent: function(e) {
128 switch (e.type) { 128 switch (e.type) {
129 case 'mousedown': 129 case 'mousedown':
130 - case 'touchstart': 130 + case 'touchstart':
  131 + if (this.painting) {
  132 + this.stopPainting();
  133 + }
131 this.startPainting(); 134 this.startPainting();
132 break; 135 break;
133 case 'mouseup': 136 case 'mouseup':
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
@@ -777,7 +777,7 @@ textarea { @@ -777,7 +777,7 @@ textarea {
777 margin-left: -50px; / half width of the spinner gif / 777 margin-left: -50px; / half width of the spinner gif /
778 margin-top: -50px; / half height of the spinner gif / 778 margin-top: -50px; / half height of the spinner gif /
779 text-align: center; 779 text-align: center;
780 - z-index: 1234; 780 + z-index: 15000;
781 overflow: auto; 781 overflow: auto;
782 width: 100px; / width of the spinner gif / 782 width: 100px; / width of the spinner gif /
783 height: 102px; /*hight of the spinner gif +2px to fix IE8 issue */ 783 height: 102px; /*hight of the spinner gif +2px to fix IE8 issue */
@@ -998,10 +998,10 @@ background-size:cover; @@ -998,10 +998,10 @@ background-size:cover;
998 { 998 {
999 z-index:100000; 999 z-index:100000;
1000 } 1000 }
1001 - .GridViewDataDivHeight 1001 + /*.GridViewDataDivHeight
1002 { 1002 {
1003 height:175px; 1003 height:175px;
1004 - } 1004 + }*/
1005 1005
1006 #exportlogo 1006 #exportlogo
1007 { 1007 {
@@ -1077,6 +1077,86 @@ a[disabled] { @@ -1077,6 +1077,86 @@ a[disabled] {
1077 pointer-events : none; 1077 pointer-events : none;
1078 opacity : 0.5; 1078 opacity : 0.5;
1079 } 1079 }
  1080 +
  1081 +#exportlogo
  1082 + {
  1083 +
  1084 + bottom: 50PX;
  1085 + position: fixed;
  1086 + right: 50px;
  1087 +}
  1088 +
  1089 +
  1090 +
  1091 +.HightLightThumbnail
  1092 + {
  1093 + background: #8C8C8C!important;
  1094 + border: 1px solid #a2a2a2;
  1095 + }
  1096 +
  1097 +.activeAASystemSelect{
  1098 + background-color:#0095DA;
  1099 + color:#ffffff;
  1100 +}
  1101 +
  1102 +.activeAASystemSelect a
  1103 +{
  1104 +color:#ffffff !important;
  1105 +}
  1106 +
  1107 +.disabledSelectedSystem a, .disabledSelectedSystem > a:hover, .dropdown-menu > .disabledSelectedSystem > a:focus
  1108 + {
  1109 +
  1110 + text-decoration: none;
  1111 + background-color: transparent !important;
  1112 + background-image: none;
  1113 + cursor: not-allowed;
  1114 + color: #878787 !important;
  1115 + pointer-events:none;
  1116 +}
  1117 +
  1118 +.pl-12{padding-left:12px;}
  1119 +
  1120 +
  1121 +/*sprit images*/
  1122 +.sprit-icon button{background-image:url("/../../../content/images/aa/LeftMenu/icon-sprit.png"); background-repeat:no-repeat; width:38px; height:32px;}
  1123 +.sprit-icon button:active{background-image:url("/../../../content/images/aa/LeftMenu/icon-sprit.png"); background-repeat:no-repeat; width:38px; height:32px;}
  1124 +#hidePinBtn{background-position:10px 5px;}
  1125 +#selectedPin{background-position:15px -24px;}
  1126 +#allPinBtn{background-position:12px -105px;}
  1127 +#dropdownMenu221{background-position:10px -49px;}
  1128 +#comment-box{background-position:28px -73px; width:80px;}
  1129 +
  1130 +
  1131 +.jsPanel-btn-norm
  1132 + {
  1133 + background-image: none !important;
  1134 +}
  1135 +.modal-small
  1136 + {
  1137 +
  1138 + width : 400px !important;
  1139 +
  1140 + }
  1141 +
  1142 +li[disabled], a[disabled] {
  1143 + pointer-events: none;
  1144 +}
  1145 +a[disabled] {
  1146 + color: #aaa !important;
  1147 +}
  1148 +
  1149 +
  1150 +.aaSystemDisable
  1151 + {
  1152 + pointer-events : none;
  1153 + opacity : 0.5;
  1154 +}
  1155 +.GridViewDataDivHeight .thumbnail img
  1156 + {
  1157 + height:150px;
  1158 + }
  1159 +
1080 .loginBox input::-ms-clear{display:none;} 1160 .loginBox input::-ms-clear{display:none;}
1081 1161
1082 1162
@@ -1109,3 +1189,11 @@ a[disabled] { @@ -1109,3 +1189,11 @@ a[disabled] {
1109 table-layout:fixed; 1189 table-layout:fixed;
1110 } 1190 }
1111 1191
  1192 +
  1193 +
  1194 +.navbar-right .logOut a
  1195 + {
  1196 + padding-top : 23px;
  1197 + padding-bottom : 11px;
  1198 + line-height : 14px;
  1199 +}
1112 \ No newline at end of file 1200 \ No newline at end of file
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css.orig 0 โ†’ 100644
  1 +/***
  2 +MAIN.CSS for AIA
  3 +TO BE USED WITH CUSTOM BOOTSTRAP THEME ALREADY INCLUDED
  4 +**/
  5 +
  6 +/*** Global ***/
  7 +* {
  8 + outline: 0 !important;
  9 +}
  10 +body {
  11 + background: #383838;
  12 +}
  13 +.btn {
  14 + -webkit-transition: all .3s ease;
  15 + -ms-transition: all .3s ease;
  16 + transition: all .3s ease;
  17 +}
  18 +.btnCustom {
  19 + border: 0 !important;
  20 + padding-left: 50px;
  21 + padding-right: 50px;
  22 + min-height: 40px;
  23 +}
  24 +.btnCustom.btn-large {
  25 + width: 220px;
  26 + height: 50px;
  27 + padding-left: 0;
  28 + padding-right: 0;
  29 +}
  30 +footer {
  31 + color: #303030;
  32 + font: 12px/30px 'Open Sans';
  33 + margin-top: -30px;
  34 +}
  35 +footer.dark {
  36 + color: #ccc;
  37 + background: #303030;
  38 +}
  39 +.frameLogo {
  40 + display: block;
  41 +}
  42 +.navbar-brand {
  43 + height: 60px;
  44 + padding: 10px 15px;
  45 +}
  46 +.no-scroll {
  47 + overflow: hidden;
  48 +}
  49 +/*** Login Page ***/
  50 +.loginBg {
  51 + min-height: 100vh;
  52 + background: #303030;
  53 +}
  54 +.loginPanel {
  55 + margin: 0 0 100px;
  56 +}
  57 +.loginLogo {
  58 + margin: 20px auto;
  59 + display: block;
  60 + max-width: 360px;
  61 +}
  62 +.headerBand {
  63 + background: #818f44;
  64 + padding-bottom: 10px;
  65 + color: #fff;
  66 +}
  67 +.headerBand h1 {
  68 + font: 700 36px/1 'Open Sans';
  69 +}
  70 +.headerBand p {
  71 + font: 400 16px 'Open Sans';
  72 + letter-spacing: 0px;
  73 + word-spacing: 1px;
  74 +}
  75 +.loginBox {
  76 + max-width: 350px;
  77 + background: #666666;
  78 + margin: 30px auto 0;
  79 + border-radius: 2px;
  80 + -webkit-box-shadow: 0px 1px 3px 0px rgba(0, 0, 0, .5);
  81 + -ms-box-shadow: 0px 1px 3px 0px rgba(0, 0, 0, .5);
  82 + box-shadow: 0px 1px 3px 0px rgba(0, 0, 0, .5);
  83 + padding: 15px 0;
  84 +}
  85 +.loginBox strong {
  86 + color: #0095da;
  87 + font: 600 18px/1 'Open Sans';
  88 + padding-bottom: 10px;
  89 + display: block;
  90 +}
  91 +.loginExBtn {
  92 + max-width: 350px;
  93 + margin: 15px auto 0;
  94 +}
  95 +.loginExBtn a {
  96 + width: 48%;
  97 +}
  98 +/*** Mainframe ***/
  99 +.sidebar {
  100 + height: 100vh;
  101 + background: #222;
  102 + width: 200px;
  103 + padding-top: 90px;
  104 + overflow: auto;
  105 + position: fixed;
  106 + left: 0;
  107 + top: 0;
  108 + z-index: 1029;
  109 +}
  110 +.navbar {
  111 + border-bottom: none!important;
  112 +}
  113 +.main {
  114 + background: #383838;
  115 + margin-left: 200px;
  116 + padding-top: 51px;
  117 +}
  118 +.treeview-left {
  119 + height: 100vh;
  120 + background: #222;
  121 + width: 300px;
  122 + padding-top: 90px;
  123 + overflow: auto;
  124 + position: fixed;
  125 + left: 0;
  126 + top: 0;
  127 + z-index: 1029;
  128 +}
  129 +.main-treeview {
  130 + background: #383838;
  131 + margin-left: 300px;
  132 + padding-top: 51px;
  133 +}
  134 +.nav-sidebar a {
  135 + color: #fff; /*border-bottom:1px solid #ccc!important;*/
  136 +}
  137 +.nav-sidebar li a {
  138 + color: #fff;
  139 +}
  140 +.nav-sidebar a:hover, .nav-sidebar a:focus {
  141 + color: #fff;
  142 + background: #1B92D0!important;
  143 +}
  144 +.nav-sidebar a.active {
  145 + color: #fff;
  146 + background: #1B92D0!important;
  147 +}
  148 +.toggleBar {
  149 + margin: 0px 10px 0 0;
  150 +}
  151 +.space-left20 {
  152 + padding-left: 20px;
  153 +}
  154 +.padd-lftright25 {
  155 + padding: 0 25px;
  156 +}
  157 +.tab-content {
  158 + padding: 10px 0;
  159 +}
  160 +.space-top50 {
  161 + margin-top: 50px;
  162 +}
  163 +/*Custom ToolTip In AIA*/
  164 +.customTooltip {
  165 + background: #333 !important;
  166 + color: #fff !important;
  167 + /*opacity: 0.9 !important;*/
  168 + }
  169 +
  170 +/*.tools {
  171 + background: #eeeeee none repeat scroll 0 0;
  172 + border: 1px solid #c1c1c1;
  173 + border-top:none;
  174 + /*padding: 10px;
  175 + width:106px;
  176 + position:absolute;
  177 + left: 0;
  178 + top: 120px;
  179 + padding-top:10px;
  180 + z-index:1024;
  181 +
  182 +}*/
  183 +.tools i {
  184 + font-size: 1.4em;
  185 +}
  186 +.marginTop10 {
  187 + margin-top: 10px;
  188 +}
  189 +.marginTop2 {
  190 + margin-top: 2px;
  191 +}
  192 +.marginL2 {
  193 + margin-left: 2px!important;
  194 +}
  195 +.marginR5 {
  196 + margin-right: 5px!important;
  197 +}
  198 +.paddTop4 {
  199 + padding-top: 4px;
  200 +}
  201 +.vert_slider {
  202 + clear: both;
  203 + margin: 20px auto 30px;
  204 + width: 1rem;
  205 + pointer-events: none;
  206 +}
  207 +
  208 +.vert_slider > .ui-slider-handle {
  209 +pointer-events: auto;
  210 +/* Other settings here */
  211 +}
  212 +
  213 +#inner-anatomyPage .nav > li > a:hover {
  214 + background: #1c92d0;
  215 + color: #fff;
  216 + border-radius: 3px 3px 0 0;
  217 + border: 1px solid #1c92d0;
  218 + border-bottom: none;
  219 +}
  220 +.page-head {
  221 + background: #f3f3f3 none repeat scroll 0 0;
  222 + border-bottom: 1px solid #ffffff;
  223 + box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.19);
  224 + padding: 8px 20px;
  225 + margin-bottom: 20px;
  226 +}
  227 +.no-margin {
  228 + margin: 0!important
  229 +}
  230 +.no-padding {
  231 + padding: 0!important
  232 +}
  233 +.marginTopBtm10 {
  234 + margin: 10px 0!important
  235 +}
  236 +.page-header {
  237 + border-bottom: 0!important
  238 +}
  239 +.marginTop5 {
  240 + margin-top: 5px;
  241 +}
  242 +.paddingbtm5 {
  243 + padding-bottom: 5px;
  244 +}
  245 +.border-Btm1 {
  246 + border-bottom: 1px solid #D8D8D8;
  247 +}
  248 +.pageHeading {
  249 + background: #818d43 none repeat scroll 0 0;
  250 + padding: 0px 15px;
  251 + margin-top: 60px;
  252 + z-index: 1030;
  253 + position: fixed;
  254 + width: 100%;
  255 +}
  256 +.pageHeading h4 {
  257 + font-size: 15px;
  258 + margin: 0!important;
  259 + color: #fff;
  260 + line-height: 30px;
  261 + font-weight: 600;
  262 + text-transform: uppercase
  263 +}
  264 +.color-white {
  265 + color: #fff!important;
  266 +}
  267 +.color-green {
  268 + color: #818f44!important;
  269 +}
  270 +.btn-black {
  271 + background-color: #4b4b4b;
  272 + border-color: #3f3f3f;
  273 + color: #ffffff;
  274 +}
  275 +.btn-black:hover, .btn-black:focus {
  276 + background-color: #1B92D0;
  277 + border-color: #1B92D0;
  278 + color: #ffffff;
  279 +}
  280 +.font16 {
  281 + font-size: 1.59em!important;
  282 +}
  283 +.modal-body {
  284 + padding: 0 10px;
  285 +}
  286 +.well-popup {
  287 + margin-bottom: 10px;
  288 + padding: 5px;
  289 +}
  290 +.annotation-modal-header {
  291 + padding: 5px 10px;
  292 +}
  293 +.form-group {
  294 + margin-bottom: 7px;
  295 +}
  296 +/********Stylish Search**************/
  297 +
  298 +#imaginary_container {
  299 + margin: 8px 0!important;
  300 +}
  301 +.stylish-input-group .input-group-addon {
  302 + background: white !important;
  303 +}
  304 +.stylish-input-group .form-control {
  305 + border-right: 0;
  306 + box-shadow: 0 0 0;
  307 + border-color: #ccc;
  308 + width: 30%;
  309 + float: right;
  310 +}
  311 +.stylish-input-group button {
  312 + border: 0;
  313 + background: transparent;
  314 +}
  315 +#vertical-slider {
  316 + height: 150px;
  317 + margin-left: 30px;
  318 +}
  319 +.navbar-nav > li > a {
  320 + line-height: 30px;
  321 +}
  322 +.paddTop5 {
  323 + padding-top: 5px;
  324 +}
  325 +.mrgnBtm5 {
  326 + margin-bottom: 3px;
  327 +}
  328 +.thumbnail a {
  329 + color: #303030!important;
  330 + text-decoration: none;
  331 +}
  332 +.thumbnail a:hover {
  333 + color: #FFFFFF!important;
  334 + text-decoration: none!important;
  335 +}
  336 +.thumbnail:hover {
  337 + background: #8C8C8C!important;
  338 + border: 1px solid #a2a2a2;
  339 +}
  340 +#inner-anatomyPage .nav-tabs {
  341 + border-bottom: 1px solid #494949;
  342 +}
  343 +#inner-anatomyPage .nav-tabs li a {
  344 + color: #fff;
  345 +}
  346 +#inner-anatomyPage .nav-tabs li.active {
  347 + color: #000;
  348 +}
  349 +#inner-anatomyPage .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {
  350 + background: #1c92d0;
  351 + border: 1px solid #1c92d0;
  352 +}
  353 +.main {
  354 + margin-left: 200px;
  355 + position: relative;
  356 + transition: margin .3s ease;
  357 + margin-top: 50px;
  358 +}
  359 +.main.active {
  360 + margin-left: 0;
  361 +}
  362 +.sidebar {
  363 + left: 0px;
  364 + transition: left .3s ease;
  365 +}
  366 +.sidebar.active {
  367 + left: -200px;
  368 +}
  369 +.main-treeview {
  370 + margin-left: 290px;
  371 + position: relative;
  372 + transition: margin .3s ease;
  373 + margin-top: 50px;
  374 +}
  375 +.main-treeview.active {
  376 + margin-left: 0;
  377 +}
  378 +.treeview-left {
  379 + left: 0px;
  380 + transition: left .3s ease;
  381 +}
  382 +.treeview-left.active {
  383 + left: -290px;
  384 +}
  385 +/*.main2{margin-left:106;position: relative;transition:margin .3s ease;margin-top:60px;}
  386 +.main2.active{margin-left:0;}
  387 +.tools{left: 0px;transition:left .3s ease;}
  388 +.tools.active{left: -106px;}*/
  389 +.main2 {
  390 + background: #383838;
  391 + margin-left: 110px;
  392 + padding-top: 1px;
  393 +}
  394 +.main2 {
  395 + margin-left: 110px;
  396 + position: relative;
  397 + transition: margin .3s ease;
  398 + margin-top: 1px;
  399 +}
  400 +.main2.active {
  401 + margin-left: 0;
  402 +}
  403 +.tools {
  404 + height: 100vh;
  405 + background: #222;
  406 + width: 110px;
  407 + padding-top: 20px;
  408 + /*overflow: hidden;*/
  409 + position: absolute !important;
  410 + left: 0;
  411 +
  412 + /*nk*/
  413 + /*top: 70px;
  414 + z-index:1029;
  415 + z-index: 1029; we made this chnage because After zommin in DA the body system drop down hides under transparency code refer bug 20490 on redmine*/
  416 +}
  417 +.tools {
  418 + left: 0px;
  419 + transition: left .3s ease;
  420 +}
  421 +
  422 +.dropdown-menu {
  423 + z-index:999999;
  424 +}
  425 +
  426 +.tools.active {
  427 + left: -100px;
  428 +}
  429 +
  430 + .navbar-fixed-bottom {
  431 + z-index: 1035;
  432 +}
  433 +.navbar-fixed-top {
  434 + z-index: 100000;
  435 +}
  436 +.main .breadcrumb {
  437 + background: #3d3d3d;
  438 + border: 1px solid #494949;
  439 + margin-bottom: 10px;
  440 + padding: 0 15px; /*background-color:rgba(61,61,61,0.95);*/
  441 +}
  442 +.main-treeview .breadcrumb {
  443 + background: #3d3d3d;
  444 + border: 1px solid #494949;
  445 + margin-bottom: 10px;
  446 + padding: 10px 15px; /*background-color:rgba(61,61,61,0.95);*/
  447 +}
  448 +.main2 .breadcrumb {
  449 + background: #3d3d3d;
  450 + border: 1px solid #494949;
  451 + margin-bottom: 10px;
  452 + padding: 5px; /*background-color:rgba(61,61,61,0.95);*/
  453 +}
  454 +.main-full {
  455 + margin-top: 100px;
  456 +}
  457 +.main-full .breadcrumb {
  458 + background: #3d3d3d;
  459 + border: 1px solid #494949;
  460 + margin-bottom: 10px;
  461 + padding: 5px; /*background-color:rgba(61,61,61,0.95);*/
  462 +}
  463 +.toggleHeadingButton {
  464 + font-size: 20px;
  465 + color: #fff;
  466 + cursor: pointer;
  467 +}
  468 +.indicators {
  469 + position: absolute;
  470 + bottom: 0;
  471 + left: 0;
  472 + background: #000000;
  473 + padding: 5px;
  474 + z-index: 9999;
  475 + width: 300px;
  476 +}
  477 +.well-white {
  478 + background: #fff;
  479 + height: 100vh;
  480 + padding: 10px;
  481 +}
  482 +.leftPanel-data {
  483 + padding: 10px 10px 0 10px;
  484 +}
  485 +.dragger {
  486 + position: relative;
  487 +}
  488 +.dragger #block-1 {
  489 + position: absolute;
  490 + top: 170px;
  491 + left: 170px;
  492 + width: 200px;
  493 + height: 50px;
  494 + border: 1px solid #333;
  495 + background: #E8E8E8;
  496 +}
  497 +.dragger .drag-img1 {
  498 + position: absolute;
  499 + bottom: 0px;
  500 + left: 0;
  501 +}
  502 +.bootstrap-dialog .modal-header.bootstrap-dialog-draggable {
  503 + cursor: move;
  504 +}
  505 +.thumbnail .caption p {
  506 + overflow: hidden;
  507 + text-overflow: ellipsis;
  508 + white-space: nowrap;
  509 + /* width: 150px !important;*/
  510 + text-align: center;
  511 +}
  512 +.pos-relative {
  513 + position: relative;
  514 + float: left;
  515 +}
  516 +.toggle-icon {
  517 + position: absolute;
  518 + top: 110px;
  519 + left: 100px;
  520 + z-index: 9;
  521 + -moz-transition: left 0.5s ease;
  522 + transition: left 0.5s ease;
  523 + background: url(../../../../../content/images/icon-sidebar.png) no-repeat 0;
  524 + width: 11px;
  525 + height: 33px;
  526 +}
  527 +.active .toggle-icon {
  528 + background: url(../../../../../content/images/icon-sidebar.png) no-repeat -11px;
  529 + width: 11px;
  530 + height: 33px;
  531 +}
  532 +.toggle-icon-treeview {
  533 + position: absolute;
  534 + top: 110px;
  535 + left: 290px;
  536 + z-index: 99999;
  537 + -moz-transition: left 0.5s ease;
  538 + transition: left 0.5s ease;
  539 + background: url(../../../../../content/images/icon-sidebar.png) no-repeat 0;
  540 + width: 11px;
  541 + height: 33px;
  542 +}
  543 +.active .toggle-icon-treeview {
  544 + background: url(../../../../../content/images/icon-sidebar.png) no-repeat -11px;
  545 + width: 11px;
  546 + height: 33px;
  547 +}
  548 +.navbar-inverse .navbar-nav > li > a {
  549 + color: #FFFFFF;
  550 +}
  551 +/*#7904*/
  552 +/*.navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus, .navbar-nav > li > a.active {
  553 + color: #2db0f5;
  554 +}*/
  555 +.navbar-inverse .navbar-nav > .navbarDropdownItem > a:hover, .navbar-nav > .navbarDropdownItem > a.active {
  556 + color: #2db0f5;
  557 +}
  558 +.navbar-inverse .navbar-nav > .navbarItem > a:hover, .navbar-inverse .navbar-nav > .navbarItem > a:focus, .navbar-nav > .navbarItem > a.active {
  559 + color: #2db0f5;
  560 +}
  561 +
  562 +ul.right0 {
  563 + right: 0!important;
  564 + left: auto;
  565 + min-width: 300px;
  566 + padding: 10px;
  567 + transition: visibility 0.15s ease 0s, opacity 0.15s ease 0s, transform 0.15s ease 0s;
  568 + border-bottom: 4px solid #abafb0;
  569 + box-shadow: 0 4px 2px -2px #abafb0 inset;
  570 +}
  571 +.navbar-inverse .navbar-nav > .open > a, .navbar-inverse .navbar-nav > .open > a:hover, .navbar-inverse .navbar-nav > .open > a:focus {
  572 + background-color: #0095da;
  573 + color: #ffffff;
  574 +}
  575 +.padd5 {
  576 + padding: 5px;
  577 +}
  578 +.padded25{ padding:25px;}
  579 +ul.listgrid-view{ list-style:none;}
  580 +ul.listgrid-view li{ float:left; margin-right:5px; background:#3D3D3D; padding:2px 5px; border-radius:2px;}
  581 +ul.listgrid-view li a{color:#fff!important;}
  582 +ul.listgrid-view li.active, ul.listgrid-view li:active{ background:#0095da!important;}
  583 +.bg-white{ background:#fff;}
  584 +.stickey-area .pagination-sm > li > a, .pagination-sm > li > span{ padding:5px 8px!important;}
  585 +.paddlftrgt10{ padding:10px 10px;}
  586 +/*.border-black{ border:1px solid #333}*/
  587 +#da-body-nav .dropdown-menu{ padding:0!important;}
  588 +
  589 +
  590 +
  591 +/*Settings popup on TopMenu related css*/
  592 +.cursor-pointer{ cursor:pointer;}
  593 +.paddTopbtm15{ padding-top:15px; padding-bottom:15px;}
  594 +.paddTop15{ padding-top:15px;}
  595 +.padd10{ padding:10px!important;}
  596 +.no-margin-btm{ margin-bottom:0;}
  597 +.marginR0{ margin-right:0!important;}
  598 +.padd-right0{ padding-right:0;}
  599 +.padd-left0{ padding-left:0!important;}
  600 +.marginTop13{ margin-top:13px;}
  601 +.font13{ font-size:13px;}
  602 +.font11{ font-size:11px;}
  603 +.modal-footer{ padding:5px 10px;}
  604 +.modal-footer-forgot-password {padding:5px 15px;}
  605 +.paddTop0{ padding-top:0;}
  606 +.no-margin-top{ margin-top:0;}
  607 +
  608 +.scrollable-Y200{ width:auto; height:228px; overflow-y:scroll; border:1px solid #e4e4e4; margin-bottom:0; z-index:999999; display:block; border-top:none; background:#fff;}
  609 +.modal-header{ cursor:move;}
  610 +.well-dark{ background:#2e2e2e; border:1px solid #686868; height:500px; overflow:hidden;}
  611 +select[multiple], select[size].multipleSelect{ height: 100%;}
  612 +
  613 +#setting-modal-dark{ height:441px;}
  614 +#setting-modal-dark .modal-body{ overflow-y:auto; overflow-x:hidden; height:365px;}
  615 +#setting-modal-dark > .modal-header{ padding:5px 10px;}
  616 +#setting-modal-dark > .modal-header h4{ font-size:15px; font-weight:600;}
  617 +#setting-modal-dark > .modal-body > .nav-tabs > li > a{ padding:5px!important}
  618 +#setting-modal-dark .nav > li > a { padding: 5px!important;}
  619 +
  620 +.skinmarginbtm6{
  621 + margin-bottom:6px !important;
  622 +}
  623 +
  624 +.skindefault{
  625 + background: #8c8c8c none repeat scroll 0 0 !important;
  626 +}
  627 +
  628 +
  629 +.bolder{ font-weight:bold;}
  630 +.skin-tones{ width:300px; margin:0 auto;}
  631 +.modal-dark > .modal-header{ padding:5px 10px;}
  632 +.modal-dark > .modal-header h4{ font-size:15px; font-weight:600;}
  633 +.modal-header .close{ margin-top:0}
  634 +#setting-modal-dark .nav-tabs > li.active > a, #setting-modal-dark .nav-tabs > li.active > a:hover, #setting-modal-dark .nav-tabs > li.active > a:focus{ background:hsl(199, 100%, 43%); border:none; color:#fff;}
  635 +.annotation-modal-header h4{ font-size:15px; font-weight:600;}
  636 +
  637 + @-webkit-keyframes circle {
  638 +0% {
  639 + opacity: 1;
  640 +}
  641 + 40% {
  642 + opacity: 1;
  643 +}
  644 + 100% {
  645 + width: 200%;
  646 + height: 200%;
  647 + opacity: 0;
  648 +}
  649 +}
  650 +@keyframes circle {
  651 + 0% {
  652 + opacity: 1;
  653 +}
  654 + 40% {
  655 + opacity: 1;
  656 +}
  657 + 100% {
  658 + width: 200%;
  659 + height: 200%;
  660 + opacity: 0;
  661 +}
  662 +}
  663 +
  664 +@media (max-width: 480px) {
  665 +.tools i {
  666 + font-size: inherit;
  667 +}
  668 +.pageHeading h4 {
  669 + font-size: 20px;
  670 +}
  671 +}
  672 +
  673 +/** Responsive **/
  674 +@media (max-width: 1199px) {
  675 +/*.main{margin-left:0;position: relative;transition:left .3s ease;left: 0;}
  676 + .main.active{left: 250px;}
  677 + .sidebar{left: -250px;transition:left .3s ease;}
  678 + .sidebar.active{left: 0;}*/
  679 + /*.main2{margin-left:0;position: relative;transition:left .3s ease;left: 0;}
  680 + .main2.active{left: 106px;}
  681 + .tools{left: -106px;transition:left .3s ease;}
  682 + .tools.active{left: 0;}*/
  683 +
  684 +
  685 +}
  686 +
  687 +@media (max-width: 767px) {
  688 +textarea {
  689 + height: 120px !important;
  690 +}
  691 +.quesDetail>*, .patDataRow>* {
  692 + text-align: left !important;
  693 +}
  694 +.table {
  695 + font-size: .9em;
  696 +}
  697 +.stylish-input-group .form-control {
  698 + border-right: 0;
  699 + box-shadow: 0 0 0;
  700 + border-color: #ccc;
  701 + width: 100%;
  702 + float: right;
  703 +}
  704 +
  705 + .table-responsive > .table > tbody > tr > td
  706 + {
  707 + white-space: normal !important;
  708 + }
  709 +}
  710 +
  711 +@media (max-width: 1023px) {
  712 +/*.nav > li > a{ padding:15px 6px!important;}*/
  713 +
  714 +.main {
  715 + margin-left: 0;
  716 + position: relative;
  717 + transition: left .3s ease;
  718 + left: 0;
  719 +}
  720 +.main.active {
  721 + left: 200px;
  722 +}
  723 +.sidebar {
  724 + left: -200px;
  725 + transition: left .3s ease;
  726 +}
  727 +.sidebar.active {
  728 + left: 0;
  729 +}
  730 +.main-treeview {
  731 + margin-left: 0;
  732 + position: relative;
  733 + transition: left .3s ease;
  734 + left: 0;
  735 +}
  736 +.main-treeview.active {
  737 + left: 300px;
  738 +}
  739 +.treeview-left {
  740 + left: -300px;
  741 + transition: left .3s ease;
  742 +}
  743 +.treeview-left.active {
  744 + left: 0;
  745 +}
  746 +}
  747 +
  748 +@media (min-width: 768px) and (max-width: 1199px) {
  749 +.hidden-sm {
  750 + display: none !important;
  751 +}
  752 +.width120 {
  753 + width: 90%!important;
  754 +}
  755 +/* .toggleBar { margin:20px 10px 0 0}*/
  756 +}
  757 +
  758 +@media (min-width: 768px) {
  759 +.toperMenu-spaceleft {
  760 + margin-left: 20px;
  761 +}
  762 +}
  763 +
  764 +@media (max-width: 350px) {
  765 +.pageHeading h4 {
  766 + overflow: hidden;
  767 + text-overflow: ellipsis;
  768 + white-space: nowrap;
  769 + width: 164px !important;
  770 +}
  771 +}
  772 +
  773 +.spinner {
  774 + position: fixed;
  775 + top: 50%;
  776 + left: 50%;
  777 + margin-left: -50px; / half width of the spinner gif /
  778 + margin-top: -50px; / half height of the spinner gif /
  779 + text-align: center;
  780 + z-index: 1234;
  781 + overflow: auto;
  782 + width: 100px; / width of the spinner gif /
  783 + height: 102px; /*hight of the spinner gif +2px to fix IE8 issue */
  784 + }
  785 +
  786 +/*to make the background fully visible on transparency box draw*/
  787 +.modal-backdrop.in {
  788 + opacity: 0;
  789 +}
  790 +
  791 +.tButtonActive {
  792 + background-color: #1B92D0;
  793 + border-color: #1B92D0;
  794 + color: #ffffff;
  795 +}
  796 +
  797 +/*28-06-2016*/
  798 +
  799 +.txt-white{ color:#fff;}
  800 +.f11 {font-size:11px;}
  801 +.f15 {font-size:15px; font-weight:600;}
  802 +.pad-lftrgt3 {padding-left:2px; padding-right:2px;}
  803 +.table-txt12 tr th, .table-txt12 tr td {font-size:12px; padding:2px 8px !important; vertical-align:middle; cursor:pointer;}
  804 +
  805 +.clsstickydiv{padding-left:19px; width:99%}
  806 +
  807 +
  808 +/*.clsthead tr th {
  809 + min-width: 180px;
  810 + text-align: left;
  811 +}*/
  812 +
  813 +
  814 +
  815 +
  816 +
  817 +/*.clstbody tr td {
  818 + min-width: 180px;
  819 + text-align: left;
  820 +}*/
  821 +
  822 +
  823 +
  824 +
  825 +
  826 +
  827 +
  828 +.cur-pot {
  829 +cursor:pointer;
  830 +}
  831 +
  832 +
  833 +@media (min-width: 320px) and (max-width:480px) {
  834 + .stickey-area {
  835 + margin-top:24px;
  836 + }
  837 +}
  838 +
  839 +.enableGender li.active{
  840 + background-color:#0095DA;
  841 + color:#ffffff;
  842 +}
  843 +
  844 +.annotationbar {
  845 + max-width: 300px;
  846 + width: 100%;
  847 +}
  848 +
  849 +.LeftButtonsDefaultState
  850 +{
  851 + background-color: #0095da;
  852 + border-color: #007ab3;
  853 + color: #ffffff;
  854 +}
  855 +
  856 +/*disable background css*/
  857 +
  858 +#modelbackground
  859 + {
  860 + background-color: black;
  861 + bottom: 0;
  862 + left: 0;
  863 + position: fixed;
  864 + right: 0;
  865 + top: 0;
  866 + z-index: 12000000;
  867 + opacity: 0.5;
  868 + display:none;
  869 + width:100%;
  870 + height:100%;
  871 +
  872 + filter: Alpha(opacity=50); / IE8 and earlier /
  873 +}
  874 +
  875 +
  876 +.modeleditstyle
  877 + {
  878 + display:none;
  879 +}
  880 + /*#7904*/
  881 +.dropdown-menu > li > a.active{background-color:#0095da;color:#fff;text-decoration:none;}
  882 +
  883 +
  884 +.annotationtoolbartab
  885 + {
  886 + background:#626c34 !important;
  887 +}
  888 +
  889 +.disableMenuannotation
  890 +{
  891 + pointer-events:none;
  892 + opacity:0.6;
  893 +
  894 +}
  895 +.disableMenuoption
  896 +{
  897 + pointer-events:none;
  898 + opacity:0.6;
  899 +
  900 +}
  901 +.disableSubMenu {
  902 + pointer-events: none;
  903 + opacity: 0.6;
  904 +}
  905 +.disableFileMenu {
  906 + pointer-events: none;
  907 + opacity: 0.6;
  908 +}
  909 +
  910 +.blankshapediv
  911 +{
  912 +background-image: url("../../../../../content/images/blank-shapes.png");
  913 +background-size:cover;
  914 +}
  915 +.outlinediv
  916 +{
  917 + border:1px solid black;
  918 + width: 72%;
  919 + margin-left: auto;
  920 + margin-right: auto;
  921 + height: 98px;
  922 + border-radius: 50%;
  923 + }
  924 +.fullcolordiv
  925 + {
  926 + position:relative;
  927 + width:100%;
  928 + height:100%;
  929 + background:#fff;
  930 + border-radius: 50%;
  931 + }
  932 +/*Bug #8679*/
  933 + .selected {
  934 + background-color: lightgrey;
  935 + }
  936 +
  937 + .disableHideShowStructure
  938 + {
  939 + background:#4b4b4b !important;
  940 + border-color:#3f3f3f !important;
  941 + }
  942 +.btn-annotation-erase:hover
  943 + {
  944 + color: #fff;
  945 + }
  946 + .btn-annotation-brush:hover
  947 + {
  948 + color: #fff;
  949 + }
  950 + .fa-eraser,.fa-paint-brush
  951 + {
  952 + color: #fff;
  953 + }
  954 + #messageModal
  955 + {
  956 + z-index: 214748;
  957 + }
  958 + #messageModal .modal-dialog
  959 + {
  960 + width:300px
  961 + }
  962 + #messageModal .modal-content
  963 + {
  964 +
  965 + box-shadow: 0 0 40px rgba(0,0,0,.5);
  966 + border: rgba(0,0,0,0);
  967 + }
  968 + #messageModal .modal-body
  969 + {
  970 + text-align: justify;
  971 + text-align-last: center;
  972 + }
  973 + #messageModal .modal-header
  974 + {
  975 + padding: 6px;
  976 + border-bottom: none;
  977 + }
  978 + #messageModal .modal-footer
  979 + {
  980 + border-top: none;
  981 + padding: 20px 10px;
  982 + text-align:center;
  983 + }
  984 + #jsPanel-1
  985 + {
  986 + z-index:11111;
  987 + }
  988 +
  989 + .tinyImg {
  990 + display: block;
  991 + max-width: 230px;
  992 + /*max-height: 95px;*/
  993 + width: auto;
  994 + height: 95px !important;
  995 +}
  996 +
  997 + #bodySystemList
  998 + {
  999 + z-index:100000;
  1000 + }
  1001 + /*.GridViewDataDivHeight
  1002 + {
  1003 + height:175px;
  1004 + }*/
  1005 +
  1006 +#exportlogo
  1007 + {
  1008 +
  1009 + bottom: 50PX;
  1010 + position: fixed;
  1011 + right: 50px;
  1012 +}
  1013 +
  1014 +
  1015 +
  1016 +.HightLightThumbnail
  1017 + {
  1018 + background: #8C8C8C!important;
  1019 + border: 1px solid #a2a2a2;
  1020 + }
  1021 +
  1022 +.activeAASystemSelect{
  1023 + background-color:#0095DA;
  1024 + color:#ffffff;
  1025 +}
  1026 +
  1027 +.activeAASystemSelect a
  1028 +{
  1029 +color:#ffffff !important;
  1030 +}
  1031 +
  1032 +.disabledSelectedSystem a, .disabledSelectedSystem > a:hover, .dropdown-menu > .disabledSelectedSystem > a:focus
  1033 + {
  1034 +
  1035 + text-decoration: none;
  1036 + background-color: transparent !important;
  1037 + background-image: none;
  1038 + cursor: not-allowed;
  1039 + color: #878787 !important;
  1040 + pointer-events:none;
  1041 +}
  1042 +
  1043 +.pl-12{padding-left:12px;}
  1044 +
  1045 +
  1046 +/*sprit images*/
  1047 +.sprit-icon button{background-image:url("/../../../content/images/aa/LeftMenu/icon-sprit.png"); background-repeat:no-repeat; width:38px; height:32px;}
  1048 +.sprit-icon button:active{background-image:url("/../../../content/images/aa/LeftMenu/icon-sprit.png"); background-repeat:no-repeat; width:38px; height:32px;}
  1049 +#hidePinBtn{background-position:10px 5px;}
  1050 +#selectedPin{background-position:15px -24px;}
  1051 +#allPinBtn{background-position:12px -105px;}
  1052 +#dropdownMenu221{background-position:10px -49px;}
  1053 +#comment-box{background-position:28px -73px; width:80px;}
  1054 +
  1055 +
  1056 +.jsPanel-btn-norm
  1057 + {
  1058 + background-image: none !important;
  1059 +}
  1060 +.modal-small
  1061 + {
  1062 +
  1063 + width : 400px !important;
  1064 +
  1065 + }
  1066 +
  1067 +li[disabled], a[disabled] {
  1068 + pointer-events: none;
  1069 +}
  1070 +a[disabled] {
  1071 + color: #aaa !important;
  1072 +}
  1073 +
  1074 +
  1075 +.aaSystemDisable
  1076 + {
  1077 + pointer-events : none;
  1078 + opacity : 0.5;
  1079 +}
  1080 +<<<<<<< HEAD
  1081 +.GridViewDataDivHeight .thumbnail img
  1082 + {
  1083 + height:150px;
  1084 + }
  1085 +
  1086 +=======
  1087 +.loginBox input::-ms-clear{display:none;}
  1088 +
  1089 +
  1090 +/*06-12-2017*/
  1091 +.customTable .table-responsive{padding-left:0; padding-right:0;width: 99%; margin-left: 11px;}
  1092 +.customTable .table-fixed .table {
  1093 + max-width:980px;
  1094 + table-layout:fixed;
  1095 + margin:auto;
  1096 +}
  1097 +.customTable .table-fixed th, .table-fixed td {
  1098 + padding:5px 10px;
  1099 +}
  1100 +.customTable .table-fixed thead {
  1101 + background:#f9f9f9;
  1102 + display:table;
  1103 + width:100%;
  1104 + width:calc(100% - 0);
  1105 +}
  1106 +.customTable .table-fixed tbody {
  1107 + height:300px;
  1108 + overflow:auto;
  1109 + overflow-x:hidden;
  1110 + display:block;
  1111 + width:100%;
  1112 +}
  1113 +.customTable .table-fixed tbody tr {
  1114 + display:table;
  1115 + width:100%;
  1116 + table-layout:fixed;
  1117 +}
  1118 +
  1119 +>>>>>>> 43d2d53f9fbd22e2488cc9bdb6309562029b7765