Commit ca615b7463a3dafffb8133f444fa085c533e03ab
Merge branch 'AtlasAnatomyJSPanelIssue' into Develop
Showing
3 changed files
with
7 additions
and
3 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
| @@ -610,7 +610,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | @@ -610,7 +610,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | ||
| 610 | theme: 'success', | 610 | theme: 'success', |
| 611 | currentController: 'CIController', | 611 | currentController: 'CIController', |
| 612 | parentSlug: 'clinical-illustrations', | 612 | parentSlug: 'clinical-illustrations', |
| 613 | - content: '<div class="row" id="canvasDiv"><div style="align:left;width:100%;height:100%"><canvas id="canvas" ng-click="onDrawingCanvasClick($event)" width="1369" height="325" class="canvas-annotationStyle" style="position: absolute; background-color: transparent;z-index:1 "></canvas> <canvas id="canvasPaint" ng-click="FreeStylePaint($event)" width="1369" height="325" class="canvas-annotationStyle1" style="position: absolute;z-index:0;"></canvas></div>' + | 613 | + content: '<div class="row" id="canvasDiv"><div style="align:left;><canvas id="canvas" ng-click="onDrawingCanvasClick($event)" width="1369" height="325" class="canvas-annotationStyle" style="position: absolute; background-color: transparent;z-index:1 "></canvas> <canvas id="canvasPaint" ng-click="FreeStylePaint($event)" width="1369" height="325" class="canvas-annotationStyle1" style="position: absolute;z-index:0;"></canvas></div>' + |
| 614 | '<div class="col-sm-12 img-thumbnail" align="center">' + | 614 | '<div class="col-sm-12 img-thumbnail" align="center">' + |
| 615 | '<img src="' + $scope.clickedCIImage + '" alt="" title="" class="img-responsive "><div class="col-sm-12 well img-subtitle">' + | 615 | '<img src="' + $scope.clickedCIImage + '" alt="" title="" class="img-responsive "><div class="col-sm-12 well img-subtitle">' + |
| 616 | '<div align="left" id="sid"><p>' + $scope.clickedCISummary + '</p></div><button id="btnTxtOnOff" class="btn btn-primary pull-right">Text Off</button>' + | 616 | '<div align="left" id="sid"><p>' + $scope.clickedCISummary + '</p></div><button id="btnTxtOnOff" class="btn btn-primary pull-right">Text Off</button>' + |
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
| @@ -274,9 +274,13 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -274,9 +274,13 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
| 274 | $timeout(function () { | 274 | $timeout(function () { |
| 275 | $compile(aaViewElement.contents())($scope); | 275 | $compile(aaViewElement.contents())($scope); |
| 276 | 276 | ||
| 277 | - if (document.getElementById('aaDetailPageDiv') != null) { | 277 | + //if (document.getElementById('aaDetailPageDiv') != null) { |
| 278 | + if (document.getElementById('aaBodyView') != null) { | ||
| 278 | 279 | ||
| 279 | //0.4 added some stylesheets | 280 | //0.4 added some stylesheets |
| 281 | + $('#aaBodyView').css("height", $(window).outerHeight()); | ||
| 282 | + | ||
| 283 | + $('#aaBodyView').css("width", $(window).outerWidth()); | ||
| 280 | 284 | ||
| 281 | $rootScope.canvasDivHeight = $('.jsPanel-content').height() - $('.main2 .stickey-area').height(); | 285 | $rootScope.canvasDivHeight = $('.jsPanel-content').height() - $('.main2 .stickey-area').height(); |
| 282 | 286 |
400-SOURCECODE/AIAHTML5.Web/app/views/module-item-view.html
| 1 | <div> | 1 | <div> |
| 2 | <div ng-include="aap/widget/MainMenu.html"></div> | 2 | <div ng-include="aap/widget/MainMenu.html"></div> |
| 3 | - <div ng-init="openModuleItem()" id="" class="aaBodyView" ng-controller="TileViewListController"></div> | 3 | + <div ng-init="openModuleItem()" id="aaBodyView" class="aaBodyView" ng-controller="TileViewListController"></div> |
| 4 | <!--<div > | 4 | <!--<div > |
| 5 | 5 | ||
| 6 | </div>--> | 6 | </div>--> |