ADAM / AIAHTML5

Commit 2a2ce7c2dfd21c6bc02e1506edcf10a870b7fcb7

Authored by Amrita Vishnoi
1 parent e56077ee

Freezing issue is fixed.

Inline Side-by-side
Showing 2 changed files with 160 additions and 39 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @2a2ce7c
... ... @@ -11,7 +11,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
11 11 $scope.imagePath = "";
12 12 $rootScope.BodyRegionData;
13 13 $rootScope.BodyRegionCordinatesData;
14   - $scope.isTransparencyActivated = false;
  14 + $rootScope.isTransparencyActivated = false;
15 15 $rootScope.BodyLayerData;
16 16 $rootScope.VocabTermData;
17 17  
... ... @@ -1000,6 +1000,15 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1000 1000  
1001 1001 $('#draggable').css('width', dragdivw);
1002 1002 $('#draggable').css('height', dragdivh)
  1003 +
  1004 + document.getElementById('btnTranparency').addEventListener('click', $scope.createTransparencyBox);
  1005 + document.getElementById('btnNormalMode').addEventListener('click', $scope.enableNormalMode);
  1006 + document.getElementById('btnExtract').addEventListener('click', $scope.enableExtract);
  1007 + document.getElementById('btnHighLight').addEventListener('click', $scope.enableHighlight);
  1008 + document.getElementById('btnIdentity').addEventListener('click', $scope.OnIdentityClick);
  1009 + document.getElementById('btnZoom').addEventListener('click', $scope.enableZoom);
  1010 + document.getElementById('btnTBoxClose').addEventListener('click', $scope.CloseTransparencyBox);
  1011 +
1003 1012 }
1004 1013  
1005 1014 function scaleRectangle(x, y, height, width, mirrorValue) {
... ... @@ -2430,7 +2439,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2430 2439 //layer change function
2431 2440 $scope.LayerChange = function () {
2432 2441  
2433   -
  2442 +
2434 2443 //if listanager is visisble then close it
2435 2444 // $rootScope.isListManagerSelected = false;
2436 2445  
... ... @@ -2455,7 +2464,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2455 2464  
2456 2465  
2457 2466 if ($scope.isTransparencyActivated) {
2458   -
  2467 + debugger;
2459 2468 //crete temp canavs to store the original data which will be used to chnange the transparency
2460 2469 if (document.getElementById('tempCanvas') != null) {
2461 2470 $('#tempCanvas').remove();
... ... @@ -3435,7 +3444,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3435 3444  
3436 3445 $scope.createTransparencyBox = function () {
3437 3446  
3438   - $scope.isTransparencyActivated = true;
  3447 + $rootScope.isTransparencyActivated = true;
3439 3448  
3440 3449 //do not create TBOX if in extarct mode otherwise create
3441 3450 if ($rootScope.isExtract == false) {
... ... @@ -4564,8 +4573,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4564 4573  
4565 4574 $scope.CloseTransparencyBox = function () {
4566 4575  
  4576 + alert('CloseTransparencyBox is called');
4567 4577 //To enable extract button
4568   - $scope.isTransparencyActivated = false;
  4578 + $rootScope.isTransparencyActivated = false;
4569 4579 $("#btnExtract").removeClass("disabled");
4570 4580  
4571 4581 $('.com_anno').css('display', 'none');
... ... @@ -4602,7 +4612,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4602 4612 //var scope = angular.element(document.getElementById("DAView")).scope();
4603 4613 //scope.$apply(function () {
4604 4614 // $scope.layerNumber = 0;
4605   - $scope.isTransparencyActivated = false;
  4615 + // $rootScope.isTransparencyActivated = false;
4606 4616 //})
4607 4617  
4608 4618  
... ... @@ -4621,7 +4631,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4621 4631 }
4622 4632 $('#transparencyScale').css('visibility', 'hidden');
4623 4633  
4624   - $scope.isTransparencyActivated = false;
  4634 + //$rootScope.isTransparencyActivated = false;
4625 4635 // document.getElementById('btnTranparency').className = 't-transparency'
4626 4636 $('#btnTranparency').removeClass('tButtonActive');
4627 4637 $('#btnTranparency').addClass('btn-black');
... ... @@ -4685,9 +4695,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4685 4695 $rootScope.CloseListManager();
4686 4696 // $('#btnIdentity').addClass('btn-primary');
4687 4697  
4688   - if ($scope.isTransparencyActivated == true) {
  4698 + if ($rootScope.isTransparencyActivated == true) {
4689 4699  
4690   - $scope.isTransparencyActivated = false;
  4700 + $rootScope.isTransparencyActivated = false;
4691 4701  
4692 4702 var canvasDiv = document.getElementById('canvasDiv');
4693 4703 canvasDiv.removeEventListener("mousedown", mouseDownListener);
... ... @@ -5042,7 +5052,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5042 5052  
5043 5053  
5044 5054  
5045   - if ($scope.isTransparencyActivated == true) {
  5055 + if ($rootScope.isTransparencyActivated == true) {
5046 5056  
5047 5057 $("#btnExtract").addClass("disabled");
5048 5058  
... ... @@ -5590,7 +5600,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5590 5600 }
5591 5601  
5592 5602  
5593   - $scope.OnGenderChange = function (event) {
  5603 + $scope.OnGenderChange = function (gender) {
5594 5604  
5595 5605  
5596 5606  
... ... @@ -7874,4 +7884,86 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7874 7884 }
7875 7885 }]
7876 7886  
7877   -);
7878 7887 \ No newline at end of file
  7888 +);
  7889 +
  7890 +
  7891 +function OnGenderChange(gender) {
  7892 +
  7893 + console.log('gender chnaged is called outside ');
  7894 + var scope = angular.element(document.getElementById("daView")).scope();
  7895 + scope.$apply(function () {
  7896 + scope.OnGenderChange(gender);
  7897 + });
  7898 +}
  7899 +
  7900 +function OnViewChange(bodyView) {
  7901 + console.log('OnViewChange chnaged is called outside ');
  7902 + var scope = angular.element(document.getElementById("daView")).scope();
  7903 + scope.$apply(function () {
  7904 + scope.OnViewChange(bodyView);
  7905 + });
  7906 +}
  7907 +
  7908 +function OnBodySystem(bodySytem) {
  7909 + console.log('OnBodySystem chnaged is called outside ');
  7910 + var scope = angular.element(document.getElementById("daView")).scope();
  7911 + scope.$apply(function () {
  7912 + scope.HighlightBodyByBodySystem(bodySytem);
  7913 + });
  7914 +}
  7915 +
  7916 +function enableShowHideStructureBox() {
  7917 + console.log('OnBodySystem chnaged is called outside ');
  7918 + var scope = angular.element(document.getElementById("daView")).scope();
  7919 + scope.$apply(function () {
  7920 + scope.enableShowHideStructureBox();
  7921 + });
  7922 +}
  7923 +
  7924 +function OnSearch() {
  7925 + console.log('Show Search is called outside ');
  7926 + var scope = angular.element(document.getElementById("daView")).scope();
  7927 + scope.$apply(function () {
  7928 + scope.ShowSearch();
  7929 + });
  7930 +}
  7931 +function selectTerm(event) {
  7932 + console.log('selectTerm is called outside ');
  7933 + var scope = angular.element(document.getElementById("daView")).scope();
  7934 + scope.$apply(function () {
  7935 + scope.jumpToTerm(event);
  7936 + });
  7937 +}
  7938 +function HighlightBodyOnListManager(event) {
  7939 + console.log('HighlightBodyOnListManager is called outside ');
  7940 + var scope = angular.element(document.getElementById("daView")).scope();
  7941 + scope.$apply(function () {
  7942 + scope.HighlightBodyOnListManagerSelection(event);
  7943 + });
  7944 +}
  7945 +
  7946 +function refreshTermListOnSystem(event) {
  7947 + console.log('refreshTermListOnSystem is called outside ');
  7948 + var scope = angular.element(document.getElementById("daView")).scope();
  7949 + scope.$apply(function () {
  7950 + scope.refreshTermListOnSystemSelection(event);
  7951 + });
  7952 +}
  7953 +
  7954 +function OnEnableExtract()
  7955 +{
  7956 + console.log('OnEnableExtract is called outside ');
  7957 + var scope = angular.element(document.getElementById("daView")).scope();
  7958 + scope.$apply(function () {
  7959 + scope.enableExtract('true');
  7960 + });
  7961 +}
  7962 +
  7963 +function onTboxCreation()
  7964 +{
  7965 + console.log('OnEnableExtract is called outside ');
  7966 + var scope = angular.element(document.getElementById("daView")).scope();
  7967 + scope.$apply(function () {
  7968 + scope.createTransparencyBox('true');
  7969 + });
  7970 +}
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
  View file @2a2ce7c
... ... @@ -54,6 +54,7 @@
54 54 .tooltip-custom + .tooltip > .tooltip-arrow {
55 55 display: none;
56 56 }
  57 +
57 58 .customTooltip {
58 59 background: #333 !important;
59 60 color: #fff !important;
... ... @@ -142,37 +143,37 @@
142 143 <div class="toggle-icon toggleBar toggleHeadingButton" title="Show/Hide Sidebar" style="top:20px;"></div>
143 144 <div class="" style="top:20px">
144 145 <div class="col-sm-6">
145   - <button id="btnIdentity" class="btn btn-primary btn-sm tooltip-custom" ng-click="OnIdentityClick()" data-toggle="tooltip" data-placement="bottom" title="Identify"> <img src="content/images/icon-identity.png" alt=""></button>
  146 + <button id="btnIdentity" 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>
146 147 </div>
147 148 <div class="col-sm-6 pull-right">
148   - <button class="btn btn-black btn-sm pull-right tooltip-custom" ng-click="enableZoom()" data-toggle="tooltip" data-placement="bottom" title="Zoom-in/Zoom-out">
  149 + <button class="btn btn-black btn-sm pull-right tooltip-custom" id="btnZoom" data-toggle="tooltip" data-placement="bottom" title="Zoom-in/Zoom-out">
149 150 <img src="content/images/icon-zoom.png" alt="">
150 151 </button>
151   -
  152 +
152 153 </div>
153 154 <div class="col-sm-12">
154   - <button id="btnTranparency" class="btn btn-black btn-sm btn-block marginTop5 tooltip-custom" ng-click="createTransparencyBox()" data-toggle="tooltip" data-placement="bottom" title="Transparency Box"><img src="content/images/icon-transparency.png" alt=""></button>
  155 + <button id="btnTranparency" class="btn btn-black btn-sm btn-block marginTop5 tooltip-custom" onclick="onTboxCreation()" data-toggle="tooltip" data-placement="bottom" title="Transparency Box"><img src="content/images/icon-transparency.png" alt=""></button>
155 156 </div>
156   -
157   -
  157 +
  158 +
158 159 <div class="col-sm-6">
159   - <button id="btnNormalMode" class="btn btn-primary btn-sm marginTop5 tooltip-custom" ng-click="enableNormalMode()" data-toggle="tooltip" data-placement="bottom" title="Normal"> <img src="content/images/bulb1.png" alt=""></button>
  160 + <button id="btnNormalMode" class="btn btn-primary btn-sm marginTop5 tooltip-custom" data-toggle="tooltip" data-placement="bottom" title="Normal"> <img src="content/images/bulb1.png" alt=""></button>
160 161 </div>
161 162 <div class="col-sm-6">
162   - <button id="btnExtract" class="btn btn-black btn-sm pull-right marginTop5 tooltip-custom" ng-click="enableExtract(true)" data-toggle="tooltip" data-placement="bottom" title="Extract"><img src="content/images/bulb1.png" alt=""></button>
  163 + <button id="btnExtract" class="btn btn-black btn-sm pull-right marginTop5 tooltip-custom" onclick="OnEnableExtract()" data-toggle="tooltip" data-placement="bottom" title="Extract"><img src="content/images/bulb1.png" alt=""></button>
163 164 </div>
164   -
  165 +
165 166 <div class="col-sm-6">
166   - <button id="btnHighLight" class="btn btn-black btn-sm marginTop5 tooltip-custom btn-resize" ng-click="enableHighlight()" data-toggle="tooltip" data-placement="bottom" title="Highlight"> <img src="content/images/bulb.png" alt=""></button>
  167 + <button id="btnHighLight" class="btn btn-black btn-sm marginTop5 tooltip-custom btn-resize" data-toggle="tooltip" data-placement="bottom" title="Highlight"> <img src="content/images/bulb.png" alt=""></button>
167 168 </div>
168   -
  169 +
169 170 <div class="col-sm-6 dropdown hover-tool">
170 171 <div class="custom-tooltip">Highlight Options</div>
171 172 <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" ng-click="LoadBodySystemData()"><img src="content/images/icon-highlight.png" alt="" title=""></button>
172 173 <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
173 174 <li ng-class="CurrentStructure"><a href="#" title="Current Structure">Current Structure</a></li>
174 175 <li role="separator" class="divider"></li>
175   - <li ng-class="Cardiovascular"><a href="#" title="Cardiovascular" id="1" ng-click="HighlightBodyByBodySystem($event)">Cardiovascular</a></li>
  176 + <!--<li ng-class="Cardiovascular"><a href="#" title="Cardiovascular" id="1" ng-click="HighlightBodyByBodySystem($event)">Cardiovascular</a></li>
176 177 <li ng-class="Digestive"><a href="#" title="Digestive" id="2" ng-click="HighlightBodyByBodySystem($event)">Digestive</a></li>
177 178 <li ng-class="Endocrine"><a href="#" title="Endocrine" id="3" ng-click="HighlightBodyByBodySystem($event)">Endocrine</a></li>
178 179 <li ng-class="Immune"><a href="#" title="Immune" id="4" ng-click="HighlightBodyByBodySystem($event)">Immune</a></li>
... ... @@ -183,41 +184,68 @@
183 184 <li ng-class="Reproductive"><a href="#" title="Reproductive" id="9" ng-click="HighlightBodyByBodySystem($event)">Reproductive</a></li>
184 185 <li ng-class="Respiratory"><a href="#" title="Respiratory" id="10" ng-click="HighlightBodyByBodySystem($event)">Respiratory</a></li>
185 186 <li ng-class="Skeletal"><a href="#" title="Skeletal" id="11" ng-click="HighlightBodyByBodySystem($event)">Skeletal</a></li>
186   - <li ng-class="Urinary"><a href="#" title="Urinary" id="12" ng-click="HighlightBodyByBodySystem($event)">Urinary</a></li>
  187 + <li ng-class="Urinary"><a href="#" title="Urinary" id="12" ng-click="HighlightBodyByBodySystem($event)">Urinary</a></li>-->
  188 +
  189 + <li ng-class="Cardiovascular"><a href="#" title="Cardiovascular" id="1" onclick="OnBodySystem(1)">Cardiovascular</a></li>
  190 + <li ng-class="Digestive"><a href="#" title="Digestive" id="2" onclick="OnBodySystem(2)">Digestive</a></li>
  191 + <li ng-class="Endocrine"><a href="#" title="Endocrine" id="3" onclick="OnBodySystem('3')">Endocrine</a></li>
  192 + <li ng-class="Immune"><a href="#" title="Immune" id="4" onclick="OnBodySystem('4')">Immune</a></li>
  193 + <li ng-class="Integumentary"><a href="#" title="Integumentary" id="5" onclick="OnBodySystem('5')">Integumentary</a></li>
  194 + <li ng-class="Lymphatic"><a href="#" title="Lymphatic" id="6" onclick="OnBodySystem('6')">Lymphatic</a></li>
  195 + <li ng-class="Muscular"><a href="#" title="Muscular" id="7" onclick="OnBodySystem('7')">Muscular</a></li>
  196 + <li ng-class="Nervous"><a href="#" title="Nervous" id="8" onclick="OnBodySystem('8')">Nervous</a></li>
  197 + <li ng-class="Reproductive"><a href="#" title="Reproductive" id="9" onclick="OnBodySystem('9')">Reproductive</a></li>
  198 + <li ng-class="Respiratory"><a href="#" title="Respiratory" id="10" onclick="OnBodySystem('10')">Respiratory</a></li>
  199 + <li ng-class="Skeletal"><a href="#" title="Skeletal" id="11" onclick="OnBodySystem('11')">Skeletal</a></li>
  200 + <li ng-class="Urinary"><a href="#" title="Urinary" id="12" onclick="OnBodySystem('12')">Urinary</a></li>
187 201 </ul>
188 202 </div>
189 203  
190   -
  204 +
191 205 <div class="col-sm-6 hover-gender-tool" ng-init="switchGender()">
192 206 <div class=" custom-tooltip1">Gender</div>
193 207 <button class="btn btn-black btn-sm marginTop5 dropdown-toggle" type="button" id="dropdownMenu4" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> <i class=" fa fa-intersex font16"></i></button>
194 208 <ul class="dropdown-menu" aria-labelledby="dropdownMenu3">
195   - <li ng-class="male"><a href="#" title="Male" ng-click="OnGenderChange($event)">Male</a></li>
196   - <li ng-class="female"><a href="#" title="Female" ng-click="OnGenderChange($event)">Female</a></li>
  209 + <li ng-class="male">
  210 + <!--<button type="button" id="btnMale" onclick="OnGenderChange('Male')" class="btn btn-link" >Male</button>-->
  211 + <a href="#" title="Male" onclick="OnGenderChange('Male')">Male</a>
  212 + </li>
  213 + <li ng-class="female">
  214 +
  215 + <!--<button type="button" id="btnFemale" onclick="OnGenderChange('Female')" class="btn btn-link">Female</button>-->
  216 + <a href="#" title="Female" onclick="OnGenderChange('Female')">Female</a>
  217 +
  218 + <!--<a href="javascript:void(0)" title="Male" ng-click="OnGenderChange($event)">Male</a></li>
  219 + <li ng-class="female"><a href="javascript:void(0)" title="Female" ng-click="OnGenderChange($event)">Female</a></li>-->
  220 + </li>
197 221 </ul>
198 222 </div>
199 223  
200   -
201   -
202   -
203 224 <div class="col-sm-6 tooltip-View-custom">
204 225 <div class="custom-tooltip2">View</div>
205 226 <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu3" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"><img src="content/images/view.png" alt="" title=""></button>
206 227 <ul class="dropdown-menu" aria-labelledby="dropdownMenu3">
207   - <li ng-class="AnteriorView"><a href="#" title="Anterior" ng-click="OnViewChange($event)">Anterior</a></li>
  228 + <!--<li ng-class="AnteriorView"><a href="#" title="Anterior" ng-click="OnViewChange($event)">Anterior</a></li>
208 229 <li ng-class="LateralView"><a href="#" title="Lateral" ng-click="OnViewChange($event)">Lateral</a></li>
209 230 <li ng-class="MedialView"><a href="#" title="Medial" ng-click="OnViewChange($event)">Medial</a></li>
210 231 <li ng-class="PosteriorView"><a href="#" title="Posterior" ng-click="OnViewChange($event)">Posterior</a></li>
211 232 <li ng-class="LateralArmView"><a href="#" title="Lateral Arm" ng-click="OnViewChange($event)">Lateral Arm</a></li>
212   - <li ng-class="MedialArmView"><a href="#" title="Medial Arm" ng-click="OnViewChange($event)">Medial Arm</a></li>
  233 + <li ng-class="MedialArmView"><a href="#" title="Medial Arm" ng-click="OnViewChange($event)">Medial Arm</a></li>-->
  234 +
  235 + <li ng-class="AnteriorView"><a href="#" title="Anterior" onclick="OnViewChange('Anterior')">Anterior</a></li>
  236 + <li ng-class="LateralView"><a href="#" title="Lateral" onclick="OnViewChange('Lateral')">Lateral</a></li>
  237 + <li ng-class="MedialView"><a href="#" title="Medial" onclick="OnViewChange('Medial')">Medial</a></li>
  238 + <li ng-class="PosteriorView"><a href="#" title="Posterior" onclick="OnViewChange('Posterior')">Posterior</a></li>
  239 + <li ng-class="LateralArmView"><a href="#" title="Lateral Arm" onclick="OnViewChange('Lateral Arm')">Lateral Arm</a></li>
  240 + <li ng-class="MedialArmView"><a href="#" title="Medial Arm" onclick="OnViewChange('Medial Arm')">Medial Arm</a></li>
213 241 </ul>
214 242 </div>
215   -
  243 +
216 244  
217 245 <div class="col-sm-12">
218   - <button id="btnStrutureBox" ng-click="enableShowHideStructureBox()" class="btn btn-primary btn-sm marginTop5 btn-block tooltip-custom" data-toggle="tooltip" data-placement="bottom" title="Show/Hide Structure Name Boxes"> <img src="content/images/comment-box.png" alt=""></button>
  246 + <button id="btnStrutureBox" onclick="enableShowHideStructureBox()" class="btn btn-primary btn-sm marginTop5 btn-block tooltip-custom" data-toggle="tooltip" data-placement="bottom" title="Show/Hide Structure Name Boxes"> <img src="content/images/comment-box.png" alt=""></button>
219 247 </div>
220   -
  248 +
221 249 </div>
222 250 <div class="">
223 251 <p>
... ... @@ -233,14 +261,15 @@
233 261 <div class="">
234 262 <div class="input-group col-sm-8 col-xs-7 col-md-10 pull-left">
235 263  
236   - <input type="text" class="form-control input-sm pull-left" id="typedtermname" ng-blur="HideSearch()" ng-click="ShowSearch()" ng-dblclick="ShowSearch()" ng-model="searchFilter" ng-change="textChange(searchFilter)" placeholder="Search...">
  264 + <input type="text" class="form-control input-sm pull-left" id="typedtermname" ng-blur="HideSearch()" onclick="OnSearch()" ondblclick="OnSearch()" ng-model="searchFilter" ng-change="textChange(searchFilter)" placeholder="Search...">
237 265  
238 266 <div id="backdrop" ng-show="IsSearchVisible">
239 267 <div class="col-sm-12 col-xs-12 col-md-12 col-lg-12 pull-left">
240 268 <!--#Bug 6591-->
241 269 <ul id="termlistfilter" class="form-control dropdown-menu" style="height:90px;width:100%;overflow-y:scroll;position:absolute;display:none;z-index:1000;">
242 270 <li ng-repeat="item in VocabTermTxt| filter:{ _TermText: searchFilter}">
243   - <a id="{{item._ActualTermNumber}}" href="" ng-click="jumpToTerm($event)">{{item._TermText}}</a>
  271 + <!--<a id="{{item._ActualTermNumber}}" href="" ng-click="jumpToTerm($event)">{{item._TermText}}</a>-->
  272 + <a id="{{item._ActualTermNumber}}" href="" onclick="selectTerm(event)">{{item._TermText}}</a>
244 273 </li>
245 274 </ul>
246 275 </div>
... ... @@ -334,7 +363,7 @@
334 363 <div>
335 364 <div>
336 365 <div class="modal-header annotation-modal-header">
337   - <button type="button" class="close" data-dismiss="modal" aria-label="Close" ng-click="CloseTransparencyBox()"><span aria-hidden="true">&times;</span></button>
  366 + <button id="btnTBoxClose" type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
338 367 <h4>Transparency</h4>
339 368 </div>
340 369 <div>
... ...