ADAM / AIAHTML5

Commit efb210beefb1a6bc72a8763df8882a69088e39cf

Authored by Amrita Vishnoi
2 parents 9baafbe6 9871bdc5

Merge branch 'thumbnailviewchange' into Develop

Inline Side-by-side
Showing 2 changed files with 78 additions and 11 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @efb210b
... ... @@ -45,7 +45,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
45 45 $scope.doHighlightOrExtract = false;
46 46 $scope.isEligibleForHighlightBodyByTermList = false;
47 47  
48   - $scope.AnteriorView = "active";
  48 + // $scope.AnteriorView = "active";
49 49  
50 50 $scope.zoomInOut = 75;
51 51 $scope.speechBubbleCounter = 0;
... ... @@ -273,6 +273,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
273 273 $rootScope.ViewTitle = $event.currentTarget.textContent;
274 274  
275 275 localStorage.setItem("currentViewTitleFromJson", $event.currentTarget.textContent);
  276 + localStorage.setItem("currentViewTitle", $event.currentTarget.textContent);
276 277 localStorage.setItem("currentBodyViewId", $event.currentTarget.id);
277 278  
278 279 var u = $location.url();
... ... @@ -280,7 +281,65 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
280 281  
281 282 var view_list = angular.element($event.currentTarget);
282 283 var view_list_male_female = view_list.attr('title');
283   -
  284 +
  285 + if (($event.currentTarget.textContent == "Female Anterior" || $event.currentTarget.textContent == "Male Anterior")) {
  286 + $rootScope.AnteriorView = "active";
  287 + $rootScope.LateralView = "";
  288 + $rootScope.MedialView = "";
  289 + $rootScope.PosteriorView = "";
  290 + $rootScope.LateralArmView = "";
  291 + $rootScope.MedialArmView = "";
  292 + }
  293 + if (($event.currentTarget.textContent == "Female Lateral" || $event.currentTarget.textContent == "Male Lateral")) {
  294 + $rootScope.AnteriorView = "";
  295 + $rootScope.LateralView = "active";
  296 + $rootScope.MedialView = "";
  297 + $rootScope.PosteriorView = "";
  298 + $rootScope.LateralArmView = "";
  299 + $rootScope.MedialArmView = "";
  300 +
  301 +
  302 + }
  303 + if (($event.currentTarget.textContent == "Female Medial" || $event.currentTarget.textContent == "Male Medial")) {
  304 + $rootScope.AnteriorView = "";
  305 + $rootScope.LateralView = "";
  306 + $rootScope.MedialView = "active";
  307 + $rootScope.PosteriorView = "";
  308 + $rootScope.LateralArmView = "";
  309 + $rootScope.MedialArmView = "";
  310 +
  311 +
  312 + }
  313 + if (($event.currentTarget.textContent == "Female Posterior" || $event.currentTarget.textContent == "Male Posterior")) {
  314 + $rootScope.AnteriorView = "";
  315 + $rootScope.LateralView = "";
  316 + $rootScope.MedialView = "";
  317 + $rootScope.PosteriorView = "active";
  318 + $rootScope.LateralArmView = "";
  319 + $rootScope.MedialArmView = "";
  320 +
  321 + }
  322 + if (($event.currentTarget.textContent == "Female Lateral Arm" || $event.currentTarget.textContent == "Male Lateral Arm")) {
  323 + $rootScope.AnteriorView = "";
  324 + $rootScope.LateralView = "";
  325 + $rootScope.MedialView = "";
  326 + $rootScope.PosteriorView = "";
  327 + $rootScope.LateralArmView = "active";
  328 + $rootScope.MedialArmView = "";
  329 +
  330 +
  331 + }
  332 + if (($event.currentTarget.textContent == "Female Medial Arm" || $event.currentTarget.textContent == "Male Medial Arm")) {
  333 + $rootScope.AnteriorView = "";
  334 + $rootScope.LateralView = "";
  335 + $rootScope.MedialView = "";
  336 + $rootScope.PosteriorView = "";
  337 + $rootScope.LateralArmView = "";
  338 + $rootScope.MedialArmView = "active";
  339 +
  340 +
  341 + }
  342 +
284 343 //$rootScope.Normal = "LeftButtonsDefaultState";
285 344  
286 345 if (view_list_male_female == "Male") {
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
  View file @efb210b
... ... @@ -54,6 +54,15 @@
54 54 .tooltip-custom + .tooltip > .tooltip-arrow {
55 55 display: none;
56 56 }
  57 + .customTooltip {
  58 + background-color: #fff !important;
  59 + color: #000 !important;
  60 + opacity: 0.9 !important;
  61 +
  62 + }
  63 +
  64 +
  65 +
57 66  
58 67 .custom-tooltip {
59 68 background-color: #fff;
... ... @@ -61,7 +70,7 @@
61 70 color: #000;
62 71 left: -52px;
63 72 opacity: 0.9;
64   - padding: 3px 0;
  73 + padding: 7px;
65 74 position: absolute;
66 75 text-align: center;
67 76 top: 45px;
... ... @@ -79,7 +88,7 @@
79 88 color: #000;
80 89 left: 52px;
81 90 opacity: 0.9;
82   - padding: 3px 0;
  91 + padding: 7px;
83 92 position: absolute;
84 93 text-align: center;
85 94 top: 45px;
... ... @@ -97,7 +106,7 @@
97 106 color: #000;
98 107 right: 10px;
99 108 opacity: 0.9;
100   - padding: 3px 0;
  109 + padding: 7px;
101 110 position: absolute;
102 111 text-align: center;
103 112 top: 45px;
... ... @@ -148,14 +157,14 @@
148 157  
149 158  
150 159 <div class="col-sm-6">
151   - <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="" title=""></button>
  160 + <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>
152 161 </div>
153 162 <div class="col-sm-6">
154   - <button id="btnExtract" 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>
  163 + <button id="btnExtract" 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>
155 164 </div>
156 165  
157 166 <div class="col-sm-6">
158   - <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="" title=""></button>
  167 + <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>
159 168 </div>
160 169  
161 170 <div class="col-sm-6 dropdown hover-tool">
... ... @@ -465,9 +474,8 @@
465 474  
466 475 </script>
467 476 <script>
468   - $(document).ready(function () {
469   - //$('[data-toggle="tooltip"]').tooltip({ trigger: 'hover', 'placement': 'top' });
470   - $('.tooltip-custom').tooltip();
  477 + $(".tooltip-custom").tooltip({
  478 + tooltipClass: 'customTooltip'
471 479 });
472 480 </script>
473 481 <script>
... ...