Commit a652edefcfa5e09d93bf02489563427b37c4e6ec
1 parent
04010187
resolved issue in atlas anatomy, AOD.
Showing
3 changed files
with
6 additions
and
5 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js
| @@ -31,7 +31,8 @@ function ($scope, $rootScope, log, $location, pages, $routeParams) { | @@ -31,7 +31,8 @@ function ($scope, $rootScope, log, $location, pages, $routeParams) { | ||
| 31 | $rootScope.currentActiveModuleTitle = $scope.links[i].title; | 31 | $rootScope.currentActiveModuleTitle = $scope.links[i].title; |
| 32 | if ($rootScope.currentActiveModuleTitle == "IP 10" || $rootScope.currentActiveModuleTitle == "A.D.A.M OnDemand") | 32 | if ($rootScope.currentActiveModuleTitle == "IP 10" || $rootScope.currentActiveModuleTitle == "A.D.A.M OnDemand") |
| 33 | { | 33 | { |
| 34 | - document.getElementById('externalLink').style.height = "1024px"; | 34 | + // document.getElementById('externalLink').style.height = "1024px"; |
| 35 | + document.getElementById('externalLink').style.height = $(window).outerHeight() - 128+"px"; | ||
| 35 | 36 | ||
| 36 | } | 37 | } |
| 37 | $scope.objdata = $scope.links[i].objurl; | 38 | $scope.objdata = $scope.links[i].objurl; |
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
| @@ -252,7 +252,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -252,7 +252,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
| 252 | left: 1, | 252 | left: 1, |
| 253 | }, | 253 | }, |
| 254 | 254 | ||
| 255 | - size: { width: $(window).outerWidth() - 10, height: $(window).outerHeight() - 110 }, | 255 | + size: { width: $(window).outerWidth() - 10, height: $(window).outerHeight() - 125 }, |
| 256 | 256 | ||
| 257 | }); | 257 | }); |
| 258 | 258 | ||
| @@ -278,9 +278,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -278,9 +278,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
| 278 | if (document.getElementById('aaBodyView') != null) { | 278 | if (document.getElementById('aaBodyView') != null) { |
| 279 | 279 | ||
| 280 | //0.4 added some stylesheets | 280 | //0.4 added some stylesheets |
| 281 | - $('#aaBodyView').css("height", $(window).outerHeight()); | 281 | + $('#aaBodyView').css("height", $(window).outerHeight()-65); |
| 282 | 282 | ||
| 283 | - $('#aaBodyView').css("width", $(window).outerWidth()); | 283 | + $('#aaBodyView').css("width", $(window).outerWidth()-15); |
| 284 | 284 | ||
| 285 | $rootScope.canvasDivHeight = $('.jsPanel-content').height() - $('.main2 .stickey-area').height(); | 285 | $rootScope.canvasDivHeight = $('.jsPanel-content').height() - $('.main2 .stickey-area').height(); |
| 286 | 286 |
400-SOURCECODE/AIAHTML5.Web/app/views/Link/Link-view.html
| 1 | <div class="bodyWrap row "> | 1 | <div class="bodyWrap row "> |
| 2 | <div ng-include="'app/widget/MainMenu.html'" /> | 2 | <div ng-include="'app/widget/MainMenu.html'" /> |
| 3 | - <div class="main" style="min-height:750px;"> | 3 | + <div class="main" > |
| 4 | <div id="siteloader" class="col-sm-12"> | 4 | <div id="siteloader" class="col-sm-12"> |
| 5 | <!--<object style="width:100%; height:100%" type="text/html" data={{objdata}}></object>--> | 5 | <!--<object style="width:100%; height:100%" type="text/html" data={{objdata}}></object>--> |
| 6 | <object id="externalLink" ng-style="myObj" type="text/html" data={{objdata}}></object> | 6 | <object id="externalLink" ng-style="myObj" type="text/html" data={{objdata}}></object> |