Commit 88cc879639c3565d3a28a0bc556316f76f8445be
1 parent
c51417b5
tooltips
Showing
2 changed files
with
24 additions
and
9 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -4643,7 +4643,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -4643,7 +4643,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
4643 | 4643 | ||
4644 | $scope.enableHighlight = function () { | 4644 | $scope.enableHighlight = function () { |
4645 | 4645 | ||
4646 | - console.log('enableHighlight is called') | 4646 | + |
4647 | 4647 | ||
4648 | if ($rootScope.isHighLight == true) { | 4648 | if ($rootScope.isHighLight == true) { |
4649 | 4649 |
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
@@ -134,25 +134,30 @@ | @@ -134,25 +134,30 @@ | ||
134 | <div class="toggle-icon toggleBar toggleHeadingButton" title="Show/Hide Sidebar" style="top:20px;"></div> | 134 | <div class="toggle-icon toggleBar toggleHeadingButton" title="Show/Hide Sidebar" style="top:20px;"></div> |
135 | <div class="" style="top:20px"> | 135 | <div class="" style="top:20px"> |
136 | <div class="col-sm-6"> | 136 | <div class="col-sm-6"> |
137 | - <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="" title=""></button> | 137 | + <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> |
138 | </div> | 138 | </div> |
139 | <div class="col-sm-6 pull-right"> | 139 | <div class="col-sm-6 pull-right"> |
140 | <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"> | 140 | <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"> |
141 | - <img src="content/images/icon-zoom.png" alt="" title=""> | 141 | + <img src="content/images/icon-zoom.png" alt=""> |
142 | </button> | 142 | </button> |
143 | + | ||
143 | </div> | 144 | </div> |
144 | <div class="col-sm-12"> | 145 | <div class="col-sm-12"> |
145 | - <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="" title=""></button> | 146 | + <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> |
146 | </div> | 147 | </div> |
148 | + | ||
149 | + | ||
147 | <div class="col-sm-6"> | 150 | <div class="col-sm-6"> |
148 | - <button ng-class="Normal" class="btn btn-black btn-sm marginTop5 tooltip-custom" ng-click="enableNormalMode()" data-toggle=" tooltip" data-placement="bottom" title="Normal"> <img src="content/images/bulb1.png" alt="" title=""></button> | 151 | + <button ng-class="Normal" class="btn btn-black btn-sm marginTop5 tooltip-custom" ng-click="enableNormalMode()" data-toggle=" tooltip" data-placement="bottom" title="Normal"> <img src="content/images/bulb1.png" alt=""></button> |
149 | </div> | 152 | </div> |
150 | <div class="col-sm-6"> | 153 | <div class="col-sm-6"> |
151 | - <button ng-class="Extract" class="btn btn-black btn-sm pull-right marginTop5 tooltip-custom" ng-click="enableExtract()" data-toggle="tooltip" data-placement="bottom" title="Extract"><img src="content/images/bulb1.png" alt="" title=""></button> | 154 | + <button ng-class="Extract" class="btn btn-black btn-sm pull-right marginTop5 tooltip-custom" ng-click="enableExtract()" data-toggle="tooltip" data-placement="bottom" title="Extract"><img src="content/images/bulb1.png" alt=""></button> |
152 | </div> | 155 | </div> |
156 | + | ||
153 | <div class="col-sm-6"> | 157 | <div class="col-sm-6"> |
154 | - <button ng-class="Highlight" 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="" title=""></button> | 158 | + <button ng-class="Highlight" 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> |
155 | </div> | 159 | </div> |
160 | + | ||
156 | <div class="col-sm-6 dropdown hover-tool"> | 161 | <div class="col-sm-6 dropdown hover-tool"> |
157 | <div class="custom-tooltip">Highlight Options</div> | 162 | <div class="custom-tooltip">Highlight Options</div> |
158 | <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> | 163 | <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> |
@@ -173,6 +178,8 @@ | @@ -173,6 +178,8 @@ | ||
173 | <li ng-class="Urinary"><a href="#" title="Urinary" id="12" ng-click="HighlightBodysystem($event)">Urinary</a></li> | 178 | <li ng-class="Urinary"><a href="#" title="Urinary" id="12" ng-click="HighlightBodysystem($event)">Urinary</a></li> |
174 | </ul> | 179 | </ul> |
175 | </div> | 180 | </div> |
181 | + | ||
182 | + | ||
176 | <div class="col-sm-6 hover-gender-tool" ng-init="switchGender()"> | 183 | <div class="col-sm-6 hover-gender-tool" ng-init="switchGender()"> |
177 | <div class=" custom-tooltip1">Gender</div> | 184 | <div class=" custom-tooltip1">Gender</div> |
178 | <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> | 185 | <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> |
@@ -181,6 +188,10 @@ | @@ -181,6 +188,10 @@ | ||
181 | <li ng-class="female"><a href="#" title="Female" ng-click="OnGenderChange($event)">Female</a></li> | 188 | <li ng-class="female"><a href="#" title="Female" ng-click="OnGenderChange($event)">Female</a></li> |
182 | </ul> | 189 | </ul> |
183 | </div> | 190 | </div> |
191 | + | ||
192 | + | ||
193 | + | ||
194 | + | ||
184 | <div class="col-sm-6 tooltip-View-custom"> | 195 | <div class="col-sm-6 tooltip-View-custom"> |
185 | <div class="custom-tooltip2">View</div> | 196 | <div class="custom-tooltip2">View</div> |
186 | <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> | 197 | <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> |
@@ -193,9 +204,12 @@ | @@ -193,9 +204,12 @@ | ||
193 | <li ng-class="MedialArmView"><a href="#" title="Medial Arm" ng-click="OnViewChange($event)">Medial Arm</a></li> | 204 | <li ng-class="MedialArmView"><a href="#" title="Medial Arm" ng-click="OnViewChange($event)">Medial Arm</a></li> |
194 | </ul> | 205 | </ul> |
195 | </div> | 206 | </div> |
207 | + | ||
208 | + | ||
196 | <div class="col-sm-12"> | 209 | <div class="col-sm-12"> |
197 | - <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="" title=""></button> | 210 | + <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> |
198 | </div> | 211 | </div> |
212 | + | ||
199 | </div> | 213 | </div> |
200 | <div class=""> | 214 | <div class=""> |
201 | <p> | 215 | <p> |
@@ -452,7 +466,8 @@ | @@ -452,7 +466,8 @@ | ||
452 | </script> | 466 | </script> |
453 | <script> | 467 | <script> |
454 | $(document).ready(function () { | 468 | $(document).ready(function () { |
455 | - $('[data-toggle="tooltip"]').tooltip({ trigger: 'hover', 'placement': 'bottom' }); | 469 | + //$('[data-toggle="tooltip"]').tooltip({ trigger: 'hover', 'placement': 'top' }); |
470 | + $('.tooltip-custom').tooltip(); | ||
456 | }); | 471 | }); |
457 | </script> | 472 | </script> |
458 | <script> | 473 | <script> |