Commit 6d6d09762c3751b401e34182ad22061078d7e0e1
Merge branch 'AAbodysystemhighlight' into Develop
Showing
3 changed files
with
50 additions
and
17 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -322,12 +322,14 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -322,12 +322,14 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
322 | var bodySystemListObj = document.getElementById("bodySystemList").getElementsByTagName("a"); | 322 | var bodySystemListObj = document.getElementById("bodySystemList").getElementsByTagName("a"); |
323 | var bodySystemListlength = bodySystemListObj.length; | 323 | var bodySystemListlength = bodySystemListObj.length; |
324 | for (var i = 0; i < bodySystemListlength; i++) { | 324 | for (var i = 0; i < bodySystemListlength; i++) { |
325 | + | ||
325 | //var boldTag = lis[i]; | 326 | //var boldTag = lis[i]; |
326 | for (var j = 0; j < $rootScope.bodySystemNames.length; j++) { | 327 | for (var j = 0; j < $rootScope.bodySystemNames.length; j++) { |
327 | if ((bodySystemListObj[i].innerHTML) == ($rootScope.bodySystemNames[j])) { | 328 | if ((bodySystemListObj[i].innerHTML) == ($rootScope.bodySystemNames[j])) { |
328 | - $("#" + i).parent().removeClass("disabled"); | ||
329 | - | 329 | + $("#" + i).parent().removeClass("disabledSelectedSystem"); |
330 | + | ||
330 | } | 331 | } |
332 | + | ||
331 | } | 333 | } |
332 | 334 | ||
333 | } | 335 | } |
@@ -605,12 +607,22 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -605,12 +607,22 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
605 | 607 | ||
606 | $scope.showSelectedSystemPins = function (event) { | 608 | $scope.showSelectedSystemPins = function (event) { |
607 | 609 | ||
610 | + | ||
611 | + var bodySystemListObj = document.getElementById("bodySystemList").getElementsByTagName("a"); | ||
612 | + var bodySystemListlength = bodySystemListObj.length; | ||
613 | + for (var i = 0; i < bodySystemListlength; i++) | ||
614 | + { | ||
615 | + | ||
616 | + $("#" + i).parent().removeClass("activeAASystemSelect"); | ||
617 | + } | ||
618 | + $("#" + event.currentTarget.id).parent().addClass("activeAASystemSelect"); | ||
619 | + | ||
608 | $rootScope.isLoading = true; | 620 | $rootScope.isLoading = true; |
609 | $('#spinner').css('visibility', 'visible'); | 621 | $('#spinner').css('visibility', 'visible'); |
610 | 622 | ||
611 | $scope.removeSpeechBubble(); | 623 | $scope.removeSpeechBubble(); |
612 | if (event.currentTarget.id == "0") { | 624 | if (event.currentTarget.id == "0") { |
613 | - | 625 | + |
614 | $scope.selectedSystemName = null; | 626 | $scope.selectedSystemName = null; |
615 | if ($scope.isHidePinBtnClicked) { | 627 | if ($scope.isHidePinBtnClicked) { |
616 | 628 | ||
@@ -622,7 +634,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -622,7 +634,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
622 | } | 634 | } |
623 | } | 635 | } |
624 | else { | 636 | else { |
625 | - | 637 | + |
626 | $scope.selectedSystemName = event.currentTarget.title; | 638 | $scope.selectedSystemName = event.currentTarget.title; |
627 | // get termText info | 639 | // get termText info |
628 | var promise = ModuleService.getTermTextDataForPin($scope.moduleName) | 640 | var promise = ModuleService.getTermTextDataForPin($scope.moduleName) |
400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
@@ -80,18 +80,18 @@ | @@ -80,18 +80,18 @@ | ||
80 | <ul class="dropdown-menu" aria-labelledby="dropdownMenu221" id="bodySystemList"> | 80 | <ul class="dropdown-menu" aria-labelledby="dropdownMenu221" id="bodySystemList"> |
81 | <li><a id="0" href="#" title="Current Structure" onclick="showSelectedSystemPins(event)">All</a></li> | 81 | <li><a id="0" href="#" title="Current Structure" onclick="showSelectedSystemPins(event)">All</a></li> |
82 | <li role="separator" class="divider"></li> | 82 | <li role="separator" class="divider"></li> |
83 | - <li class="disabled"><a id="1" href="#" title="Cardiovascular" onclick="showSelectedSystemPins(event)">Cardiovascular</a></li> | ||
84 | - <li class="disabled"><a id="2" href="#" title="Digestive" onclick="showSelectedSystemPins(event)">Digestive</a></li> | ||
85 | - <li class="disabled"><a id="3" href="#" title="Endocrine" onclick="showSelectedSystemPins(event)">Endocrine</a></li> | ||
86 | - <li class="disabled"><a id="4" href="#" title="Immune" onclick="showSelectedSystemPins(event)">Immune</a></li> | ||
87 | - <li class="disabled"><a id="5" href="#" title="Integumentary" onclick="showSelectedSystemPins(event)">Integumentary</a></li> | ||
88 | - <li class="disabled"><a id="6" href="#" title="Lymphatic" onclick="showSelectedSystemPins(event)">Lymphatic</a></li> | ||
89 | - <li class="disabled"><a id="7" href="#" title="Muscular" onclick="showSelectedSystemPins(event)">Muscular</a></li> | ||
90 | - <li class="disabled"><a id="8" href="#" title="Nervous" onclick="showSelectedSystemPins(event)">Nervous</a></li> | ||
91 | - <li class="disabled"><a id="9" href="#" title="Reproductive" onclick="showSelectedSystemPins(event)">Reproductive</a></li> | ||
92 | - <li class="disabled"><a id="10" href="#" title="Respiratory" onclick="showSelectedSystemPins(event)">Respiratory</a></li> | ||
93 | - <li class="disabled"><a id="11" href="#" title="Skeletal" onclick="showSelectedSystemPins(event)">Skeletal</a></li> | ||
94 | - <li class="disabled"><a id="12" href="#" title="Urinary" onclick="showSelectedSystemPins(event)">Urinary</a></li> | 83 | + <li class="disabledSelectedSystem"><a id="1" href="#" title="Cardiovascular" onclick="showSelectedSystemPins(event)">Cardiovascular</a></li> |
84 | + <li class="disabledSelectedSystem"><a id="2" href="#" title="Digestive" onclick="showSelectedSystemPins(event)">Digestive</a></li> | ||
85 | + <li class="disabledSelectedSystem"><a id="3" href="#" title="Endocrine" onclick="showSelectedSystemPins(event)">Endocrine</a></li> | ||
86 | + <li class="disabledSelectedSystem"><a id="4" href="#" title="Immune" onclick="showSelectedSystemPins(event)">Immune</a></li> | ||
87 | + <li class="disabledSelectedSystem"><a id="5" href="#" title="Integumentary" onclick="showSelectedSystemPins(event)">Integumentary</a></li> | ||
88 | + <li class="disabledSelectedSystem"><a id="6" href="#" title="Lymphatic" onclick="showSelectedSystemPins(event)">Lymphatic</a></li> | ||
89 | + <li class="disabledSelectedSystem"><a id="7" href="#" title="Muscular" onclick="showSelectedSystemPins(event)">Muscular</a></li> | ||
90 | + <li class="disabledSelectedSystem"><a id="8" href="#" title="Nervous" onclick="showSelectedSystemPins(event)">Nervous</a></li> | ||
91 | + <li class="disabledSelectedSystem"><a id="9" href="#" title="Reproductive" onclick="showSelectedSystemPins(event)">Reproductive</a></li> | ||
92 | + <li class="disabledSelectedSystem"><a id="10" href="#" title="Respiratory" onclick="showSelectedSystemPins(event)">Respiratory</a></li> | ||
93 | + <li class="disabledSelectedSystem"><a id="11" href="#" title="Skeletal" onclick="showSelectedSystemPins(event)">Skeletal</a></li> | ||
94 | + <li class="disabledSelectedSystem"><a id="12" href="#" title="Urinary" onclick="showSelectedSystemPins(event)">Urinary</a></li> | ||
95 | </ul> | 95 | </ul> |
96 | 96 | ||
97 | </div> | 97 | </div> |
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
@@ -1047,4 +1047,25 @@ background-size:cover; | @@ -1047,4 +1047,25 @@ background-size:cover; | ||
1047 | { | 1047 | { |
1048 | background: #8C8C8C!important; | 1048 | background: #8C8C8C!important; |
1049 | border: 1px solid #a2a2a2; | 1049 | border: 1px solid #a2a2a2; |
1050 | - } | ||
1051 | \ No newline at end of file | 1050 | \ No newline at end of file |
1051 | + } | ||
1052 | + | ||
1053 | +.activeAASystemSelect{ | ||
1054 | + background-color:#0095DA; | ||
1055 | + color:#ffffff; | ||
1056 | +} | ||
1057 | + | ||
1058 | +.activeAASystemSelect a | ||
1059 | +{ | ||
1060 | +color:#ffffff !important; | ||
1061 | +} | ||
1062 | + | ||
1063 | +.disabledSelectedSystem a, .disabledSelectedSystem > a:hover, .dropdown-menu > .disabledSelectedSystem > a:focus | ||
1064 | + { | ||
1065 | + | ||
1066 | + text-decoration: none; | ||
1067 | + background-color: transparent !important; | ||
1068 | + background-image: none; | ||
1069 | + cursor: not-allowed; | ||
1070 | + color: #878787 !important; | ||
1071 | + pointer-events:none; | ||
1072 | +} | ||
1052 | \ No newline at end of file | 1073 | \ No newline at end of file |