ADAM / AIAHTML5

Commit 390e9ada35abf051c00e520b897b34661944f76a

Authored by Amrita Vishnoi
2 parents f2bc6558 f632c046

Merge branch 'PageSizeIssueInIpad' of http://52.6.196.163/ADAM/AIAHTML5 into Develop-IPAD-MAC

Inline Side-by-side
Showing 8 changed files with 46 additions and 17 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
  View file @390e9ad
... ... @@ -166,7 +166,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
166 166 parentSlug: '3d-anatomy-list',
167 167 content: '<div class="col-sm-12">' +
168 168 '<object data="' + $scope.Selected3DImagePath + '" width="100%" height="800px" type="image/svg+xml"></object>' +
169   - '</div>',
  169 + '</div><script>$(document).ready(function(){var $ua = navigator.userAgent; if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {var threeDivWidth = $("#ThreeDView").css("width");$("#ThreeDView").css({"left":"0px","width":"100%","min-idth": threeDivWidth}); var jspanelContainerWidth = $(".jsPanel-content").css("width"); $(".jsPanel-content").css({ "width": "100%", "min-width": jspanelContainerWidth}); $("#3DImagePanel").css("width", "100%"); }});</script>',
170 170 title: $rootScope.getLocalStorageValue("currentViewTitle"),
171 171 position: {
172 172 top: 70,
... ... @@ -183,7 +183,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
183 183 {
184 184 "module": $rootScope.currentActiveModuleTitle, "bodyView": tittle, "state": 'max', "BodyViewId": $rootScope.currentBodyViewId,
185 185 "slug": $rootScope.currentSlug
186   - });
  186 + });zz
187 187  
188 188  
189 189 }
... ... @@ -202,6 +202,8 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
202 202  
203 203 }
204 204  
  205 +
  206 +
205 207 }]
206 208  
207 209  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
  View file @390e9ad
... ... @@ -556,7 +556,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
556 556 theme: 'success',
557 557 currentController: 'CAController',
558 558 parentSlug: 'clinical-animations',
559   - content: '<script src="' + $scope.playerScript + '"></script><script>$(document).ready(function(){videojs("#playerinlineVideo").pause();$("#btnTxtOnOff").click(function(){if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");$("#sid").css("visibility","hidden");}else{$(this).text("Text Off");$("#sid").css("visibility","visible");}});});</script><div id="pid" class="row"><div id="divplayerinlineVideo" class="col-sm-12" align="center" width="640" height="480"><video width="640" height="360"' +
  559 + content: '<script src="' + $scope.playerScript + '"></script><script>$(document).ready(function(){var $ua = navigator.userAgent; if (($ua.match(/(iPod|iPhone|iPad|android)/i))) { var jspanelContainerWidth = $(".jsPanel-content").css("width"); $(".jsPanel-content").css({ "width": "100%", "min-width": jspanelContainerWidth}); $("#caVideoPanel").css("width", "100%"); }videojs("#playerinlineVideo").pause();$("#btnTxtOnOff").click(function(){if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");$("#sid").css("visibility","hidden");}else{$(this).text("Text Off");$("#sid").css("visibility","visible");}});});</script><div id="pid" class="row"><div id="divplayerinlineVideo" class="col-sm-12" align="center" width="640" height="480"><video width="640" height="360"' +
560 560 'class="ADAM_Video video-js vjs-default-skin vjs-big-play-centered" type="$videoType" id="playerinlineVideo"' +
561 561 ' poster="' + $scope.poster + '"' +
562 562 'controls="true" preload="none" allowfullscreen="true" allowscriptaccess="always" ' +
... ... @@ -692,7 +692,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
692 692 }
693 693 }
694 694  
695   -
  695 +
696 696 }]
697 697  
698 698  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
  View file @390e9ad
... ... @@ -615,7 +615,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
615 615 '<div class="col-sm-12 img-thumbnail" align="center">' +
616 616 '<img src="' + $scope.clickedCIImage + '" alt="" title="" class="img-responsive "><div class="col-sm-12 well img-subtitle">' +
617 617 '<div align="left" id="sid"><p>' + $scope.clickedCISummary + '</p></div><button id="btnTxtOnOff" class="btn btn-primary pull-right">Text Off</button>' +
618   - '<script>$(document).ready(function(){$("#btnTxtOnOff").click(function(){if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");$("#sid").css("visibility","hidden");}else{$(this).text("Text Off");$("#sid").css("visibility","visible");}});});</script></div>' +
  618 + '<script>$(document).ready(function(){ var $ua = navigator.userAgent;if(($ua.match(/(iPod|iPhone|iPad|android)/i))) { var jspanelContainerWidth = $(".jsPanel-content").css("width"); $(".jsPanel-content").css({ "width": "100%", "min-width": jspanelContainerWidth });$("#ciImagePanel").css("width", "100%"); }$("#btnTxtOnOff").click(function(){if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");$("#sid").css("visibility","hidden");}else{$(this).text("Text Off");$("#sid").css("visibility","visible");}});});</script></div>' +
619 619 '</div></div>',
620 620 //ajax: {
621 621 // url: 'app/views/ci/ci-view-detail.html'
... ... @@ -746,9 +746,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
746 746 }
747 747 }
748 748  
749   -}]
750   -
751 749  
  750 +
  751 +}]
752 752 );
753 753  
754 754  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @390e9ad
... ... @@ -639,6 +639,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
639 639 //to get slider working on ipad
640 640 var $ua = navigator.userAgent;
641 641 if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
  642 + var jspanelContainerWidth = $(".jsPanel-content").css("width");
  643 + $(".jsPanel-content").css({ "width": "100%", "min-width": jspanelContainerWidth });
  644 + $("#daImagePanel").css("width", "100%");
642 645 $("#layerChangeSlider").css("pointer-events", "auto");
643 646 // on identity mode click
644 647 $("#btnZoom").removeAttr("onclick");
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @390e9ad
... ... @@ -628,6 +628,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
628 628 $rootScope.lexiconLanguageArray = [];
629 629 $rootScope.lexiconLanguageArray.push({ id: "1", language: "English" });
630 630 $(document).ready(function () {
  631 +
  632 +
631 633 $rootScope.isLexiconTabClicked = true;
632 634 $rootScope.lexiconData = function () {
633 635 if ($rootScope.isLexiconTabClicked == true) {
... ... @@ -4386,7 +4388,17 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
4386 4388 $rootScope.hidePins();
4387 4389 }, 100);
4388 4390 }
  4391 + $timeout(function () {
  4392 + var $ua = navigator.userAgent;
  4393 + if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
  4394 + var printContainerWidth = $("#printcontainer").css("width");
  4395 + $("#printcontainer").css({ "width": "100%", "min-width": printContainerWidth });
  4396 + var jspanelContainerWidth = $("#jsPanel-1 .jsPanel-content").css("width");
  4397 + $("#jsPanel-1 .jsPanel-content").css({ "width": "100%", "min-width": jspanelContainerWidth });
  4398 + $("#jsPanel-1").css("width", "100%");
4389 4399  
  4400 + }
  4401 + }, 500)
4390 4402 };
4391 4403  
4392 4404 function OpenJSPanel() {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @390e9ad
... ... @@ -1867,6 +1867,11 @@ function onZoom(scope) {
1867 1867 $(document).ready(function () {
1868 1868 var $ua = navigator.userAgent;
1869 1869 if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
  1870 +
  1871 + var jspanelContainerWidth = $(".jsPanel-content").css("width");
  1872 + $(".jsPanel-content").css({ "width": "100%", "min-width": jspanelContainerWidth });
  1873 + $("#ImagePanel").css("width", "100%");
  1874 +
1870 1875 //hide pin button clicked
1871 1876 $("#hidePinBtn").removeAttr("onclick");
1872 1877 $("#hidePinBtn").on("touchstart", function () {
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/ca/ca-view.html
  View file @390e9ad
... ... @@ -8,8 +8,8 @@
8 8 <div class="breadcrumb">
9 9 <div class="row center-block">
10 10 <h5 class="text-center text-primary txt-white f15">Display Animation By</h5>
11   - <div class="col-sm-2">&nbsp;</div>
12   - <div class="col-md-2 col-sm-4 pad-lftrgt3">
  11 + <div class="col-md-2 hidden-sm hidden-xs visible-md visible-lg">&nbsp;</div>
  12 + <div class="col-md-2 col-xs-6 col-sm-3 pad-lftrgt3">
13 13 <div class="form-group">
14 14 <h6 class="text-center text-primary txt-white f11">Body Region</h6>
15 15 <select class="form-control input-sm" ng-change="hideListViewDiv()" ng-model="query.selectedbodyregion" ng-options="item for item in CAAllBodyRegion track by item">
... ... @@ -17,7 +17,7 @@
17 17 </select>
18 18 </div>
19 19 </div>
20   - <div class="col-md-2 col-sm-4 pad-lftrgt3">
  20 + <div class="col-md-2 col-xs-6 col-sm-3 pad-lftrgt3">
21 21 <div class="form-group">
22 22 <h6 class="text-center text-primary txt-white f11">Body System</h6>
23 23 <select class="form-control input-sm" ng-change="hideListViewDiv()" ng-model="query.selectedbodysystem" ng-options="item for item in CAAllBodySystem track by item">
... ... @@ -25,7 +25,7 @@
25 25 </select>
26 26 </div>
27 27 </div>
28   - <div class="col-md-2 col-sm-4 pad-lftrgt3">
  28 + <div class="col-md-2 col-xs-6 col-sm-3 pad-lftrgt3">
29 29 <div class="form-group">
30 30 <h6 class="text-center text-primary txt-white f11">Medical Speciality</h6>
31 31 <select class="form-control input-sm" ng-change="hideListViewDiv()" ng-model="query.selectedspecialty" ng-options="item for item in CAAllSpeciality track by item">
... ... @@ -33,7 +33,7 @@
33 33 </select>
34 34 </div>
35 35 </div>
36   - <div class="col-md-2 col-sm-4 pad-lftrgt3">
  36 + <div class="col-md-2 col-xs-6 col-sm-3 pad-lftrgt3">
37 37 <div class="form-group">
38 38 <h6 class="text-center text-primary txt-white f11">Search</h6>
39 39  
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
  View file @390e9ad
... ... @@ -35,6 +35,8 @@
35 35 opacity: 0.2;
36 36 border: solid;
37 37 position: absolute;
  38 + /*Bug #24255: Mac > DA > Body Navigator is not appear properly.*/
  39 + height:14px !important;
38 40 }
39 41  
40 42 #wrapper {
... ... @@ -44,7 +46,7 @@
44 46 margin: 20px auto;
45 47 }
46 48  
47   - .tooltip-custom + .tooltip > .tooltip-inner {
  49 + .tooltip-custom + .tooltip > .tooltip-inner {
48 50 background-color: #fff;
49 51 border: 1px solid #000;
50 52 color: #000;
... ... @@ -290,8 +292,8 @@
290 292 <img src="~/../content/images/DA/navigator-view.png" style="height:30px; width:50px" />
291 293 </button>
292 294  
293   - <div class="dropdown-menu active" id="navigatorDiv" style="min-height:auto; min-width:auto; ">
294   - <div id="containment-wrapper" align="center" style="min-width:auto;height:119px; ">
  295 + <div class="dropdown-menu active" id="navigatorDiv" style="min-height: initial; min-width: initial; ">
  296 + <div id="containment-wrapper" align="center" style="min-width: initial; height: 119px; ">
295 297 <img id="navimg" alt="" />
296 298 <div id="draggable" class="draggable ui-widget-content dragdivposition" ng-mouseup="ScrollCanvasDiv()">
297 299 </div>
... ... @@ -473,6 +475,13 @@
473 475 <script src="libs/jquery/jquery_plugin/slider-pips/jquery-ui-slider-pips.js"></script>
474 476 <script>
475 477 $(function () {
  478 +
  479 +
  480 + // issue in navigator image in internet explorer
  481 + if ($.browser.msie == true) {
  482 + $("#navigatorDiv").css({"min-width":"auto", "min-height":"auto"});
  483 + $("#containment-wrapper").css("min-width", "auto");
  484 + }
476 485 $("#transparencyScale").draggable();
477 486 $("#draggable").draggable({ containment: "#containment-wrapper", scroll: false });
478 487 });
... ... @@ -501,8 +510,6 @@
501 510 $(".custom-tooltip2").css("display", "none");
502 511 });
503 512  
504   -
505   -
506 513  
507 514 });
508 515 </script>
... ...